2 files changed, 10 insertions, 1 deletions

diff --git a/applications/kube-mail/package/contents/ui/MailViewer.qml b/applications/kube-mail/package/contents/ui/MailViewer.qml
index 5929bea0..1d305297 100644
--- a/applications/kube-mail/package/contents/ui/MailViewer.qml
+++ b/applications/kube-mail/package/contents/ui/MailViewer.qml
@@ -3,8 +3,11 @@ import QtQuick.Controls 1.3
 import QtQuick.Layouts 1.1
 import QtWebKit 3.0
 
+import org.kde.kube.mail 1.0 as Mail
+
 Item {
     id: root
+    property variant message;
     property string html;
 
     WebView {
@@ -31,4 +34,10 @@ Item {
         // The file:/// argument is necessary so local icons are found
         webview.loadHtml(html, "file:///");
     }
+
+    Mail.MessageParser {
+        id: messageParser
+        message: root.message
+    }
+    html: messageParser.html
 }
diff --git a/applications/kube-mail/package/contents/ui/SingleMailView.qml b/applications/kube-mail/package/contents/ui/SingleMailView.qml
index e9563f1e..d6ae4bfa 100644
--- a/applications/kube-mail/package/contents/ui/SingleMailView.qml
+++ b/applications/kube-mail/package/contents/ui/SingleMailView.qml
@@ -63,7 +63,7 @@ Item {
                 }
 
                 MailViewer {
-                    html: model.renderedMessage
+                    message: model.mimeMessage
                     Layout.fillHeight: true
                     Layout.fillWidth: true
                 }