diff --git a/kmcomposewin.cpp b/kmcomposewin.cpp
index 751a5e395..de6c8cdff 100644
--- a/kmcomposewin.cpp
+++ b/kmcomposewin.cpp
@@ -719,8 +719,10 @@ void KMComposeWin::autoSaveMessage()
   applyChanges( true, true );
 
   // Don't continue before the applyChanges is done!
-  qApp->enter_loop();
+}
 
+void KMComposeWin::slotContinueAutoSave() 
+{
   // Ok, it's done now - continue dead letter saving
   if ( mComposedMessages.isEmpty() ) {
     kDebug(5006) <<"Composing the message failed.";
@@ -764,17 +766,10 @@ void KMComposeWin::autoSaveMessage()
   }
 
   if ( autoSaveInterval() > 0 ) {
-    mAutoSaveTimer->start( autoSaveInterval() );
+    updateAutoSave();
   }
 }
 
-void KMComposeWin::slotContinueAutoSave( bool )
-{
-  disconnect( this, SIGNAL( applyChangesDone( bool ) ),
-              this, SLOT( slotContinueAutoSave( bool ) ) );
-  qApp->exit_loop();
-}
-
 //-----------------------------------------------------------------------------
 void KMComposeWin::slotView( void )
 {
diff --git a/kmcomposewin.h b/kmcomposewin.h
index 151f06bca..7cc5977d9 100644
--- a/kmcomposewin.h
+++ b/kmcomposewin.h
@@ -755,7 +755,7 @@ public: // mailserviceimpl
     int mAttachFilesSend;
 
   private:
-    // helper method for slotInsert(My)PublicKey()
+  // helper method for slotInsert(My)PublicKey()
     void startPublicKeyExport();
     bool canSignEncryptAttachments() const {
       return cryptoMessageFormat() != Kleo::InlineOpenPGPFormat;
@@ -776,7 +776,7 @@ public: // mailserviceimpl
 
     void slotContinueDoSend( bool );
     void slotContinuePrint( bool );
-    void slotContinueAutoSave( bool );
+    void slotContinueAutoSave();
 
     void slotEncryptChiasmusToggled( bool );