--- kdepim-3.1.92/kmail/kmkernel.cpp--	2003-10-08 17:17:43.000000000 -0400
+++ kdepim-3.1.92/kmail/kmkernel.cpp	2003-10-08 17:25:16.000000000 -0400
@@ -666,8 +666,9 @@ void KMKernel::init()
 
   if (foldersPath.isEmpty())
   {
-    foldersPath = QDir::homeDirPath() + QString("/Mail");
+    foldersPath = QDir::homeDirPath() + QString("/.Mail");
     transferMail();
+    transferMailToPointMail();
   }
   the_undoStack     = new UndoStack(20);
   the_folderMgr     = new KMFolderMgr(foldersPath);
@@ -1471,5 +1472,30 @@ KMailICalIfaceImpl& KMKernel::iCalIface(
   return *mICalIface;
 }
 
+void KMKernel::transferMailToPointMail(void)
+{
+  QDir dir = QDir::home();
+  int rc;
+
+  if (!dir.cd("Mail")) return;
+
+  rc = KMessageBox::questionYesNo(0,
+         i18n(
+	    "The directory ~/Mail exists. From now on, KMail uses the "
+	    "directory ~/.Mail for its messages.\n"
+	    "KMail can move the contents of the directory ~/Mail into "
+	    "~/.Mail, but this will replace existing files with the same "
+	    "name in the directory ~/.Mail (e.g. inbox).\n"
+	    "Should KMail move the mail folders now?"));
+
+  if (rc == KMessageBox::No) return;
+
+  dir.cd("/");  // otherwise we lock the directory
+  testDir("/.Mail");
+  system("mv -f ~/Mail/ ~/.Mail");
+  //system("mv -f ~/Mail/.??* ~/.Mail");
+  system("rmdir ~/Mail");
+}
+
 
 #include "kmkernel.moc"
--- kdepim-3.1.92/kmail/kmkernel.h--	2003-10-08 17:17:46.000000000 -0400
+++ kdepim-3.1.92/kmail/kmkernel.h	2003-10-08 17:24:35.000000000 -0400
@@ -122,6 +122,8 @@ public:
   void cleanup(void);
   void quit();
   void transferMail(void);
+  void transferMailToPointMail(void);
+
   void ungrabPtrKb(void);
   void kmailMsgHandler(QtMsgType aType, const char* aMsg);
   bool doSessionManagement();