Use the actual MailViewer again.

2 files changed, 7 insertions, 12 deletions

diff --git a/components/package/contents/ui/MailViewer.qml b/components/package/contents/ui/MailViewer.qml
index c51e2666..825d4aab 100644
--- a/components/package/contents/ui/MailViewer.qml
+++ b/components/package/contents/ui/MailViewer.qml
@@ -8,13 +8,18 @@ Item {
     id: root
     property variant message;
     property string html;
+    property int desiredHeight: topPartLoader.height;
 
     Rectangle {
         id: rootRectangle
         anchors.fill: parent
+        anchors.margins: 0
         ScrollView {
             id: scrollView
             anchors.fill: parent
+            anchors.margins: 0
+            horizontalScrollBarPolicy: Qt.ScrollBarAlwaysOff
+            verticalScrollBarPolicy: Qt.ScrollBarAlwaysOff
             MessagePartTree {
                 id: topPartLoader
                 width: rootRectangle.width
diff --git a/components/package/contents/ui/SingleMailView.qml b/components/package/contents/ui/SingleMailView.qml
index 4f434edc..0248c3bd 100644
--- a/components/package/contents/ui/SingleMailView.qml
+++ b/components/package/contents/ui/SingleMailView.qml
@@ -148,7 +148,7 @@ Rectangle {
                         }
                     }
 
-                    Text {
+                    MailViewer {
                         id: body
 
                         anchors {
@@ -159,20 +159,10 @@ Rectangle {
                         }
 
                         width: header.width - Kirigami.Units.largeSpacing * 2
+                        height: desiredHeight
 
-                        text: model.mimeMessage
-
-                        clip: true
-                        wrapMode: Text.WordWrap
-                        renderType: Text.NativeRendering
-                        color: Kirigami.Theme.textColor
-                    }
-
-                    /*
-                    MailViewer {
                         message: model.mimeMessage
                     }
-                    */
 
                     Item {
                         id: footer