diff --git a/messageviewer/src/messagepartthemes/default/defaultrenderer.cpp b/messageviewer/src/messagepartthemes/default/defaultrenderer.cpp
index 6f834b9d..1a211e02 100644
--- a/messageviewer/src/messagepartthemes/default/defaultrenderer.cpp
+++ b/messageviewer/src/messagepartthemes/default/defaultrenderer.cpp
@@ -1,1079 +1,1106 @@
 /*
    Copyright (c) 2016 Sandro Knauß <sknauss@kde.org>
 
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU Library General Public License as published by
    the Free Software Foundation; either version 2 of the License, or (at your
    option) any later version.
 
    This library is distributed in the hope that it will be useful, but WITHOUT
    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
    License for more details.
 
    You should have received a copy of the GNU Library General Public License
    along with this library; see the file COPYING.LIB.  If not, write to the
    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 */
 
 #include "defaultrenderer.h"
 
 #include "defaultrenderer_p.h"
 
 #include "messageviewer_debug.h"
 
 #include "rendererpluginfactorysingleton.h"
 #include "converthtmltoplaintext.h"
 #include "messagepartrendererbase.h"
 #include "messagepartrendererfactorybase.h"
 #include "htmlblock.h"
 #include "partrendered.h"
 
 #include "utils/iconnamecache.h"
 #include "utils/mimetype.h"
 #include "viewer/csshelperbase.h"
 #include "messagepartrenderermanager.h"
 
 #include <MimeTreeParser/HtmlWriter>
 #include <MimeTreeParser/QueueHtmlWriter>
 #include <MimeTreeParser/MessagePart>
 #include <MimeTreeParser/ObjectTreeParser>
 #include <GrantleeTheme/QtResourceTemplateLoader>
 
 #include <QGpgME/Protocol>
 
 #include <MessageCore/StringUtil>
 
 #include <KEmailAddress>
 #include <KIconLoader>
 #include <KLocalizedString>
 
 #include <QApplication>
 #include <QUrl>
 
 #include <grantlee/context.h>
 #include <grantlee/engine.h>
 #include <grantlee/metatype.h>
 #include <grantlee/templateloader.h>
 #include <grantlee/template.h>
 
 using namespace MimeTreeParser;
 using namespace MessageViewer;
 
 Q_DECLARE_METATYPE(GpgME::DecryptionResult::Recipient)
 Q_DECLARE_METATYPE(const QGpgME::Protocol *)
 
 static const int SIG_FRAME_COL_UNDEF = 99;
 #define SIG_FRAME_COL_RED    -1
 #define SIG_FRAME_COL_YELLOW  0
 #define SIG_FRAME_COL_GREEN   1
 QString sigStatusToString(const QGpgME::Protocol *cryptProto, int status_code,
                           GpgME::Signature::Summary summary, int &frameColor, bool &showKeyInfos)
 {
     // note: At the moment frameColor and showKeyInfos are
     //       used for CMS only but not for PGP signatures
     // pending(khz): Implement usage of these for PGP sigs as well.
     showKeyInfos = true;
     QString result;
     if (cryptProto) {
         if (cryptProto == QGpgME::openpgp()) {
             // process enum according to it's definition to be read in
             // GNU Privacy Guard CVS repository /gpgme/gpgme/gpgme.h
             switch (status_code) {
             case 0: // GPGME_SIG_STAT_NONE
                 result = i18n("Error: Signature not verified");
                 break;
             case 1: // GPGME_SIG_STAT_GOOD
                 result = i18n("Good signature");
                 break;
             case 2: // GPGME_SIG_STAT_BAD
                 result = i18n("Bad signature");
                 break;
             case 3: // GPGME_SIG_STAT_NOKEY
                 result = i18n("No public key to verify the signature");
                 break;
             case 4: // GPGME_SIG_STAT_NOSIG
                 result = i18n("No signature found");
                 break;
             case 5: // GPGME_SIG_STAT_ERROR
                 result = i18n("Error verifying the signature");
                 break;
             case 6: // GPGME_SIG_STAT_DIFF
                 result = i18n("Different results for signatures");
                 break;
             /* PENDING(khz) Verify exact meaning of the following values:
             case 7: // GPGME_SIG_STAT_GOOD_EXP
             return i18n("Signature certificate is expired");
             break;
             case 8: // GPGME_SIG_STAT_GOOD_EXPKEY
             return i18n("One of the certificate's keys is expired");
             break;
             */
             default:
                 result.clear();   // do *not* return a default text here !
                 break;
             }
         } else if (cryptProto == QGpgME::smime()) {
             // process status bits according to SigStatus_...
             // definitions in kdenetwork/libkdenetwork/cryptplug.h
 
             if (summary == GpgME::Signature::None) {
                 result = i18n("No status information available.");
                 frameColor = SIG_FRAME_COL_YELLOW;
                 showKeyInfos = false;
                 return result;
             }
 
             if (summary & GpgME::Signature::Valid) {
                 result = i18n("Good signature.");
                 // Note:
                 // Here we are work differently than KMail did before!
                 //
                 // The GOOD case ( == sig matching and the complete
                 // certificate chain was verified and is valid today )
                 // by definition does *not* show any key
                 // information but just states that things are OK.
                 //           (khz, according to LinuxTag 2002 meeting)
                 frameColor = SIG_FRAME_COL_GREEN;
                 showKeyInfos = false;
                 return result;
             }
 
             // we are still there?  OK, let's test the different cases:
 
             // we assume green, test for yellow or red (in this order!)
             frameColor = SIG_FRAME_COL_GREEN;
             QString result2;
             if (summary & GpgME::Signature::KeyExpired) {
                 // still is green!
                 result2 = i18n("One key has expired.");
             }
             if (summary & GpgME::Signature::SigExpired) {
                 // and still is green!
                 result2 += i18n("The signature has expired.");
             }
 
             // test for yellow:
             if (summary & GpgME::Signature::KeyMissing) {
                 result2 += i18n("Unable to verify: key missing.");
                 // if the signature certificate is missing
                 // we cannot show information on it
                 showKeyInfos = false;
                 frameColor = SIG_FRAME_COL_YELLOW;
             }
             if (summary & GpgME::Signature::CrlMissing) {
                 result2 += i18n("CRL not available.");
                 frameColor = SIG_FRAME_COL_YELLOW;
             }
             if (summary & GpgME::Signature::CrlTooOld) {
                 result2 += i18n("Available CRL is too old.");
                 frameColor = SIG_FRAME_COL_YELLOW;
             }
             if (summary & GpgME::Signature::BadPolicy) {
                 result2 += i18n("A policy was not met.");
                 frameColor = SIG_FRAME_COL_YELLOW;
             }
             if (summary & GpgME::Signature::SysError) {
                 result2 += i18n("A system error occurred.");
                 // if a system error occurred
                 // we cannot trust any information
                 // that was given back by the plug-in
                 showKeyInfos = false;
                 frameColor = SIG_FRAME_COL_YELLOW;
             }
 
             // test for red:
             if (summary & GpgME::Signature::KeyRevoked) {
                 // this is red!
                 result2 += i18n("One key has been revoked.");
                 frameColor = SIG_FRAME_COL_RED;
             }
             if (summary & GpgME::Signature::Red) {
                 if (result2.isEmpty()) {
                     // Note:
                     // Here we are work differently than KMail did before!
                     //
                     // The BAD case ( == sig *not* matching )
                     // by definition does *not* show any key
                     // information but just states that things are BAD.
                     //
                     // The reason for this: In this case ALL information
                     // might be falsificated, we can NOT trust the data
                     // in the body NOT the signature - so we don't show
                     // any key/signature information at all!
                     //         (khz, according to LinuxTag 2002 meeting)
                     showKeyInfos = false;
                 }
                 frameColor = SIG_FRAME_COL_RED;
             } else {
                 result.clear();
             }
 
             if (SIG_FRAME_COL_GREEN == frameColor) {
                 result = i18n("Good signature.");
             } else if (SIG_FRAME_COL_RED == frameColor) {
                 result = i18n("Bad signature.");
             } else {
                 result.clear();
             }
 
             if (!result2.isEmpty()) {
                 if (!result.isEmpty()) {
                     result.append(QLatin1String("<br />"));
                 }
                 result.append(result2);
             }
         }
         /*
         // add i18n support for 3rd party plug-ins here:
         else if ( cryptPlug->libName().contains( "yetanotherpluginname", Qt::CaseInsensitive )) {
 
         }
         */
     }
     return result;
 }
 
 /** Checks whether @p str contains external references. To be precise,
     we only check whether @p str contains 'xxx="http[s]:' where xxx is
     not href. Obfuscated external references are ignored on purpose.
 */
 
 bool containsExternalReferences(const QString &str, const QString &extraHead)
 {
     const bool hasBaseInHeader = extraHead.contains(QStringLiteral(
                                                         "<base href=\""), Qt::CaseInsensitive);
     if (hasBaseInHeader && (str.contains(QStringLiteral("href=\"/"), Qt::CaseInsensitive)
                             || str.contains(QStringLiteral("<img src=\"/"), Qt::CaseInsensitive))) {
         return true;
     }
     int httpPos = str.indexOf(QLatin1String("\"http:"), Qt::CaseInsensitive);
     int httpsPos = str.indexOf(QLatin1String("\"https:"), Qt::CaseInsensitive);
 
     while (httpPos >= 0 || httpsPos >= 0) {
         // pos = index of next occurrence of "http: or "https: whichever comes first
         int pos = (httpPos < httpsPos)
                   ? ((httpPos >= 0) ? httpPos : httpsPos)
                   : ((httpsPos >= 0) ? httpsPos : httpPos);
         // look backwards for "href"
         if (pos > 5) {
             int hrefPos = str.lastIndexOf(QLatin1String("href"), pos - 5, Qt::CaseInsensitive);
             // if no 'href' is found or the distance between 'href' and '"http[s]:'
             // is larger than 7 (7 is the distance in 'href = "http[s]:') then
             // we assume that we have found an external reference
             if ((hrefPos == -1) || (pos - hrefPos > 7)) {
                 // HTML messages created by KMail itself for now contain the following:
                 // <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
                 // Make sure not to show an external references warning for this string
                 int dtdPos = str.indexOf(QLatin1String(
                                              "http://www.w3.org/TR/html4/loose.dtd"), pos + 1);
                 if (dtdPos != (pos + 1)) {
                     return true;
                 }
             }
         }
         // find next occurrence of "http: or "https:
         if (pos == httpPos) {
             httpPos = str.indexOf(QLatin1String("\"http:"), httpPos + 6, Qt::CaseInsensitive);
         } else {
             httpsPos = str.indexOf(QLatin1String("\"https:"), httpsPos + 7, Qt::CaseInsensitive);
         }
     }
     return false;
 }
 
