3 files changed, 28 insertions, 10 deletions

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"