diff --git a/folderstorage.cpp b/folderstorage.cpp
index b44be16ef..9b471397a 100644
--- a/folderstorage.cpp
+++ b/folderstorage.cpp
@@ -796,7 +796,7 @@ void FolderStorage::writeConfig()
 {
   KConfig* config = KMKernel::config();
   KConfigGroupSaver saver(config, "Folder-" + folder()->idString());
-  config->writeEntry("UnreadMsgs", countUnread());
+  config->writeEntry("UnreadMsgs", mGuessedUnreadMsgs == -1 ? mUnreadMsgs : -1);
   config->writeEntry("TotalMsgs", mTotalMsgs);
   config->writeEntry("Compactable", mCompactable);