diff --git a/folderstorage.cpp b/folderstorage.cpp
index bbb3e607f..b40c50333 100644
--- a/folderstorage.cpp
+++ b/folderstorage.cpp
@@ -453,8 +453,7 @@ void FolderStorage::take(QPtrList<KMMessage> msgList)
     if (msg->parent())
     {
       int idx = msg->parent()->find(msg);
-      assert( idx != -1);
-      FolderStorage::take(idx);
+      take(idx);
     }
   }
 }
diff --git a/kmfoldermaildir.cpp b/kmfoldermaildir.cpp
index ff751e5d6..9fd6261ef 100644
--- a/kmfoldermaildir.cpp
+++ b/kmfoldermaildir.cpp
@@ -940,12 +940,15 @@ KMMessage* KMFolderMaildir::take(int idx)
   // first, we do the high-level stuff.. then delete later
   KMMessage *msg = KMFolderIndex::take(idx);
 
-  if (!msg || !msg->fileName()) return 0;
+  if (!msg || !msg->fileName()) {
+    return 0;
+  }
 
-  if (removeFile(msg->fileName()))
+  if ( removeFile(msg->fileName()) ) {
     return msg;
-  else
+  } else {
     return 0;
+  }
 }
 
 // static
diff --git a/kmfoldermaildir.h b/kmfoldermaildir.h
index f062b5d94..afad6167b 100644
--- a/kmfoldermaildir.h
+++ b/kmfoldermaildir.h
@@ -35,8 +35,6 @@ public:
   /** Detach message from this folder. Usable to call addMsg() afterwards.
     Loads the message if it is not loaded up to now. */
   virtual KMMessage* take(int idx);
-  virtual void take(QPtrList<KMMessage> msgList)
-  { return KMFolderIndex::take(msgList); }
 
   /** Add the given message to the folder. Usually the message
     is added at the end of the folder. Returns zero on success and