2 files changed, 8 insertions, 4 deletions

diff --git a/components/kube/contents/ui/ComposerView.qml b/components/kube/contents/ui/ComposerView.qml
index ada7796b..d7751e1a 100644
--- a/components/kube/contents/ui/ComposerView.qml
+++ b/components/kube/contents/ui/ComposerView.qml
@@ -31,6 +31,7 @@ Kube.View {
     property bool newMessage: false
     property bool loadAsDraft: false
     property variant message: {}
+    property variant recipients: []
 
     //FIXME mean hack to unfuck hiding
     property variant _composerController: Kube.ComposerController {
@@ -53,6 +54,9 @@ Kube.View {
             }
         } else if (newMessage) {
             composerController.clear()
+            for (var i = 0; i < root.recipients.length; ++i) {
+                composerController.addTo(root.recipients[i])
+            }
             subject.forceActiveFocus()
         }
     }
diff --git a/components/kube/contents/ui/Kube.qml b/components/kube/contents/ui/Kube.qml
index c4058a30..05f4fbc3 100644
--- a/components/kube/contents/ui/Kube.qml
+++ b/components/kube/contents/ui/Kube.qml
@@ -58,7 +58,7 @@ Controls2.ApplicationWindow {
 
     Kube.Listener {
         filter: Kube.Messages.compose
-        onMessageReceived: kubeViews.openComposer(true)
+        onMessageReceived: kubeViews.openComposer(true, message.recipients)
     }
 
     //BEGIN Shortcuts
@@ -134,7 +134,7 @@ Controls2.ApplicationWindow {
                 Kube.IconButton {
                     id: composerButton
                     iconName: Kube.Icons.edit_inverted
-                    onClicked: kubeViews.openComposer(false)
+                    onClicked: kubeViews.openComposer(false, [])
                     activeFocusOnTab: true
                     checkable: true
                     Controls2.ButtonGroup.group: viewButtonGroup
@@ -252,9 +252,9 @@ Controls2.ApplicationWindow {
                 }
             }
 
-            function openComposer(newMessage) {
+            function openComposer(newMessage, recipients) {
                 composerButton.checked = true
-                kubeViews.push(composerView, {newMessage: newMessage}, Controls2.StackView.Immediate)
+                kubeViews.push(composerView, {newMessage: newMessage, recipients: recipients}, Controls2.StackView.Immediate)
             }
             function openComposerWithMail(mail, openAsDraft) {
                 composerButton.checked = true