1 files changed, 4 insertions, 2 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)
                     }
                 }