2 files changed, 11 insertions, 16 deletions

diff --git a/framework/domain/mimetreeparser/objecttreesource.cpp b/framework/domain/mimetreeparser/objecttreesource.cpp
index 12cf88ab..58667444 100644
--- a/framework/domain/mimetreeparser/objecttreesource.cpp
+++ b/framework/domain/mimetreeparser/objecttreesource.cpp
@@ -31,7 +31,7 @@ public:
         : mWriter(0)
         , mAllowDecryption(true)
         , mHtmlLoadExternal(true)
-        , mHtmlMail(true)
+        , mPreferredMode(MimeTreeParser::Util::Html)
     {
 
     }
@@ -39,7 +39,7 @@ public:
     MimeTreeParser::BodyPartFormatterBaseFactory mBodyPartFormatterBaseFactory;
     bool mAllowDecryption;
     bool mHtmlLoadExternal;
-    bool mHtmlMail;
+    MimeTreeParser::Util::HtmlMode mPreferredMode;
 };
 
 ObjectTreeSource::ObjectTreeSource(MimeTreeParser::HtmlWriter *writer)
@@ -74,16 +74,6 @@ void ObjectTreeSource::setHtmlLoadExternal(bool loadExternal)
     d->mHtmlLoadExternal = loadExternal;
 }
 
-bool ObjectTreeSource::htmlMail() const
-{
-    return d->mHtmlMail;
-}
-
-void ObjectTreeSource::setHtmlMail(bool htmlMail)
-{
-    d->mHtmlMail = htmlMail;
-}
-
 bool ObjectTreeSource::decryptMessage() const
 {
     return d->mAllowDecryption;
@@ -119,9 +109,15 @@ QObject *ObjectTreeSource::sourceObject()
     return Q_NULLPTR;
 }
 
-void ObjectTreeSource::setHtmlMode(MimeTreeParser::Util::HtmlMode mode)
+void ObjectTreeSource::setHtmlMode(MimeTreeParser::Util::HtmlMode mode, const QList<MimeTreeParser::Util::HtmlMode> &availableModes)
 {
       Q_UNUSED(mode);
+      Q_UNUSED(availableModes);
+}
+
+MimeTreeParser::Util::HtmlMode ObjectTreeSource::preferredMode() const
+{
+    return d->mPreferredMode;
 }
 
 bool ObjectTreeSource::autoImportKeys() const
diff --git a/framework/domain/mimetreeparser/objecttreesource.h b/framework/domain/mimetreeparser/objecttreesource.h
index bb0cd679..42433e71 100644
--- a/framework/domain/mimetreeparser/objecttreesource.h
+++ b/framework/domain/mimetreeparser/objecttreesource.h
@@ -31,12 +31,11 @@ public:
     ObjectTreeSource(MimeTreeParser::HtmlWriter *writer);
     virtual ~ObjectTreeSource();
     void setHtmlLoadExternal(bool loadExternal);
-    void setHtmlMail(bool htmlMail);
-    bool htmlMail() const Q_DECL_OVERRIDE;
     bool decryptMessage() const Q_DECL_OVERRIDE;
     bool htmlLoadExternal() const Q_DECL_OVERRIDE;
     bool showSignatureDetails() const Q_DECL_OVERRIDE;
-    void setHtmlMode(MimeTreeParser::Util::HtmlMode mode) Q_DECL_OVERRIDE;
+    void setHtmlMode(MimeTreeParser::Util::HtmlMode mode, const QList<MimeTreeParser::Util::HtmlMode> &availableModes) Q_DECL_OVERRIDE;
+    MimeTreeParser::Util::HtmlMode preferredMode() const Q_DECL_OVERRIDE;
     void setAllowDecryption(bool allowDecryption);
     int levelQuote() const Q_DECL_OVERRIDE;
     const QTextCodec *overrideCodec() Q_DECL_OVERRIDE;