diff --git a/messageviewer/src/messagepartthemes/default/autotests/rendertest.cpp b/messageviewer/src/messagepartthemes/default/autotests/rendertest.cpp
index e6c02b50..d4e3ca25 100644
--- a/messageviewer/src/messagepartthemes/default/autotests/rendertest.cpp
+++ b/messageviewer/src/messagepartthemes/default/autotests/rendertest.cpp
@@ -1,358 +1,366 @@
 /*
   Copyright (c) 2010 Volker Krause <vkrause@kde.org>
   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 "rendertest.h"
 #include "setupenv.h"
 #include "testcsshelper.h"
 #include "util.h"
 
 #include <MessageViewer/FileHtmlWriter>
 #include <MimeTreeParser/ObjectTreeParser>
 #include <MimeTreeParser/MessagePart>
 
 #include <KMime/Message>
 
 #include <QDir>
 #include <QProcess>
 #include <QTest>
 
 using namespace MessageViewer;
 
 void RenderTest::initTestCase()
 {
     Test::setupEnv();
 }
+#ifndef Q_OS_WIN
+void initLocale()
+{
+    setenv("LC_ALL", "en_US.utf-8", 1);
+    setenv("TZ", "UTC", 1);
+}
 
+Q_CONSTRUCTOR_FUNCTION(initLocale)
+#endif
 void RenderTest::testRenderSmart_data()
 {
     QTest::addColumn<QString>("mailFileName");
     QTest::addColumn<QString>("referenceFileName");
     QTest::addColumn<QString>("outFileName");
     QTest::addColumn<QString>("attachmentStrategy");
     QTest::addColumn<bool>("showSignatureDetails");
     QTest::addColumn<QString>("asyncFileName");
 
     QDir dir(QStringLiteral(MAIL_DATA_DIR));
     const auto l = dir.entryList(QStringList(QStringLiteral("*.mbox")), QDir::Files | QDir::Readable | QDir::NoSymLinks);
     for (const QString &file : l) {
         if (!QFile::exists(dir.path() + QLatin1Char('/') + file + QStringLiteral(".html"))) {
             continue;
         }
         QTest::newRow(file.toLatin1().constData()) << file << QString(dir.path() + QLatin1Char(
                                                                           '/') + file
                                                                       + QStringLiteral(".html"))
                                                    << QString(file + QStringLiteral(".out"))
                                                    << QStringLiteral("smart") << false << QString();
     }
 }
 
 void RenderTest::testRenderSmart()
 {
     testRender();
 }
 
 void RenderTest::testRenderSmartAsync_data()
 {
     QTest::addColumn<QString>("mailFileName");
     QTest::addColumn<QString>("referenceFileName");
     QTest::addColumn<QString>("outFileName");
     QTest::addColumn<QString>("attachmentStrategy");
     QTest::addColumn<bool>("showSignatureDetails");
     QTest::addColumn<QString>("asyncFileName");
 
     QDir dir(QStringLiteral(MAIL_DATA_DIR));
     const auto l = dir.entryList(QStringList(QStringLiteral("*.mbox")), QDir::Files | QDir::Readable | QDir::NoSymLinks);
     for (const QString &file : l) {
         if (!QFile::exists(dir.path() + QLatin1Char('/') + file
                            + QStringLiteral(".inProgress.html"))) {
             continue;
         }
         QTest::newRow(file.toLatin1().constData()) << file << QString(dir.path() + QLatin1Char(
                                                                           '/') + file
                                                                       + QStringLiteral(".html"))
                                                    << QString(file + QStringLiteral(".out"))
                                                    << QStringLiteral("smart") << false << QString(
             dir.path() + QLatin1Char(
                 '/') + file
             + QStringLiteral(".inProgress.html"));
     }
 }
 
 void RenderTest::testRenderSmartAsync()
 {
     testRender();
 }
 
 void RenderTest::testRenderSmartDetails_data()
 {
     QTest::addColumn<QString>("mailFileName");
     QTest::addColumn<QString>("referenceFileName");
     QTest::addColumn<QString>("outFileName");
     QTest::addColumn<QString>("attachmentStrategy");
     QTest::addColumn<bool>("showSignatureDetails");
     QTest::addColumn<QString>("asyncFileName");
 
     QDir dir(QStringLiteral(MAIL_DATA_DIR));
     const auto l = dir.entryList(QStringList(QStringLiteral("*.mbox")), QDir::Files | QDir::Readable | QDir::NoSymLinks);
     for (const QString &file : l) {
         QString fname = dir.path() + QLatin1String("/details/") + file + QLatin1String(".html");
         if (!QFile::exists(fname)) {
             continue;
         }
         QTest::newRow(file.toLatin1().constData()) << file << fname << QString(file + QStringLiteral(
                                                                                    ".out"))
                                                    << QStringLiteral("smart") << true << QString();
     }
 }
 
 void RenderTest::testRenderSmartDetails()
 {
     testRender();
 }
 
 void RenderTest::testRenderInlined_data()
 {
     QTest::addColumn<QString>("mailFileName");
     QTest::addColumn<QString>("referenceFileName");
     QTest::addColumn<QString>("outFileName");
     QTest::addColumn<QString>("attachmentStrategy");
     QTest::addColumn<bool>("showSignatureDetails");
     QTest::addColumn<QString>("asyncFileName");
 
     QDir dir(QStringLiteral(MAIL_DATA_DIR));
     const auto l = dir.entryList(QStringList(QStringLiteral("*.mbox")), QDir::Files | QDir::Readable | QDir::NoSymLinks);
     for (const QString &file : l) {
         QString fname = dir.path() + QLatin1String("/inlined/") + file + QLatin1String(".html");
         if (!QFile::exists(fname)) {
             fname = dir.path() + QLatin1Char('/') + file + QLatin1String(".html");
             if (!QFile::exists(fname)) {
                 continue;
             }
         }
         QTest::newRow(file.toLatin1().constData()) << file << fname << QString(file + QStringLiteral(
                                                                                    ".out"))
                                                    << QStringLiteral("inlined") << false
                                                    << QString();
     }
 }
 
 void RenderTest::testRenderInlined()
 {
     testRender();
 }
 
 void RenderTest::testRenderIconic_data()
 {
     QTest::addColumn<QString>("mailFileName");
     QTest::addColumn<QString>("referenceFileName");
     QTest::addColumn<QString>("outFileName");
     QTest::addColumn<QString>("attachmentStrategy");
     QTest::addColumn<bool>("showSignatureDetails");
     QTest::addColumn<QString>("asyncFileName");
 
     QDir dir(QStringLiteral(MAIL_DATA_DIR));
     const auto l = dir.entryList(QStringList(QStringLiteral("*.mbox")), QDir::Files | QDir::Readable | QDir::NoSymLinks);
     for (const QString &file : l) {
         QString fname = dir.path() + QLatin1String("/iconic/") + file + QLatin1String(".html");
         if (!QFile::exists(fname)) {
             fname = dir.path() + QLatin1Char('/') + file + QLatin1String(".html");
             if (!QFile::exists(fname)) {
                 continue;
             }
         }
         QTest::newRow(file.toLatin1().constData()) << file << fname << QString(file + QStringLiteral(
                                                                                    ".out"))
                                                    << QStringLiteral("iconic") << false
                                                    << QString();
     }
 }
 
 void RenderTest::testRenderIconic()
 {
     testRender();
 }
 
 void RenderTest::testRenderHidden_data()
 {
     QTest::addColumn<QString>("mailFileName");
     QTest::addColumn<QString>("referenceFileName");
     QTest::addColumn<QString>("outFileName");
     QTest::addColumn<QString>("attachmentStrategy");
     QTest::addColumn<bool>("showSignatureDetails");
     QTest::addColumn<QString>("asyncFileName");
 
     QDir dir(QStringLiteral(MAIL_DATA_DIR));
     const auto l = dir.entryList(QStringList(QStringLiteral("*.mbox")), QDir::Files | QDir::Readable | QDir::NoSymLinks);
     for (const QString &file : l) {
         QString fname = dir.path() + QLatin1String("/hidden/") + file + QLatin1String(".html");
         if (!QFile::exists(fname)) {
             fname = dir.path() + QLatin1Char('/') + file + QLatin1String(".html");
             if (!QFile::exists(fname)) {
                 continue;
             }
         }
         QTest::newRow(file.toLatin1().constData()) << file << fname << QString(file + QStringLiteral(
                                                                                    ".out"))
                                                    << QStringLiteral("hidden") << false
                                                    << QString();
     }
 }
 
 void RenderTest::testRenderHidden()
 {
     testRender();
 }
 
 void RenderTest::testRenderHeaderOnly_data()
 {
     QTest::addColumn<QString>("mailFileName");
     QTest::addColumn<QString>("referenceFileName");
     QTest::addColumn<QString>("outFileName");
     QTest::addColumn<QString>("attachmentStrategy");
     QTest::addColumn<bool>("showSignatureDetails");
     QTest::addColumn<QString>("asyncFileName");
 
     QDir dir(QStringLiteral(MAIL_DATA_DIR));
     const auto l = dir.entryList(QStringList(QStringLiteral("*.mbox")), QDir::Files | QDir::Readable | QDir::NoSymLinks);
     for (const QString &file : l) {
         QString fname = dir.path() + QLatin1String("/headeronly/") + file
                         + QStringLiteral(".html");
         if (!QFile::exists(fname)) {
             fname = dir.path() + QLatin1Char('/') + file + QLatin1String(".html");
             if (!QFile::exists(fname)) {
                 continue;
             }
         }
         QTest::newRow(file.toLatin1().constData()) << file << fname << QString(file + QStringLiteral(
                                                                                    ".out"))
                                                    << QStringLiteral("headeronly") << false
                                                    << QString();
     }
 }
 
 void RenderTest::testRenderHeaderOnly()
 {
     testRender();
 }
 
 QString renderTreeHelper(const MimeTreeParser::MessagePart::Ptr &messagePart, QString indent)
 {
     const QString line
         = QStringLiteral("%1 * %3\n").arg(indent,
                                           QString::fromUtf8(messagePart->metaObject()->className()));
     QString ret = line;
 
     indent += QLatin1Char(' ');
     foreach (const auto &subPart, messagePart->subParts()) {
         ret += renderTreeHelper(subPart, indent);
     }
     return ret;
 }
 
 void RenderTest::testRenderTree(const MimeTreeParser::MessagePart::Ptr &messagePart)
 {
     QString renderedTree = renderTreeHelper(messagePart, QString());
 
     QFETCH(QString, mailFileName);
     QFETCH(QString, outFileName);
     const QString treeFileName = QLatin1String(MAIL_DATA_DIR) + QLatin1Char('/') + mailFileName
                                  + QStringLiteral(".tree");
     const QString outTreeFileName = outFileName + QStringLiteral(".tree");
 
     {
         QFile f(outTreeFileName);
         f.open(QIODevice::WriteOnly);
         f.write(renderedTree.toUtf8());
         f.close();
     }
     // compare to reference file
     const QStringList args = QStringList()
                              << QStringLiteral("-u")
                              << treeFileName
                              << outTreeFileName;
     QProcess proc;
     proc.setProcessChannelMode(QProcess::ForwardedChannels);
     proc.start(QStringLiteral("diff"), args);
     QVERIFY(proc.waitForFinished());
 
     QCOMPARE(proc.exitCode(), 0);
 }
 
 void RenderTest::testRender()
 {
     QFETCH(QString, mailFileName);
     QFETCH(QString, referenceFileName);
     QFETCH(QString, outFileName);
     QFETCH(QString, attachmentStrategy);
     QFETCH(bool, showSignatureDetails);
     QFETCH(QString, asyncFileName);
 
     const QString htmlFileName = outFileName + QStringLiteral(".html");
     const bool bAsync = !asyncFileName.isEmpty();
 
     // load input mail
     const KMime::Message::Ptr msg(Test::readAndParseMail(mailFileName));
 
     // render the mail
     FileHtmlWriter fileWriter(outFileName);
     QImage paintDevice;
     Test::TestCSSHelper cssHelper(&paintDevice);
     MimeTreeParser::NodeHelper nodeHelper;
     Test::ObjectTreeSource testSource(&fileWriter, &cssHelper);
     testSource.setAllowDecryption(true);
     testSource.setAttachmentStrategy(attachmentStrategy);
     testSource.setShowSignatureDetails(showSignatureDetails);
 
     QEventLoop loop;
     MimeTreeParser::ObjectTreeParser otp(&testSource, &nodeHelper);
     connect(&nodeHelper, &MimeTreeParser::NodeHelper::update, &loop, &QEventLoop::quit);
     otp.setAllowAsync(bAsync);
 
     otp.parseObjectTree(msg.data());
 
     fileWriter.begin();
     fileWriter.write(cssHelper.htmlHead(false));
     testSource.render(otp.parsedPart(), false);
     fileWriter.write(QStringLiteral("</body></html>"));
     fileWriter.end();
 
     if (!bAsync) {
         testRenderTree(otp.parsedPart());
     } else {
         Test::compareFile(outFileName, asyncFileName);
         loop.exec();
 
         MimeTreeParser::ObjectTreeParser otp(&testSource, &nodeHelper);
         otp.setAllowAsync(bAsync);
 
         otp.parseObjectTree(msg.data());
 
         fileWriter.begin();
         fileWriter.write(cssHelper.htmlHead(false));
         testSource.render(otp.parsedPart(), false);
         fileWriter.write(QStringLiteral("</body></html>"));
         fileWriter.end();
 
         testRenderTree(otp.parsedPart());
     }
     Test::compareFile(outFileName, referenceFileName);
 }
 
 QTEST_MAIN(RenderTest)
diff --git a/mimetreeparser/autotests/data/alternative-notext.mbox.html b/mimetreeparser/autotests/data/alternative-notext.mbox.html
index 41db4eab..6c3619b4 100644
--- a/mimetreeparser/autotests/data/alternative-notext.mbox.html
+++ b/mimetreeparser/autotests/data/alternative-notext.mbox.html
@@ -1,17 +1,20 @@
 <?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">
         <a name="att1"/>
         <div id="attachmentDiv1">
+          <div class="inlineMessageError"><b>Note:</b> This HTML message may contain external references to images etc. For security/privacy reasons external references are not loaded. If you trust the sender of this message then you can load the external references for this message <a href="kmail:loadExternal">by clicking here</a>.</div>
+          <br/>
+          <br/>
           <div style="position: relative">
             <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; -qt-user-state:0;">Some <span style=" font-weight:600;">HTML</span> text</p>
           </div>
         </div>
       </div>
     </div>
   </body>
 </html>
diff --git a/mimetreeparser/autotests/data/alternative.mbox.html b/mimetreeparser/autotests/data/alternative.mbox.html
index 2fe886f1..0a83df46 100644
--- a/mimetreeparser/autotests/data/alternative.mbox.html
+++ b/mimetreeparser/autotests/data/alternative.mbox.html
@@ -1,17 +1,20 @@
 <?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">
         <a name="att2"/>
         <div id="attachmentDiv2">
+          <div class="inlineMessageError"><b>Note:</b> This HTML message may contain external references to images etc. For security/privacy reasons external references are not loaded. If you trust the sender of this message then you can load the external references for this message <a href="kmail:loadExternal">by clicking here</a>.</div>
+          <br/>
+          <br/>
           <div style="position: relative">
             <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; -qt-user-state:0;">Some <span style=" font-weight:600;">HTML</span> text</p>
           </div>
         </div>
       </div>
     </div>
   </body>
 </html>
diff --git a/mimetreeparser/autotests/data/headeronly/smime-signed-apple.mbox.html b/mimetreeparser/autotests/data/headeronly/smime-signed-apple.mbox.html
index 27ebdaf5..5e8ff550 100644
--- a/mimetreeparser/autotests/data/headeronly/smime-signed-apple.mbox.html
+++ b/mimetreeparser/autotests/data/headeronly/smime-signed-apple.mbox.html
@@ -1,55 +1,61 @@
 <?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 class="inlineMessageError"><b>Note:</b> This HTML message may contain external references to images etc. For security/privacy reasons external references are not loaded. If you trust the sender of this message then you can load the external references for this message <a href="kmail:loadExternal">by clicking here</a>.</div>
+                    <br/>
+                    <br/>
                     <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 class="inlineMessageError"><b>Note:</b> This HTML message may contain external references to images etc. For security/privacy reasons external references are not loaded. If you trust the sender of this message then you can load the external references for this message <a href="kmail:loadExternal">by clicking here</a>.</div>
+                    <br/>
+                    <br/>
                     <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/openpgp-signed-apple.mbox.html b/mimetreeparser/autotests/data/hidden/openpgp-signed-apple.mbox.html
index 330b02a1..c17d3331 100644
--- a/mimetreeparser/autotests/data/hidden/openpgp-signed-apple.mbox.html
+++ b/mimetreeparser/autotests/data/hidden/openpgp-signed-apple.mbox.html
@@ -1,50 +1,56 @@
 <?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="signWarn">
           <tr class="signWarnH">
             <td dir="ltr">
               <table cellspacing="0" cellpadding="0" width="100%">
                 <tr>
                   <td>Not enough information to check signature validity.</td>
                   <td align="right">
                     <a href="kmail:showSignatureDetails">Show Details</a>
                   </td>
                 </tr>
               </table>
             </td>
           </tr>
           <tr class="signWarnB">
             <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 class="inlineMessageError"><b>Note:</b> This HTML message may contain external references to images etc. For security/privacy reasons external references are not loaded. If you trust the sender of this message then you can load the external references for this message <a href="kmail:loadExternal">by clicking here</a>.</div>
+                    <br/>
+                    <br/>
                     <div style="position: relative">
                       <div class="">pre attachment</div>
                     </div>
                   </div>
                   <a name="att1.2.3"/>
                   <div id="attachmentDiv1.2.3">
+                    <div class="inlineMessageError"><b>Note:</b> This HTML message may contain external references to images etc. For security/privacy reasons external references are not loaded. If you trust the sender of this message then you can load the external references for this message <a href="kmail:loadExternal">by clicking here</a>.</div>
+                    <br/>
+                    <br/>
                     <div style="position: relative">
                       <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; -qt-user-state:0;">Some <span style=" font-weight:600;">HTML</span> text</p>
                     </div>
                   </div>
                 </div>
               </div>
             </td>
           </tr>
           <tr class="signWarnH">
             <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 27ebdaf5..5e8ff550 100644
--- a/mimetreeparser/autotests/data/hidden/smime-signed-apple.mbox.html
+++ b/mimetreeparser/autotests/data/hidden/smime-signed-apple.mbox.html
@@ -1,55 +1,61 @@
 <?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 class="inlineMessageError"><b>Note:</b> This HTML message may contain external references to images etc. For security/privacy reasons external references are not loaded. If you trust the sender of this message then you can load the external references for this message <a href="kmail:loadExternal">by clicking here</a>.</div>
+                    <br/>
+                    <br/>
                     <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 class="inlineMessageError"><b>Note:</b> This HTML message may contain external references to images etc. For security/privacy reasons external references are not loaded. If you trust the sender of this message then you can load the external references for this message <a href="kmail:loadExternal">by clicking here</a>.</div>
+                    <br/>
+                    <br/>
                     <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/html-multipart-related.mbox.html b/mimetreeparser/autotests/data/html-multipart-related.mbox.html
index cac75276..084a5836 100644
--- a/mimetreeparser/autotests/data/html-multipart-related.mbox.html
+++ b/mimetreeparser/autotests/data/html-multipart-related.mbox.html
@@ -1,18 +1,21 @@
 <?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">
         <a name="att1"/>
         <div id="attachmentDiv1">
+          <div class="inlineMessageError"><b>Note:</b> This HTML message may contain external references to images etc. For security/privacy reasons external references are not loaded. If you trust the sender of this message then you can load the external references for this message <a href="kmail:loadExternal">by clicking here</a>.</div>
+          <br/>
+          <br/>
           <div style="position: relative">
             <p> some random text :) <img src="cid:uniqueid"/> </p>
           </div>
         </div>
         <!-- embedPart(contentID=uniqueid, url=file:///tmp/messageviewer.index.2/image.png) -->
       </div>
     </div>
   </body>
 </html>
diff --git a/mimetreeparser/autotests/data/html.mbox.html b/mimetreeparser/autotests/data/html.mbox.html
index 2fe886f1..0a83df46 100644
--- a/mimetreeparser/autotests/data/html.mbox.html
+++ b/mimetreeparser/autotests/data/html.mbox.html
@@ -1,17 +1,20 @@
 <?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">
         <a name="att2"/>
         <div id="attachmentDiv2">
+          <div class="inlineMessageError"><b>Note:</b> This HTML message may contain external references to images etc. For security/privacy reasons external references are not loaded. If you trust the sender of this message then you can load the external references for this message <a href="kmail:loadExternal">by clicking here</a>.</div>
+          <br/>
+          <br/>
           <div style="position: relative">
             <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; -qt-user-state:0;">Some <span style=" font-weight:600;">HTML</span> text</p>
           </div>
         </div>
       </div>
     </div>
   </body>
 </html>
diff --git a/mimetreeparser/autotests/data/htmlonly.mbox.html b/mimetreeparser/autotests/data/htmlonly.mbox.html
index 1143f2cf..4a1db930 100644
--- a/mimetreeparser/autotests/data/htmlonly.mbox.html
+++ b/mimetreeparser/autotests/data/htmlonly.mbox.html
@@ -1,12 +1,15 @@
 <?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">
+        <div class="inlineMessageError"><b>Note:</b> This HTML message may contain external references to images etc. For security/privacy reasons external references are not loaded. If you trust the sender of this message then you can load the external references for this message <a href="kmail:loadExternal">by clicking here</a>.</div>
+        <br/>
+        <br/>
         <div style="position: relative"><b>SOME</b> HTML text.</div>
       </div>
     </div>
   </body>
 </html>
diff --git a/mimetreeparser/autotests/data/inlined/openpgp-signed-apple.mbox.html b/mimetreeparser/autotests/data/inlined/openpgp-signed-apple.mbox.html
index 092d5e1c..c17d3331 100644
--- a/mimetreeparser/autotests/data/inlined/openpgp-signed-apple.mbox.html
+++ b/mimetreeparser/autotests/data/inlined/openpgp-signed-apple.mbox.html
@@ -1,63 +1,56 @@
 <?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="signWarn">
           <tr class="signWarnH">
             <td dir="ltr">
               <table cellspacing="0" cellpadding="0" width="100%">
                 <tr>
                   <td>Not enough information to check signature validity.</td>
                   <td align="right">
                     <a href="kmail:showSignatureDetails">Show Details</a>
                   </td>
                 </tr>
               </table>
             </td>
           </tr>
           <tr class="signWarnB">
             <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 class="inlineMessageError"><b>Note:</b> This HTML message may contain external references to images etc. For security/privacy reasons external references are not loaded. If you trust the sender of this message then you can load the external references for this message <a href="kmail:loadExternal">by clicking here</a>.</div>
+                    <br/>
+                    <br/>
                     <div style="position: relative">
                       <div class="">pre attachment</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 class="inlineMessageError"><b>Note:</b> This HTML message may contain external references to images etc. For security/privacy reasons external references are not loaded. If you trust the sender of this message then you can load the external references for this message <a href="kmail:loadExternal">by clicking here</a>.</div>
+                    <br/>
+                    <br/>
                     <div style="position: relative">
                       <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; -qt-user-state:0;">Some <span style=" font-weight:600;">HTML</span> text</p>
                     </div>
                   </div>
                 </div>
               </div>
             </td>
           </tr>
           <tr class="signWarnH">
             <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 2c209a4f..5e8ff550 100644
--- a/mimetreeparser/autotests/data/inlined/smime-signed-apple.mbox.html
+++ b/mimetreeparser/autotests/data/inlined/smime-signed-apple.mbox.html
@@ -1,68 +1,61 @@
 <?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 class="inlineMessageError"><b>Note:</b> This HTML message may contain external references to images etc. For security/privacy reasons external references are not loaded. If you trust the sender of this message then you can load the external references for this message <a href="kmail:loadExternal">by clicking here</a>.</div>
+                    <br/>
+                    <br/>
                     <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 class="inlineMessageError"><b>Note:</b> This HTML message may contain external references to images etc. For security/privacy reasons external references are not loaded. If you trust the sender of this message then you can load the external references for this message <a href="kmail:loadExternal">by clicking here</a>.</div>
+                    <br/>
+                    <br/>
                     <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/openpgp-signed-apple.mbox.html b/mimetreeparser/autotests/data/openpgp-signed-apple.mbox.html
index 234eaae4..c17d3331 100644
--- a/mimetreeparser/autotests/data/openpgp-signed-apple.mbox.html
+++ b/mimetreeparser/autotests/data/openpgp-signed-apple.mbox.html
@@ -1,58 +1,56 @@
 <?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="signWarn">
           <tr class="signWarnH">
             <td dir="ltr">
               <table cellspacing="0" cellpadding="0" width="100%">
                 <tr>
                   <td>Not enough information to check signature validity.</td>
                   <td align="right">
                     <a href="kmail:showSignatureDetails">Show Details</a>
                   </td>
                 </tr>
               </table>
             </td>
           </tr>
           <tr class="signWarnB">
             <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 class="inlineMessageError"><b>Note:</b> This HTML message may contain external references to images etc. For security/privacy reasons external references are not loaded. If you trust the sender of this message then you can load the external references for this message <a href="kmail:loadExternal">by clicking here</a>.</div>
+                    <br/>
+                    <br/>
                     <div style="position: relative">
                       <div class="">pre attachment</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 class="inlineMessageError"><b>Note:</b> This HTML message may contain external references to images etc. For security/privacy reasons external references are not loaded. If you trust the sender of this message then you can load the external references for this message <a href="kmail:loadExternal">by clicking here</a>.</div>
+                    <br/>
+                    <br/>
                     <div style="position: relative">
                       <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; -qt-user-state:0;">Some <span style=" font-weight:600;">HTML</span> text</p>
                     </div>
                   </div>
                 </div>
               </div>
             </td>
           </tr>
           <tr class="signWarnH">
             <td dir="ltr">End of signed message</td>
           </tr>
         </table>
       </div>
     </div>
   </body>
 </html>
diff --git a/mimetreeparser/autotests/data/smime-signed-apple.mbox.html b/mimetreeparser/autotests/data/smime-signed-apple.mbox.html
index 2fbda399..5e8ff550 100644
--- a/mimetreeparser/autotests/data/smime-signed-apple.mbox.html
+++ b/mimetreeparser/autotests/data/smime-signed-apple.mbox.html
@@ -1,63 +1,61 @@
 <?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 class="inlineMessageError"><b>Note:</b> This HTML message may contain external references to images etc. For security/privacy reasons external references are not loaded. If you trust the sender of this message then you can load the external references for this message <a href="kmail:loadExternal">by clicking here</a>.</div>
+                    <br/>
+                    <br/>
                     <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 class="inlineMessageError"><b>Note:</b> This HTML message may contain external references to images etc. For security/privacy reasons external references are not loaded. If you trust the sender of this message then you can load the external references for this message <a href="kmail:loadExternal">by clicking here</a>.</div>
+                    <br/>
+                    <br/>
                     <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/text+html-maillinglist.mbox.html b/mimetreeparser/autotests/data/text+html-maillinglist.mbox.html
index 2b5af631..f19b5edf 100644
--- a/mimetreeparser/autotests/data/text+html-maillinglist.mbox.html
+++ b/mimetreeparser/autotests/data/text+html-maillinglist.mbox.html
@@ -1,38 +1,41 @@
 <?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">
         <a name="att1"/>
         <div id="attachmentDiv1">
           <a name="att1.2"/>
           <div id="attachmentDiv1.2">
+            <div class="inlineMessageError"><b>Note:</b> This HTML message may contain external references to images etc. For security/privacy reasons external references are not loaded. If you trust the sender of this message then you can load the external references for this message <a href="kmail:loadExternal">by clicking here</a>.</div>
+            <br/>
+            <br/>
             <div style="position: relative">
               <b><a class="bz_bug_link bz_status_NEW " title="NEW --- - Standard folder name configuration ignored on creating new users" href="https://issues.kolab.org/show_bug.cgi?id=1741#c4">Comment # 4</a>on <a class="bz_bug_link bz_status_NEW " title="NEW --- - Standard folder name configuration ignored on creating new users" href="https://issues.kolab.org/show_bug.cgi?id=1741">bug 1741</a>from <span class="vcard"><a class="email" href="mailto:wickert@kolabsys.com" title="Christoph Wickert &lt;wickert@kolabsys.com&gt;"><span class="fn">Christoph Wickert</span></a></span></b>
               <pre>You can get everything you need on test93-18.</pre>
               <span>You are receiving this mail because:</span>
               <ul>
                 <li>You are watching all bug changes.</li>
               </ul>
             </div>
           </div>
         </div>
         <a name="att2"/>
         <div id="attachmentDiv2">
           <div class="noquote">
             <div dir="ltr">_______________________________________________</div>
             <div dir="ltr">bugzilla mailing list</div>
             <div dir="ltr">
               <a href="mailto:bugzilla@lists.kolabsys.com">bugzilla@lists.kolabsys.com</a>
             </div>
             <div dir="ltr">
               <a href="https://lists.kolabsys.com/mailman/listinfo/bugzilla">https://lists.kolabsys.com/mailman/listinfo/bugzilla</a>
             </div>
           </div>
         </div>
       </div>
     </div>
   </body>
 </html>