3 files changed, 59 insertions, 2 deletions

diff --git a/framework/src/domain/mime/mailtemplates.cpp b/framework/src/domain/mime/mailtemplates.cpp
index 9af15e91..8e644b34 100644
--- a/framework/src/domain/mime/mailtemplates.cpp
+++ b/framework/src/domain/mime/mailtemplates.cpp
@@ -864,6 +864,34 @@ void MailTemplates::reply(const KMime::Message::Ptr &origMsg, const std::functio
     });
 }
 
+void MailTemplates::forward(const KMime::Message::Ptr &origMsg, const std::function<void(const KMime::Message::Ptr &result)> &callback)
+{
+    KMime::Message::Ptr wrapperMsg(new KMime::Message);
+
+    wrapperMsg->to()->clear();
+    wrapperMsg->cc()->clear();
+
+    wrapperMsg->subject()->fromUnicodeString(forwardSubject(origMsg->subject()->asUnicodeString()), "utf-8");
+
+    const QByteArray refStr = getRefStr(origMsg);
+    if (!refStr.isEmpty()) {
+        wrapperMsg->references()->fromUnicodeString(QString::fromLocal8Bit(refStr), "utf-8");
+    }
+
+    KMime::Content* fwdAttachment = new KMime::Content;
+
+    fwdAttachment->contentDisposition()->setDisposition(KMime::Headers::CDinline);
+    fwdAttachment->contentType()->setMimeType("message/rfc822");
+    fwdAttachment->contentDisposition()->setFilename(origMsg->subject()->asUnicodeString() + ".eml");
+    // The mail was parsed in loadMessage before, so no need to assemble it
+    fwdAttachment->setBody(origMsg->encodedContent());
+
+    wrapperMsg->addContent(fwdAttachment);
+    wrapperMsg->assemble();
+
+    callback(wrapperMsg);
+}
+
 QString MailTemplates::plaintextContent(const KMime::Message::Ptr &msg)
 {
     MimeTreeParser::ObjectTreeParser otp;
@@ -899,10 +927,14 @@ static KMime::Content *createAttachmentPart(const QByteArray &content, const QSt
     } else {
         part->contentDisposition(true)->setDisposition(KMime::Headers::CDattachment);
     }
+
     part->contentType(true)->setMimeType(mimeType);
     part->contentType(true)->setName(name, "utf-8");
-    //Just always encode attachments base64 so it's safe for binary data
-    part->contentTransferEncoding(true)->setEncoding(KMime::Headers::CEbase64);
+    // Just always encode attachments base64 so it's safe for binary data,
+    // except when it's another message
+    if(mimeType != "message/rfc822") {
+        part->contentTransferEncoding(true)->setEncoding(KMime::Headers::CEbase64);
+    }
     part->setBody(content);
     return part;
 }
diff --git a/framework/src/domain/mime/mailtemplates.h b/framework/src/domain/mime/mailtemplates.h
index 21efb5a0..9447e169 100644
--- a/framework/src/domain/mime/mailtemplates.h
+++ b/framework/src/domain/mime/mailtemplates.h
@@ -35,6 +35,7 @@ struct Attachment {
 namespace MailTemplates
 {
     void reply(const KMime::Message::Ptr &origMsg, const std::function<void(const KMime::Message::Ptr &result)> &callback, const KMime::Types::AddrSpecList &me = {});
+    void forward(const KMime::Message::Ptr &origMsg, const std::function<void(const KMime::Message::Ptr &result)> &callback);
     QString plaintextContent(const KMime::Message::Ptr &origMsg);
     QString body(const KMime::Message::Ptr &msg, bool &isHtml);
     KMime::Message::Ptr createMessage(KMime::Message::Ptr existingMessage, const QStringList &to, const QStringList &cc, const QStringList &bcc, const KMime::Types::Mailbox &from, const QString &subject, const QString &body, bool htmlBody, const QList<Attachment> &attachments, const std::vector<GpgME::Key> &signingKeys = {}, const std::vector<GpgME::Key> &encryptionKeys = {});
diff --git a/framework/src/domain/mime/tests/mailtemplatetest.cpp b/framework/src/domain/mime/tests/mailtemplatetest.cpp
index 302fae95..8d044608 100644
--- a/framework/src/domain/mime/tests/mailtemplatetest.cpp
+++ b/framework/src/domain/mime/tests/mailtemplatetest.cpp
@@ -224,6 +224,30 @@ private slots:
         QCOMPARE(result->cc()->addresses(), l);
     }
 
+    void testForwardAsAttachment()
+    {
+        auto msg = readMail("plaintext.mbox");
+        KMime::Message::Ptr result;
+        MailTemplates::forward(msg, [&] (const KMime::Message::Ptr &r) {
+            result = r;
+        });
+        QTRY_VERIFY(result);
+        QCOMPARE(result->subject(false)->asUnicodeString(), {"FW: A random subject with alternative contenttype"});
+        QCOMPARE(result->to()->addresses(), {});
+        QCOMPARE(result->cc()->addresses(), {});
+
+        auto attachments = result->attachments();
+        QCOMPARE(attachments.size(), 1);
+        auto attachment = attachments[0];
+        QCOMPARE(attachment->contentDisposition(false)->disposition(), KMime::Headers::CDinline);
+        QCOMPARE(attachment->contentDisposition(false)->filename(), {"A random subject with alternative contenttype.eml"});
+        QVERIFY(attachment->bodyIsMessage());
+
+        attachment->parse();
+        auto origMsg = attachment->bodyAsMessage();
+        QCOMPARE(origMsg->subject(false)->asUnicodeString(), {"A random subject with alternative contenttype"});
+    }
+
     void testCreatePlainMail()
     {
         QStringList to = {{"to@example.org"}};