1 files changed, 8 insertions, 1 deletions

diff --git a/framework/domain/messageparser.cpp b/framework/domain/messageparser.cpp
index 956bfb65..7089e2d8 100644
--- a/framework/domain/messageparser.cpp
+++ b/framework/domain/messageparser.cpp
@@ -27,6 +27,7 @@
 #include <QDebug>
 #include <QTime>
 #include <MimeTreeParser/ObjectTreeParser>
+#include <MimeTreeParser/MessagePart>
 
 MessageParser::MessageParser(QObject *parent)
     : QObject(parent)
@@ -63,10 +64,16 @@ void MessageParser::setMessage(const QVariant &message)
     ObjectTreeSource source(&htmlWriter, &cssHelper);
     MimeTreeParser::ObjectTreeParser otp(&source, mNodeHelper.get());
 
+    const auto partTree = otp.parseToTree(msg.data()).dynamicCast<MimeTreeParser::MessagePartList>();
+
     htmlWriter.begin(QString());
     htmlWriter.queue(cssHelper.htmlHead(false));
 
-    otp.parseObjectTree(msg.data());
+    if (partTree) {
+        partTree->fix();
+        partTree->copyContentFrom();
+        partTree->html(false);
+    }
 
     htmlWriter.queue(QStringLiteral("</body></html>"));
     htmlWriter.end();