diff --git a/kmheaders.cpp b/kmheaders.cpp
index cfd4f504a..251b6c564 100644
--- a/kmheaders.cpp
+++ b/kmheaders.cpp
@@ -1461,6 +1461,7 @@ void KMHeaders::moveMsgToFolder ( KMFolder* destFolder, bool askForConfirmation
   if ( destFolder == mFolder ) return; // Catch the noop case
 
   KMMessageList msgList = *selectedMsgs();
+  if ( msgList.isEmpty() ) return;
   if ( !destFolder && askForConfirmation &&    // messages shall be deleted
        KMessageBox::warningContinueCancel(this,
          i18n("<qt>Do you really want to delete the selected message?<br>"
@@ -1481,7 +1482,6 @@ void KMHeaders::moveMsgToFolder ( KMFolder* destFolder, bool askForConfirmation
   connect( command, SIGNAL( completed( KMCommand * ) ),
            this, SLOT( slotMoveCompleted( KMCommand * ) ) );
   command->start();
-
 }
 
 void KMHeaders::slotMoveCompleted( KMCommand *command )