+// FIXME this used to go through the full webkit parser to extract the body and head blocks
+// until we have that back, at least attempt to fix some of the damage
+// yes, "parsing" HTML with regexps is very very wrong, but it's still better than not filtering
+// this at all...
+QString processHtml(const QString &htmlSource, QString &extraHead)
+{
+    auto s = htmlSource.trimmed();
+    s = s.replace(QRegExp(QStringLiteral("^<!DOCTYPE[^>]*>"), Qt::CaseInsensitive), QString()).trimmed();
+    s = s.replace(QRegExp(QStringLiteral("^<html[^>]*>"), Qt::CaseInsensitive), QString()).trimmed();
+
+    // head
+    s = s.replace(QRegExp(QStringLiteral("^<head/>"), Qt::CaseInsensitive), QString()).trimmed();
+    if (s.startsWith(QLatin1String("<head>", Qt::CaseInsensitive))) {
+        const auto idx = s.indexOf(QLatin1String("</head>"), Qt::CaseInsensitive);
+        if (idx < 0)
+            return htmlSource;
+        extraHead = s.mid(6, idx - 6);
+        s = s.mid(idx + 7).trimmed();
+    }
+
+    // body
+    s = s.replace(QRegExp(QStringLiteral("<body[^>]*>"), Qt::CaseInsensitive), QString()).trimmed();
+    s = s.replace(QRegExp(QStringLiteral("</html>$"), Qt::CaseInsensitive), QString()).trimmed();
+    s = s.replace(QRegExp(QStringLiteral("</body>$"), Qt::CaseInsensitive), QString()).trimmed();
+    return s;
+}
+
 class CacheHtmlWriter : public MimeTreeParser::HtmlWriter
 {
 public:
     explicit CacheHtmlWriter(MimeTreeParser::HtmlWriter *baseWriter)
         : mBaseWriter(baseWriter)
     {
     }
 
     virtual ~CacheHtmlWriter()
     {
     }
 
     void begin(const QString &text) override
     {
         mBaseWriter->begin(text);
     }
 
     void write(const QString &str) override
     {
         html.append(str);
     }
 
     void end() override
     {
         mBaseWriter->end();
     }
 
     void reset() override
     {
         mBaseWriter->reset();
     }
 
     void queue(const QString &str) override
     {
         html.append(str);
     }
 
     void flush() override
     {
         mBaseWriter->flush();
     }
 
     void embedPart(const QByteArray &contentId, const QString &url) override
     {
         mBaseWriter->embedPart(contentId, url);
     }
 
     void extraHead(const QString &extra) override
     {
         mBaseWriter->extraHead(extra);
     }
 
     QString html;
     MimeTreeParser::HtmlWriter *mBaseWriter = nullptr;
 };
 
 DefaultRendererPrivate::DefaultRendererPrivate(const Interface::MessagePart::Ptr &msgPart,
                                                CSSHelperBase *cssHelper,
                                                const MessagePartRendererFactoryBase *rendererFactory)
     : mMsgPart(msgPart)
     , mOldWriter(msgPart->htmlWriter())
     , mCSSHelper(cssHelper)
     , mRendererFactory(rendererFactory)
 {
     mHtml = renderFactory(mMsgPart, QSharedPointer<CacheHtmlWriter>());
 }
 
 DefaultRendererPrivate::~DefaultRendererPrivate()
 {
 }
 
 QString DefaultRendererPrivate::alignText()
 {
     return QApplication::isRightToLeft() ? QStringLiteral("rtl") : QStringLiteral("ltr");
 }
 
 CSSHelperBase *DefaultRendererPrivate::cssHelper() const
 {
     auto mp = mMsgPart.dynamicCast<MessagePart>();
     if (mp) {
         return mCSSHelper;
     }
     return nullptr;
 }
 
 Interface::ObjectTreeSource *DefaultRendererPrivate::source() const
 {
     auto mp = mMsgPart.dynamicCast<MessagePart>();
     if (mp) {
         return mp->source();
     }
     return nullptr;
 }
 
 void DefaultRendererPrivate::renderSubParts(const MessagePart::Ptr &msgPart,
                                             const QSharedPointer<CacheHtmlWriter> &htmlWriter)
 {
     foreach (const auto &_m, msgPart->subParts()) {
         const auto m = _m.dynamicCast<MessagePart>();
         if (m) {
             htmlWriter->queue(renderFactory(m, htmlWriter));
         } else {
             auto hw = dynamic_cast<MimeTreeParser::QueueHtmlWriter *>(_m->htmlWriter());
             if (hw) {
                 hw->setBase(htmlWriter.data());
                 _m->html(false);
             }
         }
     }
 }
 
 QString DefaultRendererPrivate::render(const MessagePartList::Ptr &mp)
 {
     auto htmlWriter = QSharedPointer<CacheHtmlWriter>(new CacheHtmlWriter(mOldWriter));
     {
         HTMLBlock::Ptr rBlock;
         HTMLBlock::Ptr aBlock;
 
         if (mp->isRoot()) {
             rBlock = HTMLBlock::Ptr(new RootBlock(htmlWriter.data()));
         }
 
         if (mp->isAttachment()) {
             aBlock
                 = HTMLBlock::Ptr(new AttachmentMarkBlock(htmlWriter.data(), mp->attachmentNode()));
         }
 
         mp->setHtmlWriter(htmlWriter.data());
         renderSubParts(mp, htmlWriter);
         mp->setHtmlWriter(mOldWriter);
     }
 
     return htmlWriter->html;
 }
 
 QString DefaultRendererPrivate::render(const MimeMessagePart::Ptr &mp)
 {
     auto htmlWriter = QSharedPointer<CacheHtmlWriter>(new CacheHtmlWriter(mOldWriter));
     {
         HTMLBlock::Ptr aBlock;
         HTMLBlock::Ptr rBlock;
         if (mp->isAttachment()) {
             aBlock
                 = HTMLBlock::Ptr(new AttachmentMarkBlock(htmlWriter.data(), mp->attachmentNode()));
         }
 
         if (mp->isRoot()) {
             rBlock = HTMLBlock::Ptr(new RootBlock(htmlWriter.data()));
         }
 
         renderSubParts(mp, htmlWriter);
     }
 
     return htmlWriter->html;
 }
 
 QString DefaultRendererPrivate::render(const EncapsulatedRfc822MessagePart::Ptr &mp)
 {
     if (!mp->hasSubParts()) {
         return QString();
     }
     Grantlee::Template t = MessageViewer::MessagePartRendererManager::self()->loadByName(QStringLiteral(
                                                                                              ":/encapsulatedrfc822messagepart.html"));
     Grantlee::Context c = MessageViewer::MessagePartRendererManager::self()->createContext();
     QObject block;
 
     c.insert(QStringLiteral("block"), &block);
     block.setProperty("dir", alignText());
     block.setProperty("link",
                       mp->mOtp->nodeHelper()->asHREF(mp->mMessage.data(), QStringLiteral("body")));
 
     c.insert(QStringLiteral("msgHeader"), mp->source()->createMessageHeader(mp->mMessage.data()));
     {
         auto _htmlWriter = QSharedPointer<CacheHtmlWriter>(new CacheHtmlWriter(mOldWriter));
         renderSubParts(mp, _htmlWriter);
         c.insert(QStringLiteral("content"), _htmlWriter->html);
     }
 
     auto htmlWriter = QSharedPointer<CacheHtmlWriter>(new CacheHtmlWriter(mOldWriter));
     {
         HTMLBlock::Ptr aBlock;
         if (mp->isAttachment()) {
             aBlock
                 = HTMLBlock::Ptr(new AttachmentMarkBlock(htmlWriter.data(), mp->attachmentNode()));
         }
         const auto html = t->render(&c);
         htmlWriter->queue(html);
     }
     return htmlWriter->html;
 }
 
 QString DefaultRendererPrivate::render(const HtmlMessagePart::Ptr &mp)
 {
     Grantlee::Template t = MessageViewer::MessagePartRendererManager::self()->loadByName(QStringLiteral(
                                                                                              ":/htmlmessagepart.html"));
     Grantlee::Context c = MessageViewer::MessagePartRendererManager::self()->createContext();
     QObject block;
 
     c.insert(QStringLiteral("block"), &block);
 
     auto preferredMode = mp->source()->preferredMode();
     bool isHtmlPreferred = (preferredMode == Util::Html) || (preferredMode == Util::MultipartHtml);
     const bool isPrinting = mp->source()->isPrinting();
     block.setProperty("htmlMail", isHtmlPreferred);
     block.setProperty("loadExternal", mp->source()->htmlLoadExternal());
     block.setProperty("isPrinting", isPrinting);
     {
         QString extraHead;
         //laurent: FIXME port to async method webengine
-        QString bodyText = mp->mBodyHTML;//processHtml(mp->mBodyHTML, extraHead);
+        QString bodyText = processHtml(mp->mBodyHTML, extraHead);
 
         if (isHtmlPreferred) {
             mp->mOtp->nodeHelper()->setNodeDisplayedEmbedded(mp->mNode, true);
             mOldWriter->extraHead(extraHead);
         }
 
         block.setProperty("containsExternalReferences",
                           containsExternalReferences(bodyText, extraHead));
         c.insert(QStringLiteral("content"), bodyText);
     }
 
     {
         ConvertHtmlToPlainText convert;
         convert.setHtmlString(mp->mBodyHTML);
         QString plaintext = convert.generatePlainText();
         plaintext.replace(QLatin1Char('\n'), QStringLiteral("<br>"));
         c.insert(QStringLiteral("plaintext"), plaintext);
     }
     mp->source()->setHtmlMode(Util::Html, QList<Util::HtmlMode>() << Util::Html);
 
     auto htmlWriter = QSharedPointer<CacheHtmlWriter>(new CacheHtmlWriter(mOldWriter));
     {
         HTMLBlock::Ptr aBlock;
         if (mp->isAttachment()) {
             aBlock
                 = HTMLBlock::Ptr(new AttachmentMarkBlock(htmlWriter.data(), mp->attachmentNode()));
         }
         const auto html = t->render(&c);
         htmlWriter->queue(html);
     }
     return htmlWriter->html;
 }
 
 QString DefaultRendererPrivate::renderEncrypted(const EncryptedMessagePart::Ptr &mp)
 {
     KMime::Content *node = mp->mNode;
     const auto metaData = mp->mMetaData;
 
     Grantlee::Template t = MessageViewer::MessagePartRendererManager::self()->loadByName(QStringLiteral(
                                                                                              ":/encryptedmessagepart.html"));
     Grantlee::Context c = MessageViewer::MessagePartRendererManager::self()->createContext();
     QObject block;
 
     if (node || mp->hasSubParts()) {
         auto _htmlWriter = QSharedPointer<CacheHtmlWriter>(new CacheHtmlWriter(mOldWriter));
         {
             HTMLBlock::Ptr rBlock;
             if (node && mp->isRoot()) {
                 rBlock = HTMLBlock::Ptr(new RootBlock(_htmlWriter.data()));
             }
             renderSubParts(mp, _htmlWriter);
         }
         c.insert(QStringLiteral("content"), _htmlWriter->html);
     } else if (!metaData.inProgress) {
         auto part = renderWithFactory(QStringLiteral("MimeTreeParser::MessagePart"), mp);
         if (part) {
             c.insert(QStringLiteral("content"), part->html());
         } else {
             c.insert(QStringLiteral("content"), QString());
         }
     }
 
     c.insert(QStringLiteral("cryptoProto"), QVariant::fromValue(mp->mCryptoProto));
     if (mp->mDecryptRecipients.size() > 0) {
         c.insert(QStringLiteral("decryptedRecipients"),
                  QVariant::fromValue(mp->mDecryptRecipients));
     }
     c.insert(QStringLiteral("block"), &block);
 
     block.setProperty("dir", alignText());
     block.setProperty("inProgress", metaData.inProgress);
     block.setProperty("isDecrypted", mp->decryptMessage());
     block.setProperty("isDecryptable", metaData.isDecryptable);
     block.setProperty("decryptIcon",
                       QUrl::fromLocalFile(IconNameCache::instance()->iconPath(QStringLiteral(
                                                                                   "document-decrypt"),
                                                                               KIconLoader::Small)).url());
     block.setProperty("errorText", metaData.errorText);
     block.setProperty("noSecKey", mp->mNoSecKey);
     block.setProperty("iconSize",
                       MessageViewer::MessagePartRendererManager::self()->iconCurrentSize());
 
     const auto html = t->render(&c);
 
     return html;
 }
 
 QString DefaultRendererPrivate::renderSigned(const SignedMessagePart::Ptr &mp)
 {
     KMime::Content *node = mp->mNode;
     const auto metaData = mp->mMetaData;
     auto cryptoProto = mp->mCryptoProto;
 
     const bool isSMIME = cryptoProto && (cryptoProto == QGpgME::smime());
 
     Grantlee::Template t = MessageViewer::MessagePartRendererManager::self()->loadByName(QStringLiteral(
                                                                                              ":/signedmessagepart.html"));
     Grantlee::Context c = MessageViewer::MessagePartRendererManager::self()->createContext();
     QObject block;
 
     if (node) {
         auto _htmlWriter = QSharedPointer<CacheHtmlWriter>(new CacheHtmlWriter(mOldWriter));
         {
             HTMLBlock::Ptr rBlock;
             if (mp->isRoot()) {
                 rBlock = HTMLBlock::Ptr(new RootBlock(_htmlWriter.data()));
             }
             renderSubParts(mp, _htmlWriter);
         }
         c.insert(QStringLiteral("content"), _htmlWriter->html);
     } else if (!metaData.inProgress) {
         auto part = renderWithFactory(QStringLiteral("MimeTreeParser::MessagePart"), mp);
         if (part) {
             c.insert(QStringLiteral("content"), part->html());
         } else {
             c.insert(QStringLiteral("content"), QString());
         }
     }
 
     c.insert(QStringLiteral("cryptoProto"), QVariant::fromValue(cryptoProto));
     c.insert(QStringLiteral("block"), &block);
 
     block.setProperty("dir", alignText());
     block.setProperty("inProgress", metaData.inProgress);
     block.setProperty("errorText", metaData.errorText);
 
     block.setProperty("detailHeader", mp->source()->showSignatureDetails());
     block.setProperty("printing", false);
     block.setProperty("addr", metaData.signerMailAddresses.join(QLatin1Char(',')));
     block.setProperty("technicalProblem", metaData.technicalProblem);
     block.setProperty("keyId", metaData.keyId);
     if (metaData.creationTime.isValid()) {      //should be handled inside grantlee but currently not possible see: https://bugs.kde.org/363475
         block.setProperty("creationTime",
                           QLocale().toString(metaData.creationTime, QLocale::ShortFormat));
     }
     block.setProperty("isGoodSignature", metaData.isGoodSignature);
     block.setProperty("isSMIME", isSMIME);
 
     if (metaData.keyTrust == GpgME::Signature::Unknown) {
         block.setProperty("keyTrust", QStringLiteral("unknown"));
     } else if (metaData.keyTrust == GpgME::Signature::Marginal) {
         block.setProperty("keyTrust", QStringLiteral("marginal"));
     } else if (metaData.keyTrust == GpgME::Signature::Full) {
         block.setProperty("keyTrust", QStringLiteral("full"));
     } else if (metaData.keyTrust == GpgME::Signature::Ultimate) {
         block.setProperty("keyTrust", QStringLiteral("ultimate"));
     } else {
         block.setProperty("keyTrust", QStringLiteral("untrusted"));
     }
 
     QString startKeyHREF;
     {
         QString keyWithWithoutURL;
         if (cryptoProto) {
             startKeyHREF
                 = QStringLiteral("<a href=\"kmail:showCertificate#%1 ### %2 ### %3\">")
                   .arg(cryptoProto->displayName(),
                        cryptoProto->name(),
                        QString::fromLatin1(metaData.keyId));
 
             keyWithWithoutURL
                 = QStringLiteral("%1%2</a>").arg(startKeyHREF,
                                                  QString::fromLatin1(QByteArray(QByteArrayLiteral(
                                                                                     "0x")
                                                                                 + metaData.keyId)));
         } else {
             keyWithWithoutURL = QStringLiteral("0x") + QString::fromUtf8(metaData.keyId);
         }
         block.setProperty("keyWithWithoutURL", keyWithWithoutURL);
     }
 
     bool onlyShowKeyURL = false;
     bool showKeyInfos = false;
     bool cannotCheckSignature = true;
     QString signer = metaData.signer;
     QString statusStr;
     QString mClass;
     QString greenCaseWarning;
 
     if (metaData.inProgress) {
         mClass = QStringLiteral("signInProgress");
     } else {
         const QStringList &blockAddrs(metaData.signerMailAddresses);
         // note: At the moment frameColor and showKeyInfos are
         //       used for CMS only but not for PGP signatures
         // pending(khz): Implement usage of these for PGP sigs as well.
         int frameColor = SIG_FRAME_COL_UNDEF;
         statusStr = sigStatusToString(cryptoProto,
                                       metaData.status_code,
                                       metaData.sigSummary,
                                       frameColor,
                                       showKeyInfos);
         // if needed fallback to english status text
         // that was reported by the plugin
         if (statusStr.isEmpty()) {
             statusStr = metaData.status;
         }
         if (metaData.technicalProblem) {
             frameColor = SIG_FRAME_COL_YELLOW;
         }
 
         switch (frameColor) {
         case SIG_FRAME_COL_RED:
             cannotCheckSignature = false;
             break;
         case SIG_FRAME_COL_YELLOW:
             cannotCheckSignature = true;
             break;
         case SIG_FRAME_COL_GREEN:
             cannotCheckSignature = false;
             break;
         }
 
         // temporary hack: always show key information!
         showKeyInfos = true;
 
         if (isSMIME && (SIG_FRAME_COL_UNDEF != frameColor)) {
             switch (frameColor) {
             case SIG_FRAME_COL_RED:
                 mClass = QStringLiteral("signErr");
                 onlyShowKeyURL = true;
                 break;
             case SIG_FRAME_COL_YELLOW:
                 if (metaData.technicalProblem) {
                     mClass = QStringLiteral("signWarn");
                 } else {
                     mClass = QStringLiteral("signOkKeyBad");
                 }
                 break;
             case SIG_FRAME_COL_GREEN:
                 mClass = QStringLiteral("signOkKeyOk");
                 // extra hint for green case
                 // that email addresses in DN do not match fromAddress
                 QString msgFrom(KEmailAddress::extractEmailAddress(mp->mFromAddress));
                 QString certificate;
                 if (metaData.keyId.isEmpty()) {
                     certificate = i18n("certificate");
                 } else {
                     certificate = startKeyHREF + i18n("certificate") + QStringLiteral("</a>");
                 }
 
                 if (!blockAddrs.empty()) {
                     if (!blockAddrs.contains(msgFrom, Qt::CaseInsensitive)) {
                         greenCaseWarning
                             = QStringLiteral("<u>")
                               +i18nc("Start of warning message.", "Warning:")
                               +QStringLiteral("</u> ")
                               +i18n(
                             "Sender's mail address is not stored in the %1 used for signing.",
                             certificate)
                               +QStringLiteral("<br />")
                               +i18n("sender: ")
                               +msgFrom
                               +QStringLiteral("<br />")
                               +i18n("stored: ");
                         // We cannot use Qt's join() function here but
                         // have to join the addresses manually to
                         // extract the mail addresses (without '<''>')
                         // before including it into our string:
                         bool bStart = true;
                         QStringList::ConstIterator end(blockAddrs.constEnd());
                         for (QStringList::ConstIterator it = blockAddrs.constBegin();
                              it != end; ++it) {
                             if (!bStart) {
                                 greenCaseWarning.append(QStringLiteral(", <br />&nbsp; &nbsp;"));
                             }
 
                             bStart = false;
                             greenCaseWarning.append(KEmailAddress::extractEmailAddress(*it));
                         }
                     }
                 } else {
                     greenCaseWarning
                         = QStringLiteral("<u>")
                           +i18nc("Start of warning message.", "Warning:")
                           +QStringLiteral("</u> ")
                           +i18n("No mail address is stored in the %1 used for signing, "
                                 "so we cannot compare it to the sender's address %2.",
                                 certificate,
                                 msgFrom);
                 }
                 break;
             }
 
             if (showKeyInfos && !cannotCheckSignature) {
                 if (metaData.signer.isEmpty()) {
                     signer.clear();
                 } else {
                     if (!blockAddrs.empty()) {
                         const QUrl address = KEmailAddress::encodeMailtoUrl(blockAddrs.first());
                         signer
                             = QStringLiteral("<a href=\"mailto:%1\">%2</a>").arg(QLatin1String(QUrl
                                                                                                ::
                                                                                                toPercentEncoding(
                                                                                                    address
                                                                                                    .
                                                                                                    path())),
                                                                                  signer);
                     }
                 }
             }
         } else {
             if (metaData.signer.isEmpty() || metaData.technicalProblem) {
                 mClass = QStringLiteral("signWarn");
             } else {
                 // HTMLize the signer's user id and create mailto: link
                 signer = MessageCore::StringUtil::quoteHtmlChars(signer, true);
                 signer = QStringLiteral("<a href=\"mailto:%1\">%1</a>").arg(signer);
 
                 if (metaData.isGoodSignature) {
                     if (metaData.keyTrust < GpgME::Signature::Marginal) {
                         mClass = QStringLiteral("signOkKeyBad");
                     } else {
                         mClass = QStringLiteral("signOkKeyOk");
                     }
                 } else {
                     mClass = QStringLiteral("signErr");
                 }
             }
         }
     }
 
     block.setProperty("onlyShowKeyURL", onlyShowKeyURL);
     block.setProperty("showKeyInfos", showKeyInfos);
     block.setProperty("cannotCheckSignature", cannotCheckSignature);
     block.setProperty("signer", signer);
     block.setProperty("statusStr", statusStr);
     block.setProperty("signClass", mClass);
     block.setProperty("greenCaseWarning", greenCaseWarning);
 
     const auto html = t->render(&c);
 
     return html;
 }
 
 QString DefaultRendererPrivate::render(const SignedMessagePart::Ptr &mp)
 {
     auto htmlWriter = QSharedPointer<CacheHtmlWriter>(new CacheHtmlWriter(mOldWriter));
     const auto metaData = mp->mMetaData;
     if (metaData.isSigned || metaData.inProgress) {
         {
             HTMLBlock::Ptr aBlock;
             if (mp->isAttachment()) {
                 aBlock
                     = HTMLBlock::Ptr(new AttachmentMarkBlock(htmlWriter.data(),
                                                              mp->attachmentNode()));
             }
             htmlWriter->queue(renderSigned(mp));
         }
         return htmlWriter->html;
     }
     {
         HTMLBlock::Ptr aBlock;
         if (mp->isAttachment()) {
             aBlock
                 = HTMLBlock::Ptr(new AttachmentMarkBlock(htmlWriter.data(), mp->attachmentNode()));
         }
         if (mp->hasSubParts()) {
             renderSubParts(mp, htmlWriter);
         } else if (!metaData.inProgress) {
             auto part = renderWithFactory(QStringLiteral("MimeTreeParser::MessagePart"), mp);
             if (part) {
                 htmlWriter->queue(part->html());
             }
         }
     }
     return htmlWriter->html;
 }
 
 QString DefaultRendererPrivate::render(const EncryptedMessagePart::Ptr &mp)
 {
     auto htmlWriter = QSharedPointer<CacheHtmlWriter>(new CacheHtmlWriter(mOldWriter));
     const auto metaData = mp->mMetaData;
 
     if (metaData.isEncrypted || metaData.inProgress) {
         {
             HTMLBlock::Ptr aBlock;
             if (mp->isAttachment()) {
                 aBlock
                     = HTMLBlock::Ptr(new AttachmentMarkBlock(htmlWriter.data(),
                                                              mp->attachmentNode()));
             }
             htmlWriter->queue(renderEncrypted(mp));
         }
         return htmlWriter->html;
     }
 
     {
         HTMLBlock::Ptr aBlock;
         if (mp->isAttachment()) {
             aBlock
                 = HTMLBlock::Ptr(new AttachmentMarkBlock(htmlWriter.data(), mp->attachmentNode()));
         }
 
         if (mp->hasSubParts()) {
             renderSubParts(mp, htmlWriter);
         } else if (!metaData.inProgress) {
             auto part = renderWithFactory(QStringLiteral("MimeTreeParser::MessagePart"), mp);
             if (part) {
                 htmlWriter->queue(part->html());
             }
         }
     }
     return htmlWriter->html;
 }
 
 QString DefaultRendererPrivate::render(const AlternativeMessagePart::Ptr &mp)
 {
     auto htmlWriter = QSharedPointer<CacheHtmlWriter>(new CacheHtmlWriter(mOldWriter));
     {
         HTMLBlock::Ptr aBlock;
         if (mp->isAttachment()) {
             aBlock
                 = HTMLBlock::Ptr(new AttachmentMarkBlock(htmlWriter.data(), mp->attachmentNode()));
         }
 
         auto mode = mp->preferredMode();
         if (mode == MimeTreeParser::Util::MultipartPlain && mp->text().trimmed().isEmpty()) {
             foreach (const auto m, mp->availableModes()) {
                 if (m != MimeTreeParser::Util::MultipartPlain) {
                     mode = m;
                     break;
                 }
             }
         }
         MimeMessagePart::Ptr part(mp->mChildParts.first());
         if (mp->mChildParts.contains(mode)) {
             part = mp->mChildParts[mode];
         }
 
         htmlWriter->queue(render(part));
     }
     return htmlWriter->html;
 }
 
 QString DefaultRendererPrivate::render(const CertMessagePart::Ptr &mp)
 {
     const GpgME::ImportResult &importResult(mp->mImportResult);
     Grantlee::Template t = MessageViewer::MessagePartRendererManager::self()->loadByName(QStringLiteral(
                                                                                              ":/certmessagepart.html"));
     Grantlee::Context c = MessageViewer::MessagePartRendererManager::self()->createContext();
     QObject block;
 
     c.insert(QStringLiteral("block"), &block);
     block.setProperty("importError", QString::fromLocal8Bit(importResult.error().asString()));
     block.setProperty("nImp", importResult.numImported());
     block.setProperty("nUnc", importResult.numUnchanged());
     block.setProperty("nSKImp", importResult.numSecretKeysImported());
     block.setProperty("nSKUnc", importResult.numSecretKeysUnchanged());
 
     QVariantList keylist;
     const auto imports = importResult.imports();
 
     auto end(imports.end());
     for (auto it = imports.begin(); it != end; ++it) {
         QObject *key(new QObject(mp.data()));
         key->setProperty("error", QString::fromLocal8Bit((*it).error().asString()));
         key->setProperty("status", (*it).status());
         key->setProperty("fingerprint", QLatin1String((*it).fingerprint()));
         keylist << QVariant::fromValue(key);
     }
 
     auto htmlWriter = QSharedPointer<CacheHtmlWriter>(new CacheHtmlWriter(mOldWriter));
     {
         HTMLBlock::Ptr aBlock;
         if (mp->isAttachment()) {
             aBlock
                 = HTMLBlock::Ptr(new AttachmentMarkBlock(htmlWriter.data(), mp->attachmentNode()));
         }
         const auto html = t->render(&c);
         htmlWriter->queue(html);
     }
     return htmlWriter->html;
 }
 
 QSharedPointer<PartRendered> DefaultRendererPrivate::renderWithFactory(QString className,
                                                                        const Interface::MessagePart::Ptr &msgPart)
 {
     if (mRendererFactory) {
         const auto registry = mRendererFactory->typeRegistry(className);
 
         if (registry.size() > 0) {
             const auto plugin = registry.at(0);
             return plugin->render(this, msgPart);
         }
     }
 
     return QSharedPointer<PartRendered>();
 }
 
 QString DefaultRendererPrivate::renderFactory(const Interface::MessagePart::Ptr &msgPart,
                                               const QSharedPointer<CacheHtmlWriter> &htmlWriter)
 {
     const QString className = QString::fromUtf8(msgPart->metaObject()->className());
 
     const auto rendered = renderWithFactory(className, msgPart);
     if (rendered) {
         const auto parts = rendered->embededParts();
         foreach (auto key, parts.keys()) {
             htmlWriter->embedPart(key, parts.value(key));
         }
 
         foreach (auto entry, rendered->extraHeader()) {
             htmlWriter->extraHead(entry);
         }
 
         return rendered->html();
     }
 
     if (className == QStringLiteral("MimeTreeParser::MessagePartList")) {
         auto mp = msgPart.dynamicCast<MessagePartList>();
         if (mp) {
             return render(mp);
         }
     } else if (className == QStringLiteral("MimeTreeParser::MimeMessagePart")) {
         auto mp = msgPart.dynamicCast<MimeMessagePart>();
         if (mp) {
             return render(mp);
         }
     } else if (className == QStringLiteral("MimeTreeParser::EncapsulatedRfc822MessagePart")) {
         auto mp = msgPart.dynamicCast<EncapsulatedRfc822MessagePart>();
         if (mp) {
             return render(mp);
         }
     } else if (className == QStringLiteral("MimeTreeParser::HtmlMessagePart")) {
         auto mp = msgPart.dynamicCast<HtmlMessagePart>();
         if (mp) {
             return render(mp);
         }
     } else if (className == QStringLiteral("MimeTreeParser::SignedMessagePart")) {
         auto mp = msgPart.dynamicCast<SignedMessagePart>();
         if (mp) {
             return render(mp);
         }
     } else if (className == QStringLiteral("MimeTreeParser::EncryptedMessagePart")) {
         auto mp = msgPart.dynamicCast<EncryptedMessagePart>();
         if (mp) {
             return render(mp);
         }
     } else if (className == QStringLiteral("MimeTreeParser::AlternativeMessagePart")) {
         auto mp = msgPart.dynamicCast<AlternativeMessagePart>();
         if (mp) {
             return render(mp);
         }
     } else if (className == QStringLiteral("MimeTreeParser::CertMessagePart")) {
         auto mp = msgPart.dynamicCast<CertMessagePart>();
         if (mp) {
             return render(mp);
         }
     }
 
     qCDebug(MESSAGEVIEWER_LOG) << "We got a unkonwn classname, using default behaviour for "
                                << className;
 
     auto _htmlWriter = htmlWriter;
     if (!_htmlWriter) {
         _htmlWriter = QSharedPointer<CacheHtmlWriter>(new CacheHtmlWriter(mOldWriter));
     }
     msgPart->setHtmlWriter(_htmlWriter.data());
     msgPart->html(false);
     msgPart->setHtmlWriter(mOldWriter);
     if (!htmlWriter) {
         return _htmlWriter->html;
     }
 
     return QString();
 }
 
 DefaultRenderer::DefaultRenderer(const MimeTreeParser::Interface::MessagePart::Ptr &msgPart,
                                  CSSHelperBase *cssHelper)
     : d(new MimeTreeParser::DefaultRendererPrivate(msgPart, cssHelper,
                                                    rendererPluginFactoryInstance()))
 {
 }
 
 DefaultRenderer::~DefaultRenderer()
 {
     delete d;
 }
 
 QString DefaultRenderer::html() const
 {
     return d->mHtml;
 }
