From 010130243756791299955e6f40afe9c97bbd5559 Mon Sep 17 00:00:00 2001
From: Montel Laurent <montel@kde.org>
Date: Thu, 9 Feb 2017 13:46:07 +0100
Subject: [PATCH] Remove duplicate code

---
 src/kmcommands.cpp | 31 ++++++++++---------------------
 1 file changed, 10 insertions(+), 21 deletions(-)

diff --git a/src/kmcommands.cpp b/src/kmcommands.cpp
index 8832d7474..d88f1beb2 100644
--- a/src/kmcommands.cpp
+++ b/src/kmcommands.cpp
@@ -865,28 +865,17 @@ KMCommand::Result KMReplyCommand::execute()
         return Failed;
     }
 
-    MessageFactory factory(msg, item.id(), MailCommon::Util::updatedCollection(item.parentCollection()));
-    factory.setIdentityManager(KMKernel::self()->identityManager());
-    factory.setFolderIdentity(MailCommon::Util::folderIdentity(item));
-    factory.setMailingListAddresses(KMail::Util::mailingListsFromMessage(item));
-    factory.putRepliesInSameFolder(KMail::Util::putRepliesInSameFolder(item));
-    factory.setReplyStrategy(m_replyStrategy);
-    factory.setSelection(mSelection);
-    if (!mTemplate.isEmpty()) {
-        factory.setTemplate(mTemplate);
-    }
-    if (mNoQuote) {
-        factory.setQuote(false);
-    }
-    bool lastEncrypt = false;
-    bool lastSign = false;
-    KMail::Util::lastEncryptAndSignState(lastEncrypt, lastSign, msg);
+    CreateReplyMessageJobSettings settings;
+    settings.mItem = item;
+    settings.mMsg = msg;
+    settings.mSelection = mSelection;
+    settings.m_replyStrategy = m_replyStrategy;
+    settings.mTemplate = mTemplate;
+    settings.mNoQuote = mNoQuote;
 
-    MessageFactory::MessageReply reply = factory.createReply();
-    KMail::Composer *win = KMail::makeComposer(KMime::Message::Ptr(reply.msg), lastSign, lastEncrypt, replyContext(reply), 0,
-                           mSelection, mTemplate);
-    win->setFocusToEditor();
-    win->show();
+    CreateReplyMessageJob *job = new CreateReplyMessageJob;
+    job->setSettings(settings);
+    job->start();
 
     return OK;
 }