2 files changed, 73 insertions, 25 deletions

diff --git a/applications/kube-mail/package/contents/ui/Composer.qml b/applications/kube-mail/package/contents/ui/Composer.qml
index 5502b7f9..1a6a4cc4 100644
--- a/applications/kube-mail/package/contents/ui/Composer.qml
+++ b/applications/kube-mail/package/contents/ui/Composer.qml
@@ -18,9 +18,11 @@
 import QtQuick 2.4
 import QtQuick.Controls 1.4
 import QtQuick.Layouts 1.1
+import org.kde.plasma.components 2.0 as PlasmaComponents
 
 import org.kde.kube.mail 1.0 as Mail
 
+
 Item {
     id: root
     property variant originalMessage
@@ -79,20 +81,48 @@ Item {
                 text: "To"
             }
 
-            TextField {
-                id: to
-
+            RowLayout {
                 Layout.fillWidth: true
 
-                text: composer.to
+                TextField {
+                    id: to
 
-                onTextChanged: {
-                    composer.to = text;
+                    Layout.fillWidth: true
+
+                    text: composer.to
+
+                    onTextChanged: {
+                        composer.to = text;
+                    }
+                }
+
+                PlasmaComponents.Button {
+                    id: ccButton
+
+                    text: "Cc"
+
+                    onClicked: {
+                        cc.visible = true
+                        ccButton.visible = false
+                    }
+                }
+
+                PlasmaComponents.Button {
+                    id: bccButton
+
+                    text: "Bcc"
+
+                    onClicked: {
+                        bcc.visible = true
+                        bccButton.visible = false
+                    }
                 }
             }
 
             Label {
                 text: "Cc"
+
+                visible: cc.visible
             }
 
             TextField {
@@ -100,6 +130,8 @@ Item {
 
                 Layout.fillWidth: true
 
+                visible: false
+
                 text: composer.cc
 
                 onTextChanged: {
@@ -109,6 +141,8 @@ Item {
 
             Label {
                 text: "Bcc"
+
+                visible: bcc.visible
             }
 
             TextField {
@@ -116,6 +150,8 @@ Item {
 
                 Layout.fillWidth: true
 
+                visible : false
+
                 text: composer.bcc
 
                 onTextChanged: {
@@ -138,6 +174,36 @@ Item {
             }
         }
 
+        Item {
+
+            Layout.fillWidth: true
+
+            height: subject.height * 1.5
+
+            PlasmaComponents.Button {
+
+                anchors {
+                    bottom: parent.bottom
+                }
+
+                text: "Save as Draft"
+
+                onClicked: {
+                    composer.saveAsDraft()
+                }
+            }
+
+            PlasmaComponents.Button {
+
+                anchors {
+                    bottom: parent.bottom
+                    right: parent.right
+                }
+
+                text: "Attach"
+            }
+        }
+
         TextArea {
             id: content
 
diff --git a/applications/kube-mail/package/contents/ui/FocusComposer.qml b/applications/kube-mail/package/contents/ui/FocusComposer.qml
index 2be656ab..8ec01cc9 100644
--- a/applications/kube-mail/package/contents/ui/FocusComposer.qml
+++ b/applications/kube-mail/package/contents/ui/FocusComposer.qml
@@ -65,7 +65,7 @@ Rectangle {
             }
 
             RowLayout {
-                Layout.fillWidth: true
+                Layout.alignment: Qt.AlignRight
 
                 Button {
                     text: "Send"
@@ -75,24 +75,6 @@ Rectangle {
                         root.visible = false
                     }
                 }
-
-                Button {
-                    text: "Save Draft"
-
-                    onClicked: {
-                        composer.saveAsDraft()
-                        root.visible = false
-                    }
-                }
-
-                Button {
-                    text: "Discard"
-
-                    onClicked: {
-                        composer.clear()
-                        root.visible = false
-                    }
-                }
             }
         }
     }