diff --git a/kmaccount.cpp b/kmaccount.cpp
index 14f44e040..c3cb55a62 100644
--- a/kmaccount.cpp
+++ b/kmaccount.cpp
@@ -316,3 +316,22 @@ QString KMAccount::encryptStr(const QString &aStr)
       QChar(0x1001F - aStr[i].unicode());
   return result;
 }
+
+//-----------------------------------------------------------------------------
+QString KMAccount::importPassword(const QString &aStr)
+{
+  unsigned int i, val;
+  unsigned int len = aStr.length();
+  QCString result;
+  result.resize(len+1);
+
+  for (i=0; i<len; i++)
+  {
+    val = aStr[i] - ' ';
+    val = (255-' ') - val;
+    result[i] = (char)(val + ' ');
+  }
+  result[i] = '\0';
+
+  return encryptStr(result);
+}
diff --git a/kmaccount.h b/kmaccount.h
index 6aafaa0d6..e6e20d139 100644
--- a/kmaccount.h
+++ b/kmaccount.h
@@ -144,6 +144,8 @@ public:
   static QString encryptStr(const QString& inStr);
   static QString decryptStr(const QString& inStr) { return  encryptStr(inStr); }
 
+  static QString importPassword(const QString &);
+
 signals:
   virtual void finishedCheck(bool newMail);
 
diff --git a/kmacctexppop.cpp b/kmacctexppop.cpp
index fbca98a61..15f0afdfc 100644
--- a/kmacctexppop.cpp
+++ b/kmacctexppop.cpp
@@ -178,7 +178,15 @@ void KMAcctExpPop::readConfig(KConfig& config)
   mAuth = config.readEntry("auth", "USER");
   mUsePipelining = config.readNumEntry("pipelining", FALSE);
   mStorePasswd = config.readNumEntry("store-passwd", FALSE);
-  if (mStorePasswd) mPasswd = config.readEntry("pass");
+  if (mStorePasswd)
+  {
+    mPasswd = config.readEntry("pass");
+    if (mPasswd.isEmpty())
+    {
+      mPasswd = config.readEntry("passwd");
+      if (!mPasswd.isEmpty()) mPasswd = importPassword(mPasswd);
+    }
+  }
   else mPasswd = "";
   mHost = config.readEntry("host");
   mPort = config.readNumEntry("port");
diff --git a/kmacctimap.cpp b/kmacctimap.cpp
index 8f7a47e19..17e0a0759 100644
--- a/kmacctimap.cpp
+++ b/kmacctimap.cpp
@@ -134,7 +134,15 @@ void KMAcctImap::readConfig(KConfig& config)
 
   mLogin = config.readEntry("login", "");
   mStorePasswd = config.readNumEntry("store-passwd", FALSE);
-  if (mStorePasswd) mPasswd = config.readEntry("pass");
+  if (mStorePasswd)
+  {
+    mPasswd = config.readEntry("pass");
+    if (mPasswd.isEmpty())
+    {
+      mPasswd = config.readEntry("passwd");
+      if (!mPasswd.isEmpty()) mPasswd = importPassword(mPasswd);
+    }
+  }
   else mPasswd = "";
   mHost = config.readEntry("host");
   mPort = config.readNumEntry("port");
diff --git a/kmail.upd b/kmail.upd
index ea8013947..d9e5fbc1a 100644
--- a/kmail.upd
+++ b/kmail.upd
@@ -3,29 +3,6 @@ Id=1
 File=kmailrc
 Group=sending mail,Transport 1
 Script=upgrade-transport.pl,perl
-# Remove passwords in the old format
-Id=3
-File=kmailrc
-Group=Account 1
-RemoveKey=passwd
-Group=Account 2
-RemoveKey=passwd
-Group=Account 3
-RemoveKey=passwd
-Group=Account 4
-RemoveKey=passwd
-Group=Account 5
-RemoveKey=passwd
-Group=Account 6
-RemoveKey=passwd
-Group=Account 7
-RemoveKey=passwd
-Group=Account 8
-RemoveKey=passwd
-Group=Account 9
-RemoveKey=passwd
-Group=Account 10
-RemoveKey=passwd
 # Fix spelling of QuoutedText[123]
 Id=4
 File=kmailrc,kmailrc