Merge remote-tracking branch 'origin/master' into frameworks

Conflicts: libkdepim/ldap/ldapclientsearch.cpp
12 years ago · 478c78dd89
parent c225f9dbbb c60a35bdde
commit 478c78dd89
1 changed files with 2 additions and 1 deletions
--- a/editor/kmcomposewin.cpp
+++ b/editor/kmcomposewin.cpp
@ -2423,7 +2423,8 @@ void KMComposeWin::slotNewComposer()
    KMime::Message::Ptr msg( new KMime::Message );

    MessageHelper::initHeader( msg, KMKernel::self()->identityManager() );
-    win = new KMComposeWin( msg, false, false );
+    win = new KMComposeWin( msg, false, false, KMail::Composer::New );
+    win->setCollectionForNewMessage(mCollectionForNewMessage);
    win->show();
 }