diff --git a/kmfoldermbox.cpp b/kmfoldermbox.cpp
index 0d7391fee..38290e9b6 100644
--- a/kmfoldermbox.cpp
+++ b/kmfoldermbox.cpp
@@ -242,15 +242,16 @@ void KMFolderMbox::close(bool aForced)
       writeConfig();
   }
 
-  unlock();
-  mMsgList.clear(TRUE);
+  if (!noContent()) {
+    unlock();
+    mMsgList.clear(TRUE);
 
-  if (mStream) fclose(mStream);
+    if (mStream) fclose(mStream);
     if (mIndexStream) {
-	fclose(mIndexStream);
-	updateIndexStreamPtr(TRUE);
+      fclose(mIndexStream);
+      updateIndexStreamPtr(TRUE);
     }
-
+  }
   mOpenCount   = 0;
   mStream      = 0;
   mIndexStream = 0;