3 files changed, 12 insertions, 26 deletions

diff --git a/components/mail/contents/ui/main.qml b/components/mail/contents/ui/main.qml
index c2569cdc..8d7047ab 100644
--- a/components/mail/contents/ui/main.qml
+++ b/components/mail/contents/ui/main.qml
@@ -184,7 +184,8 @@ ApplicationWindow {
                     }
 
                     function handler(context) {
-                        composerComponent.createObject(app, {"originalMessage": context.mail})
+                        var component = composerComponent.createObject(app)
+                        component.loadMessage(context.mail, false)
                     }
                 }
 
@@ -195,7 +196,8 @@ ApplicationWindow {
                     }
 
                     function handler(context) {
-                        composerComponent.createObject(app, {"draftMessage": context.mail})
+                        var component= composerComponent.createObject(app, {"draftMessage": context.mail})
+                        component.loadMessage(context.mail, true)
                     }
                 }
 
diff --git a/components/package/contents/ui/Composer.qml b/components/package/contents/ui/Composer.qml
index ed8fb2f2..aef6913b 100644
--- a/components/package/contents/ui/Composer.qml
+++ b/components/package/contents/ui/Composer.qml
@@ -25,8 +25,10 @@ import org.kube.framework.domain 1.0 as KubeFramework
 
 Item {
     id: root
-    property variant originalMessage
-    property variant draftMessage
+
+    function loadMessage(message, loadAsDraft) {
+        composer.loadMessage(message, loadAsDraft)
+    }
 
     function send() {
         composer.send()
@@ -40,26 +42,8 @@ Item {
         composer.clear();
     }
 
-    KubeFramework.Retriever {
-        id: originalMessageRetriever
-        propertyName: "mimeMessage"
-        model: KubeFramework.MailListModel {
-            mail: root.originalMessage
-        }
-    }
-
-    KubeFramework.Retriever {
-        id: draftMessageRetriever
-        propertyName: "mimeMessage"
-        model: KubeFramework.MailListModel {
-            mail: root.draftMessage
-        }
-    }
-
     KubeFramework.ComposerController {
         id: composer
-        originalMessage: originalMessageRetriever.value
-        draftMessage: draftMessageRetriever.value
     }
 
     ColumnLayout {
diff --git a/components/package/contents/ui/FocusComposer.qml b/components/package/contents/ui/FocusComposer.qml
index 4e61b6c1..ea410338 100644
--- a/components/package/contents/ui/FocusComposer.qml
+++ b/components/package/contents/ui/FocusComposer.qml
@@ -23,8 +23,10 @@ import org.kube.framework.theme 1.0
 
 Rectangle {
     id: root
-    property variant originalMessage
-    property variant draftMessage
+
+    function loadMessage(message, loadAsDraft) {
+        composer.loadMessage(message, loadAsDraft);
+    }
 
     color: ColorPalette.border
 
@@ -62,8 +64,6 @@ Rectangle {
 
                 Layout.fillWidth: true
                 Layout.fillHeight: true
-                originalMessage: root.originalMessage
-                draftMessage: root.draftMessage
             }
 
             RowLayout {