diff --git a/mimetreeparser/autotests/data/headeronly/smime-signed-apple.mbox.html b/mimetreeparser/autotests/data/headeronly/smime-signed-apple.mbox.html
index 9554bb39..27ebdaf5 100644
--- a/mimetreeparser/autotests/data/headeronly/smime-signed-apple.mbox.html
+++ b/mimetreeparser/autotests/data/headeronly/smime-signed-apple.mbox.html
@@ -1,50 +1,55 @@
 <?xml version="1.0" encoding="UTF8"?>
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>
   <body>
     <div style="position: relative; word-wrap: break-word">
       <a name="att"/>
       <div id="attachmentDiv">
         <table cellspacing="1" cellpadding="1" class="signErr">
           <tr class="signErrH">
             <td dir="ltr">
               <table cellspacing="0" cellpadding="0" width="100%">
                 <tr>
                   <td>Invalid signature.</td>
                   <td align="right">
                     <a href="kmail:showSignatureDetails">Show Details</a>
                   </td>
                 </tr>
               </table>
             </td>
           </tr>
           <tr class="signErrB">
             <td>
               <a name="att1"/>
               <div id="attachmentDiv1">
                 <a name="att1.2"/>
                 <div id="attachmentDiv1.2">
                   <a name="att1.2.1"/>
                   <div id="attachmentDiv1.2.1">
