diff --git a/imapjob.cpp b/imapjob.cpp
index 8956a986e..13d4baa84 100644
--- a/imapjob.cpp
+++ b/imapjob.cpp
@@ -650,8 +650,8 @@ void ImapJob::slotCopyMessageResult( KIO::Job *job )
     QString errStr = i18n("Error while copying messages.");
     if ( (*it).progressItem )
       (*it).progressItem->setStatus( errStr );
-    account->handleJobError( job, errStr  );
-    deleteLater();
+    if ( account->handleJobError( job, errStr  ) )
+      deleteLater();
     return;
   } else {
     if ( !(*it).msgList.isEmpty() )
diff --git a/kmfoldercachedimap.cpp b/kmfoldercachedimap.cpp
index 6d1c45758..5a3140778 100644
--- a/kmfoldercachedimap.cpp
+++ b/kmfoldercachedimap.cpp
@@ -301,6 +301,11 @@ void KMFolderCachedImap::readConfig()
 
 void KMFolderCachedImap::writeConfig()
 {
+  // don't re-write the config of a removed folder, this has just been deleted in
+  // the folder manager
+  if ( mFolderRemoved )
+    return;
+
   KConfigGroup configGroup( KMKernel::config(), "Folder-" + folder()->idString() );
   configGroup.writeEntry( "ImapPath", mImapPath );
   configGroup.writeEntry( "NoContent", mNoContent );