2 files changed, 4 insertions, 6 deletions

diff --git a/views/composer/qml/View.qml b/views/composer/qml/View.qml
index f81901c4..4086f715 100644
--- a/views/composer/qml/View.qml
+++ b/views/composer/qml/View.qml
@@ -49,9 +49,8 @@ Kube.View {
         }
     ]
 
-    Component.onCompleted: loadMessage(root.message, root.loadAsDraft)
-
-    Controls2.StackView.onActivated: {
+    onSetup: {
+        loadMessage(root.message, root.loadAsDraft)
         Kube.Fabric.postMessage(Kube.Messages.synchronize, {"type": "mail", "specialPurpose": "drafts"})
         //For autocompletion
         Kube.Fabric.postMessage(Kube.Messages.synchronize, {"type": "contacts"})
diff --git a/views/composer/tests/tst_composerview.qml b/views/composer/tests/tst_composerview.qml
index b26bf762..92328077 100644
--- a/views/composer/tests/tst_composerview.qml
+++ b/views/composer/tests/tst_composerview.qml
@@ -129,12 +129,11 @@ TestCase {
                 }]
         }
         TestStore.setup(initialState)
-        var composer = createTemporaryObject(composerComponent, testCase, {})
 
         var createdMail = TestStore.load("mail", {resource: "resource1"})
+        var composer = createTemporaryObject(composerComponent, testCase, {message: createdMail, loadAsDraft: false})
+        composer.setup()
 
-        var loadAsDraft = false
-        composer.loadMessage(createdMail, loadAsDraft)
         var subject = findChild(composer, "subject");
         verify(subject)
         tryVerify(function(){ return subject.text == "RE: subject" })