19 files changed, 268 insertions, 48 deletions

diff --git a/components/kube/qml/Kube.qml b/components/kube/qml/Kube.qml
index bf38ab72..34c2a59e 100644
--- a/components/kube/qml/Kube.qml
+++ b/components/kube/qml/Kube.qml
@@ -225,12 +225,17 @@ Controls2.ApplicationWindow {
 
             Kube.Listener {
                 filter: Kube.Messages.reply
-                onMessageReceived: kubeViews.replaceView("composer", {message: message.mail, loadAsDraft: false})
+                onMessageReceived: kubeViews.replaceView("composer", {message: message.mail, loadType: Kube.ComposerController.Reply})
+            }
+
+            Kube.Listener {
+                filter: Kube.Messages.forward
+                onMessageReceived: kubeViews.replaceView("composer", {message: message.mail, loadType: Kube.ComposerController.Forward})
             }
 
             Kube.Listener {
                 filter: Kube.Messages.edit
-                onMessageReceived: kubeViews.replaceView("composer", {message: message.mail, loadAsDraft: true})
+                onMessageReceived: kubeViews.replaceView("composer", {message: message.mail, loadType: Kube.ComposerController.Draft})
             }
 
             Kube.Listener {
diff --git a/framework/qml/Icons.qml b/framework/qml/Icons.qml
index 3636a192..2afe840e 100644
--- a/framework/qml/Icons.qml
+++ b/framework/qml/Icons.qml
@@ -41,6 +41,7 @@ Item {
     property string edit: "document-edit"
     property string edit_inverted: "document-edit-inverted"
     property string replyToSender: "mail-reply-sender"
+    property string forward: "mail-forward"
     property string outbox: "mail-folder-outbox"
     property string outbox_inverted: "mail-folder-outbox-inverted"
     property string copy: "edit-copy"
diff --git a/framework/qml/MailViewer.qml b/framework/qml/MailViewer.qml
index 1a832470..f52e694d 100644
--- a/framework/qml/MailViewer.qml
+++ b/framework/qml/MailViewer.qml
@@ -370,24 +370,40 @@ Rectangle {
             }
         }
 
-        Kube.IconButton {
-            visible: !model.trash
-            anchors{
+        Grid {
+            anchors {
                 verticalCenter: parent.verticalCenter
                 right: parent.right
                 rightMargin: Kube.Units.largeSpacing
             }
-            activeFocusOnTab: false
+            columns: 2
 
-            iconName: model.draft ? Kube.Icons.edit : Kube.Icons.replyToSender
-            onClicked: {
-                if (model.draft) {
-                    Kube.Fabric.postMessage(Kube.Messages.edit, {"mail": model.mail, "isDraft": model.draft})
-                } else {
-                    Kube.Fabric.postMessage(Kube.Messages.reply, {"mail": model.mail, "isDraft": model.draft})
+            Kube.IconButton {
+                visible: !model.trash
+                activeFocusOnTab: false
+
+                iconName: model.draft ? Kube.Icons.edit : Kube.Icons.replyToSender
+                onClicked: {
+                    if (model.draft) {
+                        Kube.Fabric.postMessage(Kube.Messages.edit, {"mail": model.mail})
+                    } else {
+                        Kube.Fabric.postMessage(Kube.Messages.reply, {"mail": model.mail})
+                    }
                 }
             }
+
+            Kube.IconButton {
+                visible: !model.trash && !model.draft
+                activeFocusOnTab: false
+
+                iconName: Kube.Icons.forward
+                onClicked: {
+                    Kube.Fabric.postMessage(Kube.Messages.forward, {"mail": model.mail})
+                }
+            }
+
         }
+
     }
     Rectangle {
         anchors.fill: parent
diff --git a/framework/qml/Messages.qml b/framework/qml/Messages.qml
index 18db51ff..9df83863 100644
--- a/framework/qml/Messages.qml
+++ b/framework/qml/Messages.qml
@@ -44,6 +44,7 @@ Item {
     property string search: "search"
     property string synchronize: "synchronize"
     property string reply: "reply"
+    property string forward: "forward"
     property string edit: "edit"
     property string compose: "compose"
     property string sendOutbox: "sendOutbox"
diff --git a/framework/src/domain/composercontroller.cpp b/framework/src/domain/composercontroller.cpp
index 60e955ea..4bfc34ab 100644
--- a/framework/src/domain/composercontroller.cpp
+++ b/framework/src/domain/composercontroller.cpp
@@ -272,14 +272,8 @@ static QStringList getStringListFromAddresses(const KMime::Types::Mailbox::List
 void ComposerController::addAttachmentPart(KMime::Content *partToAttach)
 {
     QVariantMap map;
-    if (partToAttach->contentType()->mimeType() == "multipart/digest" ||
-            partToAttach->contentType()->mimeType() == "message/rfc822") {
-        // if it is a digest or a full message, use the encodedContent() of the attachment,
-        // which already has the proper headers
-        map.insert("content", partToAttach->encodedContent());
-    } else {
-        map.insert("content", partToAttach->decodedContent());
-    }
+    // May need special care for the multipart/digest MIME type
+    map.insert("content", partToAttach->decodedContent());
     map.insert("mimetype", partToAttach->contentType()->mimeType());
 
     QMimeDatabase db;
@@ -337,7 +331,40 @@ void ComposerController::setMessage(const KMime::Message::Ptr &msg)
     setExistingMessage(msg);
 }
 
-void ComposerController::loadMessage(const QVariant &message, bool loadAsDraft)
+void ComposerController::loadDraft(const QVariant &message) {
+    loadMessage(message, [this] (const KMime::Message::Ptr &mail) {
+                mRemoveDraft = true;
+                setMessage(mail);
+            });
+}
+
+void ComposerController::loadReply(const QVariant &message) {
+    loadMessage(message, [this] (const KMime::Message::Ptr &mail) {
+                //Find all personal email addresses to exclude from reply
+                KMime::Types::AddrSpecList me;
+                auto list = static_cast<IdentitySelector*>(mIdentitySelector.data())->getAllAddresses();
+                for (const auto &a : list) {
+                    KMime::Types::Mailbox mb;
+                    mb.setAddress(a);
+                    me << mb.addrSpec();
+                }
+
+                MailTemplates::reply(mail, [this] (const KMime::Message::Ptr &reply) {
+                            //We assume reply
+                            setMessage(reply);
+                        }, me);
+            });
+}
+
+void ComposerController::loadForward(const QVariant &message) {
+    loadMessage(message, [this] (const KMime::Message::Ptr &mail) {
+                MailTemplates::forward(mail, [this] (const KMime::Message::Ptr &fwdMessage) {
+                            setMessage(fwdMessage);
+                        });
+            });
+}
+
+void ComposerController::loadMessage(const QVariant &message, std::function<void(const KMime::Message::Ptr&)> callback)
 {
     using namespace Sink;
     using namespace Sink::ApplicationDomain;
@@ -346,8 +373,7 @@ void ComposerController::loadMessage(const QVariant &message, bool loadAsDraft)
     Q_ASSERT(msg);
     Query query(*msg);
     query.request<Mail::MimeMessage>();
-    Store::fetchOne<Mail>(query).then([this, loadAsDraft](const Mail &mail) {
-        mRemoveDraft = loadAsDraft;
+    Store::fetchOne<Mail>(query).then([this, callback](const Mail &mail) {
         setExistingMail(mail);
 
         const auto mailData = KMime::CRLFtoLF(mail.getMimeMessage());
@@ -355,23 +381,7 @@ void ComposerController::loadMessage(const QVariant &message, bool loadAsDraft)
             KMime::Message::Ptr mail(new KMime::Message);
             mail->setContent(mailData);
             mail->parse();
-            if (loadAsDraft) {
-                setMessage(mail);
-            } else {
-                //Find all personal email addresses to exclude from reply
-                KMime::Types::AddrSpecList me;
-                auto list = static_cast<IdentitySelector*>(mIdentitySelector.data())->getAllAddresses();
-                for (const auto &a : list) {
-                    KMime::Types::Mailbox mb;
-                    mb.setAddress(a);
-                    me << mb.addrSpec();
-                }
-
-                MailTemplates::reply(mail, [this] (const KMime::Message::Ptr &reply) {
-                    //We assume reply
-                    setMessage(reply);
-                }, me);
-            }
+            callback(mail);
         } else {
             qWarning() << "Retrieved empty message";
         }
diff --git a/framework/src/domain/composercontroller.h b/framework/src/domain/composercontroller.h
index 0ace365b..ac83dfd3 100644
--- a/framework/src/domain/composercontroller.h
+++ b/framework/src/domain/composercontroller.h
@@ -81,12 +81,21 @@ class ComposerController : public Kube::Controller
     KUBE_CONTROLLER_ACTION(saveAsDraft)
 
 public:
+    enum LoadType {
+        Draft,
+        Reply,
+        Forward,
+    };
+    Q_ENUMS(LoadType);
+
     explicit ComposerController();
 
     Completer *recipientCompleter() const;
     Selector *identitySelector() const;
 
-    Q_INVOKABLE void loadMessage(const QVariant &draft, bool loadAsDraft);
+    Q_INVOKABLE void loadDraft(const QVariant &message);
+    Q_INVOKABLE void loadReply(const QVariant &message);
+    Q_INVOKABLE void loadForward(const QVariant &message);
 
 public slots:
     virtual void clear() Q_DECL_OVERRIDE;
@@ -95,6 +104,8 @@ private slots:
     void findPersonalKey();
 
 private:
+    void loadMessage(const QVariant &message, std::function<void(const KMime::Message::Ptr&)> callback);
+
     void recordForAutocompletion(const QByteArray &addrSpec, const QByteArray &displayName);
     void setMessage(const QSharedPointer<KMime::Message> &msg);
     void addAttachmentPart(KMime::Content *partToAttach);
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"}};
diff --git a/icons/breeze/icons/actions/16/mail-forward-inverted.svg b/icons/breeze/icons/actions/16/mail-forward-inverted.svg
new file mode 100644
index 00000000..b0819afd
--- /dev/null
+++ b/icons/breeze/icons/actions/16/mail-forward-inverted.svg
@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#f2f2f2;
+      }
+      </style>
+  </defs>
+ <path style="fill:currentColor;fill-opacity:1;stroke:none" 
+     d="M 8.484909,2 7.756539,2.7263772 11.995976,6.9542136 2,7 2,8 12.060363,7.9815758 7.756539,12.273622 8.484909,13 14,7.4999998 Z"
+     class="ColorScheme-Text"
+     />
+</svg>
diff --git a/icons/breeze/icons/actions/16/mail-forward.svg b/icons/breeze/icons/actions/16/mail-forward.svg
new file mode 100644
index 00000000..c46d7b78
--- /dev/null
+++ b/icons/breeze/icons/actions/16/mail-forward.svg
@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#4d4d4d;
+      }
+      </style>
+  </defs>
+ <path style="fill:currentColor;fill-opacity:1;stroke:none" 
+     d="M 8.484909,2 7.756539,2.7263772 11.995976,6.9542136 2,7 2,8 12.060363,7.9815758 7.756539,12.273622 8.484909,13 14,7.4999998 Z"
+     class="ColorScheme-Text"
+     />
+</svg>
diff --git a/icons/breeze/icons/actions/22/mail-forward-inverted.svg b/icons/breeze/icons/actions/22/mail-forward-inverted.svg
new file mode 100644
index 00000000..2284ec32
--- /dev/null
+++ b/icons/breeze/icons/actions/22/mail-forward-inverted.svg
@@ -0,0 +1,14 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22 22">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#f2f2f2;
+      }
+      </style>
+  </defs>
+ <path 
+    style="fill:currentColor;fill-opacity:1;stroke:none" 
+    d="M 1 3 L 1 4 L 1 12 L 1 18 L 1 18.414062 L 1 19 L 2 19 L 8 19 L 14 19 L 14 18 L 8 18 L 2 18 L 2 17.414062 L 2.4628906 16.951172 L 8.7304688 10.683594 L 10.183594 12.134766 L 10.998047 12.949219 L 11 12.949219 L 11.816406 12.134766 L 13.269531 10.683594 L 14.585938 12 L 16 12 L 13.976562 9.9765625 L 19.728516 4.2226562 L 19.951172 4 L 20 4 L 20 4.2226562 L 20 12 L 21 12 L 21 3 L 20.951172 3 L 20 3 L 19.537109 3 L 2.4628906 3 L 2 3 L 1 3 z M 2 4 L 2.0488281 4 L 2.2714844 4.2226562 L 8.0234375 9.9765625 L 2 16 L 2 12 L 2 4.2226562 L 2 4 z M 3.4628906 4 L 18.537109 4 L 11 11.537109 L 3.4628906 4 z M 17.707031 12 L 17 12.707031 L 19.292969 15 L 15 15 L 15 16 L 19.292969 16 L 17 18.292969 L 17.707031 19 L 21 15.707031 L 21.207031 15.5 L 21 15.292969 L 17.707031 12 z "
+    class="ColorScheme-Text"
+    />  
+</svg>
diff --git a/icons/breeze/icons/actions/22/mail-forward.svg b/icons/breeze/icons/actions/22/mail-forward.svg
new file mode 100644
index 00000000..7b060b2a
--- /dev/null
+++ b/icons/breeze/icons/actions/22/mail-forward.svg
@@ -0,0 +1,14 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22 22">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#4d4d4d;
+      }
+      </style>
+  </defs>
+ <path 
+    style="fill:currentColor;fill-opacity:1;stroke:none" 
+    d="M 1 3 L 1 4 L 1 12 L 1 18 L 1 18.414062 L 1 19 L 2 19 L 8 19 L 14 19 L 14 18 L 8 18 L 2 18 L 2 17.414062 L 2.4628906 16.951172 L 8.7304688 10.683594 L 10.183594 12.134766 L 10.998047 12.949219 L 11 12.949219 L 11.816406 12.134766 L 13.269531 10.683594 L 14.585938 12 L 16 12 L 13.976562 9.9765625 L 19.728516 4.2226562 L 19.951172 4 L 20 4 L 20 4.2226562 L 20 12 L 21 12 L 21 3 L 20.951172 3 L 20 3 L 19.537109 3 L 2.4628906 3 L 2 3 L 1 3 z M 2 4 L 2.0488281 4 L 2.2714844 4.2226562 L 8.0234375 9.9765625 L 2 16 L 2 12 L 2 4.2226562 L 2 4 z M 3.4628906 4 L 18.537109 4 L 11 11.537109 L 3.4628906 4 z M 17.707031 12 L 17 12.707031 L 19.292969 15 L 15 15 L 15 16 L 19.292969 16 L 17 18.292969 L 17.707031 19 L 21 15.707031 L 21.207031 15.5 L 21 15.292969 L 17.707031 12 z "
+    class="ColorScheme-Text"
+    />  
+</svg>
diff --git a/icons/breeze/icons/actions/24/mail-forward-inverted.svg b/icons/breeze/icons/actions/24/mail-forward-inverted.svg
new file mode 100644
index 00000000..cb6c3817
--- /dev/null
+++ b/icons/breeze/icons/actions/24/mail-forward-inverted.svg
@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#f2f2f2;
+      }
+      </style>
+  </defs>
+ <path style="fill:currentColor;fill-opacity:1;stroke:none" 
+     d="M 2 4 L 2 5 L 2 13 L 2 19 L 2 19.414062 L 2 20 L 3 20 L 9 20 L 15 20 L 15 19 L 9 19 L 3 19 L 3 18.414062 L 3.4628906 17.951172 L 9.7304688 11.683594 L 11.183594 13.134766 L 11.998047 13.949219 L 12 13.949219 L 12.816406 13.134766 L 14.269531 11.683594 L 15.585938 13 L 17 13 L 14.976562 10.976562 L 20.728516 5.2226562 L 20.951172 5 L 21 5 L 21 5.2226562 L 21 13 L 22 13 L 22 4 L 21.951172 4 L 21 4 L 20.537109 4 L 3.4628906 4 L 3 4 L 2 4 z M 3 5 L 3.0488281 5 L 3.2714844 5.2226562 L 9.0234375 10.976562 L 3 17 L 3 13 L 3 5.2226562 L 3 5 z M 4.4628906 5 L 19.537109 5 L 12 12.537109 L 4.4628906 5 z M 18.707031 13 L 18 13.707031 L 20.292969 16 L 16 16 L 16 17 L 20.292969 17 L 18 19.292969 L 18.707031 20 L 22 16.707031 L 22.207031 16.5 L 22 16.292969 L 18.707031 13 z "
+     class="ColorScheme-Text"
+     />
+</svg>
diff --git a/icons/breeze/icons/actions/24/mail-forward.svg b/icons/breeze/icons/actions/24/mail-forward.svg
new file mode 100644
index 00000000..c92455d9
--- /dev/null
+++ b/icons/breeze/icons/actions/24/mail-forward.svg
@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#4d4d4d;
+      }
+      </style>
+  </defs>
+ <path style="fill:currentColor;fill-opacity:1;stroke:none" 
+     d="M 2 4 L 2 5 L 2 13 L 2 19 L 2 19.414062 L 2 20 L 3 20 L 9 20 L 15 20 L 15 19 L 9 19 L 3 19 L 3 18.414062 L 3.4628906 17.951172 L 9.7304688 11.683594 L 11.183594 13.134766 L 11.998047 13.949219 L 12 13.949219 L 12.816406 13.134766 L 14.269531 11.683594 L 15.585938 13 L 17 13 L 14.976562 10.976562 L 20.728516 5.2226562 L 20.951172 5 L 21 5 L 21 5.2226562 L 21 13 L 22 13 L 22 4 L 21.951172 4 L 21 4 L 20.537109 4 L 3.4628906 4 L 3 4 L 2 4 z M 3 5 L 3.0488281 5 L 3.2714844 5.2226562 L 9.0234375 10.976562 L 3 17 L 3 13 L 3 5.2226562 L 3 5 z M 4.4628906 5 L 19.537109 5 L 12 12.537109 L 4.4628906 5 z M 18.707031 13 L 18 13.707031 L 20.292969 16 L 16 16 L 16 17 L 20.292969 17 L 18 19.292969 L 18.707031 20 L 22 16.707031 L 22.207031 16.5 L 22 16.292969 L 18.707031 13 z "
+     class="ColorScheme-Text"
+     />
+</svg>
diff --git a/icons/breeze/icons/actions/32/mail-forward-inverted.svg b/icons/breeze/icons/actions/32/mail-forward-inverted.svg
new file mode 100644
index 00000000..55d4e937
--- /dev/null
+++ b/icons/breeze/icons/actions/32/mail-forward-inverted.svg
@@ -0,0 +1,14 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#f2f2f2;
+      }
+      </style>
+  </defs>
+ <path 
+     style="fill:currentColor;fill-opacity:1;stroke:none" 
+     d="M 2 5 L 2 24.683594 L 2 27 L 20 27 L 20 26 L 3 26 L 3 25.111328 L 3.4296875 24.683594 L 12.785156 15.541016 L 16 18.683594 L 19.214844 15.541016 L 21 17.285156 L 21 15.888672 L 19.929688 14.841797 L 28.976562 6 L 29 6 L 29 14 L 30 14 L 30 5 L 2 5 z M 3 6 L 3.0234375 6 L 12.070312 14.841797 L 3 23.707031 L 3 6 z M 4.453125 6 L 27.546875 6 L 16 17.285156 L 4.453125 6 z M 25.484375 16 L 24.755859 16.726562 L 28.996094 20.955078 L 20 21 L 20 22 L 29.060547 21.982422 L 24.755859 26.273438 L 25.484375 27 L 31 21.5 L 25.484375 16 z "
+     class="ColorScheme-Text"
+     />
+</svg>
diff --git a/icons/breeze/icons/actions/32/mail-forward.svg b/icons/breeze/icons/actions/32/mail-forward.svg
new file mode 100644
index 00000000..2c7a7a4c
--- /dev/null
+++ b/icons/breeze/icons/actions/32/mail-forward.svg
@@ -0,0 +1,14 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#4d4d4d;
+      }
+      </style>
+  </defs>
+ <path 
+     style="fill:currentColor;fill-opacity:1;stroke:none" 
+     d="M 2 5 L 2 24.683594 L 2 27 L 20 27 L 20 26 L 3 26 L 3 25.111328 L 3.4296875 24.683594 L 12.785156 15.541016 L 16 18.683594 L 19.214844 15.541016 L 21 17.285156 L 21 15.888672 L 19.929688 14.841797 L 28.976562 6 L 29 6 L 29 14 L 30 14 L 30 5 L 2 5 z M 3 6 L 3.0234375 6 L 12.070312 14.841797 L 3 23.707031 L 3 6 z M 4.453125 6 L 27.546875 6 L 16 17.285156 L 4.453125 6 z M 25.484375 16 L 24.755859 16.726562 L 28.996094 20.955078 L 20 21 L 20 22 L 29.060547 21.982422 L 24.755859 26.273438 L 25.484375 27 L 31 21.5 L 25.484375 16 z "
+     class="ColorScheme-Text"
+     />
+</svg>
diff --git a/icons/copybreeze.sh b/icons/copybreeze.sh
index 86e3f019..693a40c8 100755
--- a/icons/copybreeze.sh
+++ b/icons/copybreeze.sh
@@ -24,6 +24,7 @@ wantedIcons = [
     "mail-mark-important.svg",
     "mail-mark-unread-new.svg",
     "mail-reply-sender.svg",
+    "mail-forward.svg",
     "mail-folder-outbox.svg",
     "network-disconnect.svg",
     "view-refresh.svg",
diff --git a/views/composer/qml/View.qml b/views/composer/qml/View.qml
index 4086f715..1ea67513 100644
--- a/views/composer/qml/View.qml
+++ b/views/composer/qml/View.qml
@@ -30,7 +30,7 @@ Kube.View {
     id: root
 
     property bool newMessage: false
-    property bool loadAsDraft: false
+    property int loadType: Kube.ComposerController.Draft
     property variant message: {}
     property variant recipients: []
 
@@ -58,11 +58,21 @@ Kube.View {
 
     function loadMessage(message, loadAsDraft) {
         if (message) {
-            composerController.loadMessage(message, loadAsDraft)
-            //Forward focus for replies directly
-            if (!loadAsDraft) {
-                subject.forceActiveFocus()
+
+            switch(loadType) {
+                case Kube.ComposerController.Draft:
+                    composerController.loadDraft(message)
+                    break;
+                case Kube.ComposerController.Reply:
+                    composerController.loadReply(message)
+                    subject.forceActiveFocus()
+                    break;
+                case Kube.ComposerController.Forward:
+                    composerController.loadForward(message)
+                    subject.forceActiveFocus()
+                    break;
             }
+
         } else if (newMessage) {
             composerController.clear()
             if (root.recipients) {