diff --git a/imapjob.cpp b/imapjob.cpp
index a588921c7..ebc5acd66 100644
--- a/imapjob.cpp
+++ b/imapjob.cpp
@@ -226,6 +226,8 @@ void ImapJob::slotGetMessageResult( KIO::Job * job )
       msg->setHeaderField("X-UID",uid);
       msg->setComplete( TRUE );
       emit messageRetrieved(msg);
+    } else {
+      emit messageRetrieved(0);
     }
     msg = 0;
   }
diff --git a/kmmainwidget.cpp b/kmmainwidget.cpp
index d2149900e..b8ade5edb 100644
--- a/kmmainwidget.cpp
+++ b/kmmainwidget.cpp
@@ -1582,7 +1582,7 @@ void KMMainWidget::slotReplaceMsgByUnencryptedVersion()
 //-----------------------------------------------------------------------------
 void KMMainWidget::slotUpdateImapMessage(KMMessage *msg)
 {
-  if (msg && ((KMMsgBase*)msg)->isMessage()) {
+  if (msg && ((KMMsgBase*)msg)->isMessage() && msg->isComplete()) {
     mMsgView->setMsg(msg, TRUE);
   }  else // force an update of the folder
     static_cast<KMFolderImap*>(mFolder)->getFolder(true);