3 files changed, 21 insertions, 3 deletions

diff --git a/components/package/contents/ui/Composer.qml b/components/package/contents/ui/Composer.qml
index 8c6f9c77..ed8fb2f2 100644
--- a/components/package/contents/ui/Composer.qml
+++ b/components/package/contents/ui/Composer.qml
@@ -26,6 +26,7 @@ import org.kube.framework.domain 1.0 as KubeFramework
 Item {
     id: root
     property variant originalMessage
+    property variant draftMessage
 
     function send() {
         composer.send()
@@ -40,17 +41,25 @@ Item {
     }
 
     KubeFramework.Retriever {
-        id: retriever
+        id: originalMessageRetriever
         propertyName: "mimeMessage"
         model: KubeFramework.MailListModel {
-            id: mailListModel
             mail: root.originalMessage
         }
     }
 
+    KubeFramework.Retriever {
+        id: draftMessageRetriever
+        propertyName: "mimeMessage"
+        model: KubeFramework.MailListModel {
+            mail: root.draftMessage
+        }
+    }
+
     KubeFramework.ComposerController {
         id: composer
-        originalMessage: retriever.value
+        originalMessage: originalMessageRetriever.value
+        draftMessage: draftMessageRetriever.value
     }
 
     ColumnLayout {
diff --git a/components/package/contents/ui/FocusComposer.qml b/components/package/contents/ui/FocusComposer.qml
index 1cd3cb32..4e61b6c1 100644
--- a/components/package/contents/ui/FocusComposer.qml
+++ b/components/package/contents/ui/FocusComposer.qml
@@ -24,6 +24,7 @@ import org.kube.framework.theme 1.0
 Rectangle {
     id: root
     property variant originalMessage
+    property variant draftMessage
 
     color: ColorPalette.border
 
@@ -62,6 +63,7 @@ Rectangle {
                 Layout.fillWidth: true
                 Layout.fillHeight: true
                 originalMessage: root.originalMessage
+                draftMessage: root.draftMessage
             }
 
             RowLayout {
diff --git a/components/package/contents/ui/MailListView.qml b/components/package/contents/ui/MailListView.qml
index 12d6c705..9caaa9ce 100644
--- a/components/package/contents/ui/MailListView.qml
+++ b/components/package/contents/ui/MailListView.qml
@@ -29,6 +29,7 @@ Controls.ScrollView {
     id: root
     property variant parentFolder
     property variant currentMail
+    property bool isDraft : false
 
     ListView {
         id: listView
@@ -69,6 +70,12 @@ Controls.ScrollView {
                     when: listView.currentIndex == index
                     value: model.domainObject
                 }
+                QtQml.Binding {
+                    target: root
+                    property: "isDraft"
+                    when: listView.currentIndex == index
+                    value: model.draft
+                }
 
                 RowLayout {