-                    <div style="position: relative">Olá Konqui,<div class="">Here is the pdf you asked for!</div><div class="">Cheers,</div><div class="">Quaack</div></div>
+                    <div style="position: relative">
+                      <div class="">Olá Konqui,</div>
+                      <div class="">Here is the pdf you asked for!</div>
+                      <div class="">Cheers,</div>
+                      <div class="">Quaack</div>
+                    </div>
                   </div>
                   <a name="att1.2.3"/>
                   <div id="attachmentDiv1.2.3">
                     <div style="position: relative">
                       <blockquote type="cite" class="">
                         <div class="">On 20 Jan 2017, at 10:35, Konqui &lt;<a href="mailto:Konqui@kdab.com">Konqui</a></div>
                       </blockquote>
                     </div>
                   </div>
                 </div>
               </div>
             </td>
           </tr>
           <tr class="signErrH">
             <td dir="ltr">End of signed message</td>
           </tr>
         </table>
       </div>
     </div>
   </body>
 </html>
diff --git a/mimetreeparser/autotests/data/hidden/smime-signed-apple.mbox.html b/mimetreeparser/autotests/data/hidden/smime-signed-apple.mbox.html
index 9554bb39..27ebdaf5 100644
--- a/mimetreeparser/autotests/data/hidden/smime-signed-apple.mbox.html
+++ b/mimetreeparser/autotests/data/hidden/smime-signed-apple.mbox.html
@@ -1,50 +1,55 @@
 <?xml version="1.0" encoding="UTF8"?>
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>
   <body>
     <div style="position: relative; word-wrap: break-word">
       <a name="att"/>
       <div id="attachmentDiv">
         <table cellspacing="1" cellpadding="1" class="signErr">
           <tr class="signErrH">
             <td dir="ltr">
               <table cellspacing="0" cellpadding="0" width="100%">
                 <tr>
                   <td>Invalid signature.</td>
                   <td align="right">
                     <a href="kmail:showSignatureDetails">Show Details</a>
                   </td>
                 </tr>
               </table>
             </td>
           </tr>
           <tr class="signErrB">
             <td>
               <a name="att1"/>
               <div id="attachmentDiv1">
                 <a name="att1.2"/>
                 <div id="attachmentDiv1.2">
                   <a name="att1.2.1"/>
                   <div id="attachmentDiv1.2.1">
