diff -Nur src-old/amule.cpp src-new/amule.cpp
--- amule.cpp	2004-04-10 17:39:57.000000000 +0200
+++ amule.cpp	2004-04-15 01:35:01.000000000 +0200
@@ -198,9 +198,10 @@
 	unsigned int geometry_width = 800;
 	unsigned int geometry_height = 600;
 
-
+#ifndef __WXMSW__
 	// catch fatal exceptions
 	wxHandleFatalExceptions(true);
+#endif
 
 	// Apprently needed for *BSD
 	SetResourceLimits();
@@ -431,10 +432,10 @@
 		while ( entries ) {
 			if ( strncmp(entries->mnt_type, "vfat",4) == 0 ) {
 				if ( tempdir.StartsWith( entries->mnt_dir ) ) {
-					amuledlg->AddLogLine(false, "Temp dir is placed on a FAT32 partition. Disabling chmod to avoid useless warnings.");
+					printf("Temp dir is placed on a FAT32 partition. Disabling chmod to avoid useless warnings.");
 					use_chmod = false;
 				} else if ( incomingdir.StartsWith( entries->mnt_dir ) ) {
-					amuledlg->AddLogLine(false, "Incoming dir is placed on a FAT32 partition. Disabling chmod to avoid useless warnings.");
+					printf("Incoming dir is placed on a FAT32 partition. Disabling chmod to avoid useless warnings.");
 					use_chmod = false;
 				}
 			}
@@ -444,27 +445,24 @@
 	
 		fclose(mnt_tab);
 	}
-#endif /*not __OPENBSD__ */
-
-#ifdef __OPENBSD__
-       wxString incomingdir = glob_prefs->GetIncomingDir();
-       wxString tempdir = glob_prefs->GetTempDir();
-       long size, i;
-        struct statfs *mntbuf;
+#else
+	wxString incomingdir = glob_prefs->GetIncomingDir();
+	wxString tempdir = glob_prefs->GetTempDir();
+	long size, i;
+	struct statfs *mntbuf;
  	
-        size = getmntinfo(&mntbuf, MNT_NOWAIT);
-        for (i = 0; i < size; i++) {
-                if ( !strcmp(mntbuf[i].f_fstypename,"msdos"))
-                       if ( tempdir.StartsWith( mntbuf[i].f_mntonname ) ) {
-      				 amuledlg->AddLogLine(false, "Temp dir is placed on a FAT32 partition. Disabling chmod to avoid useless warnings.");
-
-                       		use_chmod = false;
-                       } else if ( incomingdir.StartsWith( mntbuf[i].f_mntonname ) ) {
-
-      				 amuledlg->AddLogLine(false, "Incoming dir is placed on a FAT32 partition. Disabling chmod to avoid useless warnings.");
-
-                       		use_chmod = false;
- 			}     
+	size = getmntinfo(&mntbuf, MNT_NOWAIT);
+	for (i = 0; i < size; i++) {
+		if ( !strcmp(mntbuf[i].f_fstypename,"msdos")) {
+			if ( tempdir.StartsWith( mntbuf[i].f_mntonname ) ) {
+				// Kry - We cannot addlogline because there's no GUI yet!
+      			printf("Temp dir is placed on a FAT32 partition. Disabling chmod to avoid useless warnings.");
+                    use_chmod = false;
+			} else if ( incomingdir.StartsWith( mntbuf[i].f_mntonname ) ) {
+				printf("Incoming dir is placed on a FAT32 partition. Disabling chmod to avoid useless warnings.");
+				use_chmod = false;
+			}     
+		}
 	}
 
 #endif // __OPENBSD__
@@ -965,10 +963,10 @@
 	delete[] amulesig_path;
 } //End Added By Bouc7
 
-
 // Gracefully handle fatal exceptions and print backtrace if possible
 void CamuleApp::OnFatalException()
 {
+#ifndef __WXMSW__
 	// Close sockets first.
 	if ( listensocket )
 		listensocket->Destroy();
@@ -1002,6 +1000,7 @@
 	fprintf(stderr, "\nOOPS! - Seems like aMule crashed\n--== no BACKTRACE yet \n\n");
 #endif
 #endif
+#endif
 }
 
 #define wxGTK_WINDOW 1
diff -Nur src-old/BaseClient.cpp src-new/BaseClient.cpp
--- BaseClient.cpp	2004-04-10 22:05:24.000000000 +0200
+++ BaseClient.cpp	2004-04-15 17:03:49.000000000 +0200
@@ -898,7 +898,7 @@
 	const UINT uExtendedRequestsVer	= 2;
 	const UINT uAcceptCommentVer	= 1;
 	const UINT uNoViewSharedFiles	= (theApp.glob_prefs->CanSeeShares() == vsfaNobody) ? 1 : 0; // for backward compatibility this has to be a 'negative' flag
-	const UINT uMultiPacket			= 1;
+	const UINT uMultiPacket			= 0;
 	const UINT uSupportPreview		= 0; //(thePrefs.CanSeeShares() != vsfaNobody) ? 1 : 0; // set 'Preview supported' only if 'View Shared Files' allowed
 	CTag tagMisOptions(CT_EMULE_MISCOPTIONS1, 
 //				(						<< 4*7) |