3 files changed, 14 insertions, 2 deletions

diff --git a/applications/kube-mail/package/contents/ui/Composer.qml b/applications/kube-mail/package/contents/ui/Composer.qml
index 19a4c331..5502b7f9 100644
--- a/applications/kube-mail/package/contents/ui/Composer.qml
+++ b/applications/kube-mail/package/contents/ui/Composer.qml
@@ -23,6 +23,7 @@ import org.kde.kube.mail 1.0 as Mail
 
 Item {
     id: root
+    property variant originalMessage
 
     function send() {
         composer.send()
@@ -36,8 +37,18 @@ Item {
         composer.clear();
     }
 
+    Mail.Retriever {
+        id: retriever
+        propertyName: "mimeMessage"
+        model: Mail.MailListModel {
+            id: mailListModel
+            mail: root.originalMessage
+        }
+    }
+
     Mail.Composer {
         id: composer
+        originalMessage: retriever.value
     }
 
     ColumnLayout {
diff --git a/applications/kube-mail/package/contents/ui/FocusComposer.qml b/applications/kube-mail/package/contents/ui/FocusComposer.qml
index 20899817..2be656ab 100644
--- a/applications/kube-mail/package/contents/ui/FocusComposer.qml
+++ b/applications/kube-mail/package/contents/ui/FocusComposer.qml
@@ -11,7 +11,6 @@
  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *   GNU General Public License for more details.
  *
-//import org.kde.kube.mail 1.0 as Mail
  *   You should have received a copy of the GNU General Public License
  *   along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
@@ -22,6 +21,7 @@ import QtQuick.Layouts 1.1
 
 Rectangle {
     id: root
+    property variant originalMessage
 
     visible: false
 
@@ -61,7 +61,7 @@ Rectangle {
 
                 Layout.fillWidth: true
                 Layout.fillHeight: true
-
+                originalMessage: root.originalMessage
             }
 
             RowLayout {
diff --git a/applications/kube-mail/package/contents/ui/main.qml b/applications/kube-mail/package/contents/ui/main.qml
index 191a7434..cf983dee 100644
--- a/applications/kube-mail/package/contents/ui/main.qml
+++ b/applications/kube-mail/package/contents/ui/main.qml
@@ -90,6 +90,7 @@ ApplicationWindow {
                 iconName: "mail-message-reply"
                 text: "Reply"
                 onClicked: {
+                    composer.originalMessage = mailListView.currentMail
                     composer.visible = true
                 }
             }