From 271014a8a676479632100a5f3bb311ac6af9ff65 Mon Sep 17 00:00:00 2001
From: Montel Laurent <montel@kde.org>
Date: Tue, 29 Nov 2011 18:17:41 +0100
Subject: [PATCH] Fix restore session

---
 kmcomposewin.cpp | 1 -
 kmkernel.cpp     | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/kmcomposewin.cpp b/kmcomposewin.cpp
index 8d98d84dc..f3f9ff302 100644
--- a/kmcomposewin.cpp
+++ b/kmcomposewin.cpp
@@ -1668,7 +1668,6 @@ void KMComposeWin::setMsg( const KMime::Message::Ptr &newMsg, bool mayAutoSign,
 
   // honor "keep reply in this folder" setting even when the identity is changed later on
   mPreventFccOverwrite = ( !kmailFcc.isEmpty() && ident.fcc() != kmailFcc );
-  autoSaveMessage( true ); //Force save message otherwise restore session will not work
 }
 
 void KMComposeWin::setAutoSaveFileName(const QString& fileName)
diff --git a/kmkernel.cpp b/kmkernel.cpp
index 916a7bd4b..87008a25e 100644
--- a/kmkernel.cpp
+++ b/kmkernel.cpp
@@ -1099,6 +1099,7 @@ void KMKernel::recoverDeadLetters()
       KMail::Composer * autoSaveWin = KMail::makeComposer();
       autoSaveWin->setMsg( autoSaveMessage, false );
       autoSaveWin->setAutoSaveFileName( filename );
+      autoSaveWin->autoSaveMessage( true );//Force save message otherwise restore session will not work
       autoSaveWin->show();
       autoSaveFile.close();
     } else {