1 files changed, 10 insertions, 7 deletions

diff --git a/framework/qml/FocusComposer.qml b/framework/qml/FocusComposer.qml
index 5179cc66..0275cc91 100644
--- a/framework/qml/FocusComposer.qml
+++ b/framework/qml/FocusComposer.qml
@@ -27,6 +27,12 @@ Item {
     id: root
 
     signal done
+    property bool loadAsDraft: false
+    property variant message: {}
+
+    //actions
+    property variant sendAction: composerController.sendAction
+    property variant saveAsDraftAction: composerController.saveAsDraftAction
 
     //Controller
     Kube.ComposerController {
@@ -34,15 +40,12 @@ Item {
         onDone: root.done()
     }
 
-    //actions
-    property variant sendAction: composerController.sendAction
-    property variant saveAsDraftAction: composerController.saveAsDraftAction
 
-    //BEGIN functions
-    function loadMessage(message, loadAsDraft) {
-        composerController.loadMessage(message, loadAsDraft)
+    Component.onCompleted: {
+        if (root.message) {
+            composerController.loadMessage(root.message, root.loadAsDraft)
+        }
     }
-    //END functions
 
     Item {