-                    <div style="position: relative">Olá Konqui,<div class="">Here is the pdf you asked for!</div><div class="">Cheers,</div><div class="">Quaack</div></div>
+                    <div style="position: relative">
+                      <div class="">Olá Konqui,</div>
+                      <div class="">Here is the pdf you asked for!</div>
+                      <div class="">Cheers,</div>
+                      <div class="">Quaack</div>
+                    </div>
                   </div>
                   <a name="att1.2.3"/>
                   <div id="attachmentDiv1.2.3">
                     <div style="position: relative">
                       <blockquote type="cite" class="">
                         <div class="">On 20 Jan 2017, at 10:35, Konqui &lt;<a href="mailto:Konqui@kdab.com">Konqui</a></div>
                       </blockquote>
                     </div>
                   </div>
                 </div>
               </div>
             </td>
           </tr>
           <tr class="signErrH">
             <td dir="ltr">End of signed message</td>
           </tr>
         </table>
       </div>
     </div>
   </body>
 </html>
diff --git a/mimetreeparser/autotests/data/inlined/smime-signed-apple.mbox.html b/mimetreeparser/autotests/data/inlined/smime-signed-apple.mbox.html
index d3f3eeb3..2c209a4f 100644
--- a/mimetreeparser/autotests/data/inlined/smime-signed-apple.mbox.html
+++ b/mimetreeparser/autotests/data/inlined/smime-signed-apple.mbox.html
@@ -1,63 +1,68 @@
 <?xml version="1.0" encoding="UTF8"?>
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>
   <body>
     <div style="position: relative; word-wrap: break-word">
       <a name="att"/>
       <div id="attachmentDiv">
         <table cellspacing="1" cellpadding="1" class="signErr">
           <tr class="signErrH">
             <td dir="ltr">
               <table cellspacing="0" cellpadding="0" width="100%">
                 <tr>
                   <td>Invalid signature.</td>
                   <td align="right">
                     <a href="kmail:showSignatureDetails">Show Details</a>
                   </td>
                 </tr>
               </table>
             </td>
           </tr>
           <tr class="signErrB">
             <td>
               <a name="att1"/>
               <div id="attachmentDiv1">
                 <a name="att1.2"/>
                 <div id="attachmentDiv1.2">
                   <a name="att1.2.1"/>
                   <div id="attachmentDiv1.2.1">
-                    <div style="position: relative">Olá Konqui,<div class="">Here is the pdf you asked for!</div><div class="">Cheers,</div><div class="">Quaack</div></div>
+                    <div style="position: relative">
+                      <div class="">Olá Konqui,</div>
+                      <div class="">Here is the pdf you asked for!</div>
+                      <div class="">Cheers,</div>
+                      <div class="">Quaack</div>
+                    </div>
                   </div>
                   <a name="att1.2.2"/>
                   <div id="attachmentDiv1.2.2">
                     <hr/>
                     <div>
                       <a href="attachment:1.2.2?place=body">
                         <img align="center" src="file:image.png" border="0" style="max-width: 100%"/>
                       </a>
                     </div>
                     <div>
                       <a href="attachment:1.2.2?place=body">image.png</a>
                     </div>
                     <div/>
                   </div>
                   <a name="att1.2.3"/>
                   <div id="attachmentDiv1.2.3">
                     <div style="position: relative">
                       <blockquote type="cite" class="">
                         <div class="">On 20 Jan 2017, at 10:35, Konqui &lt;<a href="mailto:Konqui@kdab.com">Konqui</a></div>
                       </blockquote>
                     </div>
                   </div>
                 </div>
               </div>
             </td>
           </tr>
           <tr class="signErrH">
             <td dir="ltr">End of signed message</td>
           </tr>
         </table>
       </div>
     </div>
   </body>
 </html>
diff --git a/mimetreeparser/autotests/data/smime-signed-apple.mbox b/mimetreeparser/autotests/data/smime-signed-apple.mbox
index d5cd06f1..5f092a88 100644
--- a/mimetreeparser/autotests/data/smime-signed-apple.mbox
+++ b/mimetreeparser/autotests/data/smime-signed-apple.mbox
@@ -1,197 +1,197 @@
 From: Quack <quack@example.org>
 Content-Type: multipart/signed; boundary="Apple-Mail=_607FF8D2-30E0-4FC3-86D9-1234567890AB"; protocol="application/pkcs7-signature"; micalg=sha1
 Message-Id: <468684BD-9CBD-48CF-B1BD-2824000F9541@example.org>
 Mime-Version: 1.0 (Mac OS X Mail 9.3 \(3124\))
 Subject: Re: PDF bug - modified mail, signature is not valid!
 Date: Fri, 20 Jan 2017 11:51:41 +0100
 To: Konqui <Konqui@kdab.com>
 
 
 --Apple-Mail=_607FF8D2-30E0-4FC3-86D9-1234567890AB
 Content-Type: multipart/alternative;
 	boundary="Apple-Mail=_C5F90221-8F52-4623-99DF-1234567890AB"
 
 
 --Apple-Mail=_C5F90221-8F52-4623-99DF-1234567890AB
 Content-Transfer-Encoding: quoted-printable
 Content-Type: text/plain;
 	charset=utf-8
 
 Ol=C3=A1 Konqui,
 
 Here is the pdf you asked for!
 Cheers,
 
 Quaak
 
 =E2=80=A6
 Quack | UX/UI Designer
 Klar=C3=A4lvdalens Datakonsult AB, a KDAB Group company
 Sweden (HQ) +46-563-540090, Germany +49-30-521325470
 KDAB - The Qt, C++ and OpenGL Experts | www.kdab.com
 
 
 --Apple-Mail=_C5F90221-8F52-4623-99DF-1234567890AB
 Content-Type: multipart/mixed;
 	boundary="Apple-Mail=_1C4D1EDB-36C5-40D7-9AB6-1234567890AB"
 
 
 --Apple-Mail=_1C4D1EDB-36C5-40D7-9AB6-1234567890AB
 Content-Transfer-Encoding: quoted-printable
 Content-Type: text/html;
 	charset=utf-8
 
 <html><head><meta http-equiv=3D"Content-Type" content=3D"text/html =
 charset=3Dutf-8"></head><body style=3D"word-wrap: break-word; =
--webkit-nbsp-mode: space; -webkit-line-break: after-white-space;" =
+-webkit-nbsp-mode: space; -webkit-line-break: after-white-space;"><div =
 class=3D"">Ol=C3=A1 Konqui,</div><div =
 class=3D"">Here is the pdf you asked for!</div><div =
 class=3D"">Cheers,</div><div =
 class=3D"">Quaack</div></body></html>=
 
 --Apple-Mail=_1C4D1EDB-36C5-40D7-9AB6-1234567890AB
 Content-Disposition: attachment; filename="image.png"
 Content-Transfer-Encoding: base64
 Content-Type: image/png; name="image.png"
 
 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
 o/0d59+Lh3Y1HHcAAAAASUVORK5CYII=
 --Apple-Mail=_1C4D1EDB-36C5-40D7-9AB6-1234567890AB
 Content-Transfer-Encoding: quoted-printable
 Content-Type: text/html;
 	charset=utf-8
 
 <html><head><meta http-equiv=3D"Content-Type" content=3D"text/html =
 charset=3Dutf-8"></head><body>=
 <blockquote type=3D"cite" class=3D""><div =
 class=3D"">On 20 Jan 2017, at 10:35, Konqui &lt;<a =
 href=3D"mailto:Konqui@kdab.com">Konqui</a>=
 </div>
 </blockquote>=
 </body></html>=
 
 --Apple-Mail=_1C4D1EDB-36C5-40D7-9AB6-1234567890AB--
 
 --Apple-Mail=_C5F90221-8F52-4623-99DF-1234567890AB--
 
 --Apple-Mail=_607FF8D2-30E0-4FC3-86D9-1234567890AB
 Content-Disposition: attachment;
 	filename=smime.p7s
 Content-Type: application/pkcs7-signature;
 	name=smime.p7s
 Content-Transfer-Encoding: base64
 
 MIAGCSqGSIb3DQEHAqCAMIACAQExCzAJBgUrDgMCGgUAMIAGCSqGSIb3DQEHAQAAoIILdTCCBRow
 ggQCoAMCAQICEG0Z6qcZT2ozIuYiMnqqcd4wDQYJKoZIhvcNAQEFBQAwga4xCzAJBgNVBAYTAlVT
 MQswCQYDVQQIEwJVVDEXMBUGA1UEBxMOU2FsdCBMYWtlIENpdHkxHjAcBgNVBAoTFVRoZSBVU0VS
 VFJVU1QgTmV0d29yazEhMB8GA1UECxMYaHR0cDovL3d3dy51c2VydHJ1c3QuY29tMTYwNAYDVQQD
 Ey1VVE4tVVNFUkZpcnN0LUNsaWVudCBBdXRoZW50aWNhdGlvbiBhbmQgRW1haWwwHhcNMTEwNDI4
 MDAwMDAwWhcNMjAwNTMwMTA0ODM4WjCBkzELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIg
 TWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQx
 OTA3BgNVBAMTMENPTU9ETyBDbGllbnQgQXV0aGVudGljYXRpb24gYW5kIFNlY3VyZSBFbWFpbCBD
 QTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJKEhFtLV5jUXi+LpOFAyKNTWF9mZfEy
 TvefMn1V0HhMVbdClOD5J3EHxcZppLkyxPFAGpDMJ1Zifxe1cWmu5SAb5MtjXmDKokH2auGj/7jf
 H0htZUOMKi4rYzh337EXrMLaggLW1DJq1GdvIBOPXDX65VSAr9hxCh03CgJQU2yVHakQFLSZlVkS
 Mf8JotJM3FLb3uJAAVtIaN3FSrTg7SQfOq9xXwfjrL8UO7AlcWg99A/WF1hGFYE8aIuLgw9teiFX
 5jSw2zJ+40rhpVJyZCaRTqWSD//gsWD9Gm9oUZljjRqLpcxCm5t9ImPTqaD8zp6Q30QZ9FxbNboW
 86eb/8ECAwEAAaOCAUswggFHMB8GA1UdIwQYMBaAFImCZ33EnSZwAEu0UEh83j2uBG59MB0GA1Ud
 DgQWBBR6E04AdFvGeGNkJ8Ev4qBbvHnFezAOBgNVHQ8BAf8EBAMCAQYwEgYDVR0TAQH/BAgwBgEB
 /wIBADARBgNVHSAECjAIMAYGBFUdIAAwWAYDVR0fBFEwTzBNoEugSYZHaHR0cDovL2NybC51c2Vy
 dHJ1c3QuY29tL1VUTi1VU0VSRmlyc3QtQ2xpZW50QXV0aGVudGljYXRpb25hbmRFbWFpbC5jcmww
 dAYIKwYBBQUHAQEEaDBmMD0GCCsGAQUFBzAChjFodHRwOi8vY3J0LnVzZXJ0cnVzdC5jb20vVVRO
 QWRkVHJ1c3RDbGllbnRfQ0EuY3J0MCUGCCsGAQUFBzABhhlodHRwOi8vb2NzcC51c2VydHJ1c3Qu
 Y29tMA0GCSqGSIb3DQEBBQUAA4IBAQCF1r54V1VtM39EUv5C1QaoAQOAivsNsv1Kv/avQUn1G1rF
 0q0bc24+6SZ85kyYwTAo38v7QjyhJT4KddbQPTmGZtGhm7VNm2+vKGwdr+XqdFqo2rHA8XV6L566
 k3nK/uKRHlZ0sviN0+BDchvtj/1gOSBH+4uvOmVIPJg9pSW/ve9g4EnlFsjrP0OD8ODuDcHTzTNf
 m9C9YGqzO/761Mk6PB/tm/+bSTO+Qik5g+4zaS6CnUVNqGnagBsePdIaXXxHmaWbCG0SmYbWXVcH
 G6cwvktJRLiQfsrReTjrtDP6oDpdJlieYVUYtCHVmdXgQ0BCML7qpeeU0rD+83X5f27nMIIGUzCC
 BTugAwIBAgIQMFPel8s+Gckd6L+iGIwbpTANBgkqhkiG9w0BAQUFADCBkzELMAkGA1UEBhMCR0Ix
 GzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgGA1UEChMR
 Q09NT0RPIENBIExpbWl0ZWQxOTA3BgNVBAMTMENPTU9ETyBDbGllbnQgQXV0aGVudGljYXRpb24g
 YW5kIFNlY3VyZSBFbWFpbCBDQTAeFw0xNDA2MDIwMDAwMDBaFw0xNzA2MDEyMzU5NTlaMIIBXzEL
 MAkGA1UEBhMCU0UxDzANBgNVBBETBjY4MyAzMTESMBAGA1UECBMJVmFlcm1sYW5kMRAwDgYDVQQH
 EwdIYWdmb3JzMRgwFgYDVQQJEw9Ob3JyaW5ncyB2YWVnIDIxDzANBgNVBBITBkJveCAzMDEmMCQG
 A1UECgwdS2xhcsOkbHZkYWxlbnMgRGF0YWtvbnN1bHQgQUIxHTAbBgNVBAsTFEEgS0RBQiBHcm91
 cCBDb21wYW55MUMwQQYDVQQLDDpJc3N1ZWQgdGhyb3VnaCBLbGFyw6RsdmRhbGVucyBEYXRha29u
 c3VsdCBBQiBFLVBLSSBNYW5hZ2VyMR8wHQYDVQQLExZDb3Jwb3JhdGUgU2VjdXJlIEVtYWlsMRgw
 FgYDVQQDEw9EaWFuYSBHb25jYWx2ZXMxJzAlBgkqhkiG9w0BCQEWGGRpYW5hLmdvbmNhbHZlc0Br
 ZGFiLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALrHSvWD6MR2tvF9A+wayTDg
 PvK3DahuvHWHzGQsd1p8bEh6qqupqgph2xO73P+ibM6EmNbCtZ+eQtW7l7iIyiC4IGsyEb5RSAtV
 zGAyebsO7SPHokbGIV5SVobaRQiJ+1gOvWUbqHSQ0T9ZPvMX2nNGIKZpqAfocRreZr36AZWRo4AF
 0uf6wz5aLEtq912u2rTWVsM1F966lexaepo0cZB9fdnnD8/pQX3zroj+vBTFNAkZXxxVwGMO24Pz
 92d/B6K8o1SP1ArqV4sxVYIxyQTmfW4X3iV/6bcbLfEcpcUNt6MUsjFulqr6a+j51alpyT3vNuJ9
 V1UI9jz3t/daQr0CAwEAAaOCAdIwggHOMB8GA1UdIwQYMBaAFHoTTgB0W8Z4Y2QnwS/ioFu8ecV7
 MB0GA1UdDgQWBBRIYj+FxAEGllaHmLL+EMhopIEOQjAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/
 BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDBAYIKwYBBQUHAwIwRgYDVR0gBD8wPTA7BgwrBgEEAbIx
 AQIBAwUwKzApBggrBgEFBQcCARYdaHR0cHM6Ly9zZWN1cmUuY29tb2RvLm5ldC9DUFMwVwYDVR0f
 BFAwTjBMoEqgSIZGaHR0cDovL2NybC5jb21vZG9jYS5jb20vQ09NT0RPQ2xpZW50QXV0aGVudGlj
 YXRpb25hbmRTZWN1cmVFbWFpbENBLmNybDCBiAYIKwYBBQUHAQEEfDB6MFIGCCsGAQUFBzAChkZo
 dHRwOi8vY3J0LmNvbW9kb2NhLmNvbS9DT01PRE9DbGllbnRBdXRoZW50aWNhdGlvbmFuZFNlY3Vy
 ZUVtYWlsQ0EuY3J0MCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5jb21vZG9jYS5jb20wIwYDVR0R
 BBwwGoEYZGlhbmEuZ29uY2FsdmVzQGtkYWIuY29tMA0GCSqGSIb3DQEBBQUAA4IBAQACzCCZ4ppg
 H7nXnCwisxjGLIgQMdwKPB6lnWk39YT0gEqvn85tDaXIZwGiRda7O1HWdWh7RoncolX3yHQ6p/BJ
 8RWkpxoc4es1wXSPmWMpspnglvtqYlfu7NZ/CqI6bvgqoy0w3KSv+GnVkiQ6SVKU4fV6itr5VG9q
 X0JYXAbKO8hOIP3NO3MVacPgzSIv83B9eLpfi/BlG6q6XKxVf4581lYbLL0F7cKQt1UYPiDsmPJG
 +5SEHT6ZOBiLgqQVhAw4Di+6wymUHONBRuH2bH3cjfFlkCCjiFF/cS7Oharro2RFnWQ6beZ3EzCG
 FJILmq/dVMGsBFWme23hLYwtLJSXMYIDqzCCA6cCAQEwgagwgZMxCzAJBgNVBAYTAkdCMRswGQYD
 VQQIExJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAOBgNVBAcTB1NhbGZvcmQxGjAYBgNVBAoTEUNPTU9E
 TyBDQSBMaW1pdGVkMTkwNwYDVQQDEzBDT01PRE8gQ2xpZW50IEF1dGhlbnRpY2F0aW9uIGFuZCBT
 ZWN1cmUgRW1haWwgQ0ECEDBT3pfLPhnJHei/ohiMG6UwCQYFKw4DAhoFAKCCAdcwGAYJKoZIhvcN
 AQkDMQsGCSqGSIb3DQEHATAcBgkqhkiG9w0BCQUxDxcNMTcwMTIwMTA1MTQxWjAjBgkqhkiG9w0B
 CQQxFgQU/AV0Tj17RqaDDCeGXWhe4epgX6gwgbkGCSsGAQQBgjcQBDGBqzCBqDCBkzELMAkGA1UE
 BhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgG
 A1UEChMRQ09NT0RPIENBIExpbWl0ZWQxOTA3BgNVBAMTMENPTU9ETyBDbGllbnQgQXV0aGVudGlj
 YXRpb24gYW5kIFNlY3VyZSBFbWFpbCBDQQIQMFPel8s+Gckd6L+iGIwbpTCBuwYLKoZIhvcNAQkQ
 AgsxgauggagwgZMxCzAJBgNVBAYTAkdCMRswGQYDVQQIExJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAO
 BgNVBAcTB1NhbGZvcmQxGjAYBgNVBAoTEUNPTU9ETyBDQSBMaW1pdGVkMTkwNwYDVQQDEzBDT01P
 RE8gQ2xpZW50IEF1dGhlbnRpY2F0aW9uIGFuZCBTZWN1cmUgRW1haWwgQ0ECEDBT3pfLPhnJHei/
 ohiMG6UwDQYJKoZIhvcNAQEBBQAEggEAEIfTyPoqjyJwrpYmZWRF6OY5ZCFdpw1UUfSXYUU2IdbL
 ph8QkMCc9uv5wk2IeE/9UxxvUR44J67Bu8hv/PCaeyMSh1j2peOlFG487SwyTjf5wIL+GEs8zvHo
 4+Dd2IPhAExt1Bjhmt6O7caF9LVrGQ/wlI6ZGN8MgjSgdrK4F3Ig4LbMuyTTcy3hDTvb+qzaQ4YI
 E+F4tnwhXG8FGEBnlng6nB4iXhoWSvBsjc1qF6eHEHzsOIZeNL7K6Imn7oKHJg+THGwHxC1TZGFt
 G92u6zV7Sc/i4ENH2MNzXT75mp8Gq/k6gpRz9nw8UVuLN/rDIb6esnEgVH9ad3awD154HAAAAAAA
 AA==
 --Apple-Mail=_607FF8D2-30E0-4FC3-86D9-1234567890AB--
 
diff --git a/mimetreeparser/autotests/data/smime-signed-apple.mbox.html b/mimetreeparser/autotests/data/smime-signed-apple.mbox.html
index 11652a14..2fbda399 100644
--- a/mimetreeparser/autotests/data/smime-signed-apple.mbox.html
+++ b/mimetreeparser/autotests/data/smime-signed-apple.mbox.html
@@ -1,58 +1,63 @@
 <?xml version="1.0" encoding="UTF8"?>
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>
   <body>
     <div style="position: relative; word-wrap: break-word">
       <a name="att"/>
       <div id="attachmentDiv">
         <table cellspacing="1" cellpadding="1" class="signErr">
           <tr class="signErrH">
             <td dir="ltr">
               <table cellspacing="0" cellpadding="0" width="100%">
                 <tr>
                   <td>Invalid signature.</td>
                   <td align="right">
                     <a href="kmail:showSignatureDetails">Show Details</a>
                   </td>
                 </tr>
               </table>
             </td>
           </tr>
           <tr class="signErrB">
             <td>
               <a name="att1"/>
               <div id="attachmentDiv1">
                 <a name="att1.2"/>
                 <div id="attachmentDiv1.2">
                   <a name="att1.2.1"/>
                   <div id="attachmentDiv1.2.1">
-                    <div style="position: relative">Olá Konqui,<div class="">Here is the pdf you asked for!</div><div class="">Cheers,</div><div class="">Quaack</div></div>
+                    <div style="position: relative">
+                      <div class="">Olá Konqui,</div>
+                      <div class="">Here is the pdf you asked for!</div>
+                      <div class="">Cheers,</div>
+                      <div class="">Quaack</div>
+                    </div>
                   </div>
                   <a name="att1.2.2"/>
                   <div id="attachmentDiv1.2.2">
                     <hr/>
                     <div>
                       <a href="attachment:1.2.2?place=body"><img align="center" height="48" width="48" src="file:image-png.svg" border="0" style="max-width: 100%" alt=""/>image.png</a>
                     </div>
                     <div/>
                   </div>
                   <a name="att1.2.3"/>
                   <div id="attachmentDiv1.2.3">
                     <div style="position: relative">
                       <blockquote type="cite" class="">
                         <div class="">On 20 Jan 2017, at 10:35, Konqui &lt;<a href="mailto:Konqui@kdab.com">Konqui</a></div>
                       </blockquote>
                     </div>
                   </div>
                 </div>
               </div>
             </td>
           </tr>
           <tr class="signErrH">
             <td dir="ltr">End of signed message</td>
           </tr>
         </table>
       </div>
     </div>
   </body>
 </html>
diff --git a/mimetreeparser/autotests/data/smime-signed-apple.mbox.inProgress.html b/mimetreeparser/autotests/data/smime-signed-apple.mbox.inProgress.html
index 5b57b937..295f1795 100644
--- a/mimetreeparser/autotests/data/smime-signed-apple.mbox.inProgress.html
+++ b/mimetreeparser/autotests/data/smime-signed-apple.mbox.inProgress.html
@@ -1,49 +1,54 @@
 <?xml version="1.0" encoding="UTF8"?>
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>
   <body>
     <div style="position: relative; word-wrap: break-word">
       <a name="att"/>
       <div id="attachmentDiv">
         <table cellspacing="1" cellpadding="1" class="signInProgress">
           <tr class="signInProgressH">
             <td dir="ltr">Please wait while the signature is being verified...</td>
           </tr>
           <tr class="signInProgressB">
             <td>
               <a name="att1"/>
               <div id="attachmentDiv1">
                 <a name="att1.2"/>
                 <div id="attachmentDiv1.2">
                   <a name="att1.2.1"/>
                   <div id="attachmentDiv1.2.1">
-                    <div style="position: relative">Olá Konqui,<div class="">Here is the pdf you asked for!</div><div class="">Cheers,</div><div class="">Quaack</div></div>
+                    <div style="position: relative">
+                      <div class="">Olá Konqui,</div>
+                      <div class="">Here is the pdf you asked for!</div>
+                      <div class="">Cheers,</div>
+                      <div class="">Quaack</div>
+                    </div>
                   </div>
                   <a name="att1.2.2"/>
                   <div id="attachmentDiv1.2.2">
                     <hr/>
                     <div>
                       <a href="attachment:1.2.2?place=body"><img align="center" height="48" width="48" src="file:image-png.svg" border="0" style="max-width: 100%" alt=""/>image.png</a>
                     </div>
                     <div/>
                   </div>
                   <a name="att1.2.3"/>
                   <div id="attachmentDiv1.2.3">
                     <div style="position: relative">
                       <blockquote type="cite" class="">
                         <div class="">On 20 Jan 2017, at 10:35, Konqui &lt;<a href="mailto:Konqui@kdab.com">Konqui</a></div>
                       </blockquote>
                     </div>
                   </div>
                 </div>
               </div>
             </td>
           </tr>
           <tr class="signInProgressH">
             <td dir="ltr">End of signed message</td>
           </tr>
         </table>
       </div>
     </div>
   </body>
 </html>