1 files changed, 7 insertions, 8 deletions

diff --git a/framework/domain/messageparser.h b/framework/domain/messageparser.h
index 3e0255df..9469f2b5 100644
--- a/framework/domain/messageparser.h
+++ b/framework/domain/messageparser.h
@@ -29,11 +29,11 @@
 #include <memory>
 #include <MimeTreeParser/MessagePart>
 
-namespace MimeTreeParser {
-    class NodeHelper;
-};
 class QAbstractItemModel;
 
+class Parser;
+class MessagePartPrivate;
+
 class MessageParser : public QObject
 {
     Q_OBJECT
@@ -43,6 +43,7 @@ class MessageParser : public QObject
 
 public:
     explicit MessageParser(QObject *parent = Q_NULLPTR);
+    ~MessageParser();
 
     QString html() const;
 
@@ -54,16 +55,13 @@ signals:
     void htmlChanged();
 
 private:
-    QSharedPointer<MimeTreeParser::MessagePart> mPartTree;
-    QString mHtml;
-    QMap<QByteArray, QUrl> mEmbeddedPartMap;
-    std::shared_ptr<MimeTreeParser::NodeHelper> mNodeHelper;
+    std::unique_ptr<MessagePartPrivate> d;
 };
 
 class PartModel : public QAbstractItemModel {
     Q_OBJECT
 public:
-    PartModel(QSharedPointer<MimeTreeParser::MessagePart> partTree, QMap<QByteArray, QUrl> embeddedPartMap);
+    PartModel(QSharedPointer<MimeTreeParser::MessagePart> partTree, std::shared_ptr<Parser> parser);
 
 public:
     enum Roles {
@@ -86,5 +84,6 @@ public:
 private:
     QSharedPointer<MimeTreeParser::MessagePart> mPartTree;
     QMap<QByteArray, QUrl> mEmbeddedPartMap;
+    std::shared_ptr<Parser> mParser;
 };