From db8d420485fe75ebbb45f4b6db978311c0dbf8c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20Knau=C3=9F?= <sknauss@kde.org>
Date: Sat, 2 Apr 2016 11:15:18 +0200
Subject: Use parseToTree to get a messageTree and create the html on our own

---
 framework/domain/messageparser.cpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'framework')

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();
-- 
cgit v1.2.3