Merged revisions 842190 via svnmerge from

svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.1/kdepim

........
  r842190 | tmcguire | 2008-08-04 22:58:56 +0200 (Mon, 04 Aug 2008) | 4 lines
  
  Backport r841606 by tmcguire to the 4.1 branch:
  
  Better replace just the single serial number, not all of them.
........

svn path=/branches/kdepim/enterprise4/kdepim/; revision=851345

kmmsgdict.cpp

@@ -469,13 +469,11 @@ int KMMsgDict::readFolderIds( FolderStorage& storage )
 
     // We found a serial number that is zero. This is not allowed, and would
     // later cause problems like in bug 149715.
-    // Therefore, we invalidate the folder when this happens.
+    // Therefore, use a fresh serial number instead
     if ( msn == 0 ) {
       kWarning() << "Found serial number zero at index" << index << "in folder" << filename;
-      kWarning() << "Invalidating folder.";
-      fclose( fp );
-      delete rentry;
-      return -1;
+      msn = getNextMsgSerNum();
+      Q_ASSERT( msn != 0 );
     }
 
     // Insert into the dict. Don't use dict->replace() as we _know_