diff --git a/kmfoldersearch.cpp b/kmfoldersearch.cpp
index a394994d7..de2ac3044 100644
--- a/kmfoldersearch.cpp
+++ b/kmfoldersearch.cpp
@@ -1069,7 +1069,11 @@ void KMFolderSearch::examineInvalidatedFolder(KMFolder *folder)
     if (mSearch)
         mSearch->stop();
 
-    removeContents();
+    if (!mUnlinked) {
+        unlink(QFile::encodeName(indexLocation()));
+        mUnlinked = true;
+    }
+
     if (!isOpened()) //give up, until the user manually opens the folder
         return;