diff --git a/messageviewer/src/utils/autotests/messageviewerutilstest.cpp b/messageviewer/src/utils/autotests/messageviewerutilstest.cpp
index ccb1d734..28170fc1 100644
--- a/messageviewer/src/utils/autotests/messageviewerutilstest.cpp
+++ b/messageviewer/src/utils/autotests/messageviewerutilstest.cpp
@@ -1,99 +1,99 @@
 /*
   Copyright (C) 2018-2020 Laurent Montel <montel@kde.org>
 
   This program is free software; you can redistribute it and/or modify it
   under the terms of the GNU General Public License, version 2, as
   published by the Free Software Foundation.
 
   This program 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
   General Public License for more details.
 
   You should have received a copy of the GNU General Public License along
   with this program; if not, write to the Free Software Foundation, Inc.,
   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 #include "messageviewerutilstest.h"
 #include "utils/messageviewerutil.h"
 #include <QTest>
 QTEST_GUILESS_MAIN(MessageViewerUtilsTest)
 
 MessageViewerUtilsTest::MessageViewerUtilsTest(QObject *parent)
     : QObject(parent)
 {
 }
 
 void MessageViewerUtilsTest::shouldExcludeHeader_data()
 {
     QTest::addColumn<QString>("header");
     QTest::addColumn<bool>("exclude");
     QTest::newRow("emptylist") << QString() << false;
     QTest::newRow("REFRESH1") << QStringLiteral("<meta content=\"0;URL=http://www.kde.org\" http-equiv=\'REFRESH\'></head>") << true;
     QTest::newRow("REFRESH2") << QStringLiteral("<meta content=\"0;URL=http://www.kde.org\" http-equiv=\"REFRESH\"></head>") << true;
     QTest::newRow("REFRESH3") << QStringLiteral("<meta content=\"0;URL=http://www.kde.org\" http-equiv=\"refresh\"></head>") << true;
     QTest::newRow("REFRESH4") << QStringLiteral("<meta content=\"0;URL=http://www.kde.org\" http-equiv=\"&#82;EFRESH\"></head>") << true;
     QTest::newRow("REFRESH5") << QStringLiteral("<meta content=\"0;URL=http://www.kde.org\" http-equiv=\'&#82;EFRESH\'></head>") << true;
     QTest::newRow("REFRESH6") << QStringLiteral("<meta content=\"0;URL=http://www.kde.org\" http-equiv= \"REFRESH\"></head>") << true;
 }
 
 void MessageViewerUtilsTest::shouldExcludeHeader()
 {
     QFETCH(QString, header);
     QFETCH(bool, exclude);
     QCOMPARE(MessageViewer::Util::excludeExtraHeader(header), exclude);
 }
 
 void MessageViewerUtilsTest::shouldContainsExternalReferences_data()
 {
     QTest::addColumn<QString>("filename");
     QTest::addColumn<QString>("extraHead");
     QTest::addColumn<bool>("hasExternalReference");
     QTest::newRow("noimage.txt") << QStringLiteral("noimage.txt") << QString() << false;
     QTest::newRow("image.txt") << QStringLiteral("image.txt") << QString() << true;
     QTest::newRow("image2.txt") << QStringLiteral("image2.txt") << QString() << true;
     QTest::newRow("noimage2.txt") << QStringLiteral("noimage2.txt") << QString() << false;
     QTest::newRow("noimage3.txt") << QStringLiteral("noimage3.txt") << QString() << false;
 }
 
 void MessageViewerUtilsTest::shouldContainsExternalReferences()
 {
     QFETCH(QString, filename);
     QFETCH(QString, extraHead);
     QFETCH(bool, hasExternalReference);
     const QString curPath = QStringLiteral(MESSAGEVIEWER_UTIL_DATA_DIR "/");
     QFile file(curPath + filename);
     QVERIFY(file.open(QIODevice::ReadOnly));
     const QString html = QString::fromLatin1(file.readAll());
     QCOMPARE(MessageViewer::Util::containsExternalReferences(html, extraHead), hasExternalReference);
 }
 
 
 void MessageViewerUtilsTest::shouldExtractHtml()
 {
     QFETCH(QString, input);
     QFETCH(QString, output);
     QString header;
     const QString processHtml = MessageViewer::Util::processHtml(input, header);
     bool equal = processHtml == output;
     if (!equal) {
         qDebug() << " processed " << processHtml;
         qDebug() << " ref " << output;
     }
     QVERIFY(equal);
 }
 
 void MessageViewerUtilsTest::shouldExtractHtml_data()
 {
     QTest::addColumn<QString>("input");
     QTest::addColumn<QString>("output");
     QTest::newRow("empty") << QString() << QString();
     QString input = QStringLiteral("<html><head></head><body>foo</body></html>");
     QString output = QStringLiteral("foo");
     QTest::newRow("test1") << input << output;
 
     input = QStringLiteral("That's interesting. I don't see new commits or anything relevant to it on the author's releases. I don't actually know why the author uses the other library as they do seem to have similar data... Maybe some other functions that are easier to use.<br><br><br>All the best,<br><br>C<br><br><br>-------- Original Message --------<br>On Mar 3, 2020, 09:56, foo wrote:<blockquote class=\"protonmail_quote\"><br><!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\r\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\r\np, li { white-space: pre-wrap; }\r\n</style></head><body>\r\n<p>Hey bla,</p>\r\n<p>&nbsp;</p>\r\n<p>how are things going? Done your PhD?</p>\r\n<p>&nbsp;</p>\r\n<p>On a recent installation I had an issue with the Orthanc-Module, during initialization of the database:</p>\r\n<p><span style=\" font-family:'monospace';\"><br />   from .datetime import DateTime </span><span style=\" font-family:'monospace','Noto Sans';\"><br />'Something' as changed in the setup of timezone data (between December and now so to say).</span></p>\r\n<p><span style=\" font-family:'monospace','Noto Sans';\">To make the story short, this module pytzdata comes from the pypi-package pytzdata and contains basically the same stuff as pytz.</span></p>\r\n<p><span style=\" font-family:'monospace','Noto Sans';\">Except that pendulum and pytzdata is from the same author.</span></p>\r\n<p><span style=\" font-family:'monospace','Noto Sans';\">Do you have an idea why he not uses pytz, as everybody else?</span></p>\r\n<p>&nbsp;</p>\r\n<p>Thanks</p>\r\n<p>&nbsp;</p>\r\n<p>-- </p>\r\n<p>T: @coogor</p>\r\n<p>Matrix: @docb:matrix.org</p>\r\n<p>PGP Fingerprint: 2E7F 3A19 A4A4 844A 3D09 7656 822D EB64 A3BA 290D</p>\r\n<p>&nbsp;</p>\r\n<p>http://gnuhealth.ghf2020.org</p></body></html></div>");
-    output = QStringLiteral("<p>Hey bla,</p>\r\n<p>&nbsp;</p>\r\n<p>how are things going? Done your PhD?</p>\r\n<p>&nbsp;</p>\r\n<p>On a recent installation I had an issue with the Orthanc-Module, during initialization of the database:</p>\r\n<p><span style=\" font-family:'monospace';\"><br />   from .datetime import DateTime </span><span style=\" font-family:'monospace','Noto Sans';\"><br />'Something' as changed in the setup of timezone data (between December and now so to say).</span></p>\r\n<p><span style=\" font-family:'monospace','Noto Sans';\">To make the story short, this module pytzdata comes from the pypi-package pytzdata and contains basically the same stuff as pytz.</span></p>\r\n<p><span style=\" font-family:'monospace','Noto Sans';\">Except that pendulum and pytzdata is from the same author.</span></p>\r\n<p><span style=\" font-family:'monospace','Noto Sans';\">Do you have an idea why he not uses pytz, as everybody else?</span></p>\r\n<p>&nbsp;</p>\r\n<p>Thanks</p>\r\n<p>&nbsp;</p>\r\n<p>-- </p>\r\n<p>T: @coogor</p>\r\n<p>Matrix: @docb:matrix.org</p>\r\n<p>PGP Fingerprint: 2E7F 3A19 A4A4 844A 3D09 7656 822D EB64 A3BA 290D</p>\r\n<p>&nbsp;</p>\r\n<p>http://gnuhealth.ghf2020.org</p></body></html></div>");
+    output = QStringLiteral("That's interesting. I don't see new commits or anything relevant to it on the author's releases. I don't actually know why the author uses the other library as they do seem to have similar data... Maybe some other functions that are easier to use.<br><br><br>All the best,<br><br>C<br><br><br>-------- Original Message --------<br>On Mar 3, 2020, 09:56, foo wrote:<blockquote class=\"protonmail_quote\"><br><p>Hey bla,</p>\r\n<p>&nbsp;</p>\r\n<p>how are things going? Done your PhD?</p>\r\n<p>&nbsp;</p>\r\n<p>On a recent installation I had an issue with the Orthanc-Module, during initialization of the database:</p>\r\n<p><span style=\" font-family:'monospace';\"><br />   from .datetime import DateTime </span><span style=\" font-family:'monospace','Noto Sans';\"><br />'Something' as changed in the setup of timezone data (between December and now so to say).</span></p>\r\n<p><span style=\" font-family:'monospace','Noto Sans';\">To make the story short, this module pytzdata comes from the pypi-package pytzdata and contains basically the same stuff as pytz.</span></p>\r\n<p><span style=\" font-family:'monospace','Noto Sans';\">Except that pendulum and pytzdata is from the same author.</span></p>\r\n<p><span style=\" font-family:'monospace','Noto Sans';\">Do you have an idea why he not uses pytz, as everybody else?</span></p>\r\n<p>&nbsp;</p>\r\n<p>Thanks</p>\r\n<p>&nbsp;</p>\r\n<p>-- </p>\r\n<p>T: @coogor</p>\r\n<p>Matrix: @docb:matrix.org</p>\r\n<p>PGP Fingerprint: 2E7F 3A19 A4A4 844A 3D09 7656 822D EB64 A3BA 290D</p>\r\n<p>&nbsp;</p>\r\n<p>http://gnuhealth.ghf2020.org</p>");
     QTest::newRow("bug418482") << input << output;
 }
diff --git a/messageviewer/src/utils/messageviewerutil.cpp b/messageviewer/src/utils/messageviewerutil.cpp
index 4a0e20a8..2d5f4196 100644
--- a/messageviewer/src/utils/messageviewerutil.cpp
+++ b/messageviewer/src/utils/messageviewerutil.cpp
@@ -1,720 +1,728 @@
 /*******************************************************************************
 **
 ** Filename   : util
 ** Created on : 03 April, 2005
 ** Copyright  : (c) 2005 Till Adam
 ** Email      : <adam@kde.org>
 **
 *******************************************************************************/
 
 /*******************************************************************************
 **
 **   This program is free software; you can redistribute it and/or modify
 **   it under the terms of the GNU General Public License as published by
 **   the Free Software Foundation; either version 2 of the License, or
 **   (at your option) any later version.
 **
 **   It 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
 **   General Public License for more details.
 **
 **   You should have received a copy of the GNU General Public License
 **   along with this program; if not, write to the Free Software
 **   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 **
 **   In addition, as a special exception, the copyright holders give
 **   permission to link the code of this program with any edition of
 **   the Qt library by Trolltech AS, Norway (or with modified versions
 **   of Qt that use the same license as Qt), and distribute linked
 **   combinations including the two.  You must obey the GNU General
 **   Public License in all respects for all of the code used other than
 **   Qt.  If you modify this file, you may extend this exception to
 **   your version of the file, but you are not obligated to do so.  If
 **   you do not wish to do so, delete this exception statement from
 **   your version.
 **
 *******************************************************************************/
 
 #include "messageviewer/messageviewerutil.h"
 #include "messageviewerutil_p.h"
 #include "kpimtextedit/texttospeech.h"
 #include <MimeTreeParser/NodeHelper>
 #include "messageviewer_debug.h"
 #include "MessageCore/MessageCoreSettings"
 #include "MessageCore/NodeHelper"
 #include "MessageCore/StringUtil"
 
 #include "PimCommon/RenameFileDialog"
 
 #include <Gravatar/GravatarCache>
 #include <gravatar/gravatarsettings.h>
 
 #include <AkonadiCore/item.h>
 
 #include <kmbox/mbox.h>
 
 #include <KMime/Message>
 #include <KFileWidget>
 #include <KCharsets>
 #include <KLocalizedString>
 #include <KMessageBox>
 #include <QFileDialog>
 #include <ktoolinvocation.h>
 #include <KJobWidgets>
 #include <KIO/StatJob>
 #include <KIO/FileCopyJob>
 #include <KRecentDirs>
 #include <QAction>
 #include <QIcon>
 #include <QTemporaryFile>
 #include <QWidget>
 #include <QDBusConnectionInterface>
 #include <QActionGroup>
 #include <QDesktopServices>
 #include <QRegularExpression>
 
 #include <qtwebenginewidgetsversion.h>
 
 using namespace MessageViewer;
 /** 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 Util::containsExternalReferences(const QString &str, const QString &extraHead)
 {
     const bool hasBaseInHeader = extraHead.contains(QLatin1String(
                                                         "<base href=\""), Qt::CaseInsensitive);
     if (hasBaseInHeader && (str.contains(QLatin1String("href=\"/"), Qt::CaseInsensitive)
                             || str.contains(QLatin1String("<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);
         }
     }
     QRegularExpressionMatch rmatch;
 
     const int startImgIndex = str.indexOf(QLatin1String("<img "));
     QString newStringImg;
     if (startImgIndex != -1) {
         for (int i = startImgIndex, total = str.length(); i < total; ++i) {
             const QChar charStr = str.at(i);
             if (charStr == QLatin1Char('>')) {
                 newStringImg += charStr;
                 break;
             } else {
                 newStringImg += charStr;
             }
         }
         if (!newStringImg.isEmpty()) {
             const bool containsReg2 = newStringImg.contains(QRegularExpression(QStringLiteral("<img.*src=\"https?:/.*\".*>"), QRegularExpression::CaseInsensitiveOption), &rmatch);
             if (!containsReg2) {
                 const bool containsReg = newStringImg.contains(QRegularExpression(QStringLiteral("<img.*src=https?:/.*>"), QRegularExpression::CaseInsensitiveOption), &rmatch);
                 return containsReg;
             } else {
                 return true;
             }
         }
     }
     return false;
 }
 
 bool Util::checkOverwrite(const QUrl &url, QWidget *w)
 {
     bool fileExists = false;
     if (url.isLocalFile()) {
         fileExists = QFile::exists(url.toLocalFile());
     } else {
         auto job = KIO::stat(url, KIO::StatJob::DestinationSide, 0);
         KJobWidgets::setWindow(job, w);
         fileExists = job->exec();
     }
     if (fileExists) {
         if (KMessageBox::Cancel == KMessageBox::warningContinueCancel(
                 w,
                 i18n("A file named \"%1\" already exists. "
                      "Are you sure you want to overwrite it?", url.toDisplayString()),
                 i18n("Overwrite File?"),
                 KStandardGuiItem::overwrite())) {
             return false;
         }
     }
     return true;
 }
 
 bool Util::handleUrlWithQDesktopServices(const QUrl &url)
 {
 #if defined Q_OS_WIN || defined Q_OS_MACX
     QDesktopServices::openUrl(url);
     return true;
 #else
     // Always handle help through khelpcenter or browser
     if (url.scheme() == QLatin1String("help")) {
         QDesktopServices::openUrl(url);
         return true;
     }
     return false;
 #endif
 }
 
 KMime::Content::List Util::allContents(const KMime::Content *message)
 {
     KMime::Content::List result;
     KMime::Content *child = MessageCore::NodeHelper::firstChild(message);
     if (child) {
         result += child;
         result += allContents(child);
     }
     KMime::Content *next = MessageCore::NodeHelper::nextSibling(message);
     if (next) {
         result += next;
         result += allContents(next);
     }
 
     return result;
 }
 
 bool Util::saveContents(QWidget *parent, const KMime::Content::List &contents, QList<QUrl> &urlList)
 {
     QUrl url, dirUrl;
     QString recentDirClass;
     QUrl currentFolder;
     const bool multiple = (contents.count() > 1);
     if (multiple) {
         // get the dir
         dirUrl = QFileDialog::getExistingDirectoryUrl(parent, i18n(
                                                           "Save Attachments To"),
                                                       KFileWidget::getStartUrl(QUrl(QStringLiteral(
                                                                                         "kfiledialog:///attachmentDir")),
                                                                                recentDirClass));
         if (!dirUrl.isValid()) {
             return false;
         }
 
         // we may not get a slash-terminated url out of KFileDialog
         if (!dirUrl.path().endsWith(QLatin1Char('/'))) {
             dirUrl.setPath(dirUrl.path() + QLatin1Char('/'));
         }
         currentFolder = dirUrl;
     } else {
         // only one item, get the desired filename
         KMime::Content *content = contents.first();
         QString fileName = MimeTreeParser::NodeHelper::fileName(content);
         fileName = MessageCore::StringUtil::cleanFileName(fileName);
         if (fileName.isEmpty()) {
             fileName = i18nc("filename for an unnamed attachment", "attachment.1");
         }
 
         QUrl localUrl = KFileWidget::getStartUrl(QUrl(QStringLiteral(
                                                           "kfiledialog:///attachmentDir")),
                                                  recentDirClass);
         localUrl.setPath(localUrl.path() + QLatin1Char('/') + fileName);
         QFileDialog::Options options = QFileDialog::DontConfirmOverwrite;
         url = QFileDialog::getSaveFileUrl(parent, i18n("Save Attachment"), localUrl,
                                           QString(), nullptr, options);
         if (url.isEmpty()) {
             return false;
         }
         currentFolder = KIO::upUrl(url);
     }
 
     if (!recentDirClass.isEmpty()) {
         KRecentDirs::add(recentDirClass, currentFolder.path());
     }
 
     QMap< QString, int > renameNumbering;
 
     bool globalResult = true;
     int unnamedAtmCount = 0;
     PimCommon::RenameFileDialog::RenameFileDialogResult result
         = PimCommon::RenameFileDialog::RENAMEFILE_IGNORE;
     for (KMime::Content *content : qAsConst(contents)) {
         QUrl curUrl;
         if (!dirUrl.isEmpty()) {
             curUrl = dirUrl;
             QString fileName = MimeTreeParser::NodeHelper::fileName(content);
             fileName = MessageCore::StringUtil::cleanFileName(fileName);
             if (fileName.isEmpty()) {
                 ++unnamedAtmCount;
                 fileName = i18nc("filename for the %1-th unnamed attachment",
                                  "attachment.%1", unnamedAtmCount);
             }
             if (!curUrl.path().endsWith(QLatin1Char('/'))) {
                 curUrl.setPath(curUrl.path() + QLatin1Char('/'));
             }
             curUrl.setPath(curUrl.path() + fileName);
         } else {
             curUrl = url;
         }
         if (!curUrl.isEmpty()) {
             //Bug #312954
             if (multiple && (curUrl.fileName() == QLatin1String("smime.p7s"))) {
                 continue;
             }
             // Rename the file if we have already saved one with the same name:
             // try appending a number before extension (e.g. "pic.jpg" => "pic_2.jpg")
             QString origFile = curUrl.fileName();
             QString file = origFile;
 
             while (renameNumbering.contains(file)) {
                 file = origFile;
                 int num = renameNumbering[file] + 1;
                 int dotIdx = file.lastIndexOf(QLatin1Char('.'));
                 file.insert((dotIdx >= 0) ? dotIdx : file.length(), QLatin1Char(
                                 '_') + QString::number(num));
             }
             curUrl = curUrl.adjusted(QUrl::RemoveFilename | QUrl::StripTrailingSlash);
             curUrl.setPath(curUrl.path() + QLatin1Char('/') + file);
 
             // Increment the counter for both the old and the new filename
             if (!renameNumbering.contains(origFile)) {
                 renameNumbering[origFile] = 1;
             } else {
                 renameNumbering[origFile]++;
             }
 
             if (file != origFile) {
                 if (!renameNumbering.contains(file)) {
                     renameNumbering[file] = 1;
                 } else {
                     renameNumbering[file]++;
                 }
             }
 
             if (!(result == PimCommon::RenameFileDialog::RENAMEFILE_OVERWRITEALL
                   || result == PimCommon::RenameFileDialog::RENAMEFILE_IGNOREALL)) {
                 bool fileExists = false;
                 if (curUrl.isLocalFile()) {
                     fileExists = QFile::exists(curUrl.toLocalFile());
                 } else {
                     auto job = KIO::stat(curUrl, KIO::StatJob::DestinationSide, 0);
                     KJobWidgets::setWindow(job, parent);
                     fileExists = job->exec();
                 }
                 if (fileExists) {
                     QPointer<PimCommon::RenameFileDialog> dlg = new PimCommon::RenameFileDialog(
                         curUrl,
                         multiple,
                         parent);
                     result
                         = static_cast<PimCommon::RenameFileDialog::RenameFileDialogResult>(dlg->exec());
                     if (result == PimCommon::RenameFileDialog::RENAMEFILE_IGNORE
                         || result == PimCommon::RenameFileDialog::RENAMEFILE_IGNOREALL) {
                         delete dlg;
                         continue;
                     } else if (result == PimCommon::RenameFileDialog::RENAMEFILE_RENAME) {
                         if (dlg) {
                             curUrl = dlg->newName();
                         }
                     }
                     delete dlg;
                 }
             }
             // save
             if (result != PimCommon::RenameFileDialog::RENAMEFILE_IGNOREALL) {
                 const bool resultSave = saveContent(parent, content, curUrl);
                 if (!resultSave) {
                     globalResult = resultSave;
                 } else {
                     urlList.append(curUrl);
                 }
             }
         }
     }
 
     return globalResult;
 }
 
 bool Util::saveContent(QWidget *parent, KMime::Content *content, const QUrl &url)
 {
     // FIXME: This is all horribly broken. First of all, creating a NodeHelper and then immediately
     //        reading out the encryption/signature state will not work at all.
     //        Then, topLevel() will not work for attachments that are inside encrypted parts.
     //        What should actually be done is either passing in an ObjectTreeParser that has already
     //        parsed the message, or creating an OTP here (which would have the downside that the
     //        password dialog for decrypting messages is shown twice)
 #if 0 // totally broken
     KMime::Content *topContent = content->topLevel();
     MimeTreeParser::NodeHelper *mNodeHelper = new MimeTreeParser::NodeHelper;
     bool bSaveEncrypted = false;
     bool bEncryptedParts = mNodeHelper->encryptionState(content)
                            != MimeTreeParser::KMMsgNotEncrypted;
     if (bEncryptedParts) {
         if (KMessageBox::questionYesNo(parent,
                                        i18n(
                                            "The part %1 of the message is encrypted. Do you want to keep the encryption when saving?",
                                            url.fileName()),
                                        i18n("KMail Question"), KGuiItem(i18n("Keep Encryption")),
                                        KGuiItem(i18n("Do Not Keep")))
             == KMessageBox::Yes) {
             bSaveEncrypted = true;
         }
     }
 
     bool bSaveWithSig = true;
     if (mNodeHelper->signatureState(content) != MessageViewer::MimeTreeParser::KMMsgNotSigned) {
         if (KMessageBox::questionYesNo(parent,
                                        i18n(
                                            "The part %1 of the message is signed. Do you want to keep the signature when saving?",
                                            url.fileName()),
                                        i18n("KMail Question"), KGuiItem(i18n("Keep Signature")),
                                        KGuiItem(i18n("Do Not Keep")))
             != KMessageBox::Yes) {
             bSaveWithSig = false;
         }
     }
 
     QByteArray data;
     if (bSaveEncrypted || !bEncryptedParts) {
         KMime::Content *dataNode = content;
         QByteArray rawDecryptedBody;
         bool gotRawDecryptedBody = false;
         if (!bSaveWithSig) {
             if (topContent->contentType()->mimeType() == "multipart/signed") {
                 // carefully look for the part that is *not* the signature part:
                 if (MimeTreeParser::ObjectTreeParser::findType(topContent,
                                                                "application/pgp-signature", true,
                                                                false)) {
                     dataNode = MimeTreeParser::ObjectTreeParser ::findTypeNot(topContent,
                                                                               "application",
                                                                               "pgp-signature", true,
                                                                               false);
                 } else if (MimeTreeParser::ObjectTreeParser::findType(topContent,
                                                                       "application/pkcs7-mime",
                                                                       true, false)) {
                     dataNode = MimeTreeParser::ObjectTreeParser ::findTypeNot(topContent,
                                                                               "application",
                                                                               "pkcs7-mime", true,
                                                                               false);
                 } else {
                     dataNode = MimeTreeParser::ObjectTreeParser ::findTypeNot(topContent,
                                                                               "multipart", "", true,
                                                                               false);
                 }
             } else {
                 EmptySource emptySource;
                 MimeTreeParser::ObjectTreeParser otp(&emptySource, 0, 0, false, false);
 
                 // process this node and all it's siblings and descendants
                 mNodeHelper->setNodeUnprocessed(dataNode, true);
                 otp.parseObjectTree(dataNode);
 
                 rawDecryptedBody = otp.rawDecryptedBody();
                 gotRawDecryptedBody = true;
             }
         }
         QByteArray cstr = gotRawDecryptedBody
                           ? rawDecryptedBody
                           : dataNode->decodedContent();
         data = KMime::CRLFtoLF(cstr);
     }
 #else
     const QByteArray data = content->decodedContent();
     qCWarning(MESSAGEVIEWER_LOG)
         << "Port the encryption/signature handling when saving a KMime::Content.";
 #endif
     QDataStream ds;
     QFile file;
     QTemporaryFile tf;
     if (url.isLocalFile()) {
         // save directly
         file.setFileName(url.toLocalFile());
         if (!file.open(QIODevice::WriteOnly)) {
             KMessageBox::error(parent,
                                xi18nc("1 = file name, 2 = error string",
                                       "<qt>Could not write to the file<br /><filename>%1</filename><br /><br />%2</qt>",
                                       file.fileName(),
                                       file.errorString()),
                                i18n("Error saving attachment"));
             return false;
         }
         ds.setDevice(&file);
     } else {
         // tmp file for upload
         tf.open();
         ds.setDevice(&tf);
     }
 
     const int bytesWritten = ds.writeRawData(data.data(), data.size());
     if (bytesWritten != data.size()) {
         QFile *f = static_cast<QFile *>(ds.device());
         KMessageBox::error(parent,
                            xi18nc("1 = file name, 2 = error string",
                                   "<qt>Could not write to the file<br /><filename>%1</filename><br /><br />%2</qt>",
                                   f->fileName(),
                                   f->errorString()),
                            i18n("Error saving attachment"));
         // Remove the newly created empty or partial file
         f->remove();
         return false;
     }
 
     if (!url.isLocalFile()) {
         // QTemporaryFile::fileName() is only defined while the file is open
         QString tfName = tf.fileName();
         tf.close();
         auto job = KIO::file_copy(QUrl::fromLocalFile(tfName), url);
         KJobWidgets::setWindow(job, parent);
         if (!job->exec()) {
             KMessageBox::error(parent,
                                xi18nc("1 = file name, 2 = error string",
                                       "<qt>Could not write to the file<br /><filename>%1</filename><br /><br />%2</qt>",
                                       url.toDisplayString(),
                                       job->errorString()),
                                i18n("Error saving attachment"));
             return false;
         }
     } else {
         file.close();
     }
 
     return true;
 }
 
 bool Util::saveAttachments(const KMime::Content::List &contents, QWidget *parent, QList<QUrl> &urlList)
 {
     if (contents.isEmpty()) {
         KMessageBox::information(parent, i18n("Found no attachments to save."));
         return false;
     }
 
     return Util::saveContents(parent, contents, urlList);
 }
 
 QString Util::generateMboxFileName(const Akonadi::Item &msgBase)
 {
     QString fileName;
 
     if (msgBase.hasPayload<KMime::Message::Ptr>()) {
         fileName
             = MessageCore::StringUtil::cleanFileName(MessageCore::StringUtil::cleanSubject(
                                                          msgBase.
                                                          payload
                                                          <KMime::Message::Ptr>().data()).trimmed());
         fileName.remove(QLatin1Char('\"'));
     } else {
         fileName = i18n("message");
     }
 
     if (!fileName.endsWith(QLatin1String(".mbox"))) {
         fileName += QLatin1String(".mbox");
     }
     return fileName;
 }
 
 bool Util::saveMessageInMboxAndGetUrl(QUrl &url, const Akonadi::Item::List &retrievedMsgs, QWidget *parent, bool appendMessages)
 {
     if (retrievedMsgs.isEmpty()) {
         return false;
     }
     const Akonadi::Item msgBase = retrievedMsgs.first();
     QString fileName = generateMboxFileName(msgBase);
 
     const QString filter = i18n("email messages (*.mbox);;all files (*)");
 
     QString fileClass;
     const QUrl startUrl = KFileWidget::getStartUrl(QUrl(QStringLiteral(
                                                             "kfiledialog:///savemessage")),
                                                    fileClass);
     QUrl localUrl;
     localUrl.setPath(startUrl.path() + QLatin1Char('/') + fileName);
     QFileDialog::Options opt;
     if (appendMessages) {
         opt |= QFileDialog::DontConfirmOverwrite;
     }
     QUrl dirUrl = QFileDialog::getSaveFileUrl(parent, i18np("Save Message", "Save Messages",
                                                             retrievedMsgs.count()), QUrl::fromLocalFile(localUrl.toString()), filter, nullptr,
                                               opt);
     if (!dirUrl.isEmpty()) {
         QFile file;
         QTemporaryFile tf;
         QString localFileName;
         if (dirUrl.isLocalFile()) {
             // save directly
             file.setFileName(dirUrl.toLocalFile());
             localFileName = file.fileName();
             if (!appendMessages) {
                 QFile::remove(localFileName);
             }
         } else {
             // tmp file for upload
             tf.open();
             localFileName = tf.fileName();
         }
 
         KMBox::MBox mbox;
         if (!mbox.load(localFileName)) {
             if (appendMessages) {
                 KMessageBox::error(parent, i18n("File %1 could not be loaded.",
                                                 localFileName), i18n("Error loading message"));
             } else {
                 KMessageBox::error(parent, i18n("File %1 could not be created.",
                                                 localFileName), i18n("Error saving message"));
             }
             return false;
         }
         for (const Akonadi::Item &item : qAsConst(retrievedMsgs)) {
             if (item.hasPayload<KMime::Message::Ptr>()) {
                 mbox.appendMessage(item.payload<KMime::Message::Ptr>());
             }
         }
 
         if (!mbox.save()) {
             KMessageBox::error(parent, i18n("We cannot save message."),
                                i18n("Error saving message"));
             return false;
         }
         localUrl = QUrl::fromLocalFile(localFileName);
         if (localUrl.isLocalFile()) {
             KRecentDirs::add(fileClass, localUrl.adjusted(
                                  QUrl::RemoveFilename | QUrl::StripTrailingSlash).path());
         }
 
         if (!dirUrl.isLocalFile()) {
             // QTemporaryFile::fileName() is only defined while the file is open
             QString tfName = tf.fileName();
             tf.close();
             auto job = KIO::file_copy(QUrl::fromLocalFile(tfName), dirUrl);
             KJobWidgets::setWindow(job, parent);
             if (!job->exec()) {
                 KMessageBox::error(parent,
                                    xi18nc("1 = file name, 2 = error string",
                                           "<qt>Could not write to the file<br /><filename>%1</filename><br /><br />%2</qt>",
                                           url.toDisplayString(),
                                           job->errorString()),
                                    i18n("Error saving message"));
                 return false;
             }
         } else {
             file.close();
         }
         url = localUrl;
     }
     return true;
 }
 
 bool Util::saveMessageInMbox(const Akonadi::Item::List &retrievedMsgs, QWidget *parent, bool appendMessages)
 {
     QUrl url;
     return saveMessageInMboxAndGetUrl(url, retrievedMsgs, parent, appendMessages);
 }
 
 QAction *Util::createAppAction(const KService::Ptr &service, bool singleOffer, QActionGroup *actionGroup, QObject *parent)
 {
     QString actionName(service->name().replace(QLatin1Char('&'), QStringLiteral("&&")));
     if (singleOffer) {
         actionName = i18n("Open &with %1", actionName);
     } else {
         actionName = i18nc("@item:inmenu Open With, %1 is application name", "%1", actionName);
     }
 
     QAction *act = new QAction(parent);
     act->setIcon(QIcon::fromTheme(service->icon()));
     act->setText(actionName);
     actionGroup->addAction(act);
     act->setData(QVariant::fromValue(service));
     return act;
 }
 
 bool Util::excludeExtraHeader(const QString &s)
 {
     QRegularExpression ref(QStringLiteral("http-equiv=\\s*(\'|\")(&#82;|R)EFRESH(\'|\")"), QRegularExpression::CaseInsensitiveOption);
     if (s.contains(ref)) {
         return true;
     }
     return false;
 }
 
 void Util::addHelpTextAction(QAction *act, const QString &text)
 {
     act->setStatusTip(text);
     act->setToolTip(text);
     if (act->whatsThis().isEmpty()) {
         act->setWhatsThis(text);
     }
 }
 
 const QTextCodec *Util::codecForName(const QByteArray &_str)
 {
     if (_str.isEmpty()) {
         return nullptr;
     }
     const QByteArray codec = _str.toLower();
     return KCharsets::charsets()->codecForName(QLatin1String(codec));
 }
 
 void Util::readGravatarConfig()
 {
     Gravatar::GravatarCache::self()->setMaximumSize(
         Gravatar::GravatarSettings::self()->gravatarCacheSize());
     if (!Gravatar::GravatarSettings::self()->gravatarSupportEnabled()) {
         Gravatar::GravatarCache::self()->clear();
     }
 }
 
 // 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 Util::processHtml(const QString &htmlSource, QString &extraHead)
 {
     QString s = htmlSource.trimmed();
+    const int indexDoctype = s.indexOf(QRegExp(QStringLiteral("<!DOCTYPE[^>]*>"), Qt::CaseInsensitive));
+    QString textBeforeDoctype;
+    if (indexDoctype != -1) {
+        textBeforeDoctype = s.left(indexDoctype);
+        s = s.remove(textBeforeDoctype);
+    }
     s = s.remove(QRegExp(QStringLiteral("^<!DOCTYPE[^>]*>"), Qt::CaseInsensitive)).trimmed();
     s = s.remove(QRegExp(QStringLiteral("^<html[^>]*>"), Qt::CaseInsensitive)).trimmed();
-
     // head
     s = s.remove(QRegExp(QStringLiteral("^<head/>"), Qt::CaseInsensitive)).trimmed();
     const int startIndex = s.indexOf(QLatin1String("<head>"), Qt::CaseInsensitive);
     if (startIndex >= 0) {
         const auto endIndex = s.indexOf(QLatin1String("</head>"), Qt::CaseInsensitive);
 
         if (endIndex < 0) {
             return htmlSource;
         }
         extraHead = s.mid(startIndex + 6, endIndex - startIndex - 6);
 #if QTWEBENGINEWIDGETS_VERSION < QT_VERSION_CHECK(5, 13, 0)
         //Remove this hack with https://codereview.qt-project.org/#/c/256100/2 is merged
         //Don't authorize to refresh content.
         if (MessageViewer::Util::excludeExtraHeader(s)) {
             extraHead.clear();
         }
 #endif
 
         s = s.mid(endIndex + 7).trimmed();
     }
-
+    //qDebug() << " remove 4 " << s;
     // body
     s = s.remove(QRegExp(QStringLiteral("<body[^>]*>"), Qt::CaseInsensitive)).trimmed();
+    //Some mail has </div>$ at end
+    s = s.remove(QRegExp(QStringLiteral("</html></div>$"), Qt::CaseInsensitive)).trimmed();
     s = s.remove(QRegExp(QStringLiteral("</html>$"), Qt::CaseInsensitive)).trimmed();
     s = s.remove(QRegExp(QStringLiteral("</body>$"), Qt::CaseInsensitive)).trimmed();
+    s = textBeforeDoctype + s;
     return s;
 }