276 files changed, 0 insertions, 19955 deletions

diff --git a/framework/src/domain/mimetreeparser/otp/CMakeLists.txt b/framework/src/domain/mimetreeparser/otp/CMakeLists.txt
deleted file mode 100644
index f480fa21..00000000
--- a/framework/src/domain/mimetreeparser/otp/CMakeLists.txt
+++ /dev/null
@@ -1,72 +0,0 @@
-add_definitions( -DQT_NO_CAST_FROM_ASCII )
-add_definitions( -DQT_NO_CAST_TO_ASCII )
-add_definitions("-fvisibility=default")
-
-find_package(Qt5 COMPONENTS REQUIRED Core Gui)
-find_package(KF5Mime "4.87.0" CONFIG REQUIRED)
-find_package(QGpgme CONFIG REQUIRED)
-find_package(KF5Codecs CONFIG REQUIRED)
-find_package(KF5I18n CONFIG REQUIRED)
-
-#add_definitions(-DTRANSLATION_DOMAIN=\"libmimetreeparser\")
-
-# target_include_directories does not handle empty include paths
-include_directories(${GPGME_INCLUDES})
-
-set(libmimetreeparser_SRCS
-    objecttreeparser.cpp
-
-    #Bodyformatter
-    applicationpgpencrypted.cpp
-    applicationpkcs7mime.cpp
-    mailman.cpp
-    multipartalternative.cpp
-    multipartencrypted.cpp
-    multipartmixed.cpp
-    multipartsigned.cpp
-    textplain.cpp
-    texthtml.cpp
-    utils.cpp
-    bodypartformatter_impl.cpp
-
-    #Interfaces
-    bodypartformatter.cpp
-    objecttreesource.cpp
-    bodypart.cpp
-    htmlwriter.cpp
-    messagepartrenderer.cpp
-
-    #bodypartformatter.cpp
-    bodypartformatterbasefactory.cpp
-    cryptohelper.cpp
-    nodehelper.cpp
-    messagepart.cpp
-    partnodebodypart.cpp
-    #Mementos
-    cryptobodypartmemento.cpp
-    decryptverifybodypartmemento.cpp
-    verifydetachedbodypartmemento.cpp
-    verifyopaquebodypartmemento.cpp
-    #Stuff
-    mimetreeparser_debug.cpp
-    qgpgmejobexecutor.cpp
-    util.cpp
-    attachmentstrategy.cpp
-    #HTML Writer
-    queuehtmlwriter.cpp
-    attachmenttemporaryfilesdirs.cpp
-    )
-
-add_library(kube_otp ${libmimetreeparser_SRCS})
-
-target_link_libraries(kube_otp
-    PRIVATE
-    QGpgme
-    KF5::Codecs
-    KF5::I18n
-    KF5::Mime
-    Qt5::Gui
-)
-install(TARGETS kube_otp DESTINATION ${LIB_INSTALL_DIR})
-
-add_subdirectory(autotests)
diff --git a/framework/src/domain/mimetreeparser/otp/applicationpgpencrypted.cpp b/framework/src/domain/mimetreeparser/otp/applicationpgpencrypted.cpp
deleted file mode 100644
index e0f8e30c..00000000
--- a/framework/src/domain/mimetreeparser/otp/applicationpgpencrypted.cpp
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
-   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 "applicationpgpencrypted.h"
-
-#include "utils.h"
-
-#include "objecttreeparser.h"
-#include "messagepart.h"
-
-#include <QGpgME/Protocol>
-
-#include <KMime/Content>
-
-#include "mimetreeparser_debug.h"
-
-using namespace MimeTreeParser;
-
-const ApplicationPGPEncryptedBodyPartFormatter *ApplicationPGPEncryptedBodyPartFormatter::self;
-
-const Interface::BodyPartFormatter *ApplicationPGPEncryptedBodyPartFormatter::create()
-{
-    if (!self) {
-        self = new ApplicationPGPEncryptedBodyPartFormatter();
-    }
-    return self;
-}
-
-Interface::BodyPartFormatter::Result ApplicationPGPEncryptedBodyPartFormatter::format(Interface::BodyPart *part, HtmlWriter *writer) const
-{
-    Q_UNUSED(writer)
-    const auto p = process(*part);
-    const auto mp = static_cast<MessagePart *>(p.data());
-    if (mp) {
-        mp->html(false);
-        return Ok;
-    }
-    return Failed;
-}
-
-Interface::MessagePart::Ptr ApplicationPGPEncryptedBodyPartFormatter::process(Interface::BodyPart &part) const
-{
-    KMime::Content *node(part.content());
-
-    if (node->decodedContent().trimmed() != "Version: 1") {
-        qCWarning(MIMETREEPARSER_LOG) << "Unknown PGP Version String:" << node->decodedContent().trimmed();
-    }
-
-    if (!part.content()->parent()) {
-        return MessagePart::Ptr();
-    }
-
-    KMime::Content *data = findTypeInDirectChilds(part.content()->parent(), "application/octet-stream");
-
-    if (!data) {
-        return MessagePart::Ptr(); //new MimeMessagePart(part.objectTreeParser(), node, false));
-    }
-
-    part.nodeHelper()->setEncryptionState(node, KMMsgFullyEncrypted);
-
-    EncryptedMessagePart::Ptr mp(new EncryptedMessagePart(part.objectTreeParser(),
-                                 data->decodedText(), QGpgME::openpgp(),
-                                 part.nodeHelper()->fromAsString(data), node));
-    mp->setIsEncrypted(true);
-    mp->setDecryptMessage(part.source()->decryptMessage());
-    PartMetaData *messagePart(mp->partMetaData());
-    if (!part.source()->decryptMessage()) {
-        part.nodeHelper()->setNodeProcessed(data, false);  // Set the data node to done to prevent it from being processed
-    } else if (KMime::Content *newNode = part.nodeHelper()->decryptedNodeForContent(data)) {
-        // if we already have a decrypted node for this encrypted node, don't do the decryption again
-        return MessagePart::Ptr(new MimeMessagePart(part.objectTreeParser(), newNode, part.objectTreeParser()->showOnlyOneMimePart()));
-    } else {
-        mp->startDecryption(data);
-        if (!messagePart->inProgress) {
-            part.nodeHelper()->setNodeProcessed(data, false);   // Set the data node to done to prevent it from being processed
-            if (messagePart->isDecryptable && messagePart->isSigned) {
-                part.nodeHelper()->setSignatureState(node, KMMsgFullySigned);
-            }
-        }
-    }
-    return mp;
-}
diff --git a/framework/src/domain/mimetreeparser/otp/applicationpgpencrypted.h b/framework/src/domain/mimetreeparser/otp/applicationpgpencrypted.h
deleted file mode 100644
index f0f4865c..00000000
--- a/framework/src/domain/mimetreeparser/otp/applicationpgpencrypted.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
-   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.
-*/
-
-#ifndef __MIMETREEPARSER_BODYFORAMATTER_APPLICATIONPGPENCYPTED_H__
-#define __MIMETREEPARSER_BODYFORAMATTER_APPLICATIONPGPENCYPTED_H__
-
-#include "bodypartformatter.h"
-#include "bodypart.h"
-
-namespace MimeTreeParser
-{
-
-class ApplicationPGPEncryptedBodyPartFormatter : public Interface::BodyPartFormatter
-{
-    static const ApplicationPGPEncryptedBodyPartFormatter *self;
-public:
-    Interface::MessagePart::Ptr process(Interface::BodyPart &part) const Q_DECL_OVERRIDE;
-    Interface::BodyPartFormatter::Result format(Interface::BodyPart *, HtmlWriter *) const Q_DECL_OVERRIDE;
-    using Interface::BodyPartFormatter::format;
-    static const Interface::BodyPartFormatter *create();
-};
-
-}
-
-#endif
diff --git a/framework/src/domain/mimetreeparser/otp/applicationpkcs7mime.cpp b/framework/src/domain/mimetreeparser/otp/applicationpkcs7mime.cpp
deleted file mode 100644
index bcfc0616..00000000
--- a/framework/src/domain/mimetreeparser/otp/applicationpkcs7mime.cpp
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
-   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 "applicationpkcs7mime.h"
-
-#include "utils.h"
-
-#include "attachmentstrategy.h"
-#include "objecttreeparser.h"
-#include "messagepart.h"
-
-#include <QGpgME/Protocol>
-
-#include <KMime/Content>
-
-#include <QTextCodec>
-
-#include "mimetreeparser_debug.h"
-
-using namespace MimeTreeParser;
-
-const ApplicationPkcs7MimeBodyPartFormatter *ApplicationPkcs7MimeBodyPartFormatter::self;
-
-const Interface::BodyPartFormatter *ApplicationPkcs7MimeBodyPartFormatter::create()
-{
-    if (!self) {
-        self = new ApplicationPkcs7MimeBodyPartFormatter();
-    }
-    return self;
-}
-Interface::BodyPartFormatter::Result ApplicationPkcs7MimeBodyPartFormatter::format(Interface::BodyPart *part, HtmlWriter *writer) const
-{
-    Q_UNUSED(writer)
-    const auto p = process(*part);
-    const auto mp = static_cast<MessagePart *>(p.data());
-    if (mp) {
-        mp->html(false);
-        return Ok;
-    }
-    return Failed;
-}
-
-Interface::MessagePart::Ptr ApplicationPkcs7MimeBodyPartFormatter::process(Interface::BodyPart &part) const
-{
-    KMime::Content *node = part.content();
-
-    if (node->head().isEmpty()) {
-        return MessagePart::Ptr();
-    }
-
-    const auto smimeCrypto = QGpgME::smime();
-    if (!smimeCrypto) {
-        return MessagePart::Ptr();
-    }
-
-    const QString smimeType = node->contentType()->parameter(QStringLiteral("smime-type")).toLower();
-
-    if (smimeType == QLatin1String("certs-only")) {
-        part.processResult()->setNeverDisplayInline(true);
-
-        CertMessagePart::Ptr mp(new CertMessagePart(part.objectTreeParser(), node, smimeCrypto, part.source()->autoImportKeys()));
-        return mp;
-    }
-
-    bool isSigned      = (smimeType == QLatin1String("signed-data"));
-    bool isEncrypted   = (smimeType == QLatin1String("enveloped-data"));
-
-    // Analyze "signTestNode" node to find/verify a signature.
-    // If zero part.objectTreeParser() verification was successfully done after
-    // decrypting via recursion by insertAndParseNewChildNode().
-    KMime::Content *signTestNode = isEncrypted ? nullptr : node;
-
-    // We try decrypting the content
-    // if we either *know* that it is an encrypted message part
-    // or there is neither signed nor encrypted parameter.
-    MessagePart::Ptr mp;
-    if (!isSigned) {
-        if (isEncrypted) {
-            qCDebug(MIMETREEPARSER_LOG) << "pkcs7 mime     ==      S/MIME TYPE: enveloped (encrypted) data";
-        } else {
-            qCDebug(MIMETREEPARSER_LOG) << "pkcs7 mime  -  type unknown  -  enveloped (encrypted) data ?";
-        }
-
-        auto _mp = EncryptedMessagePart::Ptr(new EncryptedMessagePart(part.objectTreeParser(),
-                                             node->decodedText(), smimeCrypto,
-                                             part.nodeHelper()->fromAsString(node), node));
-        mp = _mp;
-        _mp->setIsEncrypted(true);
-        _mp->setDecryptMessage(part.source()->decryptMessage());
-        PartMetaData *messagePart(_mp->partMetaData());
-        if (!part.source()->decryptMessage()) {
-            isEncrypted = true;
-            signTestNode = nullptr; // PENDING(marc) to be abs. sure, we'd need to have to look at the content
-        } else {
-            _mp->startDecryption();
-            if (messagePart->isDecryptable) {
-                qCDebug(MIMETREEPARSER_LOG) << "pkcs7 mime  -  encryption found  -  enveloped (encrypted) data !";
-                isEncrypted = true;
-                part.nodeHelper()->setEncryptionState(node, KMMsgFullyEncrypted);
-                signTestNode = nullptr;
-
-            } else {
-                // decryption failed, which could be because the part was encrypted but
-                // decryption failed, or because we didn't know if it was encrypted, tried,
-                // and failed. If the message was not actually encrypted, we continue
-                // assuming it's signed
-                if (_mp->passphraseError() || (smimeType.isEmpty() && messagePart->isEncrypted)) {
-                    isEncrypted = true;
-                    signTestNode = nullptr;
-                }
-
-                if (isEncrypted) {
-                    qCDebug(MIMETREEPARSER_LOG) << "pkcs7 mime  -  ERROR: COULD NOT DECRYPT enveloped data !";
-                } else {
-                    qCDebug(MIMETREEPARSER_LOG) << "pkcs7 mime  -  NO encryption found";
-                }
-            }
-        }
-
-        if (isEncrypted) {
-            part.nodeHelper()->setEncryptionState(node, KMMsgFullyEncrypted);
-        }
-    }
-
-    // We now try signature verification if necessarry.
-    if (signTestNode) {
-        if (isSigned) {
-            qCDebug(MIMETREEPARSER_LOG) << "pkcs7 mime     ==      S/MIME TYPE: opaque signed data";
-        } else {
-            qCDebug(MIMETREEPARSER_LOG) << "pkcs7 mime  -  type unknown  -  opaque signed data ?";
-        }
-
-        const QTextCodec *aCodec(part.objectTreeParser()->codecFor(signTestNode));
-        const QByteArray signaturetext = signTestNode->decodedContent();
-        auto _mp = SignedMessagePart::Ptr(new SignedMessagePart(part.objectTreeParser(),
-                                          aCodec->toUnicode(signaturetext), smimeCrypto,
-                                          part.nodeHelper()->fromAsString(node), signTestNode));
-        mp = _mp;
-        //mp->setDecryptMessage(part.source()->decryptMessage());
-        PartMetaData *messagePart(mp->partMetaData());
-        if (smimeCrypto) {
-            _mp->startVerificationDetached(signaturetext, nullptr, QByteArray());
-        } else {
-            messagePart->auditLogError = GpgME::Error(GPG_ERR_NOT_IMPLEMENTED);
-        }
-
-        if (_mp->isSigned()) {
-            if (!isSigned) {
-                qCDebug(MIMETREEPARSER_LOG) << "pkcs7 mime  -  signature found  -  opaque signed data !";
-                isSigned = true;
-            }
-
-            if (signTestNode != node) {
-                part.nodeHelper()->setSignatureState(node, KMMsgFullySigned);
-            }
-        } else {
-            qCDebug(MIMETREEPARSER_LOG) << "pkcs7 mime  -  NO signature found   :-(";
-        }
-    }
-
-    return mp;
-}
diff --git a/framework/src/domain/mimetreeparser/otp/applicationpkcs7mime.h b/framework/src/domain/mimetreeparser/otp/applicationpkcs7mime.h
deleted file mode 100644
index a9a33f7c..00000000
--- a/framework/src/domain/mimetreeparser/otp/applicationpkcs7mime.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
-   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.
-*/
-
-#ifndef __MIMETREEPARSER_BODYFORAMATTER_APPLICATIONPKCS7MIME_H__
-#define __MIMETREEPARSER_BODYFORAMATTER_APPLICATIONPKCS7MIME_H__
-
-#include "bodypartformatter.h"
-#include "bodypart.h"
-
-namespace MimeTreeParser
-{
-
-class ApplicationPkcs7MimeBodyPartFormatter : public Interface::BodyPartFormatter
-{
-    static const ApplicationPkcs7MimeBodyPartFormatter *self;
-public:
-    Interface::MessagePart::Ptr process(Interface::BodyPart &part) const Q_DECL_OVERRIDE;
-    Interface::BodyPartFormatter::Result format(Interface::BodyPart *, HtmlWriter *) const Q_DECL_OVERRIDE;
-    using Interface::BodyPartFormatter::format;
-    static const Interface::BodyPartFormatter *create();
-};
-
-}
-
-#endif
diff --git a/framework/src/domain/mimetreeparser/otp/attachmentstrategy.cpp b/framework/src/domain/mimetreeparser/otp/attachmentstrategy.cpp
deleted file mode 100644
index 5ea21133..00000000
--- a/framework/src/domain/mimetreeparser/otp/attachmentstrategy.cpp
+++ /dev/null
@@ -1,343 +0,0 @@
-/*  -*- c++ -*-
-    attachmentstrategy.cpp
-
-    This file is part of KMail, the KDE mail client.
-    Copyright (c) 2003 Marc Mutz <mutz@kde.org>
-    Copyright (C) 2009 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.net
-    Copyright (c) 2009 Andras Mantia <andras@kdab.net>
-
-    KMail 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.
-
-    KMail 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 "attachmentstrategy.h"
-
-#include "nodehelper.h"
-#include "util.h"
-
-#include <KMime/Content>
-
-#include <QIcon>
-
-#include "mimetreeparser_debug.h"
-
-using namespace MimeTreeParser;
-
-static AttachmentStrategy::Display smartDisplay(KMime::Content *node)
-{
-    const auto cd = node->contentDisposition(false);
-
-    if (cd && cd->disposition() == KMime::Headers::CDinline)
-        // explict "inline" disposition:
-    {
-        return AttachmentStrategy::Inline;
-    }
-    if (cd && cd->disposition() == KMime::Headers::CDattachment)
-        // explicit "attachment" disposition:
-    {
-        return AttachmentStrategy::AsIcon;
-    }
-
-    const auto ct = node->contentType(false);
-    if (ct && ct->isText() && ct->name().trimmed().isEmpty() &&
-            (!cd || cd->filename().trimmed().isEmpty()))
-        // text/* w/o filename parameter:
-    {
-        return AttachmentStrategy::Inline;
-    }
-    return AttachmentStrategy::AsIcon;
-}
-
-//
-// IconicAttachmentStrategy:
-//   show everything but the first text/plain body as icons
-//
-
-class IconicAttachmentStrategy : public AttachmentStrategy
-{
-    friend class AttachmentStrategy;
-protected:
-    IconicAttachmentStrategy() : AttachmentStrategy() {}
-    virtual ~IconicAttachmentStrategy() {}
-
-public:
-    const char *name() const Q_DECL_OVERRIDE
-    {
-        return "iconic";
-    }
-
-    bool inlineNestedMessages() const Q_DECL_OVERRIDE
-    {
-        return false;
-    }
-    Display defaultDisplay(KMime::Content *node) const Q_DECL_OVERRIDE
-    {
-        if (node->contentType()->isText() &&
-                node->contentDisposition()->filename().trimmed().isEmpty() &&
-                node->contentType()->name().trimmed().isEmpty())
-            // text/* w/o filename parameter:
-        {
-            return Inline;
-        }
-        return AsIcon;
-    }
-};
-
-//
-// SmartAttachmentStrategy:
-//   in addition to Iconic, show all body parts
-//   with content-disposition == "inline" and
-//   all text parts without a filename or name parameter inline
-//
-
-class SmartAttachmentStrategy : public AttachmentStrategy
-{
-    friend class AttachmentStrategy;
-protected:
-    SmartAttachmentStrategy() : AttachmentStrategy() {}
-    virtual ~SmartAttachmentStrategy() {}
-
-public:
-    const char *name() const Q_DECL_OVERRIDE
-    {
-        return "smart";
-    }
-
-    bool inlineNestedMessages() const Q_DECL_OVERRIDE
-    {
-        return true;
-    }
-    Display defaultDisplay(KMime::Content *node) const Q_DECL_OVERRIDE
-    {
-        return smartDisplay(node);
-    }
-};
-
-//
-// InlinedAttachmentStrategy:
-//   show everything possible inline
-//
-
-class InlinedAttachmentStrategy : public AttachmentStrategy
-{
-    friend class AttachmentStrategy;
-protected:
-    InlinedAttachmentStrategy() : AttachmentStrategy() {}
-    virtual ~InlinedAttachmentStrategy() {}
-
-public:
-    const char *name() const Q_DECL_OVERRIDE
-    {
-        return "inlined";
-    }
-
-    bool inlineNestedMessages() const Q_DECL_OVERRIDE
-    {
-        return true;
-    }
-    Display defaultDisplay(KMime::Content *) const Q_DECL_OVERRIDE
-    {
-        return Inline;
-    }
-};
-
-//
-// HiddenAttachmentStrategy
-//   show nothing except the first text/plain body part _at all_
-//
-
-class HiddenAttachmentStrategy : public AttachmentStrategy
-{
-    friend class AttachmentStrategy;
-protected:
-    HiddenAttachmentStrategy() : AttachmentStrategy() {}
-    virtual ~HiddenAttachmentStrategy() {}
-
-public:
-    const char *name() const Q_DECL_OVERRIDE
-    {
-        return "hidden";
-    }
-
-    bool inlineNestedMessages() const Q_DECL_OVERRIDE
-    {
-        return false;
-    }
-    Display defaultDisplay(KMime::Content *node) const Q_DECL_OVERRIDE
-    {
-        if (node->contentType()->isText() &&
-                node->contentDisposition()->filename().trimmed().isEmpty() &&
-                node->contentType()->name().trimmed().isEmpty())
-            // text/* w/o filename parameter:
-        {
-            return Inline;
-        }
-        if (!node->parent()) {
-            return Inline;
-        }
-
-        if (node->parent() && node->parent()->contentType()->isMultipart() &&
-                node->parent()->contentType()->subType() == "related") {
-            return Inline;
-        }
-
-        return None;
-    }
-};
-
-class HeaderOnlyAttachmentStrategy : public AttachmentStrategy
-{
-    friend class AttachmentStrategy;
-protected:
-    HeaderOnlyAttachmentStrategy() : AttachmentStrategy() {}
-    virtual ~HeaderOnlyAttachmentStrategy() {}
-
-public:
-    const char *name() const Q_DECL_OVERRIDE
-    {
-        return "headerOnly";
-    }
-
-    bool inlineNestedMessages() const Q_DECL_OVERRIDE
-    {
-        return true;
-    }
-
-    Display defaultDisplay(KMime::Content *node) const Q_DECL_OVERRIDE
-    {
-        if (NodeHelper::isInEncapsulatedMessage(node)) {
-            return smartDisplay(node);
-        }
-
-        if (!Util::labelForContent(node).isEmpty() && QIcon::hasThemeIcon(Util::iconNameForContent(node)) && ! Util::isTypeBlacklisted(node)) {
-            return None;
-        }
-        return smartDisplay(node);
-    }
-
-    bool requiresAttachmentListInHeader() const Q_DECL_OVERRIDE
-    {
-        return true;
-    }
-};
-
-//
-// AttachmentStrategy abstract base:
-//
-
-AttachmentStrategy::AttachmentStrategy()
-{
-
-}
-
-AttachmentStrategy::~AttachmentStrategy()
-{
-
-}
-
-const AttachmentStrategy *AttachmentStrategy::create(Type type)
-{
-    switch (type) {
-    case Iconic:     return iconic();
-    case Smart:      return smart();
-    case Inlined:    return inlined();
-    case Hidden:     return hidden();
-    case HeaderOnly: return headerOnly();
-    }
-    qCCritical(MIMETREEPARSER_LOG) << "Unknown attachment startegy ( type =="
-                                   << (int)type << ") requested!";
-    return nullptr; // make compiler happy
-}
-
-const AttachmentStrategy *AttachmentStrategy::create(const QString &type)
-{
-    const QString lowerType = type.toLower();
-    if (lowerType == QLatin1String("iconic")) {
-        return iconic();
-    }
-    //if ( lowerType == "smart" )    return smart(); // not needed, see below
-    if (lowerType == QLatin1String("inlined")) {
-        return inlined();
-    }
-    if (lowerType == QLatin1String("hidden")) {
-        return hidden();
-    }
-    if (lowerType == QLatin1String("headeronly")) {
-        return headerOnly();
-    }
-    // don't kFatal here, b/c the strings are user-provided
-    // (KConfig), so fail gracefully to the default:
-    return smart();
-}
-
-static const AttachmentStrategy *iconicStrategy = nullptr;
-static const AttachmentStrategy *smartStrategy = nullptr;
-static const AttachmentStrategy *inlinedStrategy = nullptr;
-static const AttachmentStrategy *hiddenStrategy = nullptr;
-static const AttachmentStrategy *headerOnlyStrategy = nullptr;
-
-const AttachmentStrategy *AttachmentStrategy::iconic()
-{
-    if (!iconicStrategy) {
-        iconicStrategy = new IconicAttachmentStrategy();
-    }
-    return iconicStrategy;
-}
-
-const AttachmentStrategy *AttachmentStrategy::smart()
-{
-    if (!smartStrategy) {
-        smartStrategy = new SmartAttachmentStrategy();
-    }
-    return smartStrategy;
-}
-
-const AttachmentStrategy *AttachmentStrategy::inlined()
-{
-    if (!inlinedStrategy) {
-        inlinedStrategy = new InlinedAttachmentStrategy();
-    }
-    return inlinedStrategy;
-}
-
-const AttachmentStrategy *AttachmentStrategy::hidden()
-{
-    if (!hiddenStrategy) {
-        hiddenStrategy = new HiddenAttachmentStrategy();
-    }
-    return hiddenStrategy;
-}
-
-const AttachmentStrategy *AttachmentStrategy::headerOnly()
-{
-    if (!headerOnlyStrategy) {
-        headerOnlyStrategy = new HeaderOnlyAttachmentStrategy();
-    }
-    return headerOnlyStrategy;
-}
-
-bool AttachmentStrategy::requiresAttachmentListInHeader() const
-{
-    return false;
-}
diff --git a/framework/src/domain/mimetreeparser/otp/attachmentstrategy.h b/framework/src/domain/mimetreeparser/otp/attachmentstrategy.h
deleted file mode 100644
index a0b5dc81..00000000
--- a/framework/src/domain/mimetreeparser/otp/attachmentstrategy.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/*  -*- c++ -*-
-    attachmentstrategy.h
-
-    This file is part of KMail, the KDE mail client.
-    Copyright (c) 2003 Marc Mutz <mutz@kde.org>
-    Copyright (C) 2009 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.net
-    Copyright (c) 2009 Andras Mantia <andras@kdab.net>
-
-    KMail 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.
-
-    KMail 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.
-*/
-
-#ifndef __MIMETREEPARSER_ATTACHMENTSTRATEGY_H__
-#define __MIMETREEPARSER_ATTACHMENTSTRATEGY_H__
-
-class QString;
-namespace KMime
-{
-class Content;
-}
-
-namespace MimeTreeParser
-{
-
-class AttachmentStrategy
-{
-protected:
-    AttachmentStrategy();
-    virtual ~AttachmentStrategy();
-
-public:
-    //
-    // Factory methods:
-    //
-    enum Type { Iconic, Smart, Inlined, Hidden, HeaderOnly };
-
-    static const AttachmentStrategy *create(Type type);
-    static const AttachmentStrategy *create(const QString &type);
-
-    static const AttachmentStrategy *iconic();
-    static const AttachmentStrategy *smart();
-    static const AttachmentStrategy *inlined();
-    static const AttachmentStrategy *hidden();
-    static const AttachmentStrategy *headerOnly();
-
-    //
-    // Navigation methods:
-    //
-
-    virtual const char *name() const = 0;
-
-    //
-    // Bahavioural:
-    //
-
-    enum Display { None, AsIcon, Inline };
-
-    virtual bool inlineNestedMessages() const = 0;
-    virtual Display defaultDisplay(KMime::Content *node) const = 0;
-    virtual bool requiresAttachmentListInHeader() const;
-};
-
-}
-
-#endif // __MIMETREEPARSER_ATTACHMENTSTRATEGY_H__
diff --git a/framework/src/domain/mimetreeparser/otp/attachmenttemporaryfilesdirs.cpp b/framework/src/domain/mimetreeparser/otp/attachmenttemporaryfilesdirs.cpp
deleted file mode 100644
index 364bc422..00000000
--- a/framework/src/domain/mimetreeparser/otp/attachmenttemporaryfilesdirs.cpp
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
-  Copyright (c) 2013-2017 Montel Laurent <montel@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 "attachmenttemporaryfilesdirs.h"
-
-#include <QDir>
-#include <QFile>
-#include <QTimer>
-
-using namespace MimeTreeParser;
-
-class MimeTreeParser::AttachmentTemporaryFilesDirsPrivate
-{
-public:
-    AttachmentTemporaryFilesDirsPrivate()
-        : mDelayRemoveAll(10000)
-    {
-
-    }
-    QStringList mTempFiles;
-    QStringList mTempDirs;
-    int mDelayRemoveAll;
-};
-
-AttachmentTemporaryFilesDirs::AttachmentTemporaryFilesDirs(QObject *parent)
-    : QObject(parent),
-      d(new AttachmentTemporaryFilesDirsPrivate)
-{
-
-}
-
-AttachmentTemporaryFilesDirs::~AttachmentTemporaryFilesDirs()
-{
-    delete d;
-}
-
-void AttachmentTemporaryFilesDirs::setDelayRemoveAllInMs(int ms)
-{
-    d->mDelayRemoveAll = (ms < 0) ? 0 : ms;
-}
-
-void AttachmentTemporaryFilesDirs::removeTempFiles()
-{
-    QTimer::singleShot(d->mDelayRemoveAll, this, &AttachmentTemporaryFilesDirs::slotRemoveTempFiles);
-}
-
-void AttachmentTemporaryFilesDirs::forceCleanTempFiles()
-{
-    QStringList::ConstIterator end = d->mTempFiles.constEnd();
-    for (QStringList::ConstIterator it = d->mTempFiles.constBegin(); it != end; ++it) {
-        QFile::remove(*it);
-    }
-    d->mTempFiles.clear();
-    end = d->mTempDirs.constEnd();
-    for (QStringList::ConstIterator it = d->mTempDirs.constBegin(); it != end; ++it) {
-        QDir(*it).rmdir(*it);
-    }
-    d->mTempDirs.clear();
-}
-
-void AttachmentTemporaryFilesDirs::slotRemoveTempFiles()
-{
-    forceCleanTempFiles();
-    //Delete it after cleaning
-    deleteLater();
-}
-
-void AttachmentTemporaryFilesDirs::addTempFile(const QString &file)
-{
-    if (!d->mTempFiles.contains(file)) {
-        d->mTempFiles.append(file);
-    }
-}
-
-void AttachmentTemporaryFilesDirs::addTempDir(const QString &dir)
-{
-    if (!d->mTempDirs.contains(dir)) {
-        d->mTempDirs.append(dir);
-    }
-}
-
-QStringList AttachmentTemporaryFilesDirs::temporaryFiles() const
-{
-    return d->mTempFiles;
-}
-
-QStringList AttachmentTemporaryFilesDirs::temporaryDirs() const
-{
-    return d->mTempDirs;
-}
-
diff --git a/framework/src/domain/mimetreeparser/otp/attachmenttemporaryfilesdirs.h b/framework/src/domain/mimetreeparser/otp/attachmenttemporaryfilesdirs.h
deleted file mode 100644
index bf65fcdb..00000000
--- a/framework/src/domain/mimetreeparser/otp/attachmenttemporaryfilesdirs.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
-  Copyright (c) 2013-2016 Montel Laurent <montel@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.
-
-*/
-
-#ifndef ATTACHMENTTEMPORARYFILESDIRS_H
-#define ATTACHMENTTEMPORARYFILESDIRS_H
-
-#include <QObject>
-#include <QStringList>
-
-namespace MimeTreeParser
-{
-class AttachmentTemporaryFilesDirsPrivate;
-
-class AttachmentTemporaryFilesDirs : public QObject
-{
-    Q_OBJECT
-public:
-    explicit AttachmentTemporaryFilesDirs(QObject *parent = nullptr);
-    ~AttachmentTemporaryFilesDirs();
-
-    void addTempFile(const QString &file);
-    void addTempDir(const QString &dir);
-    QStringList temporaryFiles() const;
-    void removeTempFiles();
-    void forceCleanTempFiles();
-
-    QStringList temporaryDirs() const;
-
-    void setDelayRemoveAllInMs(int ms);
-
-private Q_SLOTS:
-    void slotRemoveTempFiles();
-
-private:
-    AttachmentTemporaryFilesDirsPrivate *const d;
-};
-
-}
-
-#endif // ATTACHMENTTEMPORARYFILESDIRS_H
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/CMakeLists.txt b/framework/src/domain/mimetreeparser/otp/autotests/CMakeLists.txt
deleted file mode 100644
index 789ee795..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/CMakeLists.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-include_directories(../)
-include_directories(${CMAKE_CURRENT_BINARY_DIR})
-
-set(AUTOMOC ON)
-
-set(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR})
-add_definitions( -DMAIL_DATA_DIR="${CMAKE_CURRENT_SOURCE_DIR}/data" )
-
-include(${CMAKE_CURRENT_SOURCE_DIR}/kdepim_add_gpg_crypto_test.cmake)
-
-# convenience macro to add qtest unit tests
-macro(add_mimetreeparser_unittest _source)
-    get_filename_component(_name ${_source} NAME_WE)
-    ecm_add_test(${_source} util.cpp setupenv.cpp
-        TEST_NAME ${_name}
-        NAME_PREFIX "mimetreeparser-"
-        LINK_LIBRARIES kube_otp Qt5::Test KF5::Mime Gpgmepp
-    )
-endmacro ()
-
-macro(add_mimetreeparser_class_unittest _source _additionalSource)
-    get_filename_component(_name ${_source} NAME_WE)
-    ecm_add_test(${_source} ${_additionalSource}
-        TEST_NAME ${_name}
-        NAME_PREFIX "mimetreeparser-"
-        LINK_LIBRARIES kube_otp Qt5::Test KF5::Mime Gpgmepp
-    )
-endmacro ()
-
-macro(add_mimetreeparser_crypto_unittest _source)
-    set(_test ${_source} util.cpp)
-    get_filename_component(_name ${_source} NAME_WE)
-    add_executable( ${_name} ${_test} setupenv.cpp)
-    ecm_mark_as_test(mimetreeparser-${_name})
-    target_link_libraries( ${_name}
-        kube_otp
-        Qt5::Test
-        KF5::Mime
-        Gpgmepp
-    )
-    add_gpg_crypto_test(${_name} mimetreeparser-${_name})
-endmacro ()
-
-add_mimetreeparser_crypto_unittest(attachmenttest.cpp)
-add_mimetreeparser_unittest(nodehelpertest.cpp)
-add_mimetreeparser_class_unittest(cryptohelpertest.cpp "../cryptohelper.cpp")
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/attachmenttest.cpp b/framework/src/domain/mimetreeparser/otp/autotests/attachmenttest.cpp
deleted file mode 100644
index 44e40a45..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/attachmenttest.cpp
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
-  Copyright (c) 2015 Volker Krause <vkrause@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 "objecttreeparser.h"
-#include "util.h"
-
-#include "setupenv.h"
-
-#include <qtest.h>
-
-using namespace MimeTreeParser;
-
-class AttachmentTest : public QObject
-{
-    Q_OBJECT
-private Q_SLOTS:
-    void initTestCase();
-    void testEncryptedAttachment_data();
-    void testEncryptedAttachment();
-};
-
-QTEST_MAIN(AttachmentTest)
-
-void AttachmentTest::initTestCase()
-{
-    MimeTreeParser::Test::setupEnv();
-}
-
-void AttachmentTest::testEncryptedAttachment_data()
-{
-    QTest::addColumn<QString>("mbox");
-    QTest::newRow("encrypted") << "openpgp-encrypted-two-attachments.mbox";
-    QTest::newRow("signed") << "openpgp-signed-two-attachments.mbox";
-    QTest::newRow("signed+encrypted") << "openpgp-signed-encrypted-two-attachments.mbox";
-    QTest::newRow("encrypted+partial signed") << "openpgp-encrypted-partially-signed-attachments.mbox";
-}
-
-void AttachmentTest::testEncryptedAttachment()
-{
-    QFETCH(QString, mbox);
-    auto msg = readAndParseMail(mbox);
-    NodeHelper nodeHelper;
-    Test::TestObjectTreeSource testSource(nullptr);
-    testSource.setAllowDecryption(true);
-    ObjectTreeParser otp(&testSource, &nodeHelper);
-    otp.parseObjectTree(msg.data());
-
-    auto attachments = msg->attachments();
-    auto encAtts = nodeHelper.attachmentsOfExtraContents();
-    QCOMPARE(attachments.size() + encAtts.size(), 2);
-}
-
-#include "attachmenttest.moc"
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/cryptohelpertest.cpp b/framework/src/domain/mimetreeparser/otp/autotests/cryptohelpertest.cpp
deleted file mode 100644
index 251e657d..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/cryptohelpertest.cpp
+++ /dev/null
@@ -1,144 +0,0 @@
-/* Copyright 2015 Sandro Knauß <knauss@kolabsys.com>
-
-   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) version 3 or any later version
-   accepted by the membership of KDE e.V. (or its successor approved
-   by the membership of KDE e.V.), which shall act as a proxy
-   defined in Section 14 of version 3 of the license.
-
-   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, see <http://www.gnu.org/licenses/>.
-*/
-#include "cryptohelpertest.h"
-
-#include "cryptohelper.h"
-
-#include <QTest>
-
-using namespace MimeTreeParser;
-
-void CryptoHelperTest::testPMFDEmpty()
-{
-    QCOMPARE(prepareMessageForDecryption("").count(), 0);
-}
-
-void CryptoHelperTest::testPMFDWithNoPGPBlock()
-{
-    const QByteArray text = "testblabla";
-    const QList<Block> blocks = prepareMessageForDecryption(text);
-    QCOMPARE(blocks.count(), 1);
-    QCOMPARE(blocks[0].text(), text);
-    QCOMPARE(blocks[0].type(), NoPgpBlock);
-}
-
-void CryptoHelperTest::testPGPBlockType()
-{
-    const QString blockText = QStringLiteral("text");
-    const QString preString = QStringLiteral("before\n");
-    for (int i = 1; i <= PrivateKeyBlock; ++i) {
-        QString name;
-        switch (i) {
-        case PgpMessageBlock:
-            name = QStringLiteral("MESSAGE");
-            break;
-        case MultiPgpMessageBlock:
-            name = QStringLiteral("MESSAGE PART");
-            break;
-        case SignatureBlock:
-            name = QStringLiteral("SIGNATURE");
-            break;
-        case ClearsignedBlock:
-            name = QStringLiteral("SIGNED MESSAGE");
-            break;
-        case PublicKeyBlock:
-            name = QStringLiteral("PUBLIC KEY BLOCK");
-            break;
-        case PrivateKeyBlock:
-            name = QStringLiteral("PRIVATE KEY BLOCK");
-            break;
-        }
-        QString text = QLatin1String("-----BEGIN PGP ") + name + QLatin1String("\n") + blockText;
-        QList<Block> blocks = prepareMessageForDecryption(preString.toLatin1() + text.toLatin1());
-        QCOMPARE(blocks.count(), 1);
-        QCOMPARE(blocks[0].type(), UnknownBlock);
-
-        text += QLatin1String("\n-----END PGP ") + name + QLatin1String("\n");
-        blocks = prepareMessageForDecryption(preString.toLatin1() + text.toLatin1());
-        QCOMPARE(blocks.count(), 2);
-        QCOMPARE(blocks[1].text(), text.toLatin1());
-        QCOMPARE(blocks[1].type(), static_cast<PGPBlockType>(i));
-    }
-}
-
-void CryptoHelperTest::testDeterminePGPBlockType()
-{
-    const QString blockText = QStringLiteral("text");
-    for (int i = 1; i <= PrivateKeyBlock; ++i) {
-        QString name;
-        switch (i) {
-
-        case PgpMessageBlock:
-            name = QStringLiteral("MESSAGE");
-            break;
-        case MultiPgpMessageBlock:
-            name = QStringLiteral("MESSAGE PART");
-            break;
-        case SignatureBlock:
-            name = QStringLiteral("SIGNATURE");
-            break;
-        case ClearsignedBlock:
-            name = QStringLiteral("SIGNED MESSAGE");
-            break;
-        case PublicKeyBlock:
-            name = QStringLiteral("PUBLIC KEY BLOCK");
-            break;
-        case PrivateKeyBlock:
-            name = QStringLiteral("PRIVATE KEY BLOCK");
-            break;
-        }
-        const QString text = QLatin1String("-----BEGIN PGP ") + name + QLatin1String("\n") + blockText + QLatin1String("\n");
-        const Block block = Block(text.toLatin1());
-        QCOMPARE(block.text(), text.toLatin1());
-        QCOMPARE(block.type(), static_cast<PGPBlockType>(i));
-    }
-}
-
-void CryptoHelperTest::testEmbededPGPBlock()
-{
-    const QByteArray text = QByteArray("before\n-----BEGIN PGP MESSAGE-----\ncrypted - you see :)\n-----END PGP MESSAGE-----\nafter");
-    const QList<Block> blocks = prepareMessageForDecryption(text);
-    QCOMPARE(blocks.count(), 3);
-    QCOMPARE(blocks[0].text(), QByteArray("before\n"));
-    QCOMPARE(blocks[1].text(), QByteArray("-----BEGIN PGP MESSAGE-----\ncrypted - you see :)\n-----END PGP MESSAGE-----\n"));
-    QCOMPARE(blocks[2].text(), QByteArray("after"));
-}
-
-void CryptoHelperTest::testClearSignedMessage()
-{
-    const QByteArray text = QByteArray("before\n-----BEGIN PGP SIGNED MESSAGE-----\nsigned content\n-----BEGIN PGP SIGNATURE-----\nfancy signature\n-----END PGP SIGNATURE-----\nafter");
-    const QList<Block> blocks = prepareMessageForDecryption(text);
-    QCOMPARE(blocks.count(), 3);
-    QCOMPARE(blocks[0].text(), QByteArray("before\n"));
-    QCOMPARE(blocks[1].text(), QByteArray("-----BEGIN PGP SIGNED MESSAGE-----\nsigned content\n-----BEGIN PGP SIGNATURE-----\nfancy signature\n-----END PGP SIGNATURE-----\n"));
-    QCOMPARE(blocks[2].text(), QByteArray("after"));
-}
-
-void CryptoHelperTest::testMultipleBlockMessage()
-{
-    const QByteArray text = QByteArray("before\n-----BEGIN PGP SIGNED MESSAGE-----\nsigned content\n-----BEGIN PGP SIGNATURE-----\nfancy signature\n-----END PGP SIGNATURE-----\nafter\n-----BEGIN PGP MESSAGE-----\ncrypted - you see :)\n-----END PGP MESSAGE-----\n");
-    const QList<Block> blocks = prepareMessageForDecryption(text);
-    QCOMPARE(blocks.count(), 4);
-    QCOMPARE(blocks[0].text(), QByteArray("before\n"));
-    QCOMPARE(blocks[1].text(), QByteArray("-----BEGIN PGP SIGNED MESSAGE-----\nsigned content\n-----BEGIN PGP SIGNATURE-----\nfancy signature\n-----END PGP SIGNATURE-----\n"));
-    QCOMPARE(blocks[2].text(), QByteArray("after\n"));
-    QCOMPARE(blocks[3].text(), QByteArray("-----BEGIN PGP MESSAGE-----\ncrypted - you see :)\n-----END PGP MESSAGE-----\n"));
-}
-
-QTEST_APPLESS_MAIN(CryptoHelperTest)
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/cryptohelpertest.h b/framework/src/domain/mimetreeparser/otp/autotests/cryptohelpertest.h
deleted file mode 100644
index 71ae086f..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/cryptohelpertest.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* Copyright 2009 Thomas McGuire <mcguire@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) version 3 or any later version
-   accepted by the membership of KDE e.V. (or its successor approved
-   by the membership of KDE e.V.), which shall act as a proxy
-   defined in Section 14 of version 3 of the license.
-
-   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, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef CRYPTOHELPERTEST_H
-#define CRYPTOHELPERTEST_H
-
-#include <QObject>
-
-namespace MimeTreeParser
-{
-
-class CryptoHelperTest : public QObject
-{
-    Q_OBJECT
-
-private Q_SLOTS:
-    void testPMFDEmpty();
-    void testPMFDWithNoPGPBlock();
-    void testPGPBlockType();
-    void testDeterminePGPBlockType();
-    void testEmbededPGPBlock();
-    void testClearSignedMessage();
-    void testMultipleBlockMessage();
-};
-
-}
-#endif
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/alternative-notext.mbox b/framework/src/domain/mimetreeparser/otp/autotests/data/alternative-notext.mbox
deleted file mode 100644
index 86026437..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/alternative-notext.mbox
+++ /dev/null
@@ -1,22 +0,0 @@
-Return-Path: <konqi@example.org>
-Date: Wed, 8 Jun 2016 20:34:44 -0700
-From: Konqi <konqi@example.org>
-To: konqi@kde.org
-Subject: A random subject with a empty text alternative contenttype
-MIME-Version: 1.0
-Content-Type: multipart/alternative; 
- boundary="----=_Part_12345678_12345678"
-
- 
-------=_Part_12345678_12345678
-Content-Transfer-Encoding: 7Bit
-Content-Type: text/html; charset="windows-1252"
-
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<html><head><meta name="qrichtext" content="1" /><style type="text/css">
-p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;">
-<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></body></html>
-
-
-------=_Part_12345678_12345678--
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/alternative-notext.mbox.html b/framework/src/domain/mimetreeparser/otp/autotests/data/alternative-notext.mbox.html
deleted file mode 100644
index 41db4eab..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/alternative-notext.mbox.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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 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/framework/src/domain/mimetreeparser/otp/autotests/data/alternative-notext.mbox.tree b/framework/src/domain/mimetreeparser/otp/autotests/data/alternative-notext.mbox.tree
deleted file mode 100644
index 0de07281..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/alternative-notext.mbox.tree
+++ /dev/null
@@ -1,2 +0,0 @@
- * MimeTreeParser::MessagePartList
-  * MimeTreeParser::AlternativeMessagePart
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/alternative.mbox b/framework/src/domain/mimetreeparser/otp/autotests/data/alternative.mbox
deleted file mode 100644
index a2c58591..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/alternative.mbox
+++ /dev/null
@@ -1,34 +0,0 @@
-Return-Path: <konqi@example.org>
-Date: Wed, 8 Jun 2016 20:34:44 -0700
-From: Konqi <konqi@example.org>
-To: konqi@kde.org
-Subject: A random subject with alternative contenttype
-MIME-Version: 1.0
-Content-Type: multipart/alternative; 
- boundary="----=_Part_12345678_12345678"
-
-
-------=_Part_12345678_12345678
-Content-Type: text/plain; charset=utf-8
-Content-Transfer-Encoding: quoted-printable
-
-If you can see this text it means that your email client couldn't display o=
-ur newsletter properly.
-Please visit this link to view the newsletter on our website: http://www.go=
-g.com/newsletter/
-
-=2D GOG.com Team
-
-
-------=_Part_12345678_12345678
-Content-Transfer-Encoding: 7Bit
-Content-Type: text/html; charset="windows-1252"
-
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<html><head><meta name="qrichtext" content="1" /><style type="text/css">
-p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;">
-<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></body></html>
-
-
-------=_Part_12345678_12345678--
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/alternative.mbox.html b/framework/src/domain/mimetreeparser/otp/autotests/data/alternative.mbox.html
deleted file mode 100644
index 2fe886f1..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/alternative.mbox.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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 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/framework/src/domain/mimetreeparser/otp/autotests/data/alternative.mbox.tree b/framework/src/domain/mimetreeparser/otp/autotests/data/alternative.mbox.tree
deleted file mode 100644
index 0de07281..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/alternative.mbox.tree
+++ /dev/null
@@ -1,2 +0,0 @@
- * MimeTreeParser::MessagePartList
-  * MimeTreeParser::AlternativeMessagePart
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/details/forward-openpgp-signed-encrypted.mbox.html b/framework/src/domain/mimetreeparser/otp/autotests/data/details/forward-openpgp-signed-encrypted.mbox.html
deleted file mode 100644
index 9a81f103..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/details/forward-openpgp-signed-encrypted.mbox.html
+++ /dev/null
@@ -1,84 +0,0 @@
-<?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="noquote">
-            <div dir="ltr">bla bla bla</div>
-          </div>
-        </div>
-        <a name="att2"/>
-        <div id="attachmentDiv2">
-          <table cellspacing="1" cellpadding="1" class="rfc822">
-            <tr class="rfc822H">
-              <td dir="ltr">
-                <a href="attachment:2.1?place=body">Encapsulated message</a>
-              </td>
-            </tr>
-            <tr class="rfc822B">
-              <td>
-                <a name="att2.1"/>
-                <div id="attachmentDiv2.1">
-                  <table cellspacing="1" cellpadding="1" class="encr">
-                    <tr class="encrH">
-                      <td dir="ltr">Encrypted message</td>
-                    </tr>
-                    <tr class="encrB">
-                      <td>
-                        <div style="position: relative; word-wrap: break-word">
-                          <a name="att"/>
-                          <div id="attachmentDiv">
-                            <table cellspacing="1" cellpadding="1" class="signOkKeyOk">
-                              <tr class="signOkKeyOkH">
-                                <td dir="ltr">
-                                  <table cellspacing="0" cellpadding="0" width="100%">
-                                    <tr>
-                                      <td rowspan="2">Message was signed by <a href="mailto:test@kolab.org">test@kolab.org</a> (Key ID: <a href="kmail:showCertificate#gpg ### OpenPGP ### 8D9860C58F246DE6">0x8D9860C58F246DE6</a>).<br/>The signature is valid and the key is fully trusted.</td>
-                                      <td align="right" valign="top" nowrap="nowrap">
-                                        <a href="kmail:hideSignatureDetails">Hide Details</a>
-                                      </td>
-                                    </tr>
-                                    <tr>
-                                      <td align="right" valign="bottom" nowrap="nowrap"/>
-                                    </tr>
-                                  </table>
-                                </td>
-                              </tr>
-                              <tr class="signOkKeyOkB">
-                                <td>
-                                  <a name="att1"/>
-                                  <div id="attachmentDiv1">
-                                    <div class="noquote">
-                                      <div dir="ltr">encrypted message text</div>
-                                    </div>
-                                  </div>
-                                </td>
-                              </tr>
-                              <tr class="signOkKeyOkH">
-                                <td dir="ltr">End of signed message</td>
-                              </tr>
-                            </table>
-                          </div>
-                        </div>
-                      </td>
-                    </tr>
-                    <tr class="encrH">
-                      <td dir="ltr">End of encrypted message</td>
-                    </tr>
-                  </table>
-                </div>
-              </td>
-            </tr>
-            <tr class="rfc822H">
-              <td dir="ltr">End of encapsulated message</td>
-            </tr>
-          </table>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/details/openpgp-encoded.mbox.html b/framework/src/domain/mimetreeparser/otp/autotests/data/details/openpgp-encoded.mbox.html
deleted file mode 100644
index 65d5f95e..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/details/openpgp-encoded.mbox.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<?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 rowspan="2">Message was signed on 12/21/15 3:46 PM with unknown key <a href="kmail:showCertificate#gpg ### OpenPGP ### E68031D299A6527C">0xE68031D299A6527C</a>.<br/>The validity of the signature cannot be verified.<br/>Status:<i>No public key to verify the signature</i></td>
-                  <td align="right" valign="top" nowrap="nowrap">
-                    <a href="kmail:hideSignatureDetails">Hide Details</a>
-                  </td>
-                </tr>
-                <tr>
-                  <td align="right" valign="bottom" nowrap="nowrap"/>
-                </tr>
-              </table>
-            </td>
-          </tr>
-          <tr class="signWarnB">
-            <td>
-              <div class="noquote">
-                <div dir="ltr">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec a diam lectus. Sed sit amet ipsum mauris. Maecenas congue ligula ac quam viverra nec consectetur ante hendrerit. Donec et mollis dolor. Praesent et diam eget libero egestas mattis sit amet vitae augue. Nam tincidunt congue enim, ut porta lorem lacinia consectetur. Donec ut libero sed arcu vehicula ultricies a non tortor. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean ut gravida lorem. Ut turpis felis, pulvinar a semper sed, adipiscing id dolor. Pellentesque auctor nisi id magna consequat sagittis. Curabitur dapibus enim sit amet elit pharetra tincidunt feugiat nisl imperdiet. Ut convallis libero in urna ultrices accumsan. Donec sed odio eros. Donec viverra mi quis quam pulvinar at malesuada arcu rhoncus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. In rutrum accumsan ultricies. Mauris vitae nisi at sem facilisis semper ac in est.</div>
-              </div>
-            </td>
-          </tr>
-          <tr class="signWarnH">
-            <td dir="ltr">End of signed message</td>
-          </tr>
-        </table>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/details/openpgp-encrypted+signed.mbox.html b/framework/src/domain/mimetreeparser/otp/autotests/data/details/openpgp-encrypted+signed.mbox.html
deleted file mode 100644
index 96361c30..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/details/openpgp-encrypted+signed.mbox.html
+++ /dev/null
@@ -1,55 +0,0 @@
-<?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="encr">
-          <tr class="encrH">
-            <td dir="ltr">Encrypted message</td>
-          </tr>
-          <tr class="encrB">
-            <td>
-              <table cellspacing="1" cellpadding="1" class="signOkKeyOk">
-                <tr class="signOkKeyOkH">
-                  <td dir="ltr">
-                    <table cellspacing="0" cellpadding="0" width="100%">
-                      <tr>
-                        <td rowspan="2">Message was signed by <a href="mailto:test@kolab.org">test@kolab.org</a> (Key ID: <a href="kmail:showCertificate#gpg ### OpenPGP ### 8D9860C58F246DE6">0x8D9860C58F246DE6</a>).<br/>The signature is valid and the key is fully trusted.</td>
-                        <td align="right" valign="top" nowrap="nowrap">
-                          <a href="kmail:hideSignatureDetails">Hide Details</a>
-                        </td>
-                      </tr>
-                      <tr>
-                        <td align="right" valign="bottom" nowrap="nowrap"/>
-                      </tr>
-                    </table>
-                  </td>
-                </tr>
-                <tr class="signOkKeyOkB">
-                  <td>
-                    <div style="position: relative; word-wrap: break-word">
-                      <a name="att"/>
-                      <div id="attachmentDiv">
-                        <div class="noquote">
-                          <div dir="ltr">encrypted message text</div>
-                        </div>
-                      </div>
-                    </div>
-                  </td>
-                </tr>
-                <tr class="signOkKeyOkH">
-                  <td dir="ltr">End of signed message</td>
-                </tr>
-              </table>
-            </td>
-          </tr>
-          <tr class="encrH">
-            <td dir="ltr">End of encrypted message</td>
-          </tr>
-        </table>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/details/openpgp-encrypted-attachment-and-non-encrypted-attachment.mbox.html b/framework/src/domain/mimetreeparser/otp/autotests/data/details/openpgp-encrypted-attachment-and-non-encrypted-attachment.mbox.html
deleted file mode 100644
index cc6bf03e..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/details/openpgp-encrypted-attachment-and-non-encrypted-attachment.mbox.html
+++ /dev/null
@@ -1,80 +0,0 @@
-<?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">
-          <table cellspacing="1" cellpadding="1" class="encr">
-            <tr class="encrH">
-              <td dir="ltr">Encrypted message</td>
-            </tr>
-            <tr class="encrB">
-              <td>
-                <div style="position: relative; word-wrap: break-word">
-                  <a name="att"/>
-                  <div id="attachmentDiv">
-                    <table cellspacing="1" cellpadding="1" class="signOkKeyOk">
-                      <tr class="signOkKeyOkH">
-                        <td dir="ltr">
-                          <table cellspacing="0" cellpadding="0" width="100%">
-                            <tr>
-                              <td rowspan="2">Message was signed by <a href="mailto:test@kolab.org">test@kolab.org</a> (Key ID: <a href="kmail:showCertificate#gpg ### OpenPGP ### 8D9860C58F246DE6">0x8D9860C58F246DE6</a>).<br/>The signature is valid and the key is fully trusted.</td>
-                              <td align="right" valign="top" nowrap="nowrap">
-                                <a href="kmail:hideSignatureDetails">Hide Details</a>
-                              </td>
-                            </tr>
-                            <tr>
-                              <td align="right" valign="bottom" nowrap="nowrap"/>
-                            </tr>
-                          </table>
-                        </td>
-                      </tr>
-                      <tr class="signOkKeyOkB">
-                        <td>
-                          <a name="att1"/>
-                          <div id="attachmentDiv1">
-                            <a name="att1.1"/>
-                            <div id="attachmentDiv1.1">
-                              <div class="noquote">
-                                <div dir="ltr">test text</div>
-                              </div>
-                            </div>
-                            <a name="att1.2"/>
-                            <div id="attachmentDiv1.2">
-                              <hr/>
-                              <div>
-                                <a href="attachment:1:e0:1.2?place=body"><img align="center" height="48" width="48" src="file:text-plain.svg" border="0" style="max-width: 100%" alt=""/>file.txt</a>
-                              </div>
-                              <div/>
-                            </div>
-                          </div>
-                        </td>
-                      </tr>
-                      <tr class="signOkKeyOkH">
-                        <td dir="ltr">End of signed message</td>
-                      </tr>
-                    </table>
-                  </div>
-                </div>
-              </td>
-            </tr>
-            <tr class="encrH">
-              <td dir="ltr">End of encrypted message</td>
-            </tr>
-          </table>
-        </div>
-        <a name="att2"/>
-        <div id="attachmentDiv2">
-          <hr/>
-          <div>
-            <a href="attachment: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>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/details/openpgp-encrypted-attachment.mbox.html b/framework/src/domain/mimetreeparser/otp/autotests/data/details/openpgp-encrypted-attachment.mbox.html
deleted file mode 100644
index 61bf5d28..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/details/openpgp-encrypted-attachment.mbox.html
+++ /dev/null
@@ -1,69 +0,0 @@
-<?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="encr">
-          <tr class="encrH">
-            <td dir="ltr">Encrypted message</td>
-          </tr>
-          <tr class="encrB">
-            <td>
-              <div style="position: relative; word-wrap: break-word">
-                <a name="att"/>
-                <div id="attachmentDiv">
-                  <table cellspacing="1" cellpadding="1" class="signOkKeyOk">
-                    <tr class="signOkKeyOkH">
-                      <td dir="ltr">
-                        <table cellspacing="0" cellpadding="0" width="100%">
-                          <tr>
-                            <td rowspan="2">Message was signed by <a href="mailto:test@kolab.org">test@kolab.org</a> (Key ID: <a href="kmail:showCertificate#gpg ### OpenPGP ### 8D9860C58F246DE6">0x8D9860C58F246DE6</a>).<br/>The signature is valid and the key is fully trusted.</td>
-                            <td align="right" valign="top" nowrap="nowrap">
-                              <a href="kmail:hideSignatureDetails">Hide Details</a>
-                            </td>
-                          </tr>
-                          <tr>
-                            <td align="right" valign="bottom" nowrap="nowrap"/>
-                          </tr>
-                        </table>
-                      </td>
-                    </tr>
-                    <tr class="signOkKeyOkB">
-                      <td>
-                        <a name="att1"/>
-                        <div id="attachmentDiv1">
-                          <a name="att1.1"/>
-                          <div id="attachmentDiv1.1">
-                            <div class="noquote">
-                              <div dir="ltr">test text</div>
-                            </div>
-                          </div>
-                          <a name="att1.2"/>
-                          <div id="attachmentDiv1.2">
-                            <hr/>
-                            <div>
-                              <a href="attachment:e0:1.2?place=body"><img align="center" height="48" width="48" src="file:text-plain.svg" border="0" style="max-width: 100%" alt=""/>file.txt</a>
-                            </div>
-                            <div/>
-                          </div>
-                        </div>
-                      </td>
-                    </tr>
-                    <tr class="signOkKeyOkH">
-                      <td dir="ltr">End of signed message</td>
-                    </tr>
-                  </table>
-                </div>
-              </div>
-            </td>
-          </tr>
-          <tr class="encrH">
-            <td dir="ltr">End of encrypted message</td>
-          </tr>
-        </table>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/details/openpgp-encrypted-non-encrypted-attachment.mbox.html b/framework/src/domain/mimetreeparser/otp/autotests/data/details/openpgp-encrypted-non-encrypted-attachment.mbox.html
deleted file mode 100644
index 8d8bde0d..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/details/openpgp-encrypted-non-encrypted-attachment.mbox.html
+++ /dev/null
@@ -1,72 +0,0 @@
-<?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">
-          <table cellspacing="1" cellpadding="1" class="encr">
-            <tr class="encrH">
-              <td dir="ltr">Encrypted message</td>
-            </tr>
-            <tr class="encrB">
-              <td>
-                <div style="position: relative; word-wrap: break-word">
-                  <a name="att"/>
-                  <div id="attachmentDiv">
-                    <table cellspacing="1" cellpadding="1" class="signOkKeyOk">
-                      <tr class="signOkKeyOkH">
-                        <td dir="ltr">
-                          <table cellspacing="0" cellpadding="0" width="100%">
-                            <tr>
-                              <td rowspan="2">Message was signed by <a href="mailto:test@kolab.org">test@kolab.org</a> (Key ID: <a href="kmail:showCertificate#gpg ### OpenPGP ### 8D9860C58F246DE6">0x8D9860C58F246DE6</a>).<br/>The signature is valid and the key is fully trusted.</td>
-                              <td align="right" valign="top" nowrap="nowrap">
-                                <a href="kmail:hideSignatureDetails">Hide Details</a>
-                              </td>
-                            </tr>
-                            <tr>
-                              <td align="right" valign="bottom" nowrap="nowrap"/>
-                            </tr>
-                          </table>
-                        </td>
-                      </tr>
-                      <tr class="signOkKeyOkB">
-                        <td>
-                          <a name="att1"/>
-                          <div id="attachmentDiv1">
-                            <a name="att1.1"/>
-                            <div id="attachmentDiv1.1">
-                              <div class="noquote">
-                                <div dir="ltr">test text</div>
-                              </div>
-                            </div>
-                          </div>
-                        </td>
-                      </tr>
-                      <tr class="signOkKeyOkH">
-                        <td dir="ltr">End of signed message</td>
-                      </tr>
-                    </table>
-                  </div>
-                </div>
-              </td>
-            </tr>
-            <tr class="encrH">
-              <td dir="ltr">End of encrypted message</td>
-            </tr>
-          </table>
-        </div>
-        <a name="att2"/>
-        <div id="attachmentDiv2">
-          <hr/>
-          <div>
-            <a href="attachment: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>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/details/openpgp-encrypted-partially-signed-attachments.mbox.html b/framework/src/domain/mimetreeparser/otp/autotests/data/details/openpgp-encrypted-partially-signed-attachments.mbox.html
deleted file mode 100644
index 1716b841..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/details/openpgp-encrypted-partially-signed-attachments.mbox.html
+++ /dev/null
@@ -1,102 +0,0 @@
-<?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">
-          <table cellspacing="1" cellpadding="1" class="encr">
-            <tr class="encrH">
-              <td dir="ltr">Encrypted message</td>
-            </tr>
-            <tr class="encrB">
-              <td>
-                <div style="position: relative; word-wrap: break-word">
-                  <a name="att"/>
-                  <div id="attachmentDiv">
-                    <table cellspacing="1" cellpadding="1" class="signOkKeyOk">
-                      <tr class="signOkKeyOkH">
-                        <td dir="ltr">
-                          <table cellspacing="0" cellpadding="0" width="100%">
-                            <tr>
-                              <td rowspan="2">Message was signed by <a href="mailto:test@kolab.org">test@kolab.org</a> (Key ID: <a href="kmail:showCertificate#gpg ### OpenPGP ### 8D9860C58F246DE6">0x8D9860C58F246DE6</a>).<br/>The signature is valid and the key is fully trusted.</td>
-                              <td align="right" valign="top" nowrap="nowrap">
-                                <a href="kmail:hideSignatureDetails">Hide Details</a>
-                              </td>
-                            </tr>
-                            <tr>
-                              <td align="right" valign="bottom" nowrap="nowrap"/>
-                            </tr>
-                          </table>
-                        </td>
-                      </tr>
-                      <tr class="signOkKeyOkB">
-                        <td>
-                          <a name="att1"/>
-                          <div id="attachmentDiv1">
-                            <a name="att1.1"/>
-                            <div id="attachmentDiv1.1">
-                              <div class="noquote">
-                                <div dir="ltr">This is the main body.</div>
-                              </div>
-                            </div>
-                            <a name="att1.2"/>
-                            <div id="attachmentDiv1.2">
-                              <table cellspacing="1" class="textAtm">
-                                <tr class="textAtmH">
-                                  <td dir="ltr">attachment1.txt</td>
-                                </tr>
-                                <tr class="textAtmB">
-                                  <td>
-                                    <div class="noquote">
-                                      <div dir="ltr">This is a signed attachment.</div>
-                                    </div>
-                                  </td>
-                                </tr>
-                              </table>
-                            </div>
-                          </div>
-                        </td>
-                      </tr>
-                      <tr class="signOkKeyOkH">
-                        <td dir="ltr">End of signed message</td>
-                      </tr>
-                    </table>
-                  </div>
-                </div>
-              </td>
-            </tr>
-            <tr class="encrH">
-              <td dir="ltr">End of encrypted message</td>
-            </tr>
-          </table>
-        </div>
-        <a name="att2"/>
-        <div id="attachmentDiv2">
-          <table cellspacing="1" cellpadding="1" class="encr">
-            <tr class="encrH">
-              <td dir="ltr">Encrypted message</td>
-            </tr>
-            <tr class="encrB">
-              <td>
-                <div style="position: relative; word-wrap: break-word">
-                  <a name="att"/>
-                  <div id="attachmentDiv">
-                    <div class="noquote">
-                      <div dir="ltr">This is an unsigned attachment.</div>
-                    </div>
-                  </div>
-                </div>
-              </td>
-            </tr>
-            <tr class="encrH">
-              <td dir="ltr">End of encrypted message</td>
-            </tr>
-          </table>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/details/openpgp-inline-charset-encrypted.mbox.html b/framework/src/domain/mimetreeparser/otp/autotests/data/details/openpgp-inline-charset-encrypted.mbox.html
deleted file mode 100644
index c2fa2fee..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/details/openpgp-inline-charset-encrypted.mbox.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<?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="encr">
-          <tr class="encrH">
-            <td dir="ltr">Encrypted message</td>
-          </tr>
-          <tr class="encrB">
-            <td>
-              <table cellspacing="1" cellpadding="1" class="signOkKeyOk">
-                <tr class="signOkKeyOkH">
-                  <td dir="ltr">
-                    <table cellspacing="0" cellpadding="0" width="100%">
-                      <tr>
-                        <td rowspan="2">Message was signed by <a href="mailto:test@kolab.org">test@kolab.org</a> (Key ID: <a href="kmail:showCertificate#gpg ### OpenPGP ### 8D9860C58F246DE6">0x8D9860C58F246DE6</a>).<br/>The signature is valid and the key is fully trusted.</td>
-                        <td align="right" valign="top" nowrap="nowrap">
-                          <a href="kmail:hideSignatureDetails">Hide Details</a>
-                        </td>
-                      </tr>
-                      <tr>
-                        <td align="right" valign="bottom" nowrap="nowrap"/>
-                      </tr>
-                    </table>
-                  </td>
-                </tr>
-                <tr class="signOkKeyOkB">
-                  <td>
-                    <div class="noquote">
-                      <div dir="ltr">asdasd asd asd asdf sadf sdaf sadf öäü</div>
-                    </div>
-                  </td>
-                </tr>
-                <tr class="signOkKeyOkH">
-                  <td dir="ltr">End of signed message</td>
-                </tr>
-              </table>
-            </td>
-          </tr>
-          <tr class="encrH">
-            <td dir="ltr">End of encrypted message</td>
-          </tr>
-        </table>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/details/openpgp-inline-signed.mbox.html b/framework/src/domain/mimetreeparser/otp/autotests/data/details/openpgp-inline-signed.mbox.html
deleted file mode 100644
index 00a9dc5b..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/details/openpgp-inline-signed.mbox.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<?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="signOkKeyOk">
-          <tr class="signOkKeyOkH">
-            <td dir="ltr">
-              <table cellspacing="0" cellpadding="0" width="100%">
-                <tr>
-                  <td rowspan="2">Message was signed by <a href="mailto:test@kolab.org">test@kolab.org</a> (Key ID: <a href="kmail:showCertificate#gpg ### OpenPGP ### 8D9860C58F246DE6">0x8D9860C58F246DE6</a>).<br/>The signature is valid and the key is fully trusted.</td>
-                  <td align="right" valign="top" nowrap="nowrap">
-                    <a href="kmail:hideSignatureDetails">Hide Details</a>
-                  </td>
-                </tr>
-                <tr>
-                  <td align="right" valign="bottom" nowrap="nowrap"/>
-                </tr>
-              </table>
-            </td>
-          </tr>
-          <tr class="signOkKeyOkB">
-            <td>
-              <div class="noquote">
-                <div dir="ltr">ohno öäü</div>
-              </div>
-            </td>
-          </tr>
-          <tr class="signOkKeyOkH">
-            <td dir="ltr">End of signed message</td>
-          </tr>
-        </table>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/details/openpgp-signed-base64-mailman-footer.mbox.html b/framework/src/domain/mimetreeparser/otp/autotests/data/details/openpgp-signed-base64-mailman-footer.mbox.html
deleted file mode 100644
index c10cecd8..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/details/openpgp-signed-base64-mailman-footer.mbox.html
+++ /dev/null
@@ -1,81 +0,0 @@
-<?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">
-          <table cellspacing="1" cellpadding="1" class="signWarn">
-            <tr class="signWarnH">
-              <td dir="ltr">
-                <table cellspacing="0" cellpadding="0" width="100%">
-                  <tr>
-                    <td rowspan="2">Message was signed on 8/22/15 9:31 AM with unknown key <a href="kmail:showCertificate#gpg ### OpenPGP ### 7F96CCD64D12D247">0x7F96CCD64D12D247</a>.<br/>The validity of the signature cannot be verified.<br/>Status:<i>No public key to verify the signature</i></td>
-                    <td align="right" valign="top" nowrap="nowrap">
-                      <a href="kmail:hideSignatureDetails">Hide Details</a>
-                    </td>
-                  </tr>
-                  <tr>
-                    <td align="right" valign="bottom" nowrap="nowrap"/>
-                  </tr>
-                </table>
-              </td>
-            </tr>
-            <tr class="signWarnB">
-              <td>
-                <a name="att1.1"/>
-                <div id="attachmentDiv1.1">
-                  <div class="noquote">
-                    <div dir="ltr">Hi,</div>
-                    <br/>
-                    <div dir="ltr">I've talked to Ben, the current Phabricator test setup would actually be&nbsp;</div>
-                    <div dir="ltr">usable for "production" use for task/project management for us, without&nbsp;</div>
-                    <div dir="ltr">causing the sysadmins unreasonable trouble when migrating to the full&nbsp;</div>
-                    <div dir="ltr">production deployment of Phabricator eventually.</div>
-                    <br/>
-                    <div dir="ltr">Phabricator project layout it orthogonal to repo layout, so we can structure&nbsp;</div>
-                    <div dir="ltr">this however we want. Among other teams I see at least the following layouts:</div>
-                    <div dir="ltr">- single project for everything</div>
-                    <div dir="ltr">- a project per release</div>
-                    <div dir="ltr">- a project per component/module (ie. close to the repo layout)</div>
-                    <br/>
-                    <div dir="ltr">How do we want to structure this?</div>
-                    <br/>
-                    <div dir="ltr">I would start with a single project to not fragment this too much, as we have&nbsp;</div>
-                    <div dir="ltr">a relatively small team actually looking into this, so everyone is looking at&nbsp;</div>
-                    <div dir="ltr">most sub-projects anyway. And should we eventually hit scaling limits, we can&nbsp;</div>
-                    <div dir="ltr">always expand this I think.</div>
-                    <br/>
-                    <div dir="ltr">We of course should also talk about what we actually want to put in there. My&nbsp;</div>
-                    <div dir="ltr">current motivation is having a place to collect the tasks for getting more of&nbsp;</div>
-                    <div dir="ltr">the former pimlibs into KF5, and anything else I run into on the way there&nbsp;</div>
-                    <div dir="ltr">that we eventually should clean up/improve.</div>
-                    <br/>
-                    <div dir="ltr">regards,</div>
-                    <div dir="ltr">Volker</div>
-                  </div>
-                </div>
-              </td>
-            </tr>
-            <tr class="signWarnH">
-              <td dir="ltr">End of signed message</td>
-            </tr>
-          </table>
-        </div>
-        <a name="att2"/>
-        <div id="attachmentDiv2">
-          <div class="noquote">
-            <div dir="ltr">_______________________________________________</div>
-            <div dir="ltr">KDE PIM mailing list <a href="mailto:kde-pim@kde.org">kde-pim@kde.org</a></div>
-            <div dir="ltr">
-              <a href="https://mail.kde.org/mailman/listinfo/kde-pim">https://mail.kde.org/mailman/listinfo/kde-pim</a>
-            </div>
-            <div dir="ltr">KDE PIM home page at <a href="http://pim.kde.org/">http://pim.kde.org/</a></div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/details/openpgp-signed-encrypted-two-attachments.mbox.html b/framework/src/domain/mimetreeparser/otp/autotests/data/details/openpgp-signed-encrypted-two-attachments.mbox.html
deleted file mode 100644
index 2c02a22c..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/details/openpgp-signed-encrypted-two-attachments.mbox.html
+++ /dev/null
@@ -1,91 +0,0 @@
-<?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="encr">
-          <tr class="encrH">
-            <td dir="ltr">Encrypted message</td>
-          </tr>
-          <tr class="encrB">
-            <td>
-              <div style="position: relative; word-wrap: break-word">
-                <a name="att"/>
-                <div id="attachmentDiv">
-                  <table cellspacing="1" cellpadding="1" class="signOkKeyOk">
-                    <tr class="signOkKeyOkH">
-                      <td dir="ltr">
-                        <table cellspacing="0" cellpadding="0" width="100%">
-                          <tr>
-                            <td rowspan="2">Message was signed by <a href="mailto:test@kolab.org">test@kolab.org</a> (Key ID: <a href="kmail:showCertificate#gpg ### OpenPGP ### 8D9860C58F246DE6">0x8D9860C58F246DE6</a>).<br/>The signature is valid and the key is fully trusted.</td>
-                            <td align="right" valign="top" nowrap="nowrap">
-                              <a href="kmail:hideSignatureDetails">Hide Details</a>
-                            </td>
-                          </tr>
-                          <tr>
-                            <td align="right" valign="bottom" nowrap="nowrap"/>
-                          </tr>
-                        </table>
-                      </td>
-                    </tr>
-                    <tr class="signOkKeyOkB">
-                      <td>
-                        <a name="att1"/>
-                        <div id="attachmentDiv1">
-                          <a name="att1.1"/>
-                          <div id="attachmentDiv1.1">
-                            <div class="noquote">
-                              <div dir="ltr">this is the main body</div>
-                            </div>
-                          </div>
-                          <a name="att1.2"/>
-                          <div id="attachmentDiv1.2">
-                            <table cellspacing="1" class="textAtm">
-                              <tr class="textAtmH">
-                                <td dir="ltr">attachment1.txt</td>
-                              </tr>
-                              <tr class="textAtmB">
-                                <td>
-                                  <div class="noquote">
-                                    <div dir="ltr">this is one attachment</div>
-                                  </div>
-                                </td>
-                              </tr>
-                            </table>
-                          </div>
-                          <a name="att1.3"/>
-                          <div id="attachmentDiv1.3">
-                            <table cellspacing="1" class="textAtm">
-                              <tr class="textAtmH">
-                                <td dir="ltr">attachment2.txt</td>
-                              </tr>
-                              <tr class="textAtmB">
-                                <td>
-                                  <div class="noquote">
-                                    <div dir="ltr">this is the second attachment</div>
-                                  </div>
-                                </td>
-                              </tr>
-                            </table>
-                          </div>
-                        </div>
-                      </td>
-                    </tr>
-                    <tr class="signOkKeyOkH">
-                      <td dir="ltr">End of signed message</td>
-                    </tr>
-                  </table>
-                </div>
-              </div>
-            </td>
-          </tr>
-          <tr class="encrH">
-            <td dir="ltr">End of encrypted message</td>
-          </tr>
-        </table>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/details/openpgp-signed-encrypted.mbox.html b/framework/src/domain/mimetreeparser/otp/autotests/data/details/openpgp-signed-encrypted.mbox.html
deleted file mode 100644
index d3a7a0ce..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/details/openpgp-signed-encrypted.mbox.html
+++ /dev/null
@@ -1,58 +0,0 @@
-<?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="encr">
-          <tr class="encrH">
-            <td dir="ltr">Encrypted message</td>
-          </tr>
-          <tr class="encrB">
-            <td>
-              <div style="position: relative; word-wrap: break-word">
-                <a name="att"/>
-                <div id="attachmentDiv">
-                  <table cellspacing="1" cellpadding="1" class="signOkKeyOk">
-                    <tr class="signOkKeyOkH">
-                      <td dir="ltr">
-                        <table cellspacing="0" cellpadding="0" width="100%">
-                          <tr>
-                            <td rowspan="2">Message was signed by <a href="mailto:test@kolab.org">test@kolab.org</a> (Key ID: <a href="kmail:showCertificate#gpg ### OpenPGP ### 8D9860C58F246DE6">0x8D9860C58F246DE6</a>).<br/>The signature is valid and the key is fully trusted.</td>
-                            <td align="right" valign="top" nowrap="nowrap">
-                              <a href="kmail:hideSignatureDetails">Hide Details</a>
-                            </td>
-                          </tr>
-                          <tr>
-                            <td align="right" valign="bottom" nowrap="nowrap"/>
-                          </tr>
-                        </table>
-                      </td>
-                    </tr>
-                    <tr class="signOkKeyOkB">
-                      <td>
-                        <a name="att1"/>
-                        <div id="attachmentDiv1">
-                          <div class="noquote">
-                            <div dir="ltr">encrypted message text</div>
-                          </div>
-                        </div>
-                      </td>
-                    </tr>
-                    <tr class="signOkKeyOkH">
-                      <td dir="ltr">End of signed message</td>
-                    </tr>
-                  </table>
-                </div>
-              </div>
-            </td>
-          </tr>
-          <tr class="encrH">
-            <td dir="ltr">End of encrypted message</td>
-          </tr>
-        </table>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/details/openpgp-signed-mailinglist+old.mbox.html b/framework/src/domain/mimetreeparser/otp/autotests/data/details/openpgp-signed-mailinglist+old.mbox.html
deleted file mode 100644
index e7da94db..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/details/openpgp-signed-mailinglist+old.mbox.html
+++ /dev/null
@@ -1,97 +0,0 @@
-<?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 style="position: relative; word-wrap: break-word">
-          <a name="att"/>
-          <div id="attachmentDiv">
-            <div class="noquote">
-              <div dir="ltr">Oh man a header :)</div>
-              <br/>
-            </div>
-          </div>
-        </div>
-        <div style="position: relative; word-wrap: break-word">
-          <a name="att"/>
-          <div id="attachmentDiv">
-            <table cellspacing="1" cellpadding="1" class="rfc822">
-              <tr class="rfc822H">
-                <td dir="ltr">
-                  <a href="attachment:e1:1?place=body">Encapsulated message</a>
-                </td>
-              </tr>
-              <tr class="rfc822B">
-                <td>
-                  <a name="att1"/>
-                  <div id="attachmentDiv1">
-                    <table cellspacing="1" cellpadding="1" class="signWarn">
-                      <tr class="signWarnH">
-                        <td dir="ltr">
-                          <table cellspacing="0" cellpadding="0" width="100%">
-                            <tr>
-                              <td rowspan="2">Message was signed on 4/8/13 9:51 AM with unknown key <a href="kmail:showCertificate#gpg ### OpenPGP ### D6B72EB1A7F1DB43">0xD6B72EB1A7F1DB43</a>.<br/>The validity of the signature cannot be verified.<br/>Status:<i>No public key to verify the signature</i></td>
-                              <td align="right" valign="top" nowrap="nowrap">
-                                <a href="kmail:hideSignatureDetails">Hide Details</a>
-                              </td>
-                            </tr>
-                            <tr>
-                              <td align="right" valign="bottom" nowrap="nowrap"/>
-                            </tr>
-                          </table>
-                        </td>
-                      </tr>
-                      <tr class="signWarnB">
-                        <td>
-                          <a name="att1.1"/>
-                          <div id="attachmentDiv1.1">
-                            <div class="noquote">
-                              <div dir="ltr">hi..</div>
-                              <br/>
-                              <div dir="ltr">i noticed a new branch when i pulled kde-workspace today (finally!):&nbsp;</div>
-                              <div dir="ltr">activities_optional</div>
-                              <br/>
-                              <div dir="ltr">the lone commit in it was pushed on april 1, so maybe it's an april fools&nbsp;</div>
-                              <div dir="ltr">joke, but if it isn't, it looks like someone is trying to do something that&nbsp;</div>
-                              <div dir="ltr">makes no sense (and has no chance of being merged into master). so if this is&nbsp;</div>
-                              <div dir="ltr">a "for reals" branch, perhaps the motivation behind it can be shared?</div>
-                              <br/>
-                              <div dir="ltr">--&nbsp;</div>
-                              <div dir="ltr">Aaron J. Seigo</div>
-                            </div>
-                          </div>
-                        </td>
-                      </tr>
-                      <tr class="signWarnH">
-                        <td dir="ltr">End of signed message</td>
-                      </tr>
-                    </table>
-                  </div>
-                </td>
-              </tr>
-              <tr class="rfc822H">
-                <td dir="ltr">End of encapsulated message</td>
-              </tr>
-            </table>
-          </div>
-        </div>
-        <div style="position: relative; word-wrap: break-word">
-          <a name="att"/>
-          <div id="attachmentDiv">
-            <div class="noquote">
-              <div dir="ltr">Plasma-devel mailing list</div>
-              <div dir="ltr">
-                <a href="mailto:Plasma-devel@kde.org">Plasma-devel@kde.org</a>
-              </div>
-              <div dir="ltr">
-                <a href="https://mail.kde.org/mailman/listinfo/plasma-devel">https://mail.kde.org/mailman/listinfo/plasma-devel</a>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/details/openpgp-signed-mailinglist.mbox.html b/framework/src/domain/mimetreeparser/otp/autotests/data/details/openpgp-signed-mailinglist.mbox.html
deleted file mode 100644
index f5b20b6d..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/details/openpgp-signed-mailinglist.mbox.html
+++ /dev/null
@@ -1,68 +0,0 @@
-<?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">
-          <table cellspacing="1" cellpadding="1" class="signWarn">
-            <tr class="signWarnH">
-              <td dir="ltr">
-                <table cellspacing="0" cellpadding="0" width="100%">
-                  <tr>
-                    <td rowspan="2">Message was signed on 4/8/13 9:51 AM with unknown key <a href="kmail:showCertificate#gpg ### OpenPGP ### D6B72EB1A7F1DB43">0xD6B72EB1A7F1DB43</a>.<br/>The validity of the signature cannot be verified.<br/>Status:<i>No public key to verify the signature</i></td>
-                    <td align="right" valign="top" nowrap="nowrap">
-                      <a href="kmail:hideSignatureDetails">Hide Details</a>
-                    </td>
-                  </tr>
-                  <tr>
-                    <td align="right" valign="bottom" nowrap="nowrap"/>
-                  </tr>
-                </table>
-              </td>
-            </tr>
-            <tr class="signWarnB">
-              <td>
-                <a name="att1.1"/>
-                <div id="attachmentDiv1.1">
-                  <div class="noquote">
-                    <div dir="ltr">hi..</div>
-                    <br/>
-                    <div dir="ltr">i noticed a new branch when i pulled kde-workspace today (finally!):&nbsp;</div>
-                    <div dir="ltr">activities_optional</div>
-                    <br/>
-                    <div dir="ltr">the lone commit in it was pushed on april 1, so maybe it's an april fools&nbsp;</div>
-                    <div dir="ltr">joke, but if it isn't, it looks like someone is trying to do something that&nbsp;</div>
-                    <div dir="ltr">makes no sense (and has no chance of being merged into master). so if this is&nbsp;</div>
-                    <div dir="ltr">a "for reals" branch, perhaps the motivation behind it can be shared?</div>
-                    <br/>
-                    <div dir="ltr">--&nbsp;</div>
-                    <div dir="ltr">Aaron J. Seigo</div>
-                  </div>
-                </div>
-              </td>
-            </tr>
-            <tr class="signWarnH">
-              <td dir="ltr">End of signed message</td>
-            </tr>
-          </table>
-        </div>
-        <a name="att2"/>
-        <div id="attachmentDiv2">
-          <div class="noquote">
-            <div dir="ltr">_______________________________________________</div>
-            <div dir="ltr">Plasma-devel mailing list</div>
-            <div dir="ltr">
-              <a href="mailto:Plasma-devel@kde.org">Plasma-devel@kde.org</a>
-            </div>
-            <div dir="ltr">
-              <a href="https://mail.kde.org/mailman/listinfo/plasma-devel">https://mail.kde.org/mailman/listinfo/plasma-devel</a>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/details/openpgp-signed-two-attachments.mbox.html b/framework/src/domain/mimetreeparser/otp/autotests/data/details/openpgp-signed-two-attachments.mbox.html
deleted file mode 100644
index 1432aa44..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/details/openpgp-signed-two-attachments.mbox.html
+++ /dev/null
@@ -1,74 +0,0 @@
-<?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="signOkKeyOk">
-          <tr class="signOkKeyOkH">
-            <td dir="ltr">
-              <table cellspacing="0" cellpadding="0" width="100%">
-                <tr>
-                  <td rowspan="2">Message was signed by <a href="mailto:test@kolab.org">test@kolab.org</a> (Key ID: <a href="kmail:showCertificate#gpg ### OpenPGP ### 8D9860C58F246DE6">0x8D9860C58F246DE6</a>).<br/>The signature is valid and the key is fully trusted.</td>
-                  <td align="right" valign="top" nowrap="nowrap">
-                    <a href="kmail:hideSignatureDetails">Hide Details</a>
-                  </td>
-                </tr>
-                <tr>
-                  <td align="right" valign="bottom" nowrap="nowrap"/>
-                </tr>
-              </table>
-            </td>
-          </tr>
-          <tr class="signOkKeyOkB">
-            <td>
-              <a name="att1"/>
-              <div id="attachmentDiv1">
-                <a name="att1.1"/>
-                <div id="attachmentDiv1.1">
-                  <div class="noquote">
-                    <div dir="ltr">this is the main body text</div>
-                  </div>
-                </div>
-                <a name="att1.2"/>
-                <div id="attachmentDiv1.2">
-                  <table cellspacing="1" class="textAtm">
-                    <tr class="textAtmH">
-                      <td dir="ltr">attachment1.txt</td>
-                    </tr>
-                    <tr class="textAtmB">
-                      <td>
-                        <div class="noquote">
-                          <div dir="ltr">this is attachment one</div>
-                        </div>
-                      </td>
-                    </tr>
-                  </table>
-                </div>
-                <a name="att1.3"/>
-                <div id="attachmentDiv1.3">
-                  <table cellspacing="1" class="textAtm">
-                    <tr class="textAtmH">
-                      <td dir="ltr">attachment2.txt</td>
-                    </tr>
-                    <tr class="textAtmB">
-                      <td>
-                        <div class="noquote">
-                          <div dir="ltr">this is attachment two</div>
-                        </div>
-                      </td>
-                    </tr>
-                  </table>
-                </div>
-              </div>
-            </td>
-          </tr>
-          <tr class="signOkKeyOkH">
-            <td dir="ltr">End of signed message</td>
-          </tr>
-        </table>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/details/signed-forward-openpgp-signed-encrypted.mbox.html b/framework/src/domain/mimetreeparser/otp/autotests/data/details/signed-forward-openpgp-signed-encrypted.mbox.html
deleted file mode 100644
index b960f318..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/details/signed-forward-openpgp-signed-encrypted.mbox.html
+++ /dev/null
@@ -1,111 +0,0 @@
-<?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="signOkKeyOk">
-          <tr class="signOkKeyOkH">
-            <td dir="ltr">
-              <table cellspacing="0" cellpadding="0" width="100%">
-                <tr>
-                  <td rowspan="2">Message was signed by <a href="mailto:test@kolab.org">test@kolab.org</a> (Key ID: <a href="kmail:showCertificate#gpg ### OpenPGP ### 8D9860C58F246DE6">0x8D9860C58F246DE6</a>).<br/>The signature is valid and the key is fully trusted.</td>
-                  <td align="right" valign="top" nowrap="nowrap">
-                    <a href="kmail:hideSignatureDetails">Hide Details</a>
-                  </td>
-                </tr>
-                <tr>
-                  <td align="right" valign="bottom" nowrap="nowrap"/>
-                </tr>
-              </table>
-            </td>
-          </tr>
-          <tr class="signOkKeyOkB">
-            <td>
-              <a name="att1"/>
-              <div id="attachmentDiv1">
-                <a name="att1.1"/>
-                <div id="attachmentDiv1.1">
-                  <div class="noquote">
-                    <div dir="ltr">bla bla bla</div>
-                  </div>
-                </div>
-                <a name="att1.2"/>
-                <div id="attachmentDiv1.2">
-                  <table cellspacing="1" cellpadding="1" class="rfc822">
-                    <tr class="rfc822H">
-                      <td dir="ltr">
-                        <a href="attachment:1.2.1?place=body">Encapsulated message</a>
-                      </td>
-                    </tr>
-                    <tr class="rfc822B">
-                      <td>
-                        <a name="att1.2.1"/>
-                        <div id="attachmentDiv1.2.1">
-                          <table cellspacing="1" cellpadding="1" class="encr">
-                            <tr class="encrH">
-                              <td dir="ltr">Encrypted message</td>
-                            </tr>
-                            <tr class="encrB">
-                              <td>
-                                <div style="position: relative; word-wrap: break-word">
-                                  <a name="att"/>
-                                  <div id="attachmentDiv">
-                                    <table cellspacing="1" cellpadding="1" class="signOkKeyOk">
-                                      <tr class="signOkKeyOkH">
-                                        <td dir="ltr">
-                                          <table cellspacing="0" cellpadding="0" width="100%">
-                                            <tr>
-                                              <td rowspan="2">Message was signed by <a href="mailto:test@kolab.org">test@kolab.org</a> (Key ID: <a href="kmail:showCertificate#gpg ### OpenPGP ### 8D9860C58F246DE6">0x8D9860C58F246DE6</a>).<br/>The signature is valid and the key is fully trusted.</td>
-                                              <td align="right" valign="top" nowrap="nowrap">
-                                                <a href="kmail:hideSignatureDetails">Hide Details</a>
-                                              </td>
-                                            </tr>
-                                            <tr>
-                                              <td align="right" valign="bottom" nowrap="nowrap"/>
-                                            </tr>
-                                          </table>
-                                        </td>
-                                      </tr>
-                                      <tr class="signOkKeyOkB">
-                                        <td>
-                                          <a name="att1"/>
-                                          <div id="attachmentDiv1">
-                                            <div class="noquote">
-                                              <div dir="ltr">encrypted message text</div>
-                                            </div>
-                                          </div>
-                                        </td>
-                                      </tr>
-                                      <tr class="signOkKeyOkH">
-                                        <td dir="ltr">End of signed message</td>
-                                      </tr>
-                                    </table>
-                                  </div>
-                                </div>
-                              </td>
-                            </tr>
-                            <tr class="encrH">
-                              <td dir="ltr">End of encrypted message</td>
-                            </tr>
-                          </table>
-                        </div>
-                      </td>
-                    </tr>
-                    <tr class="rfc822H">
-                      <td dir="ltr">End of encapsulated message</td>
-                    </tr>
-                  </table>
-                </div>
-              </div>
-            </td>
-          </tr>
-          <tr class="signOkKeyOkH">
-            <td dir="ltr">End of signed message</td>
-          </tr>
-        </table>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/details/smime-opaque-enc+sign.mbox.html b/framework/src/domain/mimetreeparser/otp/autotests/data/details/smime-opaque-enc+sign.mbox.html
deleted file mode 100644
index d6345a7c..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/details/smime-opaque-enc+sign.mbox.html
+++ /dev/null
@@ -1,60 +0,0 @@
-<?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="encr">
-          <tr class="encrH">
-            <td dir="ltr">Encrypted message</td>
-          </tr>
-          <tr class="encrB">
-            <td>
-              <div style="position: relative; word-wrap: break-word">
-                <a name="att"/>
-                <div id="attachmentDiv">
-                  <table cellspacing="1" cellpadding="1" class="signOkKeyOk">
-                    <tr class="signOkKeyOkH">
-                      <td dir="ltr">
-                        <table cellspacing="0" cellpadding="0" width="100%">
-                          <tr>
-                            <td rowspan="2">Message was signed by <a href="mailto:test%40example.com">test@example.com</a> on 1/10/13 3:48 PM with key <a href="kmail:showCertificate#gpgsm ### SMIME ### 4CC658E3212B49DC">0x4CC658E3212B49DC</a><br/>&nbsp;<br/>Status:<i>Good signature.</i><br/>&nbsp;<br/><u>Warning:</u> Sender's mail address is not stored in the <a href="kmail:showCertificate#gpgsm ### SMIME ### 4CC658E3212B49DC">certificate</a> used for signing.<br/>sender: <br/>stored: test@example.com</td>
-                            <td align="right" valign="top" nowrap="nowrap">
-                              <a href="kmail:hideSignatureDetails">Hide Details</a>
-                            </td>
-                          </tr>
-                          <tr>
-                            <td align="right" valign="bottom" nowrap="nowrap"/>
-                          </tr>
-                        </table>
-                      </td>
-                    </tr>
-                    <tr class="signOkKeyOkB">
-                      <td>
-                        <div style="position: relative; word-wrap: break-word">
-                          <a name="att"/>
-                          <div id="attachmentDiv">
-                            <div class="noquote">
-                              <div dir="ltr">Encrypted and signed mail.</div>
-                            </div>
-                          </div>
-                        </div>
-                      </td>
-                    </tr>
-                    <tr class="signOkKeyOkH">
-                      <td dir="ltr">End of signed message</td>
-                    </tr>
-                  </table>
-                </div>
-              </div>
-            </td>
-          </tr>
-          <tr class="encrH">
-            <td dir="ltr">End of encrypted message</td>
-          </tr>
-        </table>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/details/smime-opaque-sign.mbox.html b/framework/src/domain/mimetreeparser/otp/autotests/data/details/smime-opaque-sign.mbox.html
deleted file mode 100644
index 248b93ff..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/details/smime-opaque-sign.mbox.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<?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="signOkKeyOk">
-          <tr class="signOkKeyOkH">
-            <td dir="ltr">
-              <table cellspacing="0" cellpadding="0" width="100%">
-                <tr>
-                  <td rowspan="2">Message was signed by <a href="mailto:test%40example.com">test@example.com</a> on 1/10/13 3:48 PM with key <a href="kmail:showCertificate#gpgsm ### SMIME ### 4CC658E3212B49DC">0x4CC658E3212B49DC</a><br/>&nbsp;<br/>Status:<i>Good signature.</i></td>
-                  <td align="right" valign="top" nowrap="nowrap">
-                    <a href="kmail:hideSignatureDetails">Hide Details</a>
-                  </td>
-                </tr>
-                <tr>
-                  <td align="right" valign="bottom" nowrap="nowrap"/>
-                </tr>
-              </table>
-            </td>
-          </tr>
-          <tr class="signOkKeyOkB">
-            <td>
-              <div style="position: relative; word-wrap: break-word">
-                <a name="att"/>
-                <div id="attachmentDiv">
-                  <div class="noquote">
-                    <div dir="ltr">A simple signed only test.</div>
-                  </div>
-                </div>
-              </div>
-            </td>
-          </tr>
-          <tr class="signOkKeyOkH">
-            <td dir="ltr">End of signed message</td>
-          </tr>
-        </table>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/details/smime-signed-encrypted.mbox.html b/framework/src/domain/mimetreeparser/otp/autotests/data/details/smime-signed-encrypted.mbox.html
deleted file mode 100644
index 6e811632..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/details/smime-signed-encrypted.mbox.html
+++ /dev/null
@@ -1,58 +0,0 @@
-<?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="encr">
-          <tr class="encrH">
-            <td dir="ltr">Encrypted message</td>
-          </tr>
-          <tr class="encrB">
-            <td>
-              <div style="position: relative; word-wrap: break-word">
-                <a name="att"/>
-                <div id="attachmentDiv">
-                  <table cellspacing="1" cellpadding="1" class="signOkKeyOk">
-                    <tr class="signOkKeyOkH">
-                      <td dir="ltr">
-                        <table cellspacing="0" cellpadding="0" width="100%">
-                          <tr>
-                            <td rowspan="2">Message was signed by <a href="mailto:test%40example.com">test@example.com</a> on 9/8/10 3:51 PM with key <a href="kmail:showCertificate#gpgsm ### SMIME ### 4CC658E3212B49DC">0x4CC658E3212B49DC</a><br/>&nbsp;<br/>Status:<i>Good signature.</i><br/>&nbsp;<br/><u>Warning:</u> Sender's mail address is not stored in the <a href="kmail:showCertificate#gpgsm ### SMIME ### 4CC658E3212B49DC">certificate</a> used for signing.<br/>sender: <br/>stored: test@example.com</td>
-                            <td align="right" valign="top" nowrap="nowrap">
-                              <a href="kmail:hideSignatureDetails">Hide Details</a>
-                            </td>
-                          </tr>
-                          <tr>
-                            <td align="right" valign="bottom" nowrap="nowrap"/>
-                          </tr>
-                        </table>
-                      </td>
-                    </tr>
-                    <tr class="signOkKeyOkB">
-                      <td>
-                        <a name="att1"/>
-                        <div id="attachmentDiv1">
-                          <div class="noquote">
-                            <div dir="ltr">encrypted message text</div>
-                          </div>
-                        </div>
-                      </td>
-                    </tr>
-                    <tr class="signOkKeyOkH">
-                      <td dir="ltr">End of signed message</td>
-                    </tr>
-                  </table>
-                </div>
-              </div>
-            </td>
-          </tr>
-          <tr class="encrH">
-            <td dir="ltr">End of encrypted message</td>
-          </tr>
-        </table>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/encapsulated-with-attachment.mbox b/framework/src/domain/mimetreeparser/otp/autotests/data/encapsulated-with-attachment.mbox
deleted file mode 100644
index 885b9d1b..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/encapsulated-with-attachment.mbox
+++ /dev/null
@@ -1,53 +0,0 @@
-From: Thomas McGuire <dontspamme@gmx.net>
-Subject: Fwd: Test with attachment
-Date: Wed, 5 Aug 2009 10:58:27 +0200
-MIME-Version: 1.0
-Content-Type: Multipart/Mixed;
-  boundary="Boundary-00=_zmUeKB+A8hGfCVZ"
-
-
---Boundary-00=_zmUeKB+A8hGfCVZ
-Content-Type: text/plain;
-  charset="iso-8859-15"
-Content-Transfer-Encoding: 7bit
-Content-Disposition: inline
-
-This is the first encapsulating message.
-
---Boundary-00=_zmUeKB+A8hGfCVZ
-Content-Type: message/rfc822;
-  name="forwarded message"
-Content-Transfer-Encoding: 7bit
-Content-Description: Thomas McGuire <dontspamme@gmx.net>: Test with attachment
-Content-Disposition: inline
-
-From: Thomas McGuire <dontspamme@gmx.net>
-Subject: Test with attachment
-Date: Wed, 5 Aug 2009 10:57:58 +0200
-MIME-Version: 1.0
-Content-Type: Multipart/Mixed;
-  boundary="Boundary-00=_WmUeKQpGb0DHyx1"
-
---Boundary-00=_WmUeKQpGb0DHyx1
-Content-Type: text/plain;
-  charset="us-ascii"
-Content-Transfer-Encoding: 7bit
-Content-Disposition: inline
-
-
-
-
-This is the second encapsulated message.
-
---Boundary-00=_WmUeKQpGb0DHyx1
-Content-Type: text/plain;
-  name="attachment.txt"
-Content-Transfer-Encoding: 7bit
-Content-Disposition: attachment;
-  filename="attachment.txt"
-
-This is an attachment.
-
---Boundary-00=_WmUeKQpGb0DHyx1--
-
---Boundary-00=_zmUeKB+A8hGfCVZ--
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/encapsulated-with-attachment.mbox.html b/framework/src/domain/mimetreeparser/otp/autotests/data/encapsulated-with-attachment.mbox.html
deleted file mode 100644
index aa3d1090..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/encapsulated-with-attachment.mbox.html
+++ /dev/null
@@ -1,51 +0,0 @@
-<?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="noquote">
-            <div dir="ltr">This is the first encapsulating message.</div>
-          </div>
-        </div>
-        <a name="att2"/>
-        <div id="attachmentDiv2">
-          <table cellspacing="1" cellpadding="1" class="rfc822">
-            <tr class="rfc822H">
-              <td dir="ltr">
-                <a href="attachment:2.1?place=body">Encapsulated message</a>
-              </td>
-            </tr>
-            <tr class="rfc822B">
-              <td>
-                <a name="att2.1"/>
-                <div id="attachmentDiv2.1">
-                  <a name="att2.1.1"/>
-                  <div id="attachmentDiv2.1.1">
-                    <div class="noquote">
-                      <div dir="ltr">This is the second encapsulated message.</div>
-                    </div>
-                  </div>
-                  <a name="att2.1.2"/>
-                  <div id="attachmentDiv2.1.2">
-                    <hr/>
-                    <div>
-                      <a href="attachment:2.1.2?place=body"><img align="center" height="48" width="48" src="file:text-plain.svg" border="0" style="max-width: 100%" alt=""/>attachment.txt</a>
-                    </div>
-                    <div/>
-                  </div>
-                </div>
-              </td>
-            </tr>
-            <tr class="rfc822H">
-              <td dir="ltr">End of encapsulated message</td>
-            </tr>
-          </table>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/encapsulated-with-attachment.mbox.tree b/framework/src/domain/mimetreeparser/otp/autotests/data/encapsulated-with-attachment.mbox.tree
deleted file mode 100644
index 050414a2..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/encapsulated-with-attachment.mbox.tree
+++ /dev/null
@@ -1,10 +0,0 @@
- * MimeTreeParser::MessagePartList
-  * MimeTreeParser::MimeMessagePart
-   * MimeTreeParser::TextMessagePart
-    * MimeTreeParser::MessagePart
-   * MimeTreeParser::EncapsulatedRfc822MessagePart
-    * MimeTreeParser::MimeMessagePart
-     * MimeTreeParser::AttachmentMessagePart
-      * MimeTreeParser::MessagePart
-     * MimeTreeParser::AttachmentMessagePart
-      * MimeTreeParser::MessagePart
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/forward-openpgp-signed-encrypted.mbox b/framework/src/domain/mimetreeparser/otp/autotests/data/forward-openpgp-signed-encrypted.mbox
deleted file mode 100644
index 1c166940..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/forward-openpgp-signed-encrypted.mbox
+++ /dev/null
@@ -1,69 +0,0 @@
-From test@kolab.org Wed, 08 Sep 2010 17:52:37 +0200
-From: OpenPGP Test <test@kolab.org>
-Subject: Fwd: OpenPGP signed and encrypted
-Date: Wed, 08 Sep 2010 17:52:37 +0200
-User-Agent: KMail/4.6 pre (Linux/2.6.34-rc2-2-default; KDE/4.5.60; x86_64; ; )
-MIME-Version: 1.0
-Content-Type: multipart/mixed; boundary="nextPart2148910.9CGjQOYhYJ"
-Content-Transfer-Encoding: 7Bit
-
-
---nextPart2148910.9CGjQOYhYJ
-Content-Transfer-Encoding: 7Bit
-Content-Type: text/plain; charset="us-ascii"
-
-bla bla bla
---nextPart2148910.9CGjQOYhYJ
-Content-Type: message/rfc822
-Content-Disposition: inline; filename="forwarded message"
-Content-Description: OpenPGP Test <test@kolab.org>: OpenPGP signed and encrypted
-
-From: OpenPGP Test <test@kolab.org>
-To: test@kolab.org
-Subject: OpenPGP signed and encrypted
-Date: Tue, 07 Sep 2010 18:08:44 +0200
-User-Agent: KMail/4.6 pre (Linux/2.6.34-rc2-2-default; KDE/4.5.60; x86_64; ; )
-MIME-Version: 1.0
-Content-Type: multipart/encrypted; boundary="nextPart25203163.0xtB501Z4V"; protocol="application/pgp-encrypted"
-Content-Transfer-Encoding: 7Bit
-
-
---nextPart25203163.0xtB501Z4V
-Content-Type: application/pgp-encrypted
-Content-Disposition: attachment
-
-Version: 1
---nextPart25203163.0xtB501Z4V
-Content-Type: application/octet-stream
-Content-Disposition: inline; filename="msg.asc"
-
------BEGIN PGP MESSAGE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-hQEMAwzOQ1qnzNo7AQf7BFYWaGiCTGtXY59bSh3LCXNnWZejblYALxIUNXOFEXbm
-y/YA95FmQsy3U5HRCAJV/DY1PEaJz1RTm9bcdIpDC3Ab2YzSwmOwV5fcoUOB2df4
-KjX19Q+2F3JxpPQ0N1gHf4dKfIu19LH+CKeFzUN13aJs5J4A5wlj+NjJikxzmxDS
-kDtNYndynPmo9DJQcsUFw3gpvx5HaHvx1cT4mAB2M5cd2l+vN1jYbaWb0x5Zq41z
-mRNI89aPieC3rcM2289m68fGloNbYvi8mZJu5RrI4Tbi/D7Rjm1y63lHgVV6AN88
-XAzRiedOeF99LoTBulrJdtT8AAgCs8nCetcWpIffdtLpAZiZkzHmYOU7nqGxqpRk
-OVeUTrCn9DW2SMmHjaP4IiKnMvzEycu5F4a72+V1LeMIhMSjTRTq+ZE2PTaqH59z
-QsMn7Nb6GlOICbTptRKNNtyJKO7xXlpT7YtvNKnCyEOkH2XrYH7GvpYCiuQ0/o+7
-SxV436ZejiYIg6DQDXJCoa2DXimGp0C10Jh0HwX0BixpoNtwEjkGRYcX6P/JzkH0
-oBood4Ly+Tiu6iVDisrK3AVGYpIzCrKkE9qULTw4R/jFKR2tcCqGb7Fxtk2LV7Md
-3S+DyOKrvKQ5GNwbp9OE97pwk+Lr1JS3UAvj5f6BR+1PVNcC0i0wWkgwDjPh1eGD
-enMQmorE6+N0uHtH2F4fOxo/TbbA3+zhI25kVW3bO03xyUl/cmQZeb52nvfOvtOo
-gSb2j6bPkzljDMPEzrtJjbFtGHJbPfUQYJgZv9OE2EQIqpg6goIw279alBq6GLIX
-pkO+dRmztzjcDyhcLxMuQ4cTizel/0J/bU7U6lvwHSyZVbT4Ev+opG5K70Hbqbwr
-NZcgdWXbSeesxGM/oQaMeSurOevxVl+/zrTVAek61aRRd1baAYqgi2pf2V7y4oK3
-qkdxzmoFpRdNlfrQW65NZWnHOi9rC9XxANIwnVn3kRcDf+t2K4PrFluI157lXM/o
-wX91j88fazysbJlQ6TjsApO9ETiPOFEBqouxCTtCZzlUgyVG8jpIjdHWFnagHeXH
-+lXNdYjxnTWTjTxMOZC9ySMpXkjWdFI1ecxVwu6Ik6RX51rvBJAAXWP75yUjPKJ4
-rRi5oQl/VLl0QznO7lvgMPtUwgDVNWO/r7Kn9B387h9fAJZ/kWFAEDW2yhAzABqO
-rCNKDzBPgfAwCnikCpMoCbOL7SU8BdbzQHD8/Lkv4m0pzliHQ/KkGF710koBzTmF
-N7+wk9pwIuvcrEBQj567
-=GV0c
------END PGP MESSAGE-----
-
---nextPart25203163.0xtB501Z4V--
-
---nextPart2148910.9CGjQOYhYJ--
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/forward-openpgp-signed-encrypted.mbox.html b/framework/src/domain/mimetreeparser/otp/autotests/data/forward-openpgp-signed-encrypted.mbox.html
deleted file mode 100644
index 7632ec39..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/forward-openpgp-signed-encrypted.mbox.html
+++ /dev/null
@@ -1,81 +0,0 @@
-<?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="noquote">
-            <div dir="ltr">bla bla bla</div>
-          </div>
-        </div>
-        <a name="att2"/>
-        <div id="attachmentDiv2">
-          <table cellspacing="1" cellpadding="1" class="rfc822">
-            <tr class="rfc822H">
-              <td dir="ltr">
-                <a href="attachment:2.1?place=body">Encapsulated message</a>
-              </td>
-            </tr>
-            <tr class="rfc822B">
-              <td>
-                <a name="att2.1"/>
-                <div id="attachmentDiv2.1">
-                  <table cellspacing="1" cellpadding="1" class="encr">
-                    <tr class="encrH">
-                      <td dir="ltr">Encrypted message</td>
-                    </tr>
-                    <tr class="encrB">
-                      <td>
-                        <div style="position: relative; word-wrap: break-word">
-                          <a name="att"/>
-                          <div id="attachmentDiv">
-                            <table cellspacing="1" cellpadding="1" class="signOkKeyOk">
-                              <tr class="signOkKeyOkH">
-                                <td dir="ltr">
-                                  <table cellspacing="0" cellpadding="0" width="100%">
-                                    <tr>
-                                      <td>Signed by <a href="mailto:test@kolab.org">test@kolab.org</a>.</td>
-                                      <td align="right">
-                                        <a href="kmail:showSignatureDetails">Show Details</a>
-                                      </td>
-                                    </tr>
-                                  </table>
-                                </td>
-                              </tr>
-                              <tr class="signOkKeyOkB">
-                                <td>
-                                  <a name="att1"/>
-                                  <div id="attachmentDiv1">
-                                    <div class="noquote">
-                                      <div dir="ltr">encrypted message text</div>
-                                    </div>
-                                  </div>
-                                </td>
-                              </tr>
-                              <tr class="signOkKeyOkH">
-                                <td dir="ltr">End of signed message</td>
-                              </tr>
-                            </table>
-                          </div>
-                        </div>
-                      </td>
-                    </tr>
-                    <tr class="encrH">
-                      <td dir="ltr">End of encrypted message</td>
-                    </tr>
-                  </table>
-                </div>
-              </td>
-            </tr>
-            <tr class="rfc822H">
-              <td dir="ltr">End of encapsulated message</td>
-            </tr>
-          </table>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/forward-openpgp-signed-encrypted.mbox.tree b/framework/src/domain/mimetreeparser/otp/autotests/data/forward-openpgp-signed-encrypted.mbox.tree
deleted file mode 100644
index 324156db..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/forward-openpgp-signed-encrypted.mbox.tree
+++ /dev/null
@@ -1,9 +0,0 @@
- * MimeTreeParser::MessagePartList
-  * MimeTreeParser::MimeMessagePart
-   * MimeTreeParser::TextMessagePart
-    * MimeTreeParser::MessagePart
-   * MimeTreeParser::EncapsulatedRfc822MessagePart
-    * MimeTreeParser::EncryptedMessagePart
-     * MimeTreeParser::SignedMessagePart
-      * MimeTreeParser::TextMessagePart
-       * MimeTreeParser::MessagePart
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/headeronly/openpgp-encrypted-attachment-and-non-encrypted-attachment.mbox.html b/framework/src/domain/mimetreeparser/otp/autotests/data/headeronly/openpgp-encrypted-attachment-and-non-encrypted-attachment.mbox.html
deleted file mode 100644
index 73c4d2d7..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/headeronly/openpgp-encrypted-attachment-and-non-encrypted-attachment.mbox.html
+++ /dev/null
@@ -1,61 +0,0 @@
-<?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">
-          <table cellspacing="1" cellpadding="1" class="encr">
-            <tr class="encrH">
-              <td dir="ltr">Encrypted message</td>
-            </tr>
-            <tr class="encrB">
-              <td>
-                <div style="position: relative; word-wrap: break-word">
-                  <a name="att"/>
-                  <div id="attachmentDiv">
-                    <table cellspacing="1" cellpadding="1" class="signOkKeyOk">
-                      <tr class="signOkKeyOkH">
-                        <td dir="ltr">
-                          <table cellspacing="0" cellpadding="0" width="100%">
-                            <tr>
-                              <td>Signed by <a href="mailto:test@kolab.org">test@kolab.org</a>.</td>
-                              <td align="right">
-                                <a href="kmail:showSignatureDetails">Show Details</a>
-                              </td>
-                            </tr>
-                          </table>
-                        </td>
-                      </tr>
-                      <tr class="signOkKeyOkB">
-                        <td>
-                          <a name="att1"/>
-                          <div id="attachmentDiv1">
-                            <a name="att1.1"/>
-                            <div id="attachmentDiv1.1">
-                              <div class="noquote">
-                                <div dir="ltr">test text</div>
-                              </div>
-                            </div>
-                          </div>
-                        </td>
-                      </tr>
-                      <tr class="signOkKeyOkH">
-                        <td dir="ltr">End of signed message</td>
-                      </tr>
-                    </table>
-                  </div>
-                </div>
-              </td>
-            </tr>
-            <tr class="encrH">
-              <td dir="ltr">End of encrypted message</td>
-            </tr>
-          </table>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/headeronly/openpgp-encrypted-attachment.mbox.html b/framework/src/domain/mimetreeparser/otp/autotests/data/headeronly/openpgp-encrypted-attachment.mbox.html
deleted file mode 100644
index d5e4550e..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/headeronly/openpgp-encrypted-attachment.mbox.html
+++ /dev/null
@@ -1,58 +0,0 @@
-<?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="encr">
-          <tr class="encrH">
-            <td dir="ltr">Encrypted message</td>
-          </tr>
-          <tr class="encrB">
-            <td>
-              <div style="position: relative; word-wrap: break-word">
-                <a name="att"/>
-                <div id="attachmentDiv">
-                  <table cellspacing="1" cellpadding="1" class="signOkKeyOk">
-                    <tr class="signOkKeyOkH">
-                      <td dir="ltr">
-                        <table cellspacing="0" cellpadding="0" width="100%">
-                          <tr>
-                            <td>Signed by <a href="mailto:test@kolab.org">test@kolab.org</a>.</td>
-                            <td align="right">
-                              <a href="kmail:showSignatureDetails">Show Details</a>
-                            </td>
-                          </tr>
-                        </table>
-                      </td>
-                    </tr>
-                    <tr class="signOkKeyOkB">
-                      <td>
-                        <a name="att1"/>
-                        <div id="attachmentDiv1">
-                          <a name="att1.1"/>
-                          <div id="attachmentDiv1.1">
-                            <div class="noquote">
-                              <div dir="ltr">test text</div>
-                            </div>
-                          </div>
-                        </div>
-                      </td>
-                    </tr>
-                    <tr class="signOkKeyOkH">
-                      <td dir="ltr">End of signed message</td>
-                    </tr>
-                  </table>
-                </div>
-              </div>
-            </td>
-          </tr>
-          <tr class="encrH">
-            <td dir="ltr">End of encrypted message</td>
-          </tr>
-        </table>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/headeronly/openpgp-encrypted-non-encrypted-attachment.mbox.html b/framework/src/domain/mimetreeparser/otp/autotests/data/headeronly/openpgp-encrypted-non-encrypted-attachment.mbox.html
deleted file mode 100644
index 73c4d2d7..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/headeronly/openpgp-encrypted-non-encrypted-attachment.mbox.html
+++ /dev/null
@@ -1,61 +0,0 @@
-<?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">
-          <table cellspacing="1" cellpadding="1" class="encr">
-            <tr class="encrH">
-              <td dir="ltr">Encrypted message</td>
-            </tr>
-            <tr class="encrB">
-              <td>
-                <div style="position: relative; word-wrap: break-word">
-                  <a name="att"/>
-                  <div id="attachmentDiv">
-                    <table cellspacing="1" cellpadding="1" class="signOkKeyOk">
-                      <tr class="signOkKeyOkH">
-                        <td dir="ltr">
-                          <table cellspacing="0" cellpadding="0" width="100%">
-                            <tr>
-                              <td>Signed by <a href="mailto:test@kolab.org">test@kolab.org</a>.</td>
-                              <td align="right">
-                                <a href="kmail:showSignatureDetails">Show Details</a>
-                              </td>
-                            </tr>
-                          </table>
-                        </td>
-                      </tr>
-                      <tr class="signOkKeyOkB">
-                        <td>
-                          <a name="att1"/>
-                          <div id="attachmentDiv1">
-                            <a name="att1.1"/>
-                            <div id="attachmentDiv1.1">
-                              <div class="noquote">
-                                <div dir="ltr">test text</div>
-                              </div>
-                            </div>
-                          </div>
-                        </td>
-                      </tr>
-                      <tr class="signOkKeyOkH">
-                        <td dir="ltr">End of signed message</td>
-                      </tr>
-                    </table>
-                  </div>
-                </div>
-              </td>
-            </tr>
-            <tr class="encrH">
-              <td dir="ltr">End of encrypted message</td>
-            </tr>
-          </table>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/headeronly/openpgp-encrypted-partially-signed-attachments.mbox.html b/framework/src/domain/mimetreeparser/otp/autotests/data/headeronly/openpgp-encrypted-partially-signed-attachments.mbox.html
deleted file mode 100644
index ebad7354..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/headeronly/openpgp-encrypted-partially-signed-attachments.mbox.html
+++ /dev/null
@@ -1,84 +0,0 @@
-<?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">
-          <table cellspacing="1" cellpadding="1" class="encr">
-            <tr class="encrH">
-              <td dir="ltr">Encrypted message</td>
-            </tr>
-            <tr class="encrB">
-              <td>
-                <div style="position: relative; word-wrap: break-word">
-                  <a name="att"/>
-                  <div id="attachmentDiv">
-                    <table cellspacing="1" cellpadding="1" class="signOkKeyOk">
-                      <tr class="signOkKeyOkH">
-                        <td dir="ltr">
-                          <table cellspacing="0" cellpadding="0" width="100%">
-                            <tr>
-                              <td>Signed by <a href="mailto:test@kolab.org">test@kolab.org</a>.</td>
-                              <td align="right">
-                                <a href="kmail:showSignatureDetails">Show Details</a>
-                              </td>
-                            </tr>
-                          </table>
-                        </td>
-                      </tr>
-                      <tr class="signOkKeyOkB">
-                        <td>
-                          <a name="att1"/>
-                          <div id="attachmentDiv1">
-                            <a name="att1.1"/>
-                            <div id="attachmentDiv1.1">
-                              <div class="noquote">
-                                <div dir="ltr">This is the main body.</div>
-                              </div>
-                            </div>
-                          </div>
-                        </td>
-                      </tr>
-                      <tr class="signOkKeyOkH">
-                        <td dir="ltr">End of signed message</td>
-                      </tr>
-                    </table>
-                  </div>
-                </div>
-              </td>
-            </tr>
-            <tr class="encrH">
-              <td dir="ltr">End of encrypted message</td>
-            </tr>
-          </table>
-        </div>
-        <a name="att2"/>
-        <div id="attachmentDiv2">
-          <table cellspacing="1" cellpadding="1" class="encr">
-            <tr class="encrH">
-              <td dir="ltr">Encrypted message</td>
-            </tr>
-            <tr class="encrB">
-              <td>
-                <div style="position: relative; word-wrap: break-word">
-                  <a name="att"/>
-                  <div id="attachmentDiv">
-                    <div class="noquote">
-                      <div dir="ltr">This is an unsigned attachment.</div>
-                    </div>
-                  </div>
-                </div>
-              </td>
-            </tr>
-            <tr class="encrH">
-              <td dir="ltr">End of encrypted message</td>
-            </tr>
-          </table>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/headeronly/openpgp-encrypted-two-attachments.mbox.html b/framework/src/domain/mimetreeparser/otp/autotests/data/headeronly/openpgp-encrypted-two-attachments.mbox.html
deleted file mode 100644
index 4cdeaa63..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/headeronly/openpgp-encrypted-two-attachments.mbox.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<?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="encr">
-          <tr class="encrH">
-            <td dir="ltr">Encrypted message</td>
-          </tr>
-          <tr class="encrB">
-            <td>
-              <div style="position: relative; word-wrap: break-word">
-                <a name="att"/>
-                <div id="attachmentDiv">
-                  <a name="att1"/>
-                  <div id="attachmentDiv1">
-                    <div class="noquote">
-                      <div dir="ltr">this is the main body part</div>
-                    </div>
-                  </div>
-                </div>
-              </div>
-            </td>
-          </tr>
-          <tr class="encrH">
-            <td dir="ltr">End of encrypted message</td>
-          </tr>
-        </table>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/headeronly/openpgp-signed-apple.mbox.html b/framework/src/domain/mimetreeparser/otp/autotests/data/headeronly/openpgp-signed-apple.mbox.html
deleted file mode 100644
index 330b02a1..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/headeronly/openpgp-signed-apple.mbox.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<?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 style="position: relative">
-                      <div class="">pre attachment</div>
-                    </div>
-                  </div>
-                  <a name="att1.2.3"/>
-                  <div id="attachmentDiv1.2.3">
-                    <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/framework/src/domain/mimetreeparser/otp/autotests/data/headeronly/openpgp-signed-encrypted-two-attachments.mbox.html b/framework/src/domain/mimetreeparser/otp/autotests/data/headeronly/openpgp-signed-encrypted-two-attachments.mbox.html
deleted file mode 100644
index 83b7a66c..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/headeronly/openpgp-signed-encrypted-two-attachments.mbox.html
+++ /dev/null
@@ -1,58 +0,0 @@
-<?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="encr">
-          <tr class="encrH">
-            <td dir="ltr">Encrypted message</td>
-          </tr>
-          <tr class="encrB">
-            <td>
-              <div style="position: relative; word-wrap: break-word">
-                <a name="att"/>
-                <div id="attachmentDiv">
-                  <table cellspacing="1" cellpadding="1" class="signOkKeyOk">
-                    <tr class="signOkKeyOkH">
-                      <td dir="ltr">
-                        <table cellspacing="0" cellpadding="0" width="100%">
-                          <tr>
-                            <td>Signed by <a href="mailto:test@kolab.org">test@kolab.org</a>.</td>
-                            <td align="right">
-                              <a href="kmail:showSignatureDetails">Show Details</a>
-                            </td>
-                          </tr>
-                        </table>
-                      </td>
-                    </tr>
-                    <tr class="signOkKeyOkB">
-                      <td>
-                        <a name="att1"/>
-                        <div id="attachmentDiv1">
-                          <a name="att1.1"/>
-                          <div id="attachmentDiv1.1">
-                            <div class="noquote">
-                              <div dir="ltr">this is the main body</div>
-                            </div>
-                          </div>
-                        </div>
-                      </td>
-                    </tr>
-                    <tr class="signOkKeyOkH">
-                      <td dir="ltr">End of signed message</td>
-                    </tr>
-                  </table>
-                </div>
-              </div>
-            </td>
-          </tr>
-          <tr class="encrH">
-            <td dir="ltr">End of encrypted message</td>
-          </tr>
-        </table>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/headeronly/openpgp-signed-mailinglist+additional-children.mbox.html b/framework/src/domain/mimetreeparser/otp/autotests/data/headeronly/openpgp-signed-mailinglist+additional-children.mbox.html
deleted file mode 100644
index 25b1ad04..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/headeronly/openpgp-signed-mailinglist+additional-children.mbox.html
+++ /dev/null
@@ -1,52 +0,0 @@
-<?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.1"/>
-          <div id="attachmentDiv1.1">
-            <div class="noquote">
-              <div dir="ltr">hi..</div>
-              <br/>
-              <div dir="ltr">i noticed a new branch when i pulled kde-workspace today (finally!):&nbsp;</div>
-              <div dir="ltr">activities_optional</div>
-              <br/>
-              <div dir="ltr">the lone commit in it was pushed on april 1, so maybe it's an april fools&nbsp;</div>
-              <div dir="ltr">joke, but if it isn't, it looks like someone is trying to do something that&nbsp;</div>
-              <div dir="ltr">makes no sense (and has no chance of being merged into master). so if this is&nbsp;</div>
-              <div dir="ltr">a "for reals" branch, perhaps the motivation behind it can be shared?</div>
-              <br/>
-              <div dir="ltr">--&nbsp;</div>
-              <div dir="ltr">Aaron J. Seigo</div>
-            </div>
-          </div>
-          <a name="att1.2"/>
-          <div id="attachmentDiv1.2">
-            <hr/>
-            <div>
-              <a href="attachment:1.2?place=body"><img align="center" height="48" width="48" src="file:application-pgp-signature.svg" border="0" style="max-width: 100%" alt=""/>signature.asc</a>
-            </div>
-            <div>This is a digitally signed message part.</div>
-          </div>
-        </div>
-        <a name="att2"/>
-        <div id="attachmentDiv2">
-          <div class="noquote">
-            <div dir="ltr">_______________________________________________</div>
-            <div dir="ltr">Plasma-devel mailing list</div>
-            <div dir="ltr">
-              <a href="mailto:Plasma-devel@kde.org">Plasma-devel@kde.org</a>
-            </div>
-            <div dir="ltr">
-              <a href="https://mail.kde.org/mailman/listinfo/plasma-devel">https://mail.kde.org/mailman/listinfo/plasma-devel</a>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/headeronly/openpgp-signed-no-protocol.mbox.html b/framework/src/domain/mimetreeparser/otp/autotests/data/headeronly/openpgp-signed-no-protocol.mbox.html
deleted file mode 100644
index bdac52b6..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/headeronly/openpgp-signed-no-protocol.mbox.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<?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="noquote">
-            <div dir="ltr">hi..</div>
-            <br/>
-            <div dir="ltr">i noticed a new branch when i pulled kde-workspace today (finally!):&nbsp;</div>
-            <div dir="ltr">activities_optional</div>
-            <br/>
-            <div dir="ltr">the lone commit in it was pushed on april 1, so maybe it's an april fools&nbsp;</div>
-            <div dir="ltr">joke, but if it isn't, it looks like someone is trying to do something that&nbsp;</div>
-            <div dir="ltr">makes no sense (and has no chance of being merged into master). so if this is&nbsp;</div>
-            <div dir="ltr">a "for reals" branch, perhaps the motivation behind it can be shared?</div>
-            <br/>
-            <div dir="ltr">--&nbsp;</div>
-            <div dir="ltr">Aaron J. Seigo</div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/headeronly/openpgp-signed-two-attachments.mbox.html b/framework/src/domain/mimetreeparser/otp/autotests/data/headeronly/openpgp-signed-two-attachments.mbox.html
deleted file mode 100644
index 027097f7..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/headeronly/openpgp-signed-two-attachments.mbox.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<?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="signOkKeyOk">
-          <tr class="signOkKeyOkH">
-            <td dir="ltr">
-              <table cellspacing="0" cellpadding="0" width="100%">
-                <tr>
-                  <td>Signed by <a href="mailto:test@kolab.org">test@kolab.org</a>.</td>
-                  <td align="right">
-                    <a href="kmail:showSignatureDetails">Show Details</a>
-                  </td>
-                </tr>
-              </table>
-            </td>
-          </tr>
-          <tr class="signOkKeyOkB">
-            <td>
-              <a name="att1"/>
-              <div id="attachmentDiv1">
-                <a name="att1.1"/>
-                <div id="attachmentDiv1.1">
-                  <div class="noquote">
-                    <div dir="ltr">this is the main body text</div>
-                  </div>
-                </div>
-              </div>
-            </td>
-          </tr>
-          <tr class="signOkKeyOkH">
-            <td dir="ltr">End of signed message</td>
-          </tr>
-        </table>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/headeronly/smime-signed-apple.mbox.html b/framework/src/domain/mimetreeparser/otp/autotests/data/headeronly/smime-signed-apple.mbox.html
deleted file mode 100644
index 9554bb39..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/headeronly/smime-signed-apple.mbox.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<?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>
-                  <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/framework/src/domain/mimetreeparser/otp/autotests/data/hidden/encapsulated-with-attachment.mbox.html b/framework/src/domain/mimetreeparser/otp/autotests/data/hidden/encapsulated-with-attachment.mbox.html
deleted file mode 100644
index 42f5ecd7..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/hidden/encapsulated-with-attachment.mbox.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<?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="noquote">
-            <div dir="ltr">This is the first encapsulating message.</div>
-          </div>
-        </div>
-        <a name="att2"/>
-        <div id="attachmentDiv2">
-          <table cellspacing="1" cellpadding="1" class="rfc822">
-            <tr class="rfc822H">
-              <td dir="ltr">
-                <a href="attachment:2.1?place=body">Encapsulated message</a>
-              </td>
-            </tr>
-            <tr class="rfc822B">
-              <td>
-                <a name="att2.1"/>
-                <div id="attachmentDiv2.1">
-                  <a name="att2.1.1"/>
-                  <div id="attachmentDiv2.1.1">
-                    <div class="noquote">
-                      <div dir="ltr">This is the second encapsulated message.</div>
-                    </div>
-                  </div>
-                </div>
-              </td>
-            </tr>
-            <tr class="rfc822H">
-              <td dir="ltr">End of encapsulated message</td>
-            </tr>
-          </table>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/hidden/openpgp-encrypted-attachment-and-non-encrypted-attachment.mbox.html b/framework/src/domain/mimetreeparser/otp/autotests/data/hidden/openpgp-encrypted-attachment-and-non-encrypted-attachment.mbox.html
deleted file mode 100644
index 73c4d2d7..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/hidden/openpgp-encrypted-attachment-and-non-encrypted-attachment.mbox.html
+++ /dev/null
@@ -1,61 +0,0 @@
-<?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">
-          <table cellspacing="1" cellpadding="1" class="encr">
-            <tr class="encrH">
-              <td dir="ltr">Encrypted message</td>
-            </tr>
-            <tr class="encrB">
-              <td>
-                <div style="position: relative; word-wrap: break-word">
-                  <a name="att"/>
-                  <div id="attachmentDiv">
-                    <table cellspacing="1" cellpadding="1" class="signOkKeyOk">
-                      <tr class="signOkKeyOkH">
-                        <td dir="ltr">
-                          <table cellspacing="0" cellpadding="0" width="100%">
-                            <tr>
-                              <td>Signed by <a href="mailto:test@kolab.org">test@kolab.org</a>.</td>
-                              <td align="right">
-                                <a href="kmail:showSignatureDetails">Show Details</a>
-                              </td>
-                            </tr>
-                          </table>
-                        </td>
-                      </tr>
-                      <tr class="signOkKeyOkB">
-                        <td>
-                          <a name="att1"/>
-                          <div id="attachmentDiv1">
-                            <a name="att1.1"/>
-                            <div id="attachmentDiv1.1">
-                              <div class="noquote">
-                                <div dir="ltr">test text</div>
-                              </div>
-                            </div>
-                          </div>
-                        </td>
-                      </tr>
-                      <tr class="signOkKeyOkH">
-                        <td dir="ltr">End of signed message</td>
-                      </tr>
-                    </table>
-                  </div>
-                </div>
-              </td>
-            </tr>
-            <tr class="encrH">
-              <td dir="ltr">End of encrypted message</td>
-            </tr>
-          </table>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/hidden/openpgp-encrypted-attachment.mbox.html b/framework/src/domain/mimetreeparser/otp/autotests/data/hidden/openpgp-encrypted-attachment.mbox.html
deleted file mode 100644
index d5e4550e..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/hidden/openpgp-encrypted-attachment.mbox.html
+++ /dev/null
@@ -1,58 +0,0 @@
-<?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="encr">
-          <tr class="encrH">
-            <td dir="ltr">Encrypted message</td>
-          </tr>
-          <tr class="encrB">
-            <td>
-              <div style="position: relative; word-wrap: break-word">
-                <a name="att"/>
-                <div id="attachmentDiv">
-                  <table cellspacing="1" cellpadding="1" class="signOkKeyOk">
-                    <tr class="signOkKeyOkH">
-                      <td dir="ltr">
-                        <table cellspacing="0" cellpadding="0" width="100%">
-                          <tr>
-                            <td>Signed by <a href="mailto:test@kolab.org">test@kolab.org</a>.</td>
-                            <td align="right">
-                              <a href="kmail:showSignatureDetails">Show Details</a>
-                            </td>
-                          </tr>
-                        </table>
-                      </td>
-                    </tr>
-                    <tr class="signOkKeyOkB">
-                      <td>
-                        <a name="att1"/>
-                        <div id="attachmentDiv1">
-                          <a name="att1.1"/>
-                          <div id="attachmentDiv1.1">
-                            <div class="noquote">
-                              <div dir="ltr">test text</div>
-                            </div>
-                          </div>
-                        </div>
-                      </td>
-                    </tr>
-                    <tr class="signOkKeyOkH">
-                      <td dir="ltr">End of signed message</td>
-                    </tr>
-                  </table>
-                </div>
-              </div>
-            </td>
-          </tr>
-          <tr class="encrH">
-            <td dir="ltr">End of encrypted message</td>
-          </tr>
-        </table>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/hidden/openpgp-encrypted-noData.mbox.html b/framework/src/domain/mimetreeparser/otp/autotests/data/hidden/openpgp-encrypted-noData.mbox.html
deleted file mode 100644
index 166812fe..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/hidden/openpgp-encrypted-noData.mbox.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<?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>
-  </body>
-</html>
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/hidden/openpgp-encrypted-non-encrypted-attachment.mbox.html b/framework/src/domain/mimetreeparser/otp/autotests/data/hidden/openpgp-encrypted-non-encrypted-attachment.mbox.html
deleted file mode 100644
index 73c4d2d7..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/hidden/openpgp-encrypted-non-encrypted-attachment.mbox.html
+++ /dev/null
@@ -1,61 +0,0 @@
-<?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">
-          <table cellspacing="1" cellpadding="1" class="encr">
-            <tr class="encrH">
-              <td dir="ltr">Encrypted message</td>
-            </tr>
-            <tr class="encrB">
-              <td>
-                <div style="position: relative; word-wrap: break-word">
-                  <a name="att"/>
-                  <div id="attachmentDiv">
-                    <table cellspacing="1" cellpadding="1" class="signOkKeyOk">
-                      <tr class="signOkKeyOkH">
-                        <td dir="ltr">
-                          <table cellspacing="0" cellpadding="0" width="100%">
-                            <tr>
-                              <td>Signed by <a href="mailto:test@kolab.org">test@kolab.org</a>.</td>
-                              <td align="right">
-                                <a href="kmail:showSignatureDetails">Show Details</a>
-                              </td>
-                            </tr>
-                          </table>
-                        </td>
-                      </tr>
-                      <tr class="signOkKeyOkB">
-                        <td>
-                          <a name="att1"/>
-                          <div id="attachmentDiv1">
-                            <a name="att1.1"/>
-                            <div id="attachmentDiv1.1">
-                              <div class="noquote">
-                                <div dir="ltr">test text</div>
-                              </div>
-                            </div>
-                          </div>
-                        </td>
-                      </tr>
-                      <tr class="signOkKeyOkH">
-                        <td dir="ltr">End of signed message</td>
-                      </tr>
-                    </table>
-                  </div>
-                </div>
-              </td>
-            </tr>
-            <tr class="encrH">
-              <td dir="ltr">End of encrypted message</td>
-            </tr>
-          </table>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/hidden/openpgp-encrypted-partially-signed-attachments.mbox.html b/framework/src/domain/mimetreeparser/otp/autotests/data/hidden/openpgp-encrypted-partially-signed-attachments.mbox.html
deleted file mode 100644
index ebad7354..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/hidden/openpgp-encrypted-partially-signed-attachments.mbox.html
+++ /dev/null
@@ -1,84 +0,0 @@
-<?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">
-          <table cellspacing="1" cellpadding="1" class="encr">
-            <tr class="encrH">
-              <td dir="ltr">Encrypted message</td>
-            </tr>
-            <tr class="encrB">
-              <td>
-                <div style="position: relative; word-wrap: break-word">
-                  <a name="att"/>
-                  <div id="attachmentDiv">
-                    <table cellspacing="1" cellpadding="1" class="signOkKeyOk">
-                      <tr class="signOkKeyOkH">
-                        <td dir="ltr">
-                          <table cellspacing="0" cellpadding="0" width="100%">
-                            <tr>
-                              <td>Signed by <a href="mailto:test@kolab.org">test@kolab.org</a>.</td>
-                              <td align="right">
-                                <a href="kmail:showSignatureDetails">Show Details</a>
-                              </td>
-                            </tr>
-                          </table>
-                        </td>
-                      </tr>
-                      <tr class="signOkKeyOkB">
-                        <td>
-                          <a name="att1"/>
-                          <div id="attachmentDiv1">
-                            <a name="att1.1"/>
-                            <div id="attachmentDiv1.1">
-                              <div class="noquote">
-                                <div dir="ltr">This is the main body.</div>
-                              </div>
-                            </div>
-                          </div>
-                        </td>
-                      </tr>
-                      <tr class="signOkKeyOkH">
-                        <td dir="ltr">End of signed message</td>
-                      </tr>
-                    </table>
-                  </div>
-                </div>
-              </td>
-            </tr>
-            <tr class="encrH">
-              <td dir="ltr">End of encrypted message</td>
-            </tr>
-          </table>
-        </div>
-        <a name="att2"/>
-        <div id="attachmentDiv2">
-          <table cellspacing="1" cellpadding="1" class="encr">
-            <tr class="encrH">
-              <td dir="ltr">Encrypted message</td>
-            </tr>
-            <tr class="encrB">
-              <td>
-                <div style="position: relative; word-wrap: break-word">
-                  <a name="att"/>
-                  <div id="attachmentDiv">
-                    <div class="noquote">
-                      <div dir="ltr">This is an unsigned attachment.</div>
-                    </div>
-                  </div>
-                </div>
-              </td>
-            </tr>
-            <tr class="encrH">
-              <td dir="ltr">End of encrypted message</td>
-            </tr>
-          </table>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/hidden/openpgp-encrypted-two-attachments.mbox.html b/framework/src/domain/mimetreeparser/otp/autotests/data/hidden/openpgp-encrypted-two-attachments.mbox.html
deleted file mode 100644
index 4cdeaa63..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/hidden/openpgp-encrypted-two-attachments.mbox.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<?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="encr">
-          <tr class="encrH">
-            <td dir="ltr">Encrypted message</td>
-          </tr>
-          <tr class="encrB">
-            <td>
-              <div style="position: relative; word-wrap: break-word">
-                <a name="att"/>
-                <div id="attachmentDiv">
-                  <a name="att1"/>
-                  <div id="attachmentDiv1">
-                    <div class="noquote">
-                      <div dir="ltr">this is the main body part</div>
-                    </div>
-                  </div>
-                </div>
-              </div>
-            </td>
-          </tr>
-          <tr class="encrH">
-            <td dir="ltr">End of encrypted message</td>
-          </tr>
-        </table>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/hidden/openpgp-signed-apple.mbox.html b/framework/src/domain/mimetreeparser/otp/autotests/data/hidden/openpgp-signed-apple.mbox.html
deleted file mode 100644
index 330b02a1..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/hidden/openpgp-signed-apple.mbox.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<?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 style="position: relative">
-                      <div class="">pre attachment</div>
-                    </div>
-                  </div>
-                  <a name="att1.2.3"/>
-                  <div id="attachmentDiv1.2.3">
-                    <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/framework/src/domain/mimetreeparser/otp/autotests/data/hidden/openpgp-signed-encrypted-two-attachments.mbox.html b/framework/src/domain/mimetreeparser/otp/autotests/data/hidden/openpgp-signed-encrypted-two-attachments.mbox.html
deleted file mode 100644
index 83b7a66c..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/hidden/openpgp-signed-encrypted-two-attachments.mbox.html
+++ /dev/null
@@ -1,58 +0,0 @@
-<?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="encr">
-          <tr class="encrH">
-            <td dir="ltr">Encrypted message</td>
-          </tr>
-          <tr class="encrB">
-            <td>
-              <div style="position: relative; word-wrap: break-word">
-                <a name="att"/>
-                <div id="attachmentDiv">
-                  <table cellspacing="1" cellpadding="1" class="signOkKeyOk">
-                    <tr class="signOkKeyOkH">
-                      <td dir="ltr">
-                        <table cellspacing="0" cellpadding="0" width="100%">
-                          <tr>
-                            <td>Signed by <a href="mailto:test@kolab.org">test@kolab.org</a>.</td>
-                            <td align="right">
-                              <a href="kmail:showSignatureDetails">Show Details</a>
-                            </td>
-                          </tr>
-                        </table>
-                      </td>
-                    </tr>
-                    <tr class="signOkKeyOkB">
-                      <td>
-                        <a name="att1"/>
-                        <div id="attachmentDiv1">
-                          <a name="att1.1"/>
-                          <div id="attachmentDiv1.1">
-                            <div class="noquote">
-                              <div dir="ltr">this is the main body</div>
-                            </div>
-                          </div>
-                        </div>
-                      </td>
-                    </tr>
-                    <tr class="signOkKeyOkH">
-                      <td dir="ltr">End of signed message</td>
-                    </tr>
-                  </table>
-                </div>
-              </div>
-            </td>
-          </tr>
-          <tr class="encrH">
-            <td dir="ltr">End of encrypted message</td>
-          </tr>
-        </table>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/hidden/openpgp-signed-mailinglist+additional-children.mbox.html b/framework/src/domain/mimetreeparser/otp/autotests/data/hidden/openpgp-signed-mailinglist+additional-children.mbox.html
deleted file mode 100644
index 1f0da385..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/hidden/openpgp-signed-mailinglist+additional-children.mbox.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<?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.1"/>
-          <div id="attachmentDiv1.1">
-            <div class="noquote">
-              <div dir="ltr">hi..</div>
-              <br/>
-              <div dir="ltr">i noticed a new branch when i pulled kde-workspace today (finally!):&nbsp;</div>
-              <div dir="ltr">activities_optional</div>
-              <br/>
-              <div dir="ltr">the lone commit in it was pushed on april 1, so maybe it's an april fools&nbsp;</div>
-              <div dir="ltr">joke, but if it isn't, it looks like someone is trying to do something that&nbsp;</div>
-              <div dir="ltr">makes no sense (and has no chance of being merged into master). so if this is&nbsp;</div>
-              <div dir="ltr">a "for reals" branch, perhaps the motivation behind it can be shared?</div>
-              <br/>
-              <div dir="ltr">--&nbsp;</div>
-              <div dir="ltr">Aaron J. Seigo</div>
-            </div>
-          </div>
-        </div>
-        <a name="att2"/>
-        <div id="attachmentDiv2">
-          <div class="noquote">
-            <div dir="ltr">_______________________________________________</div>
-            <div dir="ltr">Plasma-devel mailing list</div>
-            <div dir="ltr">
-              <a href="mailto:Plasma-devel@kde.org">Plasma-devel@kde.org</a>
-            </div>
-            <div dir="ltr">
-              <a href="https://mail.kde.org/mailman/listinfo/plasma-devel">https://mail.kde.org/mailman/listinfo/plasma-devel</a>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/hidden/openpgp-signed-no-protocol.mbox.html b/framework/src/domain/mimetreeparser/otp/autotests/data/hidden/openpgp-signed-no-protocol.mbox.html
deleted file mode 100644
index bdac52b6..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/hidden/openpgp-signed-no-protocol.mbox.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<?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="noquote">
-            <div dir="ltr">hi..</div>
-            <br/>
-            <div dir="ltr">i noticed a new branch when i pulled kde-workspace today (finally!):&nbsp;</div>
-            <div dir="ltr">activities_optional</div>
-            <br/>
-            <div dir="ltr">the lone commit in it was pushed on april 1, so maybe it's an april fools&nbsp;</div>
-            <div dir="ltr">joke, but if it isn't, it looks like someone is trying to do something that&nbsp;</div>
-            <div dir="ltr">makes no sense (and has no chance of being merged into master). so if this is&nbsp;</div>
-            <div dir="ltr">a "for reals" branch, perhaps the motivation behind it can be shared?</div>
-            <br/>
-            <div dir="ltr">--&nbsp;</div>
-            <div dir="ltr">Aaron J. Seigo</div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/hidden/openpgp-signed-two-attachments.mbox.html b/framework/src/domain/mimetreeparser/otp/autotests/data/hidden/openpgp-signed-two-attachments.mbox.html
deleted file mode 100644
index 027097f7..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/hidden/openpgp-signed-two-attachments.mbox.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<?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="signOkKeyOk">
-          <tr class="signOkKeyOkH">
-            <td dir="ltr">
-              <table cellspacing="0" cellpadding="0" width="100%">
-                <tr>
-                  <td>Signed by <a href="mailto:test@kolab.org">test@kolab.org</a>.</td>
-                  <td align="right">
-                    <a href="kmail:showSignatureDetails">Show Details</a>
-                  </td>
-                </tr>
-              </table>
-            </td>
-          </tr>
-          <tr class="signOkKeyOkB">
-            <td>
-              <a name="att1"/>
-              <div id="attachmentDiv1">
-                <a name="att1.1"/>
-                <div id="attachmentDiv1.1">
-                  <div class="noquote">
-                    <div dir="ltr">this is the main body text</div>
-                  </div>
-                </div>
-              </div>
-            </td>
-          </tr>
-          <tr class="signOkKeyOkH">
-            <td dir="ltr">End of signed message</td>
-          </tr>
-        </table>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/hidden/smime-signed-apple.mbox.html b/framework/src/domain/mimetreeparser/otp/autotests/data/hidden/smime-signed-apple.mbox.html
deleted file mode 100644
index 9554bb39..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/hidden/smime-signed-apple.mbox.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<?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>
-                  <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/framework/src/domain/mimetreeparser/otp/autotests/data/html.mbox b/framework/src/domain/mimetreeparser/otp/autotests/data/html.mbox
deleted file mode 100644
index eebd4283..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/html.mbox
+++ /dev/null
@@ -1,31 +0,0 @@
-From foo@example.com Thu, 26 May 2011 01:16:54 +0100
-From: Thomas McGuire <foo@example.com>
-Subject: HTML test
-Date: Thu, 26 May 2011 01:16:54 +0100
-Message-ID: <1501334.pROlBb7MZF@herrwackelpudding.localhost>
-X-KMail-Transport: GMX
-X-KMail-Fcc: 28
-X-KMail-Drafts: 7
-X-KMail-Templates: 9
-User-Agent: KMail/4.6 beta5 (Linux/2.6.34.7-0.7-desktop; KDE/4.6.41; x86_64; git-0269848; 2011-04-19)
-MIME-Version: 1.0
-Content-Type: multipart/alternative; boundary="nextPart8606278.tpV19BTJKu"
-Content-Transfer-Encoding: 7Bit
-
-
---nextPart8606278.tpV19BTJKu
-Content-Transfer-Encoding: 7Bit
-Content-Type: text/plain; charset="windows-1252"
-
-Some HTML text
---nextPart8606278.tpV19BTJKu
-Content-Transfer-Encoding: 7Bit
-Content-Type: text/html; charset="windows-1252"
-
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<html><head><meta name="qrichtext" content="1" /><style type="text/css">
-p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;">
-<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></body></html>
---nextPart8606278.tpV19BTJKu--
-
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/html.mbox.html b/framework/src/domain/mimetreeparser/otp/autotests/data/html.mbox.html
deleted file mode 100644
index 2fe886f1..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/html.mbox.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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 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/framework/src/domain/mimetreeparser/otp/autotests/data/html.mbox.tree b/framework/src/domain/mimetreeparser/otp/autotests/data/html.mbox.tree
deleted file mode 100644
index 0de07281..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/html.mbox.tree
+++ /dev/null
@@ -1,2 +0,0 @@
- * MimeTreeParser::MessagePartList
-  * MimeTreeParser::AlternativeMessagePart
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/htmlonly.mbox b/framework/src/domain/mimetreeparser/otp/autotests/data/htmlonly.mbox
deleted file mode 100644
index e45b1c4d..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/htmlonly.mbox
+++ /dev/null
@@ -1,21 +0,0 @@
-From foo@example.com Thu, 26 May 2011 01:16:54 +0100
-From: Thomas McGuire <foo@example.com>
-Subject: HTML test
-Date: Thu, 26 May 2011 01:16:54 +0100
-Message-ID: <1501334.pROlBb7MZF@herrwackelpudding.localhost>
-X-KMail-Transport: GMX
-X-KMail-Fcc: 28
-X-KMail-Drafts: 7
-X-KMail-Templates: 9
-User-Agent: KMail/4.6 beta5 (Linux/2.6.34.7-0.7-desktop; KDE/4.6.41; x86_64; git-0269848; 2011-04-19)
-MIME-Version: 1.0
-Content-Type: text/html
-Content-Transfer-Encoding: 7Bit
-
-<html>
-<head>
-</head>
-<body>
-<b>SOME</b> HTML text.
-</body>
-</html>
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/htmlonly.mbox.html b/framework/src/domain/mimetreeparser/otp/autotests/data/htmlonly.mbox.html
deleted file mode 100644
index 1143f2cf..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/htmlonly.mbox.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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 style="position: relative"><b>SOME</b> HTML text.</div>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/htmlonly.mbox.tree b/framework/src/domain/mimetreeparser/otp/autotests/data/htmlonly.mbox.tree
deleted file mode 100644
index a4c3191b..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/htmlonly.mbox.tree
+++ /dev/null
@@ -1,2 +0,0 @@
- * MimeTreeParser::MessagePartList
-  * MimeTreeParser::HtmlMessagePart
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/htmlonlyexternal.mbox b/framework/src/domain/mimetreeparser/otp/autotests/data/htmlonlyexternal.mbox
deleted file mode 100644
index 4eb3e2c3..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/htmlonlyexternal.mbox
+++ /dev/null
@@ -1,21 +0,0 @@
-From foo@example.com Thu, 26 May 2011 01:16:54 +0100
-From: Thomas McGuire <foo@example.com>
-Subject: HTML test
-Date: Thu, 26 May 2011 01:16:54 +0100
-Message-ID: <1501334.pROlBb7MZF@herrwackelpudding.localhost>
-X-KMail-Transport: GMX
-X-KMail-Fcc: 28
-X-KMail-Drafts: 7
-X-KMail-Templates: 9
-User-Agent: KMail/4.6 beta5 (Linux/2.6.34.7-0.7-desktop; KDE/4.6.41; x86_64; git-0269848; 2011-04-19)
-MIME-Version: 1.0
-Content-Type: text/html
-Content-Transfer-Encoding: 7Bit
-
-<html>
-<head>
-</head>
-<body>
-<b>SOME</b> HTML text. <img src="http://example.org/test.img" >
-</body>
-</html>
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/iconic/openpgp-encrypted-partially-signed-attachments.mbox.html b/framework/src/domain/mimetreeparser/otp/autotests/data/iconic/openpgp-encrypted-partially-signed-attachments.mbox.html
deleted file mode 100644
index b6f734c2..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/iconic/openpgp-encrypted-partially-signed-attachments.mbox.html
+++ /dev/null
@@ -1,92 +0,0 @@
-<?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">
-          <table cellspacing="1" cellpadding="1" class="encr">
-            <tr class="encrH">
-              <td dir="ltr">Encrypted message</td>
-            </tr>
-            <tr class="encrB">
-              <td>
-                <div style="position: relative; word-wrap: break-word">
-                  <a name="att"/>
-                  <div id="attachmentDiv">
-                    <table cellspacing="1" cellpadding="1" class="signOkKeyOk">
-                      <tr class="signOkKeyOkH">
-                        <td dir="ltr">
-                          <table cellspacing="0" cellpadding="0" width="100%">
-                            <tr>
-                              <td>Signed by <a href="mailto:test@kolab.org">test@kolab.org</a>.</td>
-                              <td align="right">
-                                <a href="kmail:showSignatureDetails">Show Details</a>
-                              </td>
-                            </tr>
-                          </table>
-                        </td>
-                      </tr>
-                      <tr class="signOkKeyOkB">
-                        <td>
-                          <a name="att1"/>
-                          <div id="attachmentDiv1">
-                            <a name="att1.1"/>
-                            <div id="attachmentDiv1.1">
-                              <div class="noquote">
-                                <div dir="ltr">This is the main body.</div>
-                              </div>
-                            </div>
-                            <a name="att1.2"/>
-                            <div id="attachmentDiv1.2">
-                              <hr/>
-                              <div>
-                                <a href="attachment:1:e0:1.2?place=body"><img align="center" height="48" width="48" src="file:text-plain.svg" border="0" style="max-width: 100%" alt=""/>attachment1.txt</a>
-                              </div>
-                              <div/>
-                            </div>
-                          </div>
-                        </td>
-                      </tr>
-                      <tr class="signOkKeyOkH">
-                        <td dir="ltr">End of signed message</td>
-                      </tr>
-                    </table>
-                  </div>
-                </div>
-              </td>
-            </tr>
-            <tr class="encrH">
-              <td dir="ltr">End of encrypted message</td>
-            </tr>
-          </table>
-        </div>
-        <a name="att2"/>
-        <div id="attachmentDiv2">
-          <table cellspacing="1" cellpadding="1" class="encr">
-            <tr class="encrH">
-              <td dir="ltr">Encrypted message</td>
-            </tr>
-            <tr class="encrB">
-              <td>
-                <div style="position: relative; word-wrap: break-word">
-                  <a name="att"/>
-                  <div id="attachmentDiv">
-                    <div class="noquote">
-                      <div dir="ltr">This is an unsigned attachment.</div>
-                    </div>
-                  </div>
-                </div>
-              </td>
-            </tr>
-            <tr class="encrH">
-              <td dir="ltr">End of encrypted message</td>
-            </tr>
-          </table>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/iconic/openpgp-encrypted-two-attachments.mbox.html b/framework/src/domain/mimetreeparser/otp/autotests/data/iconic/openpgp-encrypted-two-attachments.mbox.html
deleted file mode 100644
index 7f0b7abd..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/iconic/openpgp-encrypted-two-attachments.mbox.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<?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="encr">
-          <tr class="encrH">
-            <td dir="ltr">Encrypted message</td>
-          </tr>
-          <tr class="encrB">
-            <td>
-              <div style="position: relative; word-wrap: break-word">
-                <a name="att"/>
-                <div id="attachmentDiv">
-                  <a name="att1"/>
-                  <div id="attachmentDiv1">
-                    <div class="noquote">
-                      <div dir="ltr">this is the main body part</div>
-                    </div>
-                  </div>
-                  <a name="att2"/>
-                  <div id="attachmentDiv2">
-                    <hr/>
-                    <div>
-                      <a href="attachment:e0:2?place=body"><img align="center" height="48" width="48" src="file:text-plain.svg" border="0" style="max-width: 100%" alt=""/>attachment1.txt</a>
-                    </div>
-                    <div/>
-                  </div>
-                  <a name="att3"/>
-                  <div id="attachmentDiv3">
-                    <hr/>
-                    <div>
-                      <a href="attachment:e0:3?place=body"><img align="center" height="48" width="48" src="file:text-plain.svg" border="0" style="max-width: 100%" alt=""/>attachment2.txt</a>
-                    </div>
-                    <div/>
-                  </div>
-                </div>
-              </div>
-            </td>
-          </tr>
-          <tr class="encrH">
-            <td dir="ltr">End of encrypted message</td>
-          </tr>
-        </table>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/iconic/openpgp-signed-encrypted-two-attachments.mbox.html b/framework/src/domain/mimetreeparser/otp/autotests/data/iconic/openpgp-signed-encrypted-two-attachments.mbox.html
deleted file mode 100644
index 8d6b5814..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/iconic/openpgp-signed-encrypted-two-attachments.mbox.html
+++ /dev/null
@@ -1,74 +0,0 @@
-<?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="encr">
-          <tr class="encrH">
-            <td dir="ltr">Encrypted message</td>
-          </tr>
-          <tr class="encrB">
-            <td>
-              <div style="position: relative; word-wrap: break-word">
-                <a name="att"/>
-                <div id="attachmentDiv">
-                  <table cellspacing="1" cellpadding="1" class="signOkKeyOk">
-                    <tr class="signOkKeyOkH">
-                      <td dir="ltr">
-                        <table cellspacing="0" cellpadding="0" width="100%">
-                          <tr>
-                            <td>Signed by <a href="mailto:test@kolab.org">test@kolab.org</a>.</td>
-                            <td align="right">
-                              <a href="kmail:showSignatureDetails">Show Details</a>
-                            </td>
-                          </tr>
-                        </table>
-                      </td>
-                    </tr>
-                    <tr class="signOkKeyOkB">
-                      <td>
-                        <a name="att1"/>
-                        <div id="attachmentDiv1">
-                          <a name="att1.1"/>
-                          <div id="attachmentDiv1.1">
-                            <div class="noquote">
-                              <div dir="ltr">this is the main body</div>
-                            </div>
-                          </div>
-                          <a name="att1.2"/>
-                          <div id="attachmentDiv1.2">
-                            <hr/>
-                            <div>
-                              <a href="attachment:e0:1.2?place=body"><img align="center" height="48" width="48" src="file:text-plain.svg" border="0" style="max-width: 100%" alt=""/>attachment1.txt</a>
-                            </div>
-                            <div/>
-                          </div>
-                          <a name="att1.3"/>
-                          <div id="attachmentDiv1.3">
-                            <hr/>
-                            <div>
-                              <a href="attachment:e0:1.3?place=body"><img align="center" height="48" width="48" src="file:text-plain.svg" border="0" style="max-width: 100%" alt=""/>attachment2.txt</a>
-                            </div>
-                            <div/>
-                          </div>
-                        </div>
-                      </td>
-                    </tr>
-                    <tr class="signOkKeyOkH">
-                      <td dir="ltr">End of signed message</td>
-                    </tr>
-                  </table>
-                </div>
-              </div>
-            </td>
-          </tr>
-          <tr class="encrH">
-            <td dir="ltr">End of encrypted message</td>
-          </tr>
-        </table>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/iconic/openpgp-signed-two-attachments.mbox.html b/framework/src/domain/mimetreeparser/otp/autotests/data/iconic/openpgp-signed-two-attachments.mbox.html
deleted file mode 100644
index 73dbc5f4..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/iconic/openpgp-signed-two-attachments.mbox.html
+++ /dev/null
@@ -1,57 +0,0 @@
-<?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="signOkKeyOk">
-          <tr class="signOkKeyOkH">
-            <td dir="ltr">
-              <table cellspacing="0" cellpadding="0" width="100%">
-                <tr>
-                  <td>Signed by <a href="mailto:test@kolab.org">test@kolab.org</a>.</td>
-                  <td align="right">
-                    <a href="kmail:showSignatureDetails">Show Details</a>
-                  </td>
-                </tr>
-              </table>
-            </td>
-          </tr>
-          <tr class="signOkKeyOkB">
-            <td>
-              <a name="att1"/>
-              <div id="attachmentDiv1">
-                <a name="att1.1"/>
-                <div id="attachmentDiv1.1">
-                  <div class="noquote">
-                    <div dir="ltr">this is the main body text</div>
-                  </div>
-                </div>
-                <a name="att1.2"/>
-                <div id="attachmentDiv1.2">
-                  <hr/>
-                  <div>
-                    <a href="attachment:1.2?place=body"><img align="center" height="48" width="48" src="file:text-plain.svg" border="0" style="max-width: 100%" alt=""/>attachment1.txt</a>
-                  </div>
-                  <div/>
-                </div>
-                <a name="att1.3"/>
-                <div id="attachmentDiv1.3">
-                  <hr/>
-                  <div>
-                    <a href="attachment:1.3?place=body"><img align="center" height="48" width="48" src="file:text-plain.svg" border="0" style="max-width: 100%" alt=""/>attachment2.txt</a>
-                  </div>
-                  <div/>
-                </div>
-              </div>
-            </td>
-          </tr>
-          <tr class="signOkKeyOkH">
-            <td dir="ltr">End of signed message</td>
-          </tr>
-        </table>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/inlined/encapsulated-with-attachment.mbox.html b/framework/src/domain/mimetreeparser/otp/autotests/data/inlined/encapsulated-with-attachment.mbox.html
deleted file mode 100644
index 26d3dd60..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/inlined/encapsulated-with-attachment.mbox.html
+++ /dev/null
@@ -1,58 +0,0 @@
-<?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="noquote">
-            <div dir="ltr">This is the first encapsulating message.</div>
-          </div>
-        </div>
-        <a name="att2"/>
-        <div id="attachmentDiv2">
-          <table cellspacing="1" cellpadding="1" class="rfc822">
-            <tr class="rfc822H">
-              <td dir="ltr">
-                <a href="attachment:2.1?place=body">Encapsulated message</a>
-              </td>
-            </tr>
-            <tr class="rfc822B">
-              <td>
-                <a name="att2.1"/>
-                <div id="attachmentDiv2.1">
-                  <a name="att2.1.1"/>
-                  <div id="attachmentDiv2.1.1">
-                    <div class="noquote">
-                      <div dir="ltr">This is the second encapsulated message.</div>
-                    </div>
-                  </div>
-                  <a name="att2.1.2"/>
-                  <div id="attachmentDiv2.1.2">
-                    <table cellspacing="1" class="textAtm">
-                      <tr class="textAtmH">
-                        <td dir="ltr">attachment.txt</td>
-                      </tr>
-                      <tr class="textAtmB">
-                        <td>
-                          <div class="noquote">
-                            <div dir="ltr">This is an attachment.</div>
-                          </div>
-                        </td>
-                      </tr>
-                    </table>
-                  </div>
-                </div>
-              </td>
-            </tr>
-            <tr class="rfc822H">
-              <td dir="ltr">End of encapsulated message</td>
-            </tr>
-          </table>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/inlined/openpgp-encrypted-attachment-and-non-encrypted-attachment.mbox.html b/framework/src/domain/mimetreeparser/otp/autotests/data/inlined/openpgp-encrypted-attachment-and-non-encrypted-attachment.mbox.html
deleted file mode 100644
index 49e503f1..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/inlined/openpgp-encrypted-attachment-and-non-encrypted-attachment.mbox.html
+++ /dev/null
@@ -1,90 +0,0 @@
-<?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">
-          <table cellspacing="1" cellpadding="1" class="encr">
-            <tr class="encrH">
-              <td dir="ltr">Encrypted message</td>
-            </tr>
-            <tr class="encrB">
-              <td>
-                <div style="position: relative; word-wrap: break-word">
-                  <a name="att"/>
-                  <div id="attachmentDiv">
-                    <table cellspacing="1" cellpadding="1" class="signOkKeyOk">
-                      <tr class="signOkKeyOkH">
-                        <td dir="ltr">
-                          <table cellspacing="0" cellpadding="0" width="100%">
-                            <tr>
-                              <td>Signed by <a href="mailto:test@kolab.org">test@kolab.org</a>.</td>
-                              <td align="right">
-                                <a href="kmail:showSignatureDetails">Show Details</a>
-                              </td>
-                            </tr>
-                          </table>
-                        </td>
-                      </tr>
-                      <tr class="signOkKeyOkB">
-                        <td>
-                          <a name="att1"/>
-                          <div id="attachmentDiv1">
-                            <a name="att1.1"/>
-                            <div id="attachmentDiv1.1">
-                              <div class="noquote">
-                                <div dir="ltr">test text</div>
-                              </div>
-                            </div>
-                            <a name="att1.2"/>
-                            <div id="attachmentDiv1.2">
-                              <table cellspacing="1" class="textAtm">
-                                <tr class="textAtmH">
-                                  <td dir="ltr">file.txt</td>
-                                </tr>
-                                <tr class="textAtmB">
-                                  <td>
-                                    <div class="noquote">
-                                      <div dir="ltr">some plain ascii text...</div>
-                                      <br/>
-                                    </div>
-                                  </td>
-                                </tr>
-                              </table>
-                            </div>
-                          </div>
-                        </td>
-                      </tr>
-                      <tr class="signOkKeyOkH">
-                        <td dir="ltr">End of signed message</td>
-                      </tr>
-                    </table>
-                  </div>
-                </div>
-              </td>
-            </tr>
-            <tr class="encrH">
-              <td dir="ltr">End of encrypted message</td>
-            </tr>
-          </table>
-        </div>
-        <a name="att2"/>
-        <div id="attachmentDiv2">
-          <hr/>
-          <div>
-            <a href="attachment:2?place=body">
-              <img align="center" src="file:image.png" border="0" style="max-width: 100%"/>
-            </a>
-          </div>
-          <div>
-            <a href="attachment:2?place=body">image.png</a>
-          </div>
-          <div/>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/inlined/openpgp-encrypted-attachment.mbox.html b/framework/src/domain/mimetreeparser/otp/autotests/data/inlined/openpgp-encrypted-attachment.mbox.html
deleted file mode 100644
index 67897491..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/inlined/openpgp-encrypted-attachment.mbox.html
+++ /dev/null
@@ -1,74 +0,0 @@
-<?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="encr">
-          <tr class="encrH">
-            <td dir="ltr">Encrypted message</td>
-          </tr>
-          <tr class="encrB">
-            <td>
-              <div style="position: relative; word-wrap: break-word">
-                <a name="att"/>
-                <div id="attachmentDiv">
-                  <table cellspacing="1" cellpadding="1" class="signOkKeyOk">
-                    <tr class="signOkKeyOkH">
-                      <td dir="ltr">
-                        <table cellspacing="0" cellpadding="0" width="100%">
-                          <tr>
-                            <td>Signed by <a href="mailto:test@kolab.org">test@kolab.org</a>.</td>
-                            <td align="right">
-                              <a href="kmail:showSignatureDetails">Show Details</a>
-                            </td>
-                          </tr>
-                        </table>
-                      </td>
-                    </tr>
-                    <tr class="signOkKeyOkB">
-                      <td>
-                        <a name="att1"/>
-                        <div id="attachmentDiv1">
-                          <a name="att1.1"/>
-                          <div id="attachmentDiv1.1">
-                            <div class="noquote">
-                              <div dir="ltr">test text</div>
-                            </div>
-                          </div>
-                          <a name="att1.2"/>
-                          <div id="attachmentDiv1.2">
-                            <table cellspacing="1" class="textAtm">
-                              <tr class="textAtmH">
-                                <td dir="ltr">file.txt</td>
-                              </tr>
-                              <tr class="textAtmB">
-                                <td>
-                                  <div class="noquote">
-                                    <div dir="ltr">some plain ascii text...</div>
-                                    <br/>
-                                  </div>
-                                </td>
-                              </tr>
-                            </table>
-                          </div>
-                        </div>
-                      </td>
-                    </tr>
-                    <tr class="signOkKeyOkH">
-                      <td dir="ltr">End of signed message</td>
-                    </tr>
-                  </table>
-                </div>
-              </div>
-            </td>
-          </tr>
-          <tr class="encrH">
-            <td dir="ltr">End of encrypted message</td>
-          </tr>
-        </table>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/inlined/openpgp-encrypted-non-encrypted-attachment.mbox.html b/framework/src/domain/mimetreeparser/otp/autotests/data/inlined/openpgp-encrypted-non-encrypted-attachment.mbox.html
deleted file mode 100644
index 6091ee5a..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/inlined/openpgp-encrypted-non-encrypted-attachment.mbox.html
+++ /dev/null
@@ -1,74 +0,0 @@
-<?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">
-          <table cellspacing="1" cellpadding="1" class="encr">
-            <tr class="encrH">
-              <td dir="ltr">Encrypted message</td>
-            </tr>
-            <tr class="encrB">
-              <td>
-                <div style="position: relative; word-wrap: break-word">
-                  <a name="att"/>
-                  <div id="attachmentDiv">
-                    <table cellspacing="1" cellpadding="1" class="signOkKeyOk">
-                      <tr class="signOkKeyOkH">
-                        <td dir="ltr">
-                          <table cellspacing="0" cellpadding="0" width="100%">
-                            <tr>
-                              <td>Signed by <a href="mailto:test@kolab.org">test@kolab.org</a>.</td>
-                              <td align="right">
-                                <a href="kmail:showSignatureDetails">Show Details</a>
-                              </td>
-                            </tr>
-                          </table>
-                        </td>
-                      </tr>
-                      <tr class="signOkKeyOkB">
-                        <td>
-                          <a name="att1"/>
-                          <div id="attachmentDiv1">
-                            <a name="att1.1"/>
-                            <div id="attachmentDiv1.1">
-                              <div class="noquote">
-                                <div dir="ltr">test text</div>
-                              </div>
-                            </div>
-                          </div>
-                        </td>
-                      </tr>
-                      <tr class="signOkKeyOkH">
-                        <td dir="ltr">End of signed message</td>
-                      </tr>
-                    </table>
-                  </div>
-                </div>
-              </td>
-            </tr>
-            <tr class="encrH">
-              <td dir="ltr">End of encrypted message</td>
-            </tr>
-          </table>
-        </div>
-        <a name="att2"/>
-        <div id="attachmentDiv2">
-          <hr/>
-          <div>
-            <a href="attachment:2?place=body">
-              <img align="center" src="file:image.png" border="0" style="max-width: 100%"/>
-            </a>
-          </div>
-          <div>
-            <a href="attachment:2?place=body">image.png</a>
-          </div>
-          <div/>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/inlined/openpgp-signed-apple.mbox.html b/framework/src/domain/mimetreeparser/otp/autotests/data/inlined/openpgp-signed-apple.mbox.html
deleted file mode 100644
index 092d5e1c..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/inlined/openpgp-signed-apple.mbox.html
+++ /dev/null
@@ -1,63 +0,0 @@
-<?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 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 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/framework/src/domain/mimetreeparser/otp/autotests/data/inlined/openpgp-signed-mailinglist+additional-children.mbox.html b/framework/src/domain/mimetreeparser/otp/autotests/data/inlined/openpgp-signed-mailinglist+additional-children.mbox.html
deleted file mode 100644
index cc49cbcc..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/inlined/openpgp-signed-mailinglist+additional-children.mbox.html
+++ /dev/null
@@ -1,67 +0,0 @@
-<?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.1"/>
-          <div id="attachmentDiv1.1">
-            <div class="noquote">
-              <div dir="ltr">hi..</div>
-              <br/>
-              <div dir="ltr">i noticed a new branch when i pulled kde-workspace today (finally!):&nbsp;</div>
-              <div dir="ltr">activities_optional</div>
-              <br/>
-              <div dir="ltr">the lone commit in it was pushed on april 1, so maybe it's an april fools&nbsp;</div>
-              <div dir="ltr">joke, but if it isn't, it looks like someone is trying to do something that&nbsp;</div>
-              <div dir="ltr">makes no sense (and has no chance of being merged into master). so if this is&nbsp;</div>
-              <div dir="ltr">a "for reals" branch, perhaps the motivation behind it can be shared?</div>
-              <br/>
-              <div dir="ltr">--&nbsp;</div>
-              <div dir="ltr">Aaron J. Seigo</div>
-            </div>
-          </div>
-          <a name="att1.2"/>
-          <div id="attachmentDiv1.2">
-            <hr/>
-            <div>
-              <a href="attachment:1.2?place=body"><img align="center" height="48" width="48" src="file:application-pgp-signature.svg" border="0" style="max-width: 100%" alt=""/>signature.asc</a>
-            </div>
-            <div>This is a digitally signed message part.</div>
-          </div>
-          <a name="att1.3"/>
-          <div id="attachmentDiv1.3">
-            <table cellspacing="1" class="textAtm">
-              <tr class="textAtmH">
-                <td dir="ltr">broken.attachment</td>
-              </tr>
-              <tr class="textAtmB">
-                <td>
-                  <div class="noquote">
-                    <div dir="ltr">Let's break a signed message - This messageblock should not be here :D</div>
-                  </div>
-                </td>
-              </tr>
-            </table>
-          </div>
-        </div>
-        <a name="att2"/>
-        <div id="attachmentDiv2">
-          <div class="noquote">
-            <div dir="ltr">_______________________________________________</div>
-            <div dir="ltr">Plasma-devel mailing list</div>
-            <div dir="ltr">
-              <a href="mailto:Plasma-devel@kde.org">Plasma-devel@kde.org</a>
-            </div>
-            <div dir="ltr">
-              <a href="https://mail.kde.org/mailman/listinfo/plasma-devel">https://mail.kde.org/mailman/listinfo/plasma-devel</a>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/inlined/smime-signed-apple.mbox.html b/framework/src/domain/mimetreeparser/otp/autotests/data/inlined/smime-signed-apple.mbox.html
deleted file mode 100644
index d3f3eeb3..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/inlined/smime-signed-apple.mbox.html
+++ /dev/null
@@ -1,63 +0,0 @@
-<?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>
-                  <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/framework/src/domain/mimetreeparser/otp/autotests/data/inlinepgpencrypted-appendix.mbox b/framework/src/domain/mimetreeparser/otp/autotests/data/inlinepgpencrypted-appendix.mbox
deleted file mode 100644
index c05a7e69..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/inlinepgpencrypted-appendix.mbox
+++ /dev/null
@@ -1,33 +0,0 @@
-From test@kolab.org Wed, 25 May 2011 23:49:40 +0100
-From: OpenPGP Test <test@kolab.org>
-To: test@kolab.org
-Subject: inlinepgpencrypted
-Date: Wed, 25 May 2011 23:49:40 +0100
-Message-ID: <1786696.yKXrOjjflF@herrwackelpudding.localhost>
-X-KMail-Transport: GMX
-X-KMail-Fcc: 28
-X-KMail-Drafts: 7
-X-KMail-Templates: 9
-User-Agent: KMail/4.6 beta5 (Linux/2.6.34.7-0.7-desktop; KDE/4.6.41; x86_64; git-0269848; 2011-04-19)
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7Bit
-Content-Type: text/plain; charset="us-ascii"
-
------BEGIN PGP MESSAGE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-hQEMAwzOQ1qnzNo7AQf/a3aNTLpQBfcUr+4AKsZQLj4h6z7e7a5AaCW8AG0wrbxN
-kBYB7E5jdZh45DX/99gvoZslthWryUCX2kKZ3LtIllxKVjqNuK5hSt+SAuKkwiMR
-Xcbf1KFKENKupgGSO9B2NJRbjoExdJ+fC3mGXnO3dT7xJJAo3oLE8Nivu+Bj1peY
-E1wCf+vcTwVHFrA7SV8eMRb9Z9wBXmU8Q8e9ekJ7ZsRX3tMeBs6jvscVvfMf6DYY
-N14snZBZuGNKT9a3DPny7IC1S0lHcaam34ogWwMi3FxPGJt/Lg52kARlkF5TDhcP
-N6H0EB/iqDRjOOUoEVm8um5XOSR1FpEiAdD0DON3y9JPATnrYq7sgYZz3BVImYY+
-N/jV8fEiN0a34pcOq8NQedMuOsJHNBS5MtbQH/kJLq0MXBpXekGlHo4MKw0trISc
-Rw3pW6/BFfhPJLni29g9tw==
-=fRFW
------END PGP MESSAGE-----
-
-_______________________________________________
-test mailing list
-test@lists.kde.org
-http://kde.org
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/inlinepgpencrypted-appendix.mbox.html b/framework/src/domain/mimetreeparser/otp/autotests/data/inlinepgpencrypted-appendix.mbox.html
deleted file mode 100644
index 8af2b1c6..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/inlinepgpencrypted-appendix.mbox.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<?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="encr">
-          <tr class="encrH">
-            <td dir="ltr">Encrypted message</td>
-          </tr>
-          <tr class="encrB">
-            <td>
-              <div class="noquote">
-                <div dir="ltr">some random text</div>
-              </div>
-            </td>
-          </tr>
-          <tr class="encrH">
-            <td dir="ltr">End of encrypted message</td>
-          </tr>
-        </table>
-        <div class="noquote">
-          <div dir="ltr">_______________________________________________</div>
-          <div dir="ltr">test mailing list</div>
-          <div dir="ltr">
-            <a href="mailto:test@lists.kde.org">test@lists.kde.org</a>
-          </div>
-          <div dir="ltr">
-            <a href="http://kde.org">http://kde.org</a>
-          </div>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/inlinepgpencrypted-appendix.mbox.tree b/framework/src/domain/mimetreeparser/otp/autotests/data/inlinepgpencrypted-appendix.mbox.tree
deleted file mode 100644
index 018f5c33..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/inlinepgpencrypted-appendix.mbox.tree
+++ /dev/null
@@ -1,4 +0,0 @@
- * MimeTreeParser::MessagePartList
-  * MimeTreeParser::TextMessagePart
-   * MimeTreeParser::EncryptedMessagePart
-   * MimeTreeParser::MessagePart
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/inlinepgpencrypted-error.mbox b/framework/src/domain/mimetreeparser/otp/autotests/data/inlinepgpencrypted-error.mbox
deleted file mode 100644
index 529b4d3b..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/inlinepgpencrypted-error.mbox
+++ /dev/null
@@ -1,55 +0,0 @@
-From test@kolab.org Wed, 25 May 2011 23:49:40 +0100
-From: OpenPGP Test <test@kolab.org>
-To: test@kolab.org
-Subject: inlinepgpencrypted - no seckey
-Date: Wed, 25 May 2011 23:49:40 +0100
-Message-ID: <1786696.yKXrOjjflF@herrwackelpudding.localhost>
-X-KMail-Transport: GMX
-X-KMail-Fcc: 28
-X-KMail-Drafts: 7
-X-KMail-Templates: 9
-User-Agent: KMail/4.6 beta5 (Linux/2.6.34.7-0.7-desktop; KDE/4.6.41; x86_64; git-0269848; 2011-04-19)
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7Bit
-Content-Type: text/plain; charset="us-ascii"
-
------BEGIN PGP MESSAGE-----
-Version: GnuPG v2
-
-hQIMA1U9QmLaS63yAQ/8C8o5D7wQ9LoPHrNCNelku19bwQogTIqxRJSTYzO0b0tr
-Pb7Oyxkm1XabYxhg9bxFcNvvAbxcbzmnFJqkVPzCird43N5BDMtwGumiUjNNYVgy
-4tD6hs+h8GsmmQ5/J5cmuUwA+Ee20ubrTMH2qkU75WcyuRAG+IFsA80eEKG5qR8y
-i2WXjBiImcmjrEVtSA3L+mUHmhuWxz/46EnCelSAJMfhSG8zuTJnK6OFBSDQNkqE
-NRJl0PO4DYDeJiSYeXWEB2GTvc9JXtcHm7wIwzHXHSrBlXvQWEj5B8z9GSOJwO0o
-JuV29TVU4iDU8d3flfhMGZEJXUkIIwt66/0CtuJNDmIAnqc4wQO9LtXFXOI/YK7x
-twidnLY04kmh1bZfQsUBhwdYqLUzr0AXqE2kRTozod4XgVBmphVt6Ytu11L1UFdb
-1wKBaQG/qmhOmeMJb7eJX6I66p8LzKiqkfNlTnPQURELMbCmiRwoDCC5wnrDj8g/
-K0zvfNRFbGimbTHeQ01OncoVcRIlXK7njM6dTTqnglzwZagHn1Ph0krkdbnzLJkc
-j8v1QLWuM1ttMIgW5xu4R4cjSSuLZKtZNmnlQe1e5rllZbwIFlUVH/SRNblAnRi5
-GUPDJWLZJppfFk2H1pjgze4s9oZljEKXzeOa/pfrfcZ8BVmg7UnKnMyygVH1+4aF
-BA4D9uaj0SbGMOAQEACfyo8uFl+Yq9XwFbAJmeSP3/AMG2HhfCNgkGkcjE+EykTm
-/jn/Emscw1QyjonX1RcOvtFHbI7VsUblCcJngytfikSgM/5U/NniPtrdqohOhjgO
-WJ+TxWhO4K64WaBzq5E5Q+7S2ciZTkz3tlZ2jRI0pjTxuvxVUV5fHwlES7ZfHCUg
-F4eGGFU7xz3gxC6Wt6OV2EGP7wa1qf430fa5bmLZ1QsJY7l+ApbqOoWqfDmjhN6o
-qf6xEtt+xx41lakdWg05VPYzkhDv7FHb2pGWeLRZpG5Rblg3LVi94lGyXstNcFre
-cudq5kM2rPB9/LL65qq54KB2BsXgBSuihvRpryHqv7PSSBw+Gx5wOWZ/DZOS2RvV
-UsrpN1M8XqJYUX/AExzSajsABQkbLj3Gw1WRyed7Sokrrus9fXJy25FXQ3AjBEQZ
-vl8nrsEFWFQIi8s3NWoHz6IU9jyDWzJp2Twi/PKVfe7r7aMeHGRJJWMvVQbIjPEW
-C8GqjyVPZmmGw5Eo6V95kwF1ED6UZaEdEYLdgKIoXwL1epil2mEaX0AuugN1vkHr
-35gyHosJC0dWtNRGoSh7nGR4uwEDs6Sf9J87b+QAGbbDgePprH6AAq0qsLxc0SNO
-OWFzo8/CeA4KjsYXTCsIOov99TomqI93bP9BrhNBra4RMBxjsfZ5FL2X3cCwKBAA
-jPFVgrctgkX3piwu58Zi5OpRbiXOLF6PdPaBjwyD3cFIU+TmdSLU0zGG/uCkwL3U
-LSHhHEdf8D5laasulX7Bz72X2DXSKraoHu8tSa2f/gBRrEOSJV86yw6FAxLCn3Lm
-NCn/cSKskO/m/J2WGhiHgFSe/4OrFpqx78tWKM+XheAgz6No9vPT9KooEyKqCwlS
-lI7QHhLl9eWmT1NPRibfdL9aMzjPfxmE91vaN29NnxQJG2w7KnI7sxXvZljOvuSI
-FE9NvGs2uHjRFjO0Vncjuv/fAbdvVvkTCSyLWZLUyOegJa/0KZOU48HtwwBzVxl1
-D9joee2bmQnmxuGomRwelUVbux1GKRhfCtnNuKQNXU7NP3AnNUDAQjrQSD5C1f3e
-9tPOi3wRuXnlYfBcmemKUrdYNVpWBpHh+KnJ1rW/NqwNvUtq0ucYIT5//dKaPiIf
-HqizKm0MntFbIv4f29TNfw5Wp1GcTXc6Dmt/KSCjLH+IxPtdAgI5ZlrdOfVxlY1B
-abIFKjN0csPfkfX7l8g6ekOYgP/NRHQQs7Zyds59Zj7Roi7+uabV8svXRREm0V34
-595ro3cEzABOAnErxErC7Lm/VUI348kdOP/3IAckmwv1qts3P2eDA6CcLYE2V+sz
-7mb9UGrUzu8hBxPjbuqIYfi2XOSxGRCvSH0Rmw7XzKfSRwHpusUQjpCbRXyntVqY
-Db8+PufLBENx22ipLLEDltP1P9zRuy2KpANd0sggM/HtUC3Bjta7IR9Q3qbVcPDx
-3Qu241eOBdb6
-=J3lb
------END PGP MESSAGE-----
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/inlinepgpencrypted-error.mbox.html b/framework/src/domain/mimetreeparser/otp/autotests/data/inlinepgpencrypted-error.mbox.html
deleted file mode 100644
index a4427e01..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/inlinepgpencrypted-error.mbox.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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="encr">
-          <tr class="encrH">
-            <td dir="ltr">Encrypted message (decryption not possible)<br/>Reason: Crypto plug-in "OpenPGP" could not decrypt the data.<br/>Error: Decryption failed</td>
-          </tr>
-          <tr class="encrB">
-            <td>
-              <div style="font-size:x-large; text-align:center; padding:20pt;">No secret key found to encrypt the message. It is encrypted for following keys:<br/><a href="kmail:showCertificate#gpg ### OpenPGP ### 553D4262DA4BADF2">0x553D4262DA4BADF2</a><br/><a href="kmail:showCertificate#gpg ### OpenPGP ### F6E6A3D126C630E0">0xF6E6A3D126C630E0</a></div>
-            </td>
-          </tr>
-          <tr class="encrH">
-            <td dir="ltr">End of encrypted message</td>
-          </tr>
-        </table>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/inlinepgpencrypted-error.mbox.tree b/framework/src/domain/mimetreeparser/otp/autotests/data/inlinepgpencrypted-error.mbox.tree
deleted file mode 100644
index 6680b8bc..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/inlinepgpencrypted-error.mbox.tree
+++ /dev/null
@@ -1,3 +0,0 @@
- * MimeTreeParser::MessagePartList
-  * MimeTreeParser::TextMessagePart
-   * MimeTreeParser::EncryptedMessagePart
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/inlinepgpencrypted.mbox b/framework/src/domain/mimetreeparser/otp/autotests/data/inlinepgpencrypted.mbox
deleted file mode 100644
index b581602c..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/inlinepgpencrypted.mbox
+++ /dev/null
@@ -1,29 +0,0 @@
-From test@kolab.org Wed, 25 May 2011 23:49:40 +0100
-From: OpenPGP Test <test@kolab.org>
-To: test@kolab.org
-Subject: inlinepgpencrypted
-Date: Wed, 25 May 2011 23:49:40 +0100
-Message-ID: <1786696.yKXrOjjflF@herrwackelpudding.localhost>
-X-KMail-Transport: GMX
-X-KMail-Fcc: 28
-X-KMail-Drafts: 7
-X-KMail-Templates: 9
-User-Agent: KMail/4.6 beta5 (Linux/2.6.34.7-0.7-desktop; KDE/4.6.41; x86_64; git-0269848; 2011-04-19)
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7Bit
-Content-Type: text/plain; charset="us-ascii"
-
------BEGIN PGP MESSAGE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-hQEMAwzOQ1qnzNo7AQf/a3aNTLpQBfcUr+4AKsZQLj4h6z7e7a5AaCW8AG0wrbxN
-kBYB7E5jdZh45DX/99gvoZslthWryUCX2kKZ3LtIllxKVjqNuK5hSt+SAuKkwiMR
-Xcbf1KFKENKupgGSO9B2NJRbjoExdJ+fC3mGXnO3dT7xJJAo3oLE8Nivu+Bj1peY
-E1wCf+vcTwVHFrA7SV8eMRb9Z9wBXmU8Q8e9ekJ7ZsRX3tMeBs6jvscVvfMf6DYY
-N14snZBZuGNKT9a3DPny7IC1S0lHcaam34ogWwMi3FxPGJt/Lg52kARlkF5TDhcP
-N6H0EB/iqDRjOOUoEVm8um5XOSR1FpEiAdD0DON3y9JPATnrYq7sgYZz3BVImYY+
-N/jV8fEiN0a34pcOq8NQedMuOsJHNBS5MtbQH/kJLq0MXBpXekGlHo4MKw0trISc
-Rw3pW6/BFfhPJLni29g9tw==
-=fRFW
------END PGP MESSAGE-----
-
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/inlinepgpencrypted.mbox.html b/framework/src/domain/mimetreeparser/otp/autotests/data/inlinepgpencrypted.mbox.html
deleted file mode 100644
index 1f695bdf..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/inlinepgpencrypted.mbox.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<?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="encr">
-          <tr class="encrH">
-            <td dir="ltr">Encrypted message</td>
-          </tr>
-          <tr class="encrB">
-            <td>
-              <div class="noquote">
-                <div dir="ltr">some random text</div>
-              </div>
-            </td>
-          </tr>
-          <tr class="encrH">
-            <td dir="ltr">End of encrypted message</td>
-          </tr>
-        </table>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/inlinepgpencrypted.mbox.inProgress.html b/framework/src/domain/mimetreeparser/otp/autotests/data/inlinepgpencrypted.mbox.inProgress.html
deleted file mode 100644
index e5eb55d0..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/inlinepgpencrypted.mbox.inProgress.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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="encr">
-          <tr class="encrH">
-            <td dir="ltr">Please wait while the message is being decrypted...</td>
-          </tr>
-          <tr class="encrB">
-            <td>
-              <div style="font-size:x-large; text-align:center; padding:20pt;"/>
-            </td>
-          </tr>
-          <tr class="encrH">
-            <td dir="ltr">End of encrypted message</td>
-          </tr>
-        </table>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/inlinepgpencrypted.mbox.tree b/framework/src/domain/mimetreeparser/otp/autotests/data/inlinepgpencrypted.mbox.tree
deleted file mode 100644
index 6680b8bc..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/inlinepgpencrypted.mbox.tree
+++ /dev/null
@@ -1,3 +0,0 @@
- * MimeTreeParser::MessagePartList
-  * MimeTreeParser::TextMessagePart
-   * MimeTreeParser::EncryptedMessagePart
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/mailheader.css b/framework/src/domain/mimetreeparser/otp/autotests/data/mailheader.css
deleted file mode 100644
index 10181957..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/mailheader.css
+++ /dev/null
@@ -1,512 +0,0 @@
-div.header {
-  margin-bottom: 10pt ! important;
-}
-
-table.textAtm {
-  margin-top: 10pt ! important;
-  margin-bottom: 10pt ! important;
-}
-
-tr.textAtmH,
-tr.textAtmB,
-tr.rfc822B {
-  font-weight: normal ! important;
-}
-
-tr.signInProgressH,
-tr.rfc822H,
-tr.encrH,
-tr.signOkKeyOkH,
-tr.signOkKeyBadH,
-tr.signWarnH,
-tr.signErrH {
-  font-weight: bold ! important;
-}
-
-tr.textAtmH td,
-tr.textAtmB td {
-  padding: 3px ! important;
-}
-
-table.rfc822 {
-  width: 100% ! important;
-  border: solid 1px black ! important;
-  margin-top: 10pt ! important;
-  margin-bottom: 10pt ! important;
-}
-
-table.textAtm,
-table.encr,
-table.signWarn,
-table.signErr,
-table.signOkKeyBad,
-table.signOkKeyOk,
-table.signInProgress,
-div.fancy.header table {
-  width: 100% ! important;
-  border-width: 0px ! important;
-  line-height: normal;
-}
-
-div.htmlWarn {
-  margin: 0px 5% ! important;
-  padding: 10px ! important;
-  text-align: left ! important;
-  line-height: normal;
-}
-
-div.fancy.header > div {
-  font-weight: bold ! important;
-  padding: 4px ! important;
-  line-height: normal;
-}
-
-div.fancy.header table {
-  padding: 2px ! important;
-  text-align: left ! important;
-  border-collapse: separate ! important;
-}
-
-div.fancy.header table th {
-  font-family: "Sans Serif" ! important;
-  font-size: 0px ! important;
-
-  padding: 0px ! important;
-  white-space: nowrap ! important;
-  border-spacing: 0px ! important;
-  text-align: left ! important;
-  vertical-align: top ! important;
-  background-color: #d6d2d0 ! important;
-  color: #221f1e ! important;
-  border: 1px ! important;
-}
-
-div.fancy.header table td {
-  font-family: "Sans Serif" ! important;
-  font-size: 0px ! important;
-
-  padding: 0px ! important;
-  border-spacing: 0px ! important;
-  text-align: left ! important;
-  vertical-align: top ! important;
-  width: 100% ! important;
-  background-color: #d6d2d0 ! important;
-  color: #221f1e ! important;
-  border: 1px ! important;
-}
-
-div.fancy.header table a:hover {
-  background-color: transparent ! important;
-}
-
-span.pimsmileytext {
-  position: absolute;
-  top: 0px;
-  left: 0px;
-  visibility: hidden;
-}
-
-img.pimsmileyimg {
-}
-
-div.quotelevelmark {
-  position: absolute;
-  margin-left:-10px;
-}
-
-@media screen {
-
-body {
-  font-family: "Sans Serif" ! important;
-  font-size: 0px ! important;
-  color: #1f1c1b ! important;
-  background-color: #ffffff ! important;
-}
-
-a {
-  color: #0057ae ! important;
-  text-decoration: none ! important;
-}
-
-a.white {
-  color: white ! important;
-}
-
-a.black {
-  color: black ! important;
-}
-
-table.textAtm { background-color: #1f1c1b ! important; }
-
-tr.textAtmH {
-  background-color: #ffffff ! important;
-  font-family: "Sans Serif" ! important;
-  font-size: 0px ! important;
-}
-
-tr.textAtmB {
-  background-color: #ffffff ! important;
-}
-
-table.signInProgress,
-table.rfc822 {
-  background-color: #ffffff ! important;
-}
-
-tr.signInProgressH,
-tr.rfc822H {
-  font-family: "Sans Serif" ! important;
-  font-size: 0px ! important;
-}
-
-table.encr {
-  background-color: #0069cc ! important;
-}
-
-tr.encrH {
-  background-color: #0080ff ! important;
-  color: #ffffff ! important;
-  font-family: "Sans Serif" ! important;
-  font-size: 0px ! important;
-}
-
-tr.encrB { background-color: #e0f0ff ! important; }
-
-table.signOkKeyOk {
-  background-color: #33cc33 ! important;
-}
-
-tr.signOkKeyOkH {
-  background-color: #40ff40 ! important;
-  color: #27ae60 ! important;
-  font-family: "Sans Serif" ! important;
-  font-size: 0px ! important;
-}
-
-tr.signOkKeyOkB { background-color: #e8ffe8 ! important; }
-
-table.signOkKeyBad {
-  background-color: #cccc33 ! important;
-}
-
-tr.signOkKeyBadH {
-  background-color: #ffff40 ! important;
-  color: #f67400 ! important;
-  font-family: "Sans Serif" ! important;
-  font-size: 0px ! important;
-}
-
-tr.signOkKeyBadB { background-color: #ffffe8 ! important; }
-
-table.signWarn {
-  background-color: #cccc33 ! important;
-}
-
-tr.signWarnH {
-  background-color: #ffff40 ! important;
-  color: #f67400 ! important;
-  font-family: "Sans Serif" ! important;
-  font-size: 0px ! important;
-}
-
-tr.signWarnB { background-color: #ffffe8 ! important; }
-
-table.signErr {
-  background-color: #cc0000 ! important;
-}
-
-tr.signErrH {
-  background-color: #ff0000 ! important;
-  color: #da4453 ! important;
-  font-family: "Sans Serif" ! important;
-  font-size: 0px ! important;
-}
-
-tr.signErrB { background-color: #ffe0e0 ! important; }
-
-div.htmlWarn {
-  border: 2px solid #ff4040 ! important;
-  line-height: normal;
-}
-
-div.header {
-  font-family: "Sans Serif" ! important;
-  font-size: 0px ! important;
-}
-
-div.fancy.header > div {
-  background-color: #43ace8 ! important;
-  color: #ffffff ! important;
-  border: solid #221f1e 1px ! important;
-  line-height: normal;
-}
-
-div.fancy.header > div a[href] { color: #ffffff ! important; }
-
-div.fancy.header > div a[href]:hover { text-decoration: underline ! important; }
-
-div.fancy.header > div.spamheader {
-  background-color: #cdcdcd ! important;
-  border-top: 0px ! important;
-  padding: 3px ! important;
-  color: black ! important;
-  font-weight: bold ! important;
-  font-size: smaller ! important;
-}
-
-div.fancy.header > table.outer {
-  background-color: #d6d2d0 ! important;
-  color: #221f1e ! important;
-  border-bottom: solid #221f1e 1px ! important;
-  border-left: solid #221f1e 1px ! important;
-  border-right: solid #221f1e 1px ! important;
-}
-
-div.senderpic{
-  padding: 0px ! important;
-  font-size:0.8em ! important;
-  border:1px solid #b3aba7 ! important;
-  background-color:#d6d2d0 ! important;
-}
-
-div.senderstatus{
-  text-align:center ! important;
-}
-
-div.quotelevel1 {
-  color: #008000 ! important;
-  font-style: italic ! important;
-}
-
-div.quotelevel2 {
-  color: #007000 ! important;
-  font-style: italic ! important;
-}
-
-div.quotelevel3 {
-  color: #006000 ! important;
-  font-style: italic ! important;
-}
-
-div.deepquotelevel1 {
-  color: #008000 ! important;
-  font-style: italic ! important;
-}
-
-div.deepquotelevel2 {
-  color: #007000 ! important;
-  font-style: italic ! important;
-}
-
-div.deepquotelevel3 {
-  color: #006000 ! important;
-  font-style: italic ! important;
-}
-
-blockquote {
-  margin: 4pt 0 4pt 0;
-  padding: 0 0 0 1em;
-  border-left: 2px solid #008000;
-  unicode-bidi: -webkit-plaintext
-}
-
-blockquote blockquote {
-  margin: 4pt 0 4pt 0;
-  padding: 0 0 0 1em;
-  border-left: 2px solid #007000;
-  unicode-bidi: -webkit-plaintext
-}
-
-blockquote blockquote blockquote {
-  margin: 4pt 0 4pt 0;
-  padding: 0 0 0 1em;
-  border-left: 2px solid #006000;
-  unicode-bidi: -webkit-plaintext
-}
-
-blockquote blockquote blockquote blockquote {
-  margin: 4pt 0 4pt 0;
-  padding: 0 0 0 1em;
-  border-left: 2px solid #008000;
-  unicode-bidi: -webkit-plaintext
-}
-
-blockquote blockquote blockquote blockquote blockquote {
-  margin: 4pt 0 4pt 0;
-  padding: 0 0 0 1em;
-  border-left: 2px solid #007000;
-  unicode-bidi: -webkit-plaintext
-}
-
-blockquote blockquote blockquote blockquote blockquote blockquote {
-  margin: 4pt 0 4pt 0;
-  padding: 0 0 0 1em;
-  border-left: 2px solid #006000;
-  unicode-bidi: -webkit-plaintext
-}
-
-blockquote blockquote blockquote blockquote blockquote blockquote blockquote {
-  margin: 4pt 0 4pt 0;
-  padding: 0 0 0 1em;
-  border-left: 2px solid #008000;
-  unicode-bidi: -webkit-plaintext
-}
-
-blockquote blockquote blockquote blockquote blockquote blockquote blockquote blockquote {
-  margin: 4pt 0 4pt 0;
-  padding: 0 0 0 1em;
-  border-left: 2px solid #007000;
-  unicode-bidi: -webkit-plaintext
-}
-
-blockquote blockquote blockquote blockquote blockquote blockquote blockquote blockquote blockquote {
-  margin: 4pt 0 4pt 0;
-  padding: 0 0 0 1em;
-  border-left: 2px solid #006000;
-  unicode-bidi: -webkit-plaintext
-}
-
-.quotemarks{
-  color:transparent;
-  font-size:0px;
-}
-
-}
-@media print {
-
-body {
-  font-family: "Sans Serif" ! important;
-  font-size: 9pt ! important;
-  color: #000000 ! important;
-  background-color: #ffffff ! important
-}
-
-tr.textAtmH,
-tr.signInProgressH,
-tr.rfc822H,
-tr.encrH,
-tr.signOkKeyOkH,
-tr.signOkKeyBadH,
-tr.signWarnH,
-tr.signErrH,
-div.header {
-  font-family: "Sans Serif" ! important;
-  font-size: 9pt ! important;
-}
-
-div.fancy.header > div {
-  background-color: #d6d2d0 ! important;
-  color: #221f1e ! important;
-  padding: 4px ! important;
-  border: solid #221f1e 1px ! important;
-  line-height: normal;
-}
-
-div.fancy.header > div a[href] { color: #221f1e ! important; }
-
-div.fancy.header > table.outer{
-  background-color: #d6d2d0 ! important;
-  color: #221f1e ! important;
-  border-bottom: solid #221f1e 1px ! important;
-  border-left: solid #221f1e 1px ! important;
-  border-right: solid #221f1e 1px ! important;
-}
-
-div.spamheader {
-  display:none ! important;
-}
-
-div.htmlWarn {
-  border: 2px solid #ffffff ! important;
-  line-height: normal;
-}
-
-div.senderpic{
-  font-size:0.8em ! important;
-  border:1px solid black ! important;
-  background-color:#d6d2d0 ! important;
-}
-
-div.senderstatus{
-  text-align:center ! important;
-}
-
-div.noprint {
-  display:none ! important;
-}
-
-blockquote {
-  margin: 4pt 0 4pt 0;
-  padding: 0 0 0 1em;
-  border-left: 2px solid #008000;
-  unicode-bidi: -webkit-plaintext
-}
-
-blockquote blockquote {
-  margin: 4pt 0 4pt 0;
-  padding: 0 0 0 1em;
-  border-left: 2px solid #007000;
-  unicode-bidi: -webkit-plaintext
-}
-
-blockquote blockquote blockquote {
-  margin: 4pt 0 4pt 0;
-  padding: 0 0 0 1em;
-  border-left: 2px solid #006000;
-  unicode-bidi: -webkit-plaintext
-}
-
-blockquote blockquote blockquote blockquote {
-  margin: 4pt 0 4pt 0;
-  padding: 0 0 0 1em;
-  border-left: 2px solid #008000;
-  unicode-bidi: -webkit-plaintext
-}
-
-blockquote blockquote blockquote blockquote blockquote {
-  margin: 4pt 0 4pt 0;
-  padding: 0 0 0 1em;
-  border-left: 2px solid #007000;
-  unicode-bidi: -webkit-plaintext
-}
-
-blockquote blockquote blockquote blockquote blockquote blockquote {
-  margin: 4pt 0 4pt 0;
-  padding: 0 0 0 1em;
-  border-left: 2px solid #006000;
-  unicode-bidi: -webkit-plaintext
-}
-
-blockquote blockquote blockquote blockquote blockquote blockquote blockquote {
-  margin: 4pt 0 4pt 0;
-  padding: 0 0 0 1em;
-  border-left: 2px solid #008000;
-  unicode-bidi: -webkit-plaintext
-}
-
-blockquote blockquote blockquote blockquote blockquote blockquote blockquote blockquote {
-  margin: 4pt 0 4pt 0;
-  padding: 0 0 0 1em;
-  border-left: 2px solid #007000;
-  unicode-bidi: -webkit-plaintext
-}
-
-blockquote blockquote blockquote blockquote blockquote blockquote blockquote blockquote blockquote {
-  margin: 4pt 0 4pt 0;
-  padding: 0 0 0 1em;
-  border-left: 2px solid #006000;
-  unicode-bidi: -webkit-plaintext
-}
-
-.quotemarks{
-  color:transparent;
-  font-size:0px;
-}
-
-.quotemarksemptyline{
-  color:transparent;
-  font-size:0px;
-  line-height: 12pt;
-}
-
-}
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/no-content-type.mbox b/framework/src/domain/mimetreeparser/otp/autotests/data/no-content-type.mbox
deleted file mode 100644
index ad050d8c..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/no-content-type.mbox
+++ /dev/null
@@ -1,7 +0,0 @@
-From: hans@example.com
-To: karl@example.com
-Subject: Simple Mail Without Content-Type Header
-Date: Sat, 15 May 2010 10:52:24 +0200
-MIME-Version: 1.0
-
-asdfasdf
\ No newline at end of file
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/no-content-type.mbox.html b/framework/src/domain/mimetreeparser/otp/autotests/data/no-content-type.mbox.html
deleted file mode 100644
index 9e3eb752..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/no-content-type.mbox.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<?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="noquote">
-          <div dir="ltr">asdfasdf</div>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/no-content-type.mbox.tree b/framework/src/domain/mimetreeparser/otp/autotests/data/no-content-type.mbox.tree
deleted file mode 100644
index c003ec97..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/no-content-type.mbox.tree
+++ /dev/null
@@ -1,3 +0,0 @@
- * MimeTreeParser::MessagePartList
-  * MimeTreeParser::TextMessagePart
-   * MimeTreeParser::MessagePart
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encoded.mbox b/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encoded.mbox
deleted file mode 100644
index 168c8dc4..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encoded.mbox
+++ /dev/null
@@ -1,33 +0,0 @@
-Content-Type: text/plain; charset="us-ascii"
-Content-Transfer-Encoding: 7bit
-
------BEGIN PGP MESSAGE-----
-Version: GnuPG v2
-
-owGdk31MlVUcx5G3jClvI1JH7GiOil0uYJATBW8FK6HkDtBJI93heQ6Xk8/L9Tnn
-XExALDfJQaJutl4UzUoCIxDwos0XTLktqJaJkJE5QAU3yMKpkRqdc+GC/dsfz/bs
-ec7v+/v+Pr/v2TnbxytgxvUt8T99cCirZEa9zw/5fopuIHX1xsjjr4gXgO2EqUDW
-+WdAMAVQRdQEJF0jSKKIMgNAGdsxkbBmA0jB1AxSdQ1JAAIZQxUo/BgjZpCN5Kn6
-SVEVMgPzX69CJCENEqFqYwgo2MYUCKAENjCu4MAOZBgQCNH/9NUoAoVIkw1kTLfl
-6qquKJhMeDYDqwERQRoVf9yOkI2/KTgfGbp4J5R3ViGlvGTKoANTiABk3I4ZrORF
-FGsSlhmXmTSJNKyaAKPArhsUAjc1oECOAcOHbXp8samehJOAhsSAAxViSUzKFGpg
-CSPCoWm6BiiXFNb/9waeRxqCmuhpM6ADy5P+zGAVBbyAHwYF/CQxATtTHFiDXIP7
-Uu3IEPZMDytieYokUhQOEpENTLCRuEegYYLFERXatMm5+dIoINCGBVIzeJEZMB8L
-mzK043xG3OimUQvHwF4IDUT5kqc5FyBmw1yJd1AAFtZkjKh7BN7GAd07nkSK+ayG
-5gEpOEoSUwnUPPQFc13GfOGGTjwfPcFSMQ8aF3OnbRoIDxJUEGGQ43PvyyjUNYm5
-R+L+dQnzGg1SXeCw8wDTiemoG4YIIH/s0OCjY5E/VRfsTLyESO61GVgW++c1qlBd
-oQGDUYNre9xPB0NcEnFZJoPppi4o83gU8MxxFCK9Ewvk94bz4Lk2B2z3jvD1mhHg
-5e/nLW60V8CjwZ7LTpKCxjNIzhNRXcER/6RVXUzaGdocqGY3vd+5LO7+qSV3pdFP
-+s6tv3Jp8EZg+V9qza9zKhf4b3xn4MfVSYOW+qaihPsHrc3O5hpzXCV77sROqxWw
-vbfaOrpClvTszr8+8pVc/ELc0aeOm+856kqfDYNZmUXt33+Y1nLT4nvH0tomz47f
-tfzP+dlpQW8vRj3v+qcXyXpef3Hvldy2gfECZ3LMGdMomlsR8fQm42zMcLh3eW1N
-Xszwqt5dLXimuVk6vb+/etNN8xgeuhoWeb79myzXg9jUv11xbQ8OR9/wnXP7QGzj
-kWN+v+RpX58qa2dbTr2VeMn/aPJrOZ3ZYS0dW7s6dhcu/3lzT1DdhS8zGgIrynIH
-tjkf21tmXtZ8pOjj/a7xsahsEGKxLG4h+St9Oj9ace1kn1+vdWl06+nEvhPlOWnh
-5OVrw1nzTv6+pjo3K9Vr3YFZeZmu6K1jA2OW7M96Bs85ChL23ck95Cx5/bfuHeX3
-wktCXYN1/fvWpxxIfyk2/pm0N4bCRyrfS8z13VPNMr6rckbuP1YS2rp0z27X/FEy
-FPHm4OHHv7iXsuaPg5dpg6XWN9B/SG/81Bq8tv5WwMjFRVUZId6Rn+sL68uudls3
-z+vMvLwwrdw5t+Pb5ISuppDUVkvmme4nTahhwYX7setmpdxt29ZeO5MFPFK6Pep2
-+nlHdfFa78ZFpSMV/Q1n/wU=
-=zzr4
------END PGP MESSAGE-----
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encoded.mbox.html b/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encoded.mbox.html
deleted file mode 100644
index 585bb4f0..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encoded.mbox.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<?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>
-              <div class="noquote">
-                <div dir="ltr">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec a diam lectus. Sed sit amet ipsum mauris. Maecenas congue ligula ac quam viverra nec consectetur ante hendrerit. Donec et mollis dolor. Praesent et diam eget libero egestas mattis sit amet vitae augue. Nam tincidunt congue enim, ut porta lorem lacinia consectetur. Donec ut libero sed arcu vehicula ultricies a non tortor. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean ut gravida lorem. Ut turpis felis, pulvinar a semper sed, adipiscing id dolor. Pellentesque auctor nisi id magna consequat sagittis. Curabitur dapibus enim sit amet elit pharetra tincidunt feugiat nisl imperdiet. Ut convallis libero in urna ultrices accumsan. Donec sed odio eros. Donec viverra mi quis quam pulvinar at malesuada arcu rhoncus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. In rutrum accumsan ultricies. Mauris vitae nisi at sem facilisis semper ac in est.</div>
-              </div>
-            </td>
-          </tr>
-          <tr class="signWarnH">
-            <td dir="ltr">End of signed message</td>
-          </tr>
-        </table>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encoded.mbox.tree b/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encoded.mbox.tree
deleted file mode 100644
index ea8223fd..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encoded.mbox.tree
+++ /dev/null
@@ -1,4 +0,0 @@
- * MimeTreeParser::MessagePartList
-  * MimeTreeParser::TextMessagePart
-   * MimeTreeParser::EncryptedMessagePart
-    * MimeTreeParser::SignedMessagePart
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted+signed.mbox b/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted+signed.mbox
deleted file mode 100644
index fbe5ce7f..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted+signed.mbox
+++ /dev/null
@@ -1,46 +0,0 @@
-From test@kolab.org Wed, 08 Sep 2010 17:02:52 +0200
-From: OpenPGP Test <test@kolab.org>
-To: test@kolab.org
-Subject: OpenPGP encrypted
-Date: Wed, 08 Sep 2010 17:02:52 +0200
-User-Agent: KMail/4.6 pre (Linux/2.6.34-rc2-2-default; KDE/4.5.60; x86_64; ; )
-MIME-Version: 1.0
-Content-Type: multipart/encrypted; boundary="nextPart1357031.ppLHckZtsp"; protocol="application/pgp-encrypted"
-Content-Transfer-Encoding: 7Bit
-
-
---nextPart1357031.ppLHckZtsp
-Content-Type: application/pgp-encrypted
-Content-Disposition: attachment
-
-Version: 1
---nextPart1357031.ppLHckZtsp
-Content-Type: application/octet-stream
-Content-Disposition: inline; filename="msg.asc"
-
------BEGIN PGP MESSAGE-----
-Version: GnuPG v2
-
-hQEMAwzOQ1qnzNo7AQgAkQI925mOOybpzcGcjUE7jmfMVoUvJW6Br9Zx9UEtko5H
-fdmnrrUhFDyhBdwcg2E6AChipNcJjZhdX17lNAO0kI2IoPJAEkX9lyhjoiVEH/M8
-xmJEKFRejYzefx0S8esKyqqtfAmMKfsA5HmKRY8iDmQnI5d/FKhkcqLTJYo7fQyL
-rEEycdr5PU5OJbMtE5+8+kbmG8PywjiCCad68FXakXIEFyWX1A99W/0ScWtqrqDB
-kuQSdxJs4aAZWopxGKxDobt/qVyG6W6+PUnLx3eg80KytcWNxLJRV7WEJMj4OYCU
-JdHrh4J1DTTRbuRmqx9de3fBDFHNNZpJP43UJYJWtoSMAxiZbYU0+6KtAQQAnRxD
-XNwzBSmPk9NG3HYf/RleTAS8/fMp3D973Y3VF5JV72ljWqZO/1o/3RIpD0pl5nSE
-nI0wPyncmPvAgQl5EAKTdYonKLuMCTbQ4eT7vkOdfA/HUxgaoE8ppH/OYXDDiqz/
-2GlNCCHcaQcVWwkHbWWgyhd/VvB7Mt9PVqPgTsHSwQ4BZf/JDwWe3MDAg21Raryf
-dN4ZmWUzd3osDIRyy8H2hZL9vgZ3r0auIP6DMyYrPf3yTj9ApZeBiIpgBvqMwvR/
-8si6r1JaXr48KRCxAkn9fIXe2jMwQE2bk5tYDrTXY868V3DA5iKq1dgXUSn0tzG3
-0x9pjaOFkwxm0wtlpwnhZREJ9/ieIY7hy6p7CDpq4ZGRh8jQta4tWrjxN0wly+Dh
-a9TjzHzgTh9BTh7vjcDLitOQFL5NcCQtK717FQ5Z1DRnkHDVLPoyPnW+5sllOVr9
-UcqNXwrPbrtElFjHULL5Y1pem1+AE6nCAtlvCAc7cil6QDsU508sOXW7BhTWATIU
-tGHg/nIC0qVs24LR3MyYrwvfXL2JOkN/IK/g+0bbs6DMYVYaEOjcjqtidxWuLsE5
-aFEwlUFzcTcSauW+AOKwH+YFihRnlh9+4taaZxGZeutb12D5u8eEk+3nyVcsdogY
-k/nT6ElN8i/Z2vgcxL6ABvB+g/bZmp/eCJphDNYc00lP8NMC4EEJvTZL438ThJ3j
-wz0Qo4PlV0/OMXYxP2iZup2/rCe+pkmc9Gyz3Mkal4/9bBtIgP9cWBR7JZLMrK50
-KO4+NtrZYEY4JXRJlAo=
-=1lYB
------END PGP MESSAGE-----
-
---nextPart1357031.ppLHckZtsp--
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted+signed.mbox.html b/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted+signed.mbox.html
deleted file mode 100644
index 54c58b85..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted+signed.mbox.html
+++ /dev/null
@@ -1,52 +0,0 @@
-<?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="encr">
-          <tr class="encrH">
-            <td dir="ltr">Encrypted message</td>
-          </tr>
-          <tr class="encrB">
-            <td>
-              <table cellspacing="1" cellpadding="1" class="signOkKeyOk">
-                <tr class="signOkKeyOkH">
-                  <td dir="ltr">
-                    <table cellspacing="0" cellpadding="0" width="100%">
-                      <tr>
-                        <td>Signed by <a href="mailto:test@kolab.org">test@kolab.org</a>.</td>
-                        <td align="right">
-                          <a href="kmail:showSignatureDetails">Show Details</a>
-                        </td>
-                      </tr>
-                    </table>
-                  </td>
-                </tr>
-                <tr class="signOkKeyOkB">
-                  <td>
-                    <div style="position: relative; word-wrap: break-word">
-                      <a name="att"/>
-                      <div id="attachmentDiv">
-                        <div class="noquote">
-                          <div dir="ltr">encrypted message text</div>
-                        </div>
-                      </div>
-                    </div>
-                  </td>
-                </tr>
-                <tr class="signOkKeyOkH">
-                  <td dir="ltr">End of signed message</td>
-                </tr>
-              </table>
-            </td>
-          </tr>
-          <tr class="encrH">
-            <td dir="ltr">End of encrypted message</td>
-          </tr>
-        </table>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted+signed.mbox.tree b/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted+signed.mbox.tree
deleted file mode 100644
index 7d5bbeb7..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted+signed.mbox.tree
+++ /dev/null
@@ -1,5 +0,0 @@
- * MimeTreeParser::MessagePartList
-  * MimeTreeParser::EncryptedMessagePart
-   * MimeTreeParser::SignedMessagePart
-    * MimeTreeParser::TextMessagePart
-     * MimeTreeParser::MessagePart
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted-applemail.mbox b/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted-applemail.mbox
deleted file mode 100644
index f5d083ff..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted-applemail.mbox
+++ /dev/null
@@ -1,52 +0,0 @@
-Received: from konqi
-From: "Konqui" <konqi@example.org>
-To: "Bird" <bird@example.org>
-Subject: gpg problem 1/2
-Date: Tue, 22 Mar 2016 17:09:18 +0100
-Message-ID: <123456@example.org>
-Accept-Language: de-DE, en-US
-Content-Language: en-US
-Content-Type: multipart/mixed;
-        boundary="_003_55514CDCA78D430384C5F0810DF10C7Adsmpgde_"
-MIME-Version: 1.0
-
- 
---_003_55514CDCA78D430384C5F0810DF10C7Adsmpgde_
-Content-Type: text/plain; charset="us-ascii"
-
-
---_003_55514CDCA78D430384C5F0810DF10C7Adsmpgde_
-Content-Type: application/pgp-encrypted;
-        name="PGPMIME Versions Identification"
-Content-Description: PGP/MIME Versions Identification
-Content-Disposition: attachment; filename="PGPMIME Versions Identification";
-        size=77; creation-date="Tue, 22 Mar 2016 16:09:18 GMT";
-        modification-date="Tue, 22 Mar 2016 16:09:18 GMT"
-Content-ID: <D82BB3DF89947646AD6C4C24C8C54BAC@example.org>
-Content-Transfer-Encoding: base64
-
-VmVyc2lvbjogMQ0NCg==
-
---_003_55514CDCA78D430384C5F0810DF10C7Adsmpgde_
-Content-Type: application/octet-stream; name="encrypted.asc"
-Content-Description: OpenPGP encrypted message.asc
-Content-Disposition: attachment; filename="encrypted.asc"; size=872;
-        creation-date="Tue, 22 Mar 2016 16:09:18 GMT";
-        modification-date="Tue, 22 Mar 2016 16:09:18 GMT"
-Content-ID: <58A712E65AB1824AB726904A6449178F@example.org>
-Content-Transfer-Encoding: base64
-
-LS0tLS1CRUdJTiBQR1AgTUVTU0FHRS0tLS0tClZlcnNpb246IEdudVBHIHYxCkNvbW1lbnQ6IFVz
-aW5nIEdudVBHIHdpdGggSWNlZG92ZSAtIGh0dHA6Ly93d3cuZW5pZ21haWwubmV0LwoKaEl3REdK
-bHRoVFQ3b3EwQkEvOU50TExYYmlJSlZTNnBPeW53RWVTem5yUUs3a1lWbGE4Uk00My8vSkVDQ2tH
-SgphekVhU0J6bmFiQnY2ZXBhRm1RdFZITE1YbENiWm5NbVc5bG95cVBCZk1vQW1zNmtLS0JkRy9q
-cWh1czg5aVhFCitzZVhuZ0MyMzNWYS9nWk1iMkR4T3FJb2tWTmZqOXRwUjd4UTh3Uy9qSFREaUxO
-YzFHT1FDN2t1NDJ6MmJOTEEKSVFGUkQvcWJCRno4OWhVNHdQNGNZb0F5c09uRURvakZyc3JuQ2lk
-VEhKT0pybmRNNlBQVXRIL2pRQ3lmci9FRwoydFNwSndZS3ZtVDZseTN5cWFHTEJ0UlBJeGl2K2RN
-ZSs3eXcwdDQwcWJqdnZhVEdhdkVyRUJKRUtYNWVXYlROCi9zamFqSHBVSHFzNlNJaU1oZUg5ZHIr
-V2Z6Rk9OdFZiUEVnR1JtT0VSaGxnVGwvbkxvODZBWnBqSnJvSUdLSkoKdFRIQ2NvUUdBV0crTjd3
-ckNFMVJ4UjBra01zNG5Sb3pqMFRMdTZaeVhNcytIMDYzTWV3VFBOeE5BaVFUMU5iaQp1ZEtXbWZM
-Qmx4bjA2cCtKRHpVS3hqOFBGd09iZGJ4VHZBQ3piQXZCWTFhSE1RPT0KPW1MbDMKLS0tLS1FTkQg
-UEdQIE1FU1NBR0UtLS0tLQoK
-
---_003_55514CDCA78D430384C5F0810DF10C7Adsmpgde_--
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted-applemail.mbox.html b/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted-applemail.mbox.html
deleted file mode 100644
index ca8d7fbb..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted-applemail.mbox.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<?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="att2"/>
-        <div id="attachmentDiv2">
-          <table cellspacing="1" cellpadding="1" class="encr">
-            <tr class="encrH">
-              <td dir="ltr">Encrypted message</td>
-            </tr>
-            <tr class="encrB">
-              <td>
-                <div style="position: relative; word-wrap: break-word">
-                  <a name="att"/>
-                  <div id="attachmentDiv">
-                    <a name="att1"/>
-                    <div id="attachmentDiv1">
-                      <div class="noquote">
-                        <div dir="ltr">test</div>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-              </td>
-            </tr>
-            <tr class="encrH">
-              <td dir="ltr">End of encrypted message</td>
-            </tr>
-          </table>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted-applemail.mbox.tree b/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted-applemail.mbox.tree
deleted file mode 100644
index 8ef3df2d..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted-applemail.mbox.tree
+++ /dev/null
@@ -1,7 +0,0 @@
- * MimeTreeParser::MessagePartList
-  * MimeTreeParser::MimeMessagePart
-   * MimeTreeParser::TextMessagePart
-   * MimeTreeParser::EncryptedMessagePart
-    * MimeTreeParser::MimeMessagePart
-     * MimeTreeParser::TextMessagePart
-      * MimeTreeParser::MessagePart
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted-attachment-and-non-encrypted-attachment.mbox b/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted-attachment-and-non-encrypted-attachment.mbox
deleted file mode 100644
index 2d9726ea..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted-attachment-and-non-encrypted-attachment.mbox
+++ /dev/null
@@ -1,115 +0,0 @@
-From test@kolab.org Fri May 01 15:12:47 2015
-From: testkey <test@kolab.org>
-To: you@you.com
-Subject: enc & non enc attachment
-Date: Fri, 01 May 2015 17:12:47 +0200
-Message-ID: <13897561.XENKdJMSlR@tabin.local>
-X-KMail-Identity: 1197256126
-User-Agent: KMail/4.13.0.1 (Linux/3.19.1-towo.1-siduction-amd64; KDE/4.14.2; x86_64; git-cd33034; 2015-04-11)
-MIME-Version: 1.0
-Content-Type: multipart/mixed; boundary="nextPart1939768.sIoLGH0PD8"
-Content-Transfer-Encoding: 7Bit
-
-This is a multi-part message in MIME format.
-
---nextPart1939768.sIoLGH0PD8
-Content-Type: multipart/encrypted; boundary="nextPart2814166.CHKktCGlQ3"; protocol="application/pgp-encrypted"
-
-
---nextPart2814166.CHKktCGlQ3
-Content-Type: application/pgp-encrypted
-Content-Disposition: attachment
-Content-Transfer-Encoding: 7Bit
-
-Version: 1
---nextPart2814166.CHKktCGlQ3
-Content-Type: application/octet-stream
-Content-Disposition: inline; filename="msg.asc"
-Content-Transfer-Encoding: 7Bit
-
------BEGIN PGP MESSAGE-----
-Version: GnuPG v2
-
-hIwDGJlthTT7oq0BA/9cXFQ6mN9Vxnc2B9M10odS3/6z1tsIY9oJdsiOjpfxqapX
-P7nOzR/jNWdFQanXoG1SjAcY2FeZEN0c3SkxEM6R5QVF1vMh/Xsni1clI+peZyVT
-Z4OSU74YCfYLg+cgDnPCF3kyNPVe6Z1pnfWOCZNCG3rpApw6UVLN63ScWC6eQIUB
-DAMMzkNap8zaOwEIANKHn1svvj+hBOIZYf8R+q2Bw7cd4xEChiJ7uQLnD98j0Fh1
-85v7/8JbZx6rEDDenPp1mCciDodb0aCmi0XLuzJz2ANGTVflfq+ZA+v1pwLksWCs
-0YcHLEjOJzjr3KKmvu6wqnun5J2yV69K3OW3qTTGhNvcYZulqQ617pPa48+sFCgh
-nM8TMAD0ElVEwmMtrS3AWoJz52Af+R3YzpAnX8NzV317/JG+b6e2ksl3tR7TWp1q
-2FOqC1sXAxuv+DIz4GgRfaK1+xYr2ckkg+H/3HJqa5LmJ7rGCyv+Epfp9u+OvdBG
-PBvuCtO3tm0crmnttMw57Gy35BKutRf/8MpBj/nS6QFX0t7XOLeL4Me7/a2H20wz
-HZsuRGDXMCh0lL0FYCBAwdbbYvvy0gz/5iaNvoADtaIu+VtbFNrTUN0SwuL+AIFS
-+WIiaSbFt4Ng3t9YmqL6pqB7fjxI10S+PK0s7ABqe4pgbzUWWt1yzBcxfk8l/47Q
-JrlvcE7HuDOhNOHfZIgUP2Dbeu+pVvHIJbmLsNWpl4s+nHhoxc9HrVhYG/MTZtQ3
-kkUWviegO6mwEZjQvgBxjWib7090sCxkO847b8A93mfQNHnuy2ZEEJ+9xyk7nIWs
-4RsiNR8pYc/SMvdocyAvQMH/qSvmn/IFJ+jHhtT8UJlXJ0bHvXTHjHMqBp6fP69z
-Jh1ERadWQdMaTkzQ+asl+kl/x3p6RZP8MEVbZIl/3pcV+xiFCYcFu2TETKMtbW+b
-NYOlrltFxFDvyu3WeNNp0g9k0nFpD/T1OXHRBRcbUDWE4QF6NWTm6NO9wy2UYHCi
-7QTSecBWgMaw7cUdwvnW6chIVoov1pm69BI9D0PoV76zCI7KzpiDsTFxdilKwbQf
-K/PDnv9Adx3ERh0/F8llBHrj2UGsRs4aHSEBDBJIHDCp8+lqtsRcINQBKEU3qIjt
-wf5vizdaVIgQnsD2z8QmBQ7QCCipI0ur6GKl+YWDDOSDLDUs9dK4A6xo/4Q0bsnI
-rH63ti5HslGq6uArfFkewH2MWff/8Li3uGEqzpK5NhP5UpbArelK+QaQQP5SdsmW
-XFwUqDS4QTCKNJXw/5SQMl8UE10l2Xaav3TkiOYTcBcvPNDovYgnMyRff/tTeFa8
-83STkvpGtkULkCntp22fydv5rg6DZ7eJrYfC2oZXdM87hHhUALUO6Y/VtVmNdNYw
-F3Uim4PDuLIKt+mFqRtFqnWm+5X/AslC31qLkjH+Fbb83TY+mC9gbIn7CZGJRCjn
-zzzMX2h15V/VHzNUgx9V/h28T0/z25FxoozZiJxpmhOtqoxMHp+y6nXXfMoIAD1D
-963Pc7u1HS0ny54A7bqc6KKd4W9IF7HkXn3SoBwCyn0IOPoKQTDD8mW3lbBI6+h9
-vP+MAQpfD8s+3VZ9r7OKYCVmUv47ViTRlf428Co6WT7rTHjGM09tqz826fTOXA==
-=6Eu9
------END PGP MESSAGE-----
-
---nextPart2814166.CHKktCGlQ3--
-
---nextPart1939768.sIoLGH0PD8
-Content-Disposition: attachment; filename="image.png"
-Content-Transfer-Encoding: base64
-Content-Type: image/png; name="image.png"
-
-iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAAlwSFlzAAAb
-rwAAG68BXhqRHAAAAAd0SU1FB9gHFg8aNG8uqeIAAAAGYktHRAD/AP8A/6C9p5MAAAkqSURBVHja
-5VV7cFTVGf/OPefeu3fv3t1NdhMSCHkKASEpyEsaGwalWEWntLV1Wu0fdOxAx9Iq0xntAwac6ehY
-p+rwKLbjjLRFh9JadURKRGgFQTTECCYQE9nNgzzYZDe7m33d1+l3tpOOU61T2tF/+s1s7pzn9/t+
-v993Av/3QT6FO6WdO/d+M55Il8rMOdrT0x3Zt++3+c8EgM/nozseeviJiYmpe1zOQdM8BOOCIku/
-lIj1VrQ/0r9n9+78xwLgeAA3w4fHXV1d5Omnn6aapumlJSVVqalUJJvJZRdcu0RSfZQsaW7mjfPm
-cbF9+/btEIlEaq6Z03whXyhIjDFuGIZEKSP5fMFRVcVNT2Vf0jzsmMxYGtel9rff/vM/M8bjcZpM
-Jp1XX32VNDc3e7ovRP3JyZGVNdXVd1FGGwKBQEM8njiWTKV36IHgEACwibGx62LjU/cBd01Zljoc
-p9DHmLbHsmyK1UuKooJt24IMcLE+y3L45eEYLS8LgWH4YXR0bAPZtGmTVFvfoBZMEzKpFKmqqmqp
-qane4DhOteH3L1FkWZVlGSzLAtd1Oe4773C4LxoZvDWXh82OY2MtwAuFvCvSyDIFXdelYDDIvF4d
-xPzA0AgXFStMcWPxBPGoKvXpPh6JDG5hK1Zcv1H36Xc6tsMs21EMQ69CLSts2wGkDygTyW2CP8gX
-TKLIyvx0OrdDUXyLKXVUkdSne4QKtFAwuWmabjAYkDyqAgG/jziORh1EKaonkkQt2yRZRC5JHEGn
-L7OKyopNqqo2IbWQjqWgLOwFBFKsuGDa4PVyIssMk1sCACCjimXbrbquYKW41zJJOpXkeARyeZNQ
-SUKwHEqCKnBuAybkZeFSmssVSDKdhlBpCRgIcnQsdvKPB19sY4rMNIaH0BhQUVHKvXgpIiQF0wK/
-4QORnOEayoDzOSBMXK4BSgpeTcMECqiqTDKZHDKmct3LCI55Kp0mQgK/3yDYkgIc3kNhfHzCkRk9
-p6nk+yPD3SmWzeZiKNkciUrg2g5BjQWdSBchiEvQjzoWAFkUYPDrCjBFUEJ8AhSIRyl2jcfjEL9h
-AFJODL8B6H7IZrNIt2g3B1mysShdQhmbT58+ExRdx3L5/PNomGU4kJkuA9ILYn+JP4CXOoDUoWO9
-IBhCSBCLTYCK+rqOg8CKvY6JPQhGxjkX1zyAdwrgAhTKWBDmxTUTC7Tcy5dHBiilL7cdaTsNGAwP
-7o32D4Q9HnWTrvsCiqIgdWgqDkJfkKgDU1MZcBGMhbKgj2B0LIle8eNhgiBsoMwFEY7rQDqVwlo5
-esUE/AAR81gUYIUT8UR2//4/rK+pLjs3MhIFEVJN9WwXK2oM+P1BREpQO0hjwkw+BzJWY1oOXB5L
-w9DIOGTQvYS4UFqigR9ZwUqEXFghVop059AjonqcAIZrqCKg31AS3OU66Adf4sabWqKvvHIYpoNh
-y+Vj4xMHVEW93eUuo0izhT4oRbcSIoALbRle4AVVkfBup6g9thwCzRX1VRQmdMeqLVETEIkW2ZNx
-H8oqzqAfXCGJEQ6XBQEgNQ2A7tq1C1a1tvaattOOrVFOqVSLCQhqU6QPx+DTsOU0GavLYUV20Qv4
-rEIymYNQuB48Wkg8QTA0NIQeYKB6NGTgH90jIcJEMikAi1dRRo9NLV583ek33jjpFAGIPw8++IAj
-e9SIRGm5wliraVosnTWLmmemUugBkTiPSS3AtgV8VQA9A8LxdfULYXBoEKv2wMhIn2BHGFR0DZ6d
-glQ6hUDT6A/RWVSSmfx5DjxRV1vzVkdHBzDAWLNmDezc+aQVqqz5dSY52Z63nLn9A33lI9myLXNL
-xv0Fq3gWutMN0BToxcso+AN+cKmOXI5A9P12mKDzYNXcZXDq1F+h+IboFgzb1VAhDULeJpxwC19G
-g/uMgOXVfXW1tbWCYM6mtdi8+YfiM4m/Y1UrHzkergyXz/3czImCnRjuHiW3qxpPqGFPy6SpHJC9
-IR+Sm+2N8i/dcMOMZdGeshcrS/S58+c3zU2Z8oVD50cbVfP8M4pGkymoUxLxsUzOVhtmQ+5432Rg
-oj6QOLFj28/caQk+EjMXraUV1eW+8dH06StQZnlnNbQefGTD92pWfu3I6TOT8oY7brv4hWUt3xiw
-2OrlDVVdRslsd2Fd469Q8sUB3c8uOW49SdHX1rbcePhoz3B7feuqlt5oZtBTv+ioSdXc7q3fHQaM
-fwtg6Vd/dEvn8Qssnzg/0Ns56jRcO6Nw4d1Af+/RH0/cdv+O/fRK7KnmBXPWGsQeDPhK9oWC6hdd
-R3pdUcg88Tx7U7Ej1y1qMjreGwjt/cnaF2YtvCXQe7bzxLkj+/sunT0Ry00OwHRI8DERLqeNmqGV
-JZJVC6Yu7UxMOfLFlV9pWQcYp57/013rb1u9ua29b0Ch4bsl4tKLY5P1sgxNJzsHDj136KzS3NTk
-9mTNusPvXJLrbnjUe/b16FDfsZ/3xC8d4/HoCQ4Anwzg91vWPL7+3pvvDM806sTY4IVyMxfrojO3
-BVubbyJMhnVVM3y+l187/nChIJ2ZpSs9hMD4qC6t6x6+0gkAoRC33/Sb8RdmXj9nzvWraivhP47g
-AyHxKb1mfWkRYHCjMb30nafeeWzerU9963w3L3/02c4f7D0y0NXTx3f3D/JTb7bzxpeODu55+PGT
-yy5F+ZmeD/iSrh5efeJd/hGZP5GBux+6cysY3w7H+16IVy65V6trnn3P9JqVjQ3JuSsdHhWW6hIL
-NuhyUpJgEF/ofSVBeLBuVtVjd3y55SHXhQ8UBht0DR4r98Fs+IRg/zrxlz2/2A7p5yYBY93Gu+4f
-H5xojLwOxfjd/WufOHhQ/IcD7eYVC5YyCjFMfkVV4NpMFvpTachoZeDaNryLnliOczsUCv1XBWD8
-YjF5MWJ9kcT757qenR7vf4bDoqWwHCvUUfPNsQQMWSZAZTlsw7nxYQQTcuDrjgQuPn7z/D7YivNt
-nPPfEDzwqcU75/j6SD/f8uG5vXs5dL7Hjb+d4gp8mnF8nAOabjcac+OBAxyuNiT4HyNwGZYgu0RW
-IDt/Icz4zAC0tXE4183rQ6XwU9uBXgLQ5Teg7GIv1+EqgsF/GY4DtCQALZMp2ITttmqoHzpWr756
-o/0d59+Lh3Y1HHcAAAAASUVORK5CYII=
-
---nextPart1939768.sIoLGH0PD8--
-
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted-attachment-and-non-encrypted-attachment.mbox.html b/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted-attachment-and-non-encrypted-attachment.mbox.html
deleted file mode 100644
index 092a3440..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted-attachment-and-non-encrypted-attachment.mbox.html
+++ /dev/null
@@ -1,77 +0,0 @@
-<?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">
-          <table cellspacing="1" cellpadding="1" class="encr">
-            <tr class="encrH">
-              <td dir="ltr">Encrypted message</td>
-            </tr>
-            <tr class="encrB">
-              <td>
-                <div style="position: relative; word-wrap: break-word">
-                  <a name="att"/>
-                  <div id="attachmentDiv">
-                    <table cellspacing="1" cellpadding="1" class="signOkKeyOk">
-                      <tr class="signOkKeyOkH">
-                        <td dir="ltr">
-                          <table cellspacing="0" cellpadding="0" width="100%">
-                            <tr>
-                              <td>Signed by <a href="mailto:test@kolab.org">test@kolab.org</a>.</td>
-                              <td align="right">
-                                <a href="kmail:showSignatureDetails">Show Details</a>
-                              </td>
-                            </tr>
-                          </table>
-                        </td>
-                      </tr>
-                      <tr class="signOkKeyOkB">
-                        <td>
-                          <a name="att1"/>
-                          <div id="attachmentDiv1">
-                            <a name="att1.1"/>
-                            <div id="attachmentDiv1.1">
-                              <div class="noquote">
-                                <div dir="ltr">test text</div>
-                              </div>
-                            </div>
-                            <a name="att1.2"/>
-                            <div id="attachmentDiv1.2">
-                              <hr/>
-                              <div>
-                                <a href="attachment:1:e0:1.2?place=body"><img align="center" height="48" width="48" src="file:text-plain.svg" border="0" style="max-width: 100%" alt=""/>file.txt</a>
-                              </div>
-                              <div/>
-                            </div>
-                          </div>
-                        </td>
-                      </tr>
-                      <tr class="signOkKeyOkH">
-                        <td dir="ltr">End of signed message</td>
-                      </tr>
-                    </table>
-                  </div>
-                </div>
-              </td>
-            </tr>
-            <tr class="encrH">
-              <td dir="ltr">End of encrypted message</td>
-            </tr>
-          </table>
-        </div>
-        <a name="att2"/>
-        <div id="attachmentDiv2">
-          <hr/>
-          <div>
-            <a href="attachment: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>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted-attachment-and-non-encrypted-attachment.mbox.tree b/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted-attachment-and-non-encrypted-attachment.mbox.tree
deleted file mode 100644
index 473f0b10..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted-attachment-and-non-encrypted-attachment.mbox.tree
+++ /dev/null
@@ -1,11 +0,0 @@
- * MimeTreeParser::MessagePartList
-  * MimeTreeParser::MimeMessagePart
-   * MimeTreeParser::EncryptedMessagePart
-    * MimeTreeParser::SignedMessagePart
-     * MimeTreeParser::MimeMessagePart
-      * MimeTreeParser::TextMessagePart
-       * MimeTreeParser::MessagePart
-      * MimeTreeParser::AttachmentMessagePart
-       * MimeTreeParser::MessagePart
-   * MimeTreeParser::AttachmentMessagePart
-    * MimeTreeParser::MessagePart
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted-attachment.mbox b/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted-attachment.mbox
deleted file mode 100644
index 4204fb0b..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted-attachment.mbox
+++ /dev/null
@@ -1,57 +0,0 @@
-From test@kolab.org Fri May 01 15:13:18 2015
-From: testkey <test@kolab.org>
-To: you@you.com
-Subject: enc attachment
-Date: Fri, 01 May 2015 17:13:18 +0200
-Message-ID: <2401407.XhOc2XYoOt@tabin.local>
-X-KMail-Identity: 1197256126
-User-Agent: KMail/4.13.0.1 (Linux/3.19.1-towo.1-siduction-amd64; KDE/4.14.2; x86_64; git-cd33034; 2015-04-11)
-MIME-Version: 1.0
-Content-Type: multipart/encrypted; boundary="nextPart4793536.cjk9hKXLQ5"; protocol="application/pgp-encrypted"
-
-
---nextPart4793536.cjk9hKXLQ5
-Content-Type: application/pgp-encrypted
-Content-Disposition: attachment
-Content-Transfer-Encoding: 7Bit
-
-Version: 1
---nextPart4793536.cjk9hKXLQ5
-Content-Type: application/octet-stream
-Content-Disposition: inline; filename="msg.asc"
-Content-Transfer-Encoding: 7Bit
-
------BEGIN PGP MESSAGE-----
-Version: GnuPG v2
-
-hIwDGJlthTT7oq0BBACLMnR5Mln6JGCccvqZCgM3qUkFWZ7a33b7Nl2g5lSOLX6q
-dlGOr/0jAuqdkRwCDTom3hsrH2vf1kARTSST+5cewngS2CgBTAwwc8JymEagTkKf
-VK/tTnM6G7puMVkwuafpuRggyJAUYvjktgUKOUaXtuxX71g0NagAFQGqlvGuq4UB
-DAMMzkNap8zaOwEH+wWSs5xdV1x37T11EnUvkhoOMu+uId2U7NEx2JdQ/FGJZdti
-mtqfM9GKTtQlGVcn3ISH7Wmrw3x0bsOLuW7oxkU4xIS3tVvibxaaWdmponN5TUai
-Dr4LCTEmG7+jLNopF6V4zPmpQ9YxMwQOm8ITml+auNOg9EtHxavwr3Xd1hOYA92N
-1bkOiHzmb9hQtUy1GfRRk91tRqtRPoaamczLxWV9yROFDRNuSSbZ8oBU/K4YgSTL
-D+/FhCt6MxV0DQzp+UCSL7ZsMx+ldPnZK44Udd17+U3xQDDUffo6cSg6FAF425Rh
-v3ZQP0j7LtSIwDh2Rxc+Is4DuSmfZksL5nLPH5nS6QGJnsVEqVcZgQPktl1Zaeil
-x/6WaWruuJm92G2fd9x2/giTLZnk918BVi/n00xR/n4bnSQmmFhXVqAVjGlG6Tr9
-dxej8dSiFdxO8ZjFe5tguQw76xlCu/9MxmSXTP7Mfvm4jqdcjUOINwHOzR/h2T62
-ZlrmqoxMHm4RN0PQ334tSzQXD4gcoUHL+xq62ATt7/jx0p0pIXPmPVUFopCk8k1E
-m2ErPLnyfGLd4LNZRL03oP0jCjX6Q/LFWLTjCIdU6+aM6nT26CZy98yZV0SRGyhu
-qYxN0aVW+RatmDRWWtouOJllQouQ7ZaqmjHLgyOj32/oT8cYUWWdFswSsnMhJjxb
-r6iajUeAZgiN+zqwgf6j1Z8/mMvb+yirP+Rn9ME1fq3XSYHlnIOxKNBa+St8DdaP
-/ZvrkwNTpVp1GmaZLBXdqdeLmflJ4U/X7wphZGR3sgjOwj0oYotX1Zb8OrtlP5WC
-VXhhrt40e7Ilt2B0x7Xe9DWKByDCqrQUhwxwTS3miiKH9G1VEcHko70O98RjKJQ3
-I4VW6e/Gqv2zAMiiOu1MBTeGfPQItca4bUrVzhKjm27twtZD4wLSQDTQECxrCWHC
-BFAdzvsIry0FIXoO6Vh16Hojq+YZ8tpmknGfpg0pnuRvAdDWU+0uuECXDE0UZFWC
-2g3Bs2Dn2BYYyrI6X92swHz8qP3JvdxN0dpsYMkMdHN4yWXJogNSfXzy2udf0A4P
-NNZMOonhlwH+DBRfcWS0A/j0/fdDCDzR5Ca5dbX7lL4EscbBeoCP1JJyVoOp6DUc
-ICuHJGGrnpNdG9DMa97tqpyGRHTAwI3lJXPKTDEHN9v9XobIyndFgi/tcPLZ7QWz
-9mN94NKLmeYWjrMiRbNQk8BYXR9K17SHb4BkIMdBxRsJjgMEC8qniUH64Nnf8/x4
-yaRCuUo0bkHDE3AqCzZE1R0he66dDkfOIz+mLwcpG8jZWjFm7sXAflBe3jvIc0lm
-NyWQ1WnMkP83fWm/+YqrLLf+tTQtievRPeS1Dd/7v9yqUWEmQ0pUOj3MNf9Ej2KI
-vu5ap7fHIevcBn42BPwQgSnp4YmXEY0ir5Ccwogusnt7QliNSRmkN6Jap4AF
-=AVJ4
------END PGP MESSAGE-----
-
---nextPart4793536.cjk9hKXLQ5--
-
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted-attachment.mbox.html b/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted-attachment.mbox.html
deleted file mode 100644
index 2b266b02..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted-attachment.mbox.html
+++ /dev/null
@@ -1,66 +0,0 @@
-<?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="encr">
-          <tr class="encrH">
-            <td dir="ltr">Encrypted message</td>
-          </tr>
-          <tr class="encrB">
-            <td>
-              <div style="position: relative; word-wrap: break-word">
-                <a name="att"/>
-                <div id="attachmentDiv">
-                  <table cellspacing="1" cellpadding="1" class="signOkKeyOk">
-                    <tr class="signOkKeyOkH">
-                      <td dir="ltr">
-                        <table cellspacing="0" cellpadding="0" width="100%">
-                          <tr>
-                            <td>Signed by <a href="mailto:test@kolab.org">test@kolab.org</a>.</td>
-                            <td align="right">
-                              <a href="kmail:showSignatureDetails">Show Details</a>
-                            </td>
-                          </tr>
-                        </table>
-                      </td>
-                    </tr>
-                    <tr class="signOkKeyOkB">
-                      <td>
-                        <a name="att1"/>
-                        <div id="attachmentDiv1">
-                          <a name="att1.1"/>
-                          <div id="attachmentDiv1.1">
-                            <div class="noquote">
-                              <div dir="ltr">test text</div>
-                            </div>
-                          </div>
-                          <a name="att1.2"/>
-                          <div id="attachmentDiv1.2">
-                            <hr/>
-                            <div>
-                              <a href="attachment:e0:1.2?place=body"><img align="center" height="48" width="48" src="file:text-plain.svg" border="0" style="max-width: 100%" alt=""/>file.txt</a>
-                            </div>
-                            <div/>
-                          </div>
-                        </div>
-                      </td>
-                    </tr>
-                    <tr class="signOkKeyOkH">
-                      <td dir="ltr">End of signed message</td>
-                    </tr>
-                  </table>
-                </div>
-              </div>
-            </td>
-          </tr>
-          <tr class="encrH">
-            <td dir="ltr">End of encrypted message</td>
-          </tr>
-        </table>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted-attachment.mbox.tree b/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted-attachment.mbox.tree
deleted file mode 100644
index f433fd45..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted-attachment.mbox.tree
+++ /dev/null
@@ -1,8 +0,0 @@
- * MimeTreeParser::MessagePartList
-  * MimeTreeParser::EncryptedMessagePart
-   * MimeTreeParser::SignedMessagePart
-    * MimeTreeParser::MimeMessagePart
-     * MimeTreeParser::TextMessagePart
-      * MimeTreeParser::MessagePart
-     * MimeTreeParser::AttachmentMessagePart
-      * MimeTreeParser::MessagePart
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted-enigmail1.6.mbox b/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted-enigmail1.6.mbox
deleted file mode 100644
index 9afd17e3..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted-enigmail1.6.mbox
+++ /dev/null
@@ -1,48 +0,0 @@
-From you@you.com Sat, 29 Mar 2014 15:04:21 +0100
-FCC: imap://hefee%40netzguerilla.net@mail.netzguerilla.net/Sent
-X-Identity-Key: id1
-X-Account-Key: account4
-Message-ID: <5336D2E5.6010602@you.com>
-Date: Sat, 29 Mar 2014 15:04:21 +0100
-From: you <you@you.com>
-X-Mozilla-Draft-Info: internal/draft; vcard=0; receipt=0; DSN=0; uuencode=0
-User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Icedove/24.4.0
-MIME-Version: 1.0
-To: test@kolab.com
-Subject: test
-X-Enigmail-Version: 1.6
-X-Enigmail-Draft-Status: 515
-X-Enigmail-Draft-Status: 739
-Content-Type: multipart/encrypted;
- protocol="application/pgp-encrypted";
- boundary="23VWJ4jAoB40SD17lh6TOBXK3fQSEGNu5"
-
-This is an OpenPGP/MIME encrypted message (RFC 4880 and 3156)
---23VWJ4jAoB40SD17lh6TOBXK3fQSEGNu5
-Content-Type: application/pgp-encrypted
-Content-Description: PGP/MIME version identification
-
-Version: 1
-
---23VWJ4jAoB40SD17lh6TOBXK3fQSEGNu5
-Content-Type: application/octet-stream; name="encrypted.asc"
-Content-Description: OpenPGP encrypted message
-Content-Disposition: inline; filename="encrypted.asc"
-
------BEGIN PGP MESSAGE-----
-Version: GnuPG v1
-Comment: Using GnuPG with Icedove - http://www.enigmail.net/
-
-hIwDGJlthTT7oq0BA/9NtLLXbiIJVS6pOynwEeSznrQK7kYVla8RM43//JECCkGJ
-azEaSBznabBv6epaFmQtVHLMXlCbZnMmW9loyqPBfMoAms6kKKBdG/jqhus89iXE
-+seXngC233Va/gZMb2DxOqIokVNfj9tpR7xQ8wS/jHTDiLNc1GOQC7ku42z2bNLA
-IQFRD/qbBFz89hU4wP4cYoAysOnEDojFrsrnCidTHJOJrndM6PPUtH/jQCyfr/EG
-2tSpJwYKvmT6ly3yqaGLBtRPIxiv+dMe+7yw0t40qbjvvaTGavErEBJEKX5eWbTN
-/sjajHpUHqs6SIiMheH9dr+WfzFONtVbPEgGRmOERhlgTl/nLo86AZpjJroIGKJJ
-tTHCcoQGAWG+N7wrCE1RxR0kkMs4nRozj0TLu6ZyXMs+H063MewTPNxNAiQT1Nbi
-udKWmfLBlxn06p+JDzUKxj8PFwObdbxTvACzbAvBY1aHMQ==
-=mLl3
------END PGP MESSAGE-----
-
---23VWJ4jAoB40SD17lh6TOBXK3fQSEGNu5--
-
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted-enigmail1.6.mbox.html b/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted-enigmail1.6.mbox.html
deleted file mode 100644
index 09d904bb..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted-enigmail1.6.mbox.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<?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="encr">
-          <tr class="encrH">
-            <td dir="ltr">Encrypted message</td>
-          </tr>
-          <tr class="encrB">
-            <td>
-              <div style="position: relative; word-wrap: break-word">
-                <a name="att"/>
-                <div id="attachmentDiv">
-                  <a name="att1"/>
-                  <div id="attachmentDiv1">
-                    <div class="noquote">
-                      <div dir="ltr">test</div>
-                    </div>
-                  </div>
-                </div>
-              </div>
-            </td>
-          </tr>
-          <tr class="encrH">
-            <td dir="ltr">End of encrypted message</td>
-          </tr>
-        </table>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted-enigmail1.6.mbox.tree b/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted-enigmail1.6.mbox.tree
deleted file mode 100644
index 009ba99a..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted-enigmail1.6.mbox.tree
+++ /dev/null
@@ -1,5 +0,0 @@
- * MimeTreeParser::MessagePartList
-  * MimeTreeParser::EncryptedMessagePart
-   * MimeTreeParser::MimeMessagePart
-    * MimeTreeParser::TextMessagePart
-     * MimeTreeParser::MessagePart
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted-noData.mbox b/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted-noData.mbox
deleted file mode 100644
index c4f14226..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted-noData.mbox
+++ /dev/null
@@ -1,17 +0,0 @@
-From test@kolab.org Wed, 08 Sep 2010 17:02:52 +0200
-From: OpenPGP Test <test@kolab.org>
-To: test@kolab.org
-Subject: OpenPGP encrypted
-Date: Wed, 08 Sep 2010 17:02:52 +0200
-User-Agent: KMail/4.6 pre (Linux/2.6.34-rc2-2-default; KDE/4.5.60; x86_64; ; )
-MIME-Version: 1.0
-Content-Type: multipart/encrypted; boundary="nextPart1357031.ppLHckZtsp"; protocol="application/pgp-encrypted"
-Content-Transfer-Encoding: 7Bit
-
---nextPart1357031.ppLHckZtsp
-Content-Type: application/pgp-encrypted
-Content-Disposition: attachment
-
-Version: 1
-
---nextPart1357031.ppLHckZtsp--
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted-noData.mbox.html b/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted-noData.mbox.html
deleted file mode 100644
index 52196784..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted-noData.mbox.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<?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">
-          <hr/>
-          <div>
-            <a href="attachment:1?place=body"><img align="center" height="48" width="48" src="file:application-pgp-encrypted.svg" border="0" style="max-width: 100%" alt=""/>Unnamed</a>
-          </div>
-          <div/>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted-noData.mbox.tree b/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted-noData.mbox.tree
deleted file mode 100644
index 79a20c8d..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted-noData.mbox.tree
+++ /dev/null
@@ -1,4 +0,0 @@
- * MimeTreeParser::MessagePartList
-  * MimeTreeParser::MimeMessagePart
-   * MimeTreeParser::AttachmentMessagePart
-    * MimeTreeParser::MessagePart
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted-non-encrypted-attachment.mbox b/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted-non-encrypted-attachment.mbox
deleted file mode 100644
index 2957bf3c..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted-non-encrypted-attachment.mbox
+++ /dev/null
@@ -1,114 +0,0 @@
-From test@kolab.org Fri May 01 15:13:51 2015
-From: testkey <test@kolab.org>
-To: you@you.com
-Subject: non enc attachment
-Date: Fri, 01 May 2015 17:13:51 +0200
-Message-ID: <20157069.RcaNBhWVXx@tabin.local>
-X-KMail-Identity: 1197256126
-User-Agent: KMail/4.13.0.1 (Linux/3.19.1-towo.1-siduction-amd64; KDE/4.14.2; x86_64; git-cd33034; 2015-04-11)
-MIME-Version: 1.0
-Content-Type: multipart/mixed; boundary="nextPart1612969.Xqz3IcFXZ3"
-Content-Transfer-Encoding: 7Bit
-
-This is a multi-part message in MIME format.
-
---nextPart1612969.Xqz3IcFXZ3
-Content-Type: multipart/encrypted; boundary="nextPart2213427.hvfAsaxZ1O"; protocol="application/pgp-encrypted"
-
-
---nextPart2213427.hvfAsaxZ1O
-Content-Type: application/pgp-encrypted
-Content-Disposition: attachment
-Content-Transfer-Encoding: 7Bit
-
-Version: 1
---nextPart2213427.hvfAsaxZ1O
-Content-Type: application/octet-stream
-Content-Disposition: inline; filename="msg.asc"
-Content-Transfer-Encoding: 7Bit
-
------BEGIN PGP MESSAGE-----
-Version: GnuPG v2
-
-hIwDGJlthTT7oq0BBACdvp3PFrRx6vxZhxt06LqyaO7+SWBbVUr7GOa3QaYCCBm+
-/KTUZEfhPuGVcsVpJKZbPsUKVhYfvYpDAsZu3TehmKflobWAV/cCIK2BkQB744pd
-oaCtTj7pmCO05Zt5Uo/tXbrgceuW+/huwn2DO2fk4MUBsluH3fMbvccZJnR3yoUB
-DAMMzkNap8zaOwEIAOTKI8Bh3NhfuJdWDsjv+UT6E4kf/zg3D95mJ+3gK8kHFXdd
-YyEKaMsYx64kSwm1KcjsJ4gWykJlB34YDDfcIrnbgO2QRss9GhgOcUtLr0KNcY+0
-OJ4sbNmI8I3XssMb4rHtDrcXc0ODd0v/C/Lw2VfUdN+bBY4EetG096OPiZ4R41kF
-Rj95nhO8tpoJx9VltegCdZI2AxtykOYvUaLFyYqCoKMmQwqGjdaUv1CeMnxUIPsn
-A/x6TQ0AjpZ5IfMqO7QmOv3ACFo5/Ur93NauOK6szg/zdih9OxUL0Qid3nZQQwqA
-J9ZChTcUgdjQo8EjpWLy0oXR9uLSHcLwRo3OdRzS6QEz7Dus6hmpEal3zTZFj2NR
-mK38tpp+eWhzSAFAx8tyImz8SU2N2o7xQHlEdlWYGeIQg0embMnmMv6WJVWhYahb
-x5OTfHCGwHFsLhZDmtaNhAVMlYdqxKXoR45H9cmGNPpU5kN5Ckjr6I+I51cfgAOE
-1vF54jYHXd1btfGrwAyKWBfFVQFPWjuIUdsEl8zDjNTmcCCbA77tEGohSqDi+WWL
-LyYw5g/uwwZ+5OzeRdjAJ+9xtJ+WXhnDUffG8GgGgZWBQD+S2Ix4lZ2NcAeyLPt/
-cXeDHkPUXj7cjm0hl7SvBKzR6X4EEWO/hh19mxngd4+e19q6Qm4K2QMfTwQQyNED
-whBkRXhcXcRxWlb/ICwFDIgxKLJko5HVTknBJDllNdm6l2C4Y9/IY2imqXni8xZX
-zQfAkDOBlfouUrHbPuBCRdCLmp7BgbanCaJDvgYGBvXEgjMKpV3bezTfm4Ugwiyk
-dJfMu/4XftZy7XqoFuDheNXuQ5JobpvVDaiTQ0EWHpHeX3TZ0xa8i1FO6ANLakUp
-aVFWzYl91bxbNHIcPh278neyi+LNWWT6TvkCwcbUYUfuIySOwfSUJAHDIJOx50Ha
-If0fNQDtF4o9mDFwXDwVf8e2zx5NjheqgYX/qIWjFE2cCCkUM4UkNrkYBOiwnh9F
-RJz4M6wKPhZT34MBlTKgwDbypDp+XYnM2HunzIDXCAigYsD/AuLNeFwsIPiXWJ47
-oXamEJxyqS9G0t/iy7+1mbNiFct7pvHt6QUKZ9aXSXj3MkQuWjjVNvMz6KocTSyL
-AeWQNYuvA5NkyZOA5+VU1ma3wn7IAXYkgw+OMvcz9VNevXNg956ZnGbb47Fqppp+
-MjK2ptM1UzIEnHxXtq3KFrXG1AzzhyFnKIjsiDpFTlMGTT9pRGnK8zyYXYPEgpwW
-874A5auLFOvhwPSNMhMai+XSoE3P+zZDqhXMYU8c49O+SeOtISg3Iy5tXuIPlIps
-7k0KA60hPulMYBQLtZ/yDO/gXhkeWaw=
-=EJZ6
------END PGP MESSAGE-----
-
---nextPart2213427.hvfAsaxZ1O--
-
---nextPart1612969.Xqz3IcFXZ3
-Content-Disposition: attachment; filename="image.png"
-Content-Transfer-Encoding: base64
-Content-Type: image/png; name="image.png"
-
-iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAAlwSFlzAAAb
-rwAAG68BXhqRHAAAAAd0SU1FB9gHFg8aNG8uqeIAAAAGYktHRAD/AP8A/6C9p5MAAAkqSURBVHja
-5VV7cFTVGf/OPefeu3fv3t1NdhMSCHkKASEpyEsaGwalWEWntLV1Wu0fdOxAx9Iq0xntAwac6ehY
-p+rwKLbjjLRFh9JadURKRGgFQTTECCYQE9nNgzzYZDe7m33d1+l3tpOOU61T2tF/+s1s7pzn9/t+
-v993Av/3QT6FO6WdO/d+M55Il8rMOdrT0x3Zt++3+c8EgM/nozseeviJiYmpe1zOQdM8BOOCIku/
-lIj1VrQ/0r9n9+78xwLgeAA3w4fHXV1d5Omnn6aapumlJSVVqalUJJvJZRdcu0RSfZQsaW7mjfPm
-cbF9+/btEIlEaq6Z03whXyhIjDFuGIZEKSP5fMFRVcVNT2Vf0jzsmMxYGtel9rff/vM/M8bjcZpM
-Jp1XX32VNDc3e7ovRP3JyZGVNdXVd1FGGwKBQEM8njiWTKV36IHgEACwibGx62LjU/cBd01Zljoc
-p9DHmLbHsmyK1UuKooJt24IMcLE+y3L45eEYLS8LgWH4YXR0bAPZtGmTVFvfoBZMEzKpFKmqqmqp
-qane4DhOteH3L1FkWZVlGSzLAtd1Oe4773C4LxoZvDWXh82OY2MtwAuFvCvSyDIFXdelYDDIvF4d
-xPzA0AgXFStMcWPxBPGoKvXpPh6JDG5hK1Zcv1H36Xc6tsMs21EMQ69CLSts2wGkDygTyW2CP8gX
-TKLIyvx0OrdDUXyLKXVUkdSne4QKtFAwuWmabjAYkDyqAgG/jziORh1EKaonkkQt2yRZRC5JHEGn
-L7OKyopNqqo2IbWQjqWgLOwFBFKsuGDa4PVyIssMk1sCACCjimXbrbquYKW41zJJOpXkeARyeZNQ
-SUKwHEqCKnBuAybkZeFSmssVSDKdhlBpCRgIcnQsdvKPB19sY4rMNIaH0BhQUVHKvXgpIiQF0wK/
-4QORnOEayoDzOSBMXK4BSgpeTcMECqiqTDKZHDKmct3LCI55Kp0mQgK/3yDYkgIc3kNhfHzCkRk9
-p6nk+yPD3SmWzeZiKNkciUrg2g5BjQWdSBchiEvQjzoWAFkUYPDrCjBFUEJ8AhSIRyl2jcfjEL9h
-AFJODL8B6H7IZrNIt2g3B1mysShdQhmbT58+ExRdx3L5/PNomGU4kJkuA9ILYn+JP4CXOoDUoWO9
-IBhCSBCLTYCK+rqOg8CKvY6JPQhGxjkX1zyAdwrgAhTKWBDmxTUTC7Tcy5dHBiilL7cdaTsNGAwP
-7o32D4Q9HnWTrvsCiqIgdWgqDkJfkKgDU1MZcBGMhbKgj2B0LIle8eNhgiBsoMwFEY7rQDqVwlo5
-esUE/AAR81gUYIUT8UR2//4/rK+pLjs3MhIFEVJN9WwXK2oM+P1BREpQO0hjwkw+BzJWY1oOXB5L
-w9DIOGTQvYS4UFqigR9ZwUqEXFghVop059AjonqcAIZrqCKg31AS3OU66Adf4sabWqKvvHIYpoNh
-y+Vj4xMHVEW93eUuo0izhT4oRbcSIoALbRle4AVVkfBup6g9thwCzRX1VRQmdMeqLVETEIkW2ZNx
-H8oqzqAfXCGJEQ6XBQEgNQ2A7tq1C1a1tvaattOOrVFOqVSLCQhqU6QPx+DTsOU0GavLYUV20Qv4
-rEIymYNQuB48Wkg8QTA0NIQeYKB6NGTgH90jIcJEMikAi1dRRo9NLV583ek33jjpFAGIPw8++IAj
-e9SIRGm5wliraVosnTWLmmemUugBkTiPSS3AtgV8VQA9A8LxdfULYXBoEKv2wMhIn2BHGFR0DZ6d
-glQ6hUDT6A/RWVSSmfx5DjxRV1vzVkdHBzDAWLNmDezc+aQVqqz5dSY52Z63nLn9A33lI9myLXNL
-xv0Fq3gWutMN0BToxcso+AN+cKmOXI5A9P12mKDzYNXcZXDq1F+h+IboFgzb1VAhDULeJpxwC19G
-g/uMgOXVfXW1tbWCYM6mtdi8+YfiM4m/Y1UrHzkergyXz/3czImCnRjuHiW3qxpPqGFPy6SpHJC9
-IR+Sm+2N8i/dcMOMZdGeshcrS/S58+c3zU2Z8oVD50cbVfP8M4pGkymoUxLxsUzOVhtmQ+5432Rg
-oj6QOLFj28/caQk+EjMXraUV1eW+8dH06StQZnlnNbQefGTD92pWfu3I6TOT8oY7brv4hWUt3xiw
-2OrlDVVdRslsd2Fd469Q8sUB3c8uOW49SdHX1rbcePhoz3B7feuqlt5oZtBTv+ioSdXc7q3fHQaM
-fwtg6Vd/dEvn8Qssnzg/0Ns56jRcO6Nw4d1Af+/RH0/cdv+O/fRK7KnmBXPWGsQeDPhK9oWC6hdd
-R3pdUcg88Tx7U7Ej1y1qMjreGwjt/cnaF2YtvCXQe7bzxLkj+/sunT0Ry00OwHRI8DERLqeNmqGV
-JZJVC6Yu7UxMOfLFlV9pWQcYp57/013rb1u9ua29b0Ch4bsl4tKLY5P1sgxNJzsHDj136KzS3NTk
-9mTNusPvXJLrbnjUe/b16FDfsZ/3xC8d4/HoCQ4Anwzg91vWPL7+3pvvDM806sTY4IVyMxfrojO3
-BVubbyJMhnVVM3y+l187/nChIJ2ZpSs9hMD4qC6t6x6+0gkAoRC33/Sb8RdmXj9nzvWraivhP47g
-AyHxKb1mfWkRYHCjMb30nafeeWzerU9963w3L3/02c4f7D0y0NXTx3f3D/JTb7bzxpeODu55+PGT
-yy5F+ZmeD/iSrh5efeJd/hGZP5GBux+6cysY3w7H+16IVy65V6trnn3P9JqVjQ3JuSsdHhWW6hIL
-NuhyUpJgEF/ofSVBeLBuVtVjd3y55SHXhQ8UBht0DR4r98Fs+IRg/zrxlz2/2A7p5yYBY93Gu+4f
-H5xojLwOxfjd/WufOHhQ/IcD7eYVC5YyCjFMfkVV4NpMFvpTachoZeDaNryLnliOczsUCv1XBWD8
-YjF5MWJ9kcT757qenR7vf4bDoqWwHCvUUfPNsQQMWSZAZTlsw7nxYQQTcuDrjgQuPn7z/D7YivNt
-nPPfEDzwqcU75/j6SD/f8uG5vXs5dL7Hjb+d4gp8mnF8nAOabjcac+OBAxyuNiT4HyNwGZYgu0RW
-IDt/Icz4zAC0tXE4183rQ6XwU9uBXgLQ5Teg7GIv1+EqgsF/GY4DtCQALZMp2ITttmqoHzpWr756
-o/0d59+Lh3Y1HHcAAAAASUVORK5CYII=
-
---nextPart1612969.Xqz3IcFXZ3--
-
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted-non-encrypted-attachment.mbox.html b/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted-non-encrypted-attachment.mbox.html
deleted file mode 100644
index e20a9568..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted-non-encrypted-attachment.mbox.html
+++ /dev/null
@@ -1,69 +0,0 @@
-<?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">
-          <table cellspacing="1" cellpadding="1" class="encr">
-            <tr class="encrH">
-              <td dir="ltr">Encrypted message</td>
-            </tr>
-            <tr class="encrB">
-              <td>
-                <div style="position: relative; word-wrap: break-word">
-                  <a name="att"/>
-                  <div id="attachmentDiv">
-                    <table cellspacing="1" cellpadding="1" class="signOkKeyOk">
-                      <tr class="signOkKeyOkH">
-                        <td dir="ltr">
-                          <table cellspacing="0" cellpadding="0" width="100%">
-                            <tr>
-                              <td>Signed by <a href="mailto:test@kolab.org">test@kolab.org</a>.</td>
-                              <td align="right">
-                                <a href="kmail:showSignatureDetails">Show Details</a>
-                              </td>
-                            </tr>
-                          </table>
-                        </td>
-                      </tr>
-                      <tr class="signOkKeyOkB">
-                        <td>
-                          <a name="att1"/>
-                          <div id="attachmentDiv1">
-                            <a name="att1.1"/>
-                            <div id="attachmentDiv1.1">
-                              <div class="noquote">
-                                <div dir="ltr">test text</div>
-                              </div>
-                            </div>
-                          </div>
-                        </td>
-                      </tr>
-                      <tr class="signOkKeyOkH">
-                        <td dir="ltr">End of signed message</td>
-                      </tr>
-                    </table>
-                  </div>
-                </div>
-              </td>
-            </tr>
-            <tr class="encrH">
-              <td dir="ltr">End of encrypted message</td>
-            </tr>
-          </table>
-        </div>
-        <a name="att2"/>
-        <div id="attachmentDiv2">
-          <hr/>
-          <div>
-            <a href="attachment: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>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted-non-encrypted-attachment.mbox.tree b/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted-non-encrypted-attachment.mbox.tree
deleted file mode 100644
index c2a6ad01..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted-non-encrypted-attachment.mbox.tree
+++ /dev/null
@@ -1,9 +0,0 @@
- * MimeTreeParser::MessagePartList
-  * MimeTreeParser::MimeMessagePart
-   * MimeTreeParser::EncryptedMessagePart
-    * MimeTreeParser::SignedMessagePart
-     * MimeTreeParser::MimeMessagePart
-      * MimeTreeParser::TextMessagePart
-       * MimeTreeParser::MessagePart
-   * MimeTreeParser::AttachmentMessagePart
-    * MimeTreeParser::MessagePart
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted-partially-signed-attachments.mbox b/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted-partially-signed-attachments.mbox
deleted file mode 100644
index 222b5936..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted-partially-signed-attachments.mbox
+++ /dev/null
@@ -1,91 +0,0 @@
-From: firstname.lastname@example.com
-To: test@kolab.org
-Subject: OpenPGP encrypted one signed and one unsigned attachment
-Date: Sun, 30 Aug 2015 12:08:40 +0200
-Message-ID: <1737262.ESByPkoaL9@vkpc5>
-X-KMail-Identity: 402312391
-X-KMail-Dictionary: en_US
-User-Agent: KMail/5.0.42 pre (Linux/3.16.6-2-desktop; KDE/5.14.0; x86_64; ; )
-MIME-Version: 1.0
-Content-Type: multipart/mixed; boundary="nextPart2760349.k2GQmrcl5a"
-Content-Transfer-Encoding: 7Bit
-
-This is a multi-part message in MIME format.
-
---nextPart2760349.k2GQmrcl5a
-Content-Type: multipart/encrypted; boundary="nextPart2260160.XvshVD34ka"; protocol="application/pgp-encrypted"
-
---nextPart2260160.XvshVD34ka
-Content-Type: application/pgp-encrypted
-Content-Disposition: attachment
-Content-Transfer-Encoding: 7Bit
-
-Version: 1
---nextPart2260160.XvshVD34ka
-Content-Type: application/octet-stream
-Content-Disposition: inline; filename="msg.asc"
-Content-Transfer-Encoding: 7Bit
-
------BEGIN PGP MESSAGE-----
-Version: GnuPG v2
-
-hQEMAwzOQ1qnzNo7AQgAooa+Peu1t5aiX4WvssEnRlapkr62/49/Dbz5assvshdr
-o9zOC+89Qr5P/ea+tC1MO7ek/DfyL9C4EzOMp/r08GeInLqWMc9qLZO//YaT2JUp
-0IZFbpUQ4C2zjXMRuy/PMrltHuCfsvhvHX1YAHp/xjRsKpQoE3mSDzz5sc8/Hj9n
-2eoKoCEW1rgt2qHtV4DD6lvUPo42LMZclJ9GqfoD7WLoEH9ebRLhXr3D00j6xBfy
-//nooAhzQSW8b7GZth4Qc7DKAZMhuEly/kp07nhuPd1fMJDEAB/zh9EYlgnn3STb
-MCdtFs6kMC24uA2eDCH330Bn9OzzWnsVU9ae4XiKnNLpAeactSFRKKvGytBQaloq
-Gvn1+D0Xmw6OsSmRJ84DzKqG4E6bzE+XhMEMnLlqDvZDsOtU/sCGvMK0MM3y5B7M
-ONqWLN3ng3zrGPec5gqfvnWgKpANUrbJkzS8LNjv4hwoKh0tFpghWQiefG0Z9Hw1
-UaYbFwvaFgXcm72oBkynDCleWjQ2vnDE4P38PldqZbAW/Pw1q6Yq8m9MhS1VpbI5
-WBjuRQhgQvMG0LY0gR/3Qor5tX9ASllWnPfWYVuOiSOAe5Hsp7BmELXkWftHii7k
-YW0Qim7jleDaY1MGfFr0vrO/PiYxGTb+4IUyUgEBYEpxa9ozUoeftF6JbHPuEZI0
-ENX8aIVJ9FnpssrR5HlpXieF12ec9ZFeV7mAwcucJ3RXuDcQHQTHgEbfnzTsaEpL
-Hxs+6euOCJXhKOYVrsAlB4IxK0OQm4XHiZ7WBp5Jp7rlSHltdxFpSnHIfqngyCA4
-L+c/gsUEVbNI++iOOhOKVT47XIf+s/xa1Y4XghGbHIA3/pQphYo4U5dTeLoX0OWI
-64tPxliQTKuJ+NAv9Km2bDgvlvn83jsc94THi5u+fIdDEGp7pgoQNXR69Lkz1bsA
-Hh9xqKzVloHu4SsT3OGX+bfTO3jUh8ieU/4tflZMrJ9RkEfE08PzTnopT08FppFx
-QWpHv/fwyJf6Cw1IevM5pVLAShg0sbCPF/xsYTjSyWNib1wFtxkmv5MToCFwkxi5
-b1yT23BNlV5RV6wcjmrum7p2fMwPjbt8X6z+pgUtkD7zImBWeYddMjgSjOFuFEjF
-gpfVoV3OIvMPZMe2jqWsjnjujHJr2z5IZn3A7WI0b4SIDP0sGwsTBiogKqcBNWpn
-O4MKUq9JwC0K/MY7yS1MCLoHfwU18z19Es/flaAgwtXk8IWIcjkkumAwNl+y8Q+I
-+8AFGdiXTKld9QVwCKnMS3QivHPuFNL8rfcWKsr1nOhOEhaO+zD94eOOiCbwiXGr
-E6WsewNCVQUN4bxAXl2vRi+9WRctLy7bsuIL5dgUz0CMYkQ+dDmrBflD0nyC
-=TGNA
------END PGP MESSAGE-----
-
---nextPart2260160.XvshVD34ka--
-
---nextPart2760349.k2GQmrcl5a
-Content-Type: multipart/encrypted; boundary="nextPart22530242.iRl14SoP0Q"; protocol="application/pgp-encrypted"
-
---nextPart22530242.iRl14SoP0Q
-Content-Type: application/pgp-encrypted
-Content-Disposition: attachment
-Content-Transfer-Encoding: 7Bit
-
-Version: 1
---nextPart22530242.iRl14SoP0Q
-Content-Type: application/octet-stream
-Content-Disposition: inline; filename="msg.asc"
-Content-Transfer-Encoding: 7Bit
-
------BEGIN PGP MESSAGE-----
-Version: GnuPG v2
-
-hQEMAwzOQ1qnzNo7AQgAtA94bBRwgpo64zcyh+4dzt0Pr2pmNjiS4ZX+a/xzYCmD
-oS1a26s/LVZH+aJYC13l1kEu+6YjKn+ruQvMfhihOxglHBLjmUO17TPFC05AReSn
-amMqPbgS6mOwhlBJHrBa/SVwkxmbMaNBUJ/KxRXFtTW/V4pPWImRvI9mnmpo8fHy
-ZLvVAI3hGe7vPG5Vbdi5/Iu/JzqwlglVsP82gYpLlx7HhWGF4gmTGc6YBwFtzEvS
-eqFtKRDqN60bo4HnNLOEnMaWlYPTpt3QibLWWIbtpA1Gb0Q/1NvDnn3Lyj8H+0WV
-8H6Ks9/cvAuoAMOad6y4gDJb+K/AS7Ha+08/3lMYG9LAAgGe8Qocxg1W3ha1o0Ph
-YSfV2ooebsLiHjwspjYpsX5ijnRj6uNGp5Dt28EIo1ANF+oDiSKEwAMGPBtcnqaO
-FWXy39dP3VXE73nsO+dyTidaATFBlYg+IpPTDSFTgsk7XDV973EpdXvOkBEp/vBv
-EZknuZFOkS0v5QHk9Y/hhlSLACTIEWQpBiFGOwUVSZFXLEY5zQNTbQdRbz3ZYcE9
-mIFzD9Ujw6tIJIOFazhwr9SxxyeaAygWeg4ifmmdhAsmFYum
-=WsAv
------END PGP MESSAGE-----
-
---nextPart22530242.iRl14SoP0Q--
-
---nextPart2760349.k2GQmrcl5a--
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted-partially-signed-attachments.mbox.html b/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted-partially-signed-attachments.mbox.html
deleted file mode 100644
index c0b9d79e..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted-partially-signed-attachments.mbox.html
+++ /dev/null
@@ -1,99 +0,0 @@
-<?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">
-          <table cellspacing="1" cellpadding="1" class="encr">
-            <tr class="encrH">
-              <td dir="ltr">Encrypted message</td>
-            </tr>
-            <tr class="encrB">
-              <td>
-                <div style="position: relative; word-wrap: break-word">
-                  <a name="att"/>
-                  <div id="attachmentDiv">
-                    <table cellspacing="1" cellpadding="1" class="signOkKeyOk">
-                      <tr class="signOkKeyOkH">
-                        <td dir="ltr">
-                          <table cellspacing="0" cellpadding="0" width="100%">
-                            <tr>
-                              <td>Signed by <a href="mailto:test@kolab.org">test@kolab.org</a>.</td>
-                              <td align="right">
-                                <a href="kmail:showSignatureDetails">Show Details</a>
-                              </td>
-                            </tr>
-                          </table>
-                        </td>
-                      </tr>
-                      <tr class="signOkKeyOkB">
-                        <td>
-                          <a name="att1"/>
-                          <div id="attachmentDiv1">
-                            <a name="att1.1"/>
-                            <div id="attachmentDiv1.1">
-                              <div class="noquote">
-                                <div dir="ltr">This is the main body.</div>
-                              </div>
-                            </div>
-                            <a name="att1.2"/>
-                            <div id="attachmentDiv1.2">
-                              <table cellspacing="1" class="textAtm">
-                                <tr class="textAtmH">
-                                  <td dir="ltr">attachment1.txt</td>
-                                </tr>
-                                <tr class="textAtmB">
-                                  <td>
-                                    <div class="noquote">
-                                      <div dir="ltr">This is a signed attachment.</div>
-                                    </div>
-                                  </td>
-                                </tr>
-                              </table>
-                            </div>
-                          </div>
-                        </td>
-                      </tr>
-                      <tr class="signOkKeyOkH">
-                        <td dir="ltr">End of signed message</td>
-                      </tr>
-                    </table>
-                  </div>
-                </div>
-              </td>
-            </tr>
-            <tr class="encrH">
-              <td dir="ltr">End of encrypted message</td>
-            </tr>
-          </table>
-        </div>
-        <a name="att2"/>
-        <div id="attachmentDiv2">
-          <table cellspacing="1" cellpadding="1" class="encr">
-            <tr class="encrH">
-              <td dir="ltr">Encrypted message</td>
-            </tr>
-            <tr class="encrB">
-              <td>
-                <div style="position: relative; word-wrap: break-word">
-                  <a name="att"/>
-                  <div id="attachmentDiv">
-                    <div class="noquote">
-                      <div dir="ltr">This is an unsigned attachment.</div>
-                    </div>
-                  </div>
-                </div>
-              </td>
-            </tr>
-            <tr class="encrH">
-              <td dir="ltr">End of encrypted message</td>
-            </tr>
-          </table>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted-partially-signed-attachments.mbox.tree b/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted-partially-signed-attachments.mbox.tree
deleted file mode 100644
index 5cb83749..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted-partially-signed-attachments.mbox.tree
+++ /dev/null
@@ -1,12 +0,0 @@
- * MimeTreeParser::MessagePartList
-  * MimeTreeParser::MimeMessagePart
-   * MimeTreeParser::EncryptedMessagePart
-    * MimeTreeParser::SignedMessagePart
-     * MimeTreeParser::MimeMessagePart
-      * MimeTreeParser::TextMessagePart
-       * MimeTreeParser::MessagePart
-      * MimeTreeParser::AttachmentMessagePart
-       * MimeTreeParser::MessagePart
-   * MimeTreeParser::EncryptedMessagePart
-    * MimeTreeParser::TextMessagePart
-     * MimeTreeParser::MessagePart
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted-two-attachments.mbox b/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted-two-attachments.mbox
deleted file mode 100644
index c53e0916..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted-two-attachments.mbox
+++ /dev/null
@@ -1,42 +0,0 @@
-From: firstname.lastname@example.com
-To: test@kolab.org
-Subject: OpenPGP encrypted with 2 text attachments
-Date: Sun, 30 Aug 2015 12:05:17 +0200
-Message-ID: <1505824.VT0nqpAGu0@vkpc5>
-X-KMail-Identity: 402312391
-X-KMail-Dictionary: en_US
-User-Agent: KMail/5.0.42 pre (Linux/3.16.6-2-desktop; KDE/5.14.0; x86_64; ; )
-MIME-Version: 1.0
-Content-Type: multipart/encrypted; boundary="nextPart3335835.KxmPgziKxd"; protocol="application/pgp-encrypted"
-
---nextPart3335835.KxmPgziKxd
-Content-Type: application/pgp-encrypted
-Content-Disposition: attachment
-Content-Transfer-Encoding: 7Bit
-
-Version: 1
---nextPart3335835.KxmPgziKxd
-Content-Type: application/octet-stream
-Content-Disposition: inline; filename="msg.asc"
-Content-Transfer-Encoding: 7Bit
-
------BEGIN PGP MESSAGE-----
-Version: GnuPG v2
-
-hQEMAwzOQ1qnzNo7AQgA6tTJs017mI+xuhjcSTr3F5X/rJghq0oaXbjk1K0W33p+
-jsEyPTbuUIvI2a+5xHJ3BV+gnnO0Xosz57tGTF/eVAySnGiMse5cu2RQR9b/9EkC
-uzt3tIChyub3GUODG3yzXqkhSiwIImvedWgnJYTJ7eeBkWdizVT0b0byiG2d7Hjq
-hzYzyPJRwuoE36hryDsFycAhPfSsQAirxDJXk4HTsfBCmz7tzJhtt4wKc7z5m8fq
-y+jddnDADq5+tykJS6zemJOzgU3AOQyVJbmsx2vTV1CJdpKPHvTTgghpAaSuVbg0
-tR9BX1nPnA/bgX/V7C+3PwuCvB0ZKmv5d8kaGaTwO9LAhQGaWTfhG1cyy+MJhXdR
-rH63PMkZh/lrvj7qJYofI5iVoe1CiMaX44BiwKVclGf7bEFdzc2NSRvvTSzisN3T
-nSzydEttuEY5jGagQQNT1l1l4I8HAtUgwGtkKZVTAUL6iKHYAqzB77sRs33UJy4k
-ZSIWFnSY8l+HLG+MYKsYCGsvJHkxEHnMiS1EZcmpUFhxOGQpiF2rJ4qnL2jbFWbA
-9N1O5N1N/DJ/YKjwgy/jVVj6AOCrBZrxvKKt2mtG/wVX0F/KSKiEd8mgrLIx1udw
-tibiDAJmDxUk8K0lAdOHBrzBChvysiT/QxCJFcSY6FE99Rral+BWjeyAIQQWvc2B
-cEceZCtzjCOrwvoJwl2uEX+51nmMp+z1EoeyyhmUZZ4y65yOg4P6KGXGcLmIjSbH
-IhsSls1jRkSrypf/wcEd6o7KZdeYbfA=
-=Sud3
------END PGP MESSAGE-----
-
---nextPart3335835.KxmPgziKxd--
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted-two-attachments.mbox.html b/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted-two-attachments.mbox.html
deleted file mode 100644
index cca4c455..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted-two-attachments.mbox.html
+++ /dev/null
@@ -1,64 +0,0 @@
-<?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="encr">
-          <tr class="encrH">
-            <td dir="ltr">Encrypted message</td>
-          </tr>
-          <tr class="encrB">
-            <td>
-              <div style="position: relative; word-wrap: break-word">
-                <a name="att"/>
-                <div id="attachmentDiv">
-                  <a name="att1"/>
-                  <div id="attachmentDiv1">
-                    <div class="noquote">
-                      <div dir="ltr">this is the main body part</div>
-                    </div>
-                  </div>
-                  <a name="att2"/>
-                  <div id="attachmentDiv2">
-                    <table cellspacing="1" class="textAtm">
-                      <tr class="textAtmH">
-                        <td dir="ltr">attachment1.txt</td>
-                      </tr>
-                      <tr class="textAtmB">
-                        <td>
-                          <div class="noquote">
-                            <div dir="ltr">this is the first attachment</div>
-                          </div>
-                        </td>
-                      </tr>
-                    </table>
-                  </div>
-                  <a name="att3"/>
-                  <div id="attachmentDiv3">
-                    <table cellspacing="1" class="textAtm">
-                      <tr class="textAtmH">
-                        <td dir="ltr">attachment2.txt</td>
-                      </tr>
-                      <tr class="textAtmB">
-                        <td>
-                          <div class="noquote">
-                            <div dir="ltr">this is the second attachment</div>
-                          </div>
-                        </td>
-                      </tr>
-                    </table>
-                  </div>
-                </div>
-              </div>
-            </td>
-          </tr>
-          <tr class="encrH">
-            <td dir="ltr">End of encrypted message</td>
-          </tr>
-        </table>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted-two-attachments.mbox.tree b/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted-two-attachments.mbox.tree
deleted file mode 100644
index 71a67b58..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted-two-attachments.mbox.tree
+++ /dev/null
@@ -1,9 +0,0 @@
- * MimeTreeParser::MessagePartList
-  * MimeTreeParser::EncryptedMessagePart
-   * MimeTreeParser::MimeMessagePart
-    * MimeTreeParser::TextMessagePart
-     * MimeTreeParser::MessagePart
-    * MimeTreeParser::AttachmentMessagePart
-     * MimeTreeParser::MessagePart
-    * MimeTreeParser::AttachmentMessagePart
-     * MimeTreeParser::MessagePart
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted.mbox b/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted.mbox
deleted file mode 100644
index 5102fa78..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted.mbox
+++ /dev/null
@@ -1,36 +0,0 @@
-From test@kolab.org Wed, 08 Sep 2010 17:02:52 +0200
-From: OpenPGP Test <test@kolab.org>
-To: test@kolab.org
-Subject: OpenPGP encrypted
-Date: Wed, 08 Sep 2010 17:02:52 +0200
-User-Agent: KMail/4.6 pre (Linux/2.6.34-rc2-2-default; KDE/4.5.60; x86_64; ; )
-MIME-Version: 1.0
-Content-Type: multipart/encrypted; boundary="nextPart1357031.ppLHckZtsp"; protocol="application/pgp-encrypted"
-Content-Transfer-Encoding: 7Bit
-
-
---nextPart1357031.ppLHckZtsp
-Content-Type: application/pgp-encrypted
-Content-Disposition: attachment
-
-Version: 1
---nextPart1357031.ppLHckZtsp
-Content-Type: application/octet-stream
-Content-Disposition: inline; filename="msg.asc"
-
------BEGIN PGP MESSAGE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-hQEMAwzOQ1qnzNo7AQgAtWfDWWI2JUGuptpackiIxpWViEEpGAeruETubiIPwxNb
-DNmXrMDhbm/zIbPntIGWJDgUMfABZCUgmlJLWhsceDTt+tXnWGha2VYrN2/WsF6/
-Pqs/TavTvMIJQHDaIH5yDDCaMoq/mGSbcu7go2H8Sw7aBEYlM8jGlqc1HziXnZ1q
-3vDiA+4qWfvbNoSRo1kb9Pcq997yg6WqZXH2hJ7cp+hIQ4uTP1/+qgYHMvfPlzQk
-XcDguGbIer88ELhuR5622unGBAB4dqp+5w6n9c6rrCH81qhV4W0nqSEvj1tBj78S
-ZTi6VBAo5eS0e3iOJqMpwUZz6hQUpJw2wnNRGvLgI9KZAag0HkgPdMeANowg7vpE
-L4nU7B0ybhswA2Y7QT/wwCDZu9N1JGeBmy0dgy4sA38Ki27rn2/lIaP0j14JycwM
-RTJ1uwI+ZuQiwXlyYtdFZJWe8nraWARch0oKqhaR7aSsxGWo63eiGEQhkQCBFBb3
-Vg0nNCZRBauEqIESEW5EV2zrJqdfNYcz+f9IP125dnQEKgLZ6FxTt3+v
-=mhNl
------END PGP MESSAGE-----
-
---nextPart1357031.ppLHckZtsp--
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted.mbox.html b/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted.mbox.html
deleted file mode 100644
index ba0976cd..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted.mbox.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<?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="encr">
-          <tr class="encrH">
-            <td dir="ltr">Encrypted message</td>
-          </tr>
-          <tr class="encrB">
-            <td>
-              <div style="position: relative; word-wrap: break-word">
-                <a name="att"/>
-                <div id="attachmentDiv">
-                  <div class="noquote">
-                    <div dir="ltr">encrypted message text</div>
-                  </div>
-                </div>
-              </div>
-            </td>
-          </tr>
-          <tr class="encrH">
-            <td dir="ltr">End of encrypted message</td>
-          </tr>
-        </table>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted.mbox.inProgress.html b/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted.mbox.inProgress.html
deleted file mode 100644
index e5eb55d0..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted.mbox.inProgress.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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="encr">
-          <tr class="encrH">
-            <td dir="ltr">Please wait while the message is being decrypted...</td>
-          </tr>
-          <tr class="encrB">
-            <td>
-              <div style="font-size:x-large; text-align:center; padding:20pt;"/>
-            </td>
-          </tr>
-          <tr class="encrH">
-            <td dir="ltr">End of encrypted message</td>
-          </tr>
-        </table>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted.mbox.tree b/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted.mbox.tree
deleted file mode 100644
index 82f705c2..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted.mbox.tree
+++ /dev/null
@@ -1,4 +0,0 @@
- * MimeTreeParser::MessagePartList
-  * MimeTreeParser::EncryptedMessagePart
-   * MimeTreeParser::TextMessagePart
-    * MimeTreeParser::MessagePart
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-inline-charset-encrypted.mbox b/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-inline-charset-encrypted.mbox
deleted file mode 100644
index 8bd06910..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-inline-charset-encrypted.mbox
+++ /dev/null
@@ -1,40 +0,0 @@
-From test@example.com Thu, 17 Oct 2013 02:13:03 +0200
-Return-Path: <test@example.com>
-Delivered-To: you@you.com
-Received: from localhost (localhost [127.0.0.1])
-        by test@example.com (Postfix) with ESMTP id B30D8120030
-        for <you@you.com>; Thu, 17 Oct 2013 02:13:05 +0200 (CEST)
-From: test <test@example.com>
-To: you@you.com
-Subject: charset
-Date: Thu, 17 Oct 2013 02:13:03 +0200
-Message-ID: <4081645.yGjUJ4o4Se@example.local>
-User-Agent: KMail/4.12 pre (Linux/3.11-4.towo-siduction-amd64; KDE/4.11.2; x86_64; git-f7f14e3; 2013-10-15)
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7Bit
-Content-Type: text/plain; charset="ISO-8859-15"
-
------BEGIN PGP MESSAGE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-hIwDGJlthTT7oq0BBACbaRZudMigMTetPZNRgkfEXv4QQowR1jborw0dcgKKqMQ1
-6o67NkpxvmXKGJTfTVCLBX3nk6FKYo6NwlPCyU7X9X0DDk8hvaBdR9wGfrdm5YWX
-GKOzcqJY1EypiMsspXeZvjzEW7O8I956c3vBb/2pM3xqYEK1kh8+d9bVH+cjf4UB
-DAMMzkNap8zaOwEH/1rPShyYL8meJN+/GGgS8+Nf1BW5pSHdAPCg0dnX4QCLEx7u
-GkBU6N4JGYayaCBofibOLacQPhYZdnR5Xb/Pvrx03GrzyzyDp0WyeI9nGNfkani7
-sCRWbzlMPsEvGEvJVnMLNRSk4xhPIWumL4APkw+Mgi6mf+Br8z0RhfnGwyMA53Mr
-pG9VQKlq3v7/aaN40pMjAsxiytcHS515jXrb3Ko4pWbTlAr/eytOEfkLRJgSOpQT
-BY7lWs+UQJqiG8Yn65vS9LMDNJgX9EOGx77Z4u9wvv4ZieOxzgbHGg5kYCoae7ba
-hxZeNjYKscH+E6epbOxM/wlTdr4UTiiW9dMsH0zSwMUB891gToeXq+LDGEPTKVSX
-tsJm4HS/kISJBwrCI4EUqWZML6xQ427NkZGmF2z/sD3kmL66GjspIKnb4zHmXacp
-84n2KrI9s7p6AnKnQjsxvB/4/lpXPCIY5GH7KjySEJiMsHECzeN1dJSL6keykBsx
-DtmYDA+dhZ6UWbwzx/78+mjNREhyp/UiSAmLzlJh89OH/xelAPvKcIosYwz4cY9N
-wjralTmL+Y0aHKeZJOeqPLaXADcPFiZrCNPCH65Ey5GEtDpjLpEbjVbykPV9+YkK
-7JKW6bwMraOl5zmAoR77PWMo3IoYb9q4GuqDr1V2ZGlb7eMH1gj1nfgfVintKC1X
-3jFfy7aK6LIQDVKEwbi0SxVXTKStuliVUy5oX4woDOxmTEotJf1QlKZpn5oF20UP
-tumYrp0SPoP8Bo4EVRVaLupduI5cYce1q/kFj9Iho/wk56MoG9PxMMfsH7oKg3AA
-CqQ6/kM4oJNdN5xIf1EH5HeaNFkDy1jlLznnhwVAZKPo/9ffpg==
-=bPqu
------END PGP MESSAGE-----
-
-
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-inline-charset-encrypted.mbox.html b/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-inline-charset-encrypted.mbox.html
deleted file mode 100644
index 344dc237..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-inline-charset-encrypted.mbox.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<?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="encr">
-          <tr class="encrH">
-            <td dir="ltr">Encrypted message</td>
-          </tr>
-          <tr class="encrB">
-            <td>
-              <table cellspacing="1" cellpadding="1" class="signOkKeyOk">
-                <tr class="signOkKeyOkH">
-                  <td dir="ltr">
-                    <table cellspacing="0" cellpadding="0" width="100%">
-                      <tr>
-                        <td>Signed by <a href="mailto:test@kolab.org">test@kolab.org</a>.</td>
-                        <td align="right">
-                          <a href="kmail:showSignatureDetails">Show Details</a>
-                        </td>
-                      </tr>
-                    </table>
-                  </td>
-                </tr>
-                <tr class="signOkKeyOkB">
-                  <td>
-                    <div class="noquote">
-                      <div dir="ltr">asdasd asd asd asdf sadf sdaf sadf öäü</div>
-                    </div>
-                  </td>
-                </tr>
-                <tr class="signOkKeyOkH">
-                  <td dir="ltr">End of signed message</td>
-                </tr>
-              </table>
-            </td>
-          </tr>
-          <tr class="encrH">
-            <td dir="ltr">End of encrypted message</td>
-          </tr>
-        </table>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-inline-charset-encrypted.mbox.inProgress.html b/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-inline-charset-encrypted.mbox.inProgress.html
deleted file mode 100644
index e5eb55d0..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-inline-charset-encrypted.mbox.inProgress.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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="encr">
-          <tr class="encrH">
-            <td dir="ltr">Please wait while the message is being decrypted...</td>
-          </tr>
-          <tr class="encrB">
-            <td>
-              <div style="font-size:x-large; text-align:center; padding:20pt;"/>
-            </td>
-          </tr>
-          <tr class="encrH">
-            <td dir="ltr">End of encrypted message</td>
-          </tr>
-        </table>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-inline-charset-encrypted.mbox.tree b/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-inline-charset-encrypted.mbox.tree
deleted file mode 100644
index ea8223fd..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-inline-charset-encrypted.mbox.tree
+++ /dev/null
@@ -1,4 +0,0 @@
- * MimeTreeParser::MessagePartList
-  * MimeTreeParser::TextMessagePart
-   * MimeTreeParser::EncryptedMessagePart
-    * MimeTreeParser::SignedMessagePart
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-inline-signed-broken.mbox b/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-inline-signed-broken.mbox
deleted file mode 100644
index fc0d2df9..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-inline-signed-broken.mbox
+++ /dev/null
@@ -1,26 +0,0 @@
-From: test <test@kolab.org>
-To: you@you.de
-Subject: test
-Date: Tue, 25 Aug 2015 16:47:10 +0200
-Message-ID: <1662097.O9NVKTC5pT@11b508545ba2>
-X-KMail-Identity: 1428848833
-User-Agent: KMail/4.13.0.3 (Linux/4.1.0-rc5-siduction-amd64; KDE/4.14.3; x86_64; git-7c86098; 2015-08-23)
-MIME-Version: 1.0
-Content-Transfer-Encoding: quoted-printable
-Content-Type: text/plain; charset="iso-8859-1"
-
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-ohno break it =F6=E4=FC
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQEcBAEBCAAGBQJV3H/vAAoJEI2YYMWPJG3mEZQH/2mbCDa60risTUsomEecasc7
-kIc8Ch+OjZwlEQWKEiFbpLCMVjMwf0oGFcpc/dqnIyIqeVvF6Em+v7iqKuyAaihu
-7ZxxC816tDDI7UIpmyWu39McqGB/2hoA/q+QAMgBiaIuMwYJK9Aw08hXzoCds6O7
-Uor2Y6kMSwEiRnTSYvQHdoaZY3F9SFTLPgjvwfSu7scvp7xvH7bAVIqGGfkLjXpP
-OFkDhEqUI7ORwD5cvvzEu57XmbGB7Nj5LRCGcTq6IlaGeN6Pw5+hOdd6MQ4iISwy
-870msP9NvktURnfXYC3fYnJaK/eUln7LYCBl/k04Z/3Um6dMYyQGh63oGv/2qxQ=3D
-=3D4ctb
------END PGP SIGNATURE-----
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-inline-signed.mbox b/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-inline-signed.mbox
deleted file mode 100644
index 6099a51f..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-inline-signed.mbox
+++ /dev/null
@@ -1,26 +0,0 @@
-From: test <test@kolab.org>
-To: you@you.de
-Subject: test
-Date: Tue, 25 Aug 2015 16:47:10 +0200
-Message-ID: <1662097.O9NVKTC5pT@11b508545ba2>
-X-KMail-Identity: 1428848833
-User-Agent: KMail/4.13.0.3 (Linux/4.1.0-rc5-siduction-amd64; KDE/4.14.3; x86_64; git-7c86098; 2015-08-23)
-MIME-Version: 1.0
-Content-Transfer-Encoding: quoted-printable
-Content-Type: text/plain; charset="iso-8859-1"
-
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-ohno =F6=E4=FC
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQEcBAEBCAAGBQJV3H/vAAoJEI2YYMWPJG3mEZQH/2mbCDa60risTUsomEecasc7
-kIc8Ch+OjZwlEQWKEiFbpLCMVjMwf0oGFcpc/dqnIyIqeVvF6Em+v7iqKuyAaihu
-7ZxxC816tDDI7UIpmyWu39McqGB/2hoA/q+QAMgBiaIuMwYJK9Aw08hXzoCds6O7
-Uor2Y6kMSwEiRnTSYvQHdoaZY3F9SFTLPgjvwfSu7scvp7xvH7bAVIqGGfkLjXpP
-OFkDhEqUI7ORwD5cvvzEu57XmbGB7Nj5LRCGcTq6IlaGeN6Pw5+hOdd6MQ4iISwy
-870msP9NvktURnfXYC3fYnJaK/eUln7LYCBl/k04Z/3Um6dMYyQGh63oGv/2qxQ=3D
-=3D4ctb
------END PGP SIGNATURE-----
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-inline-signed.mbox.html b/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-inline-signed.mbox.html
deleted file mode 100644
index d32d0235..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-inline-signed.mbox.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<?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="signOkKeyOk">
-          <tr class="signOkKeyOkH">
-            <td dir="ltr">
-              <table cellspacing="0" cellpadding="0" width="100%">
-                <tr>
-                  <td>Signed by <a href="mailto:test@kolab.org">test@kolab.org</a>.</td>
-                  <td align="right">
-                    <a href="kmail:showSignatureDetails">Show Details</a>
-                  </td>
-                </tr>
-              </table>
-            </td>
-          </tr>
-          <tr class="signOkKeyOkB">
-            <td>
-              <div class="noquote">
-                <div dir="ltr">ohno öäü</div>
-              </div>
-            </td>
-          </tr>
-          <tr class="signOkKeyOkH">
-            <td dir="ltr">End of signed message</td>
-          </tr>
-        </table>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-inline-signed.mbox.inProgress.html b/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-inline-signed.mbox.inProgress.html
deleted file mode 100644
index 45a999d3..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-inline-signed.mbox.inProgress.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<?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/>
-          </tr>
-          <tr class="signInProgressH">
-            <td dir="ltr">End of signed message</td>
-          </tr>
-        </table>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-inline-signed.mbox.tree b/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-inline-signed.mbox.tree
deleted file mode 100644
index 23e99880..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-inline-signed.mbox.tree
+++ /dev/null
@@ -1,3 +0,0 @@
- * MimeTreeParser::MessagePartList
-  * MimeTreeParser::TextMessagePart
-   * MimeTreeParser::SignedMessagePart
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-inline-wrong-charset-encrypted.mbox b/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-inline-wrong-charset-encrypted.mbox
deleted file mode 100644
index 5ecfc612..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-inline-wrong-charset-encrypted.mbox
+++ /dev/null
@@ -1,34 +0,0 @@
-From t.glaser@tarent.de Mon Aug 18 10:59:01 2014
-Return-Path: <t.glaser@tarent.de>
-Received: from tgwrk.ig42.org (tgwrk.ig42.org.
- [2a01:238:4200:4342:321e:80ff:fe12:4223]) by mx.google.com with ESMTPSA id
- pe6sm40660135wjb.38.2014.08.18.01.59.01 for <t.glaser@tarent.de>
- (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 18
- Aug 2014 01:59:01 -0700 (PDT)
-Date: Mon, 18 Aug 2014 10:59:00 +0200 (CEST)
-From: Thorsten Glaser <t.glaser@tarent.de>
-X-X-Sender: tglase@tglase.lan.tarent.de
-To: Thorsten Glaser <t.glaser@tarent.de>
-Subject: Test for Mozilla bug#1054187
-Message-ID: <alpine.DEB.2.11.1408181058220.30583@tglase.lan.tarent.de>
-User-Agent: Alpine 2.11 (DEB 23 2013-08-11)
-MIME-Version: 1.0
-Content-Type: TEXT/PLAIN; charset=US-ASCII
-
------BEGIN PGP MESSAGE-----
-Version: GnuPG v2
-
-hIwDTFSKP3rBSXcBBAClcHW9/6kw8i+XkMes47vcmGBCjIC0UysqkVYyNqT2Y6tb
-s7pdfZFQPVWbdYoxP0WLzGgNFEWttlojWJmaTNiDVLOP22hFuJL3LUxesC1cWE+6
-foCkENDI2YnkAw4o5HTrmHoBlG7N/Nzzu3+1kfUVANSoAhgWd5WJDsXyvPMoD9LA
-7gHZZmq4bK5OwTHvAvdUOstCGd6Wqj5zkVXT59WOfYxYLcrGZ8I62lBS1/90TlJe
-iEolBoaufZT7K2YW7k/+DPYgRIzvWISTccPWpcS7OOyifvK4zOFJeGsVq/DowP52
-Zt1xQj1En5CVUT/MkpvS1rB4BfSuhJETZdtUGveUe0HhcAzbnbIJULdK0p1XAo4O
-q84vmOVD0BtKJVy/+rIW7h4aOr8C66HNDKLiUzWtdEaG97GQwhpQZ05JNsulG9tV
-wyP6UWmDMY/5YuRoVHOYx8NXORHX4E5P151Tr5Fted9TpXI/gOTHHyPK5AiiDG6U
-ja4fgkO6hYnjHxqqooxfGj+pg5atynnbMTALfWoXxmqyKrIB+SKqnsw+sCL3ro2x
-j54EGZZ9wM6AYDQ48lJV5beWgQ55r28HxlhPNl/driNkMZHUazAdsubWo5NqJPXl
-HrHQ4lv53ZUohbpVvdkmsldWhA5me7yRhQHytTQMMfadmSiYZVsy53siQ/5gEhUv
-DQ4ggpUjf8twqR+5TLue5/r/fRXkGfKr5U1w4qcMcFcGwEIbwE+qtIDY0Cw/+xU=
-=Ecl0
------END PGP MESSAGE-----
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-inline-wrong-charset-encrypted.mbox.html b/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-inline-wrong-charset-encrypted.mbox.html
deleted file mode 100644
index 3ed4e0fb..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-inline-wrong-charset-encrypted.mbox.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<?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="encr">
-          <tr class="encrH">
-            <td dir="ltr">Encrypted message</td>
-          </tr>
-          <tr class="encrB">
-            <td>
-              <table cellspacing="1" cellpadding="1" class="signOkKeyOk">
-                <tr class="signOkKeyOkH">
-                  <td dir="ltr">
-                    <table cellspacing="0" cellpadding="0" width="100%">
-                      <tr>
-                        <td>Signed by <a href="mailto:test@kolab.org">test@kolab.org</a>.</td>
-                        <td align="right">
-                          <a href="kmail:showSignatureDetails">Show Details</a>
-                        </td>
-                      </tr>
-                    </table>
-                  </td>
-                </tr>
-                <tr class="signOkKeyOkB">
-                  <td>
-                    <div class="noquote">
-                      <div dir="ltr">This is a utf-8 message you see - öäüß@ł€¶ŧ←↓→øþ</div>
-                    </div>
-                  </td>
-                </tr>
-                <tr class="signOkKeyOkH">
-                  <td dir="ltr">End of signed message</td>
-                </tr>
-              </table>
-            </td>
-          </tr>
-          <tr class="encrH">
-            <td dir="ltr">End of encrypted message</td>
-          </tr>
-        </table>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-inline-wrong-charset-encrypted.mbox.tree b/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-inline-wrong-charset-encrypted.mbox.tree
deleted file mode 100644
index ea8223fd..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-inline-wrong-charset-encrypted.mbox.tree
+++ /dev/null
@@ -1,4 +0,0 @@
- * MimeTreeParser::MessagePartList
-  * MimeTreeParser::TextMessagePart
-   * MimeTreeParser::EncryptedMessagePart
-    * MimeTreeParser::SignedMessagePart
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-signed-apple.mbox b/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-signed-apple.mbox
deleted file mode 100644
index ba85df86..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-signed-apple.mbox
+++ /dev/null
@@ -1,129 +0,0 @@
-Return-Path: <sender@example.org>
-Sender: sender@example.org
-From: Quonk <sender@example.org>
-X-Pgp-Agent: GPGMail
-Content-Type: multipart/signed; boundary="Apple-Mail=_12345678-1234-1234-1234-12345678"; protocol="application/pgp-signature"; micalg=pgp-sha512
-Subject: PDF
-Date: Mon, 16 Jan 2017 15:14:51 +0100
-Message-Id: <199E2891-3080-42B6-ABCD-1230B78EBABC@example.org>
-To: Konqi <konqui@example.org>
-Mime-Version: 1.0 (Mac OS X Mail 9.3 \(3124\))
-
-
---Apple-Mail=_12345678-1234-1234-1234-12345678
-Content-Type: multipart/alternative;
-    boundary="Apple-Mail=_23456789-1234-1234-1234-12345678"
-
-
---Apple-Mail=_23456789-1234-1234-1234-12345678
-Content-Transfer-Encoding: quoted-printable
-Content-Type: text/plain;
-    charset=utf-8
-
-
-
-=E2=80=A6
-Quonk
-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=_23456789-1234-1234-1234-12345678
-Content-Type: multipart/mixed;
-    boundary="Apple-Mail=_34567890-1234-1234-1234-12345678"
-
-
---Apple-Mail=_34567890-1234-1234-1234-12345678
-Content-Transfer-Encoding: 7bit
-Content-Type: text/html;
-    charset=us-ascii
-
-<html><head><meta http-equiv="Content-Type" content="text/html charset=us-ascii"></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space;" class=""><div class="">pre attachment</div></body></html>
---Apple-Mail=_34567890-1234-1234-1234-12345678
-Content-Disposition: attachment; filename="image.png"
-Content-Transfer-Encoding: base64
-Content-Type: image/png; name="image.png"
-
-iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAAlwSFlzAAAb
-rwAAG68BXhqRHAAAAAd0SU1FB9gHFg8aNG8uqeIAAAAGYktHRAD/AP8A/6C9p5MAAAkqSURBVHja
-5VV7cFTVGf/OPefeu3fv3t1NdhMSCHkKASEpyEsaGwalWEWntLV1Wu0fdOxAx9Iq0xntAwac6ehY
-p+rwKLbjjLRFh9JadURKRGgFQTTECCYQE9nNgzzYZDe7m33d1+l3tpOOU61T2tF/+s1s7pzn9/t+
-v993Av/3QT6FO6WdO/d+M55Il8rMOdrT0x3Zt++3+c8EgM/nozseeviJiYmpe1zOQdM8BOOCIku/
-lIj1VrQ/0r9n9+78xwLgeAA3w4fHXV1d5Omnn6aapumlJSVVqalUJJvJZRdcu0RSfZQsaW7mjfPm
-cbF9+/btEIlEaq6Z03whXyhIjDFuGIZEKSP5fMFRVcVNT2Vf0jzsmMxYGtel9rff/vM/M8bjcZpM
-Jp1XX32VNDc3e7ovRP3JyZGVNdXVd1FGGwKBQEM8njiWTKV36IHgEACwibGx62LjU/cBd01Zljoc
-p9DHmLbHsmyK1UuKooJt24IMcLE+y3L45eEYLS8LgWH4YXR0bAPZtGmTVFvfoBZMEzKpFKmqqmqp
-qane4DhOteH3L1FkWZVlGSzLAtd1Oe4773C4LxoZvDWXh82OY2MtwAuFvCvSyDIFXdelYDDIvF4d
-xPzA0AgXFStMcWPxBPGoKvXpPh6JDG5hK1Zcv1H36Xc6tsMs21EMQ69CLSts2wGkDygTyW2CP8gX
-TKLIyvx0OrdDUXyLKXVUkdSne4QKtFAwuWmabjAYkDyqAgG/jziORh1EKaonkkQt2yRZRC5JHEGn
-L7OKyopNqqo2IbWQjqWgLOwFBFKsuGDa4PVyIssMk1sCACCjimXbrbquYKW41zJJOpXkeARyeZNQ
-SUKwHEqCKnBuAybkZeFSmssVSDKdhlBpCRgIcnQsdvKPB19sY4rMNIaH0BhQUVHKvXgpIiQF0wK/
-4QORnOEayoDzOSBMXK4BSgpeTcMECqiqTDKZHDKmct3LCI55Kp0mQgK/3yDYkgIc3kNhfHzCkRk9
-p6nk+yPD3SmWzeZiKNkciUrg2g5BjQWdSBchiEvQjzoWAFkUYPDrCjBFUEJ8AhSIRyl2jcfjEL9h
-AFJODL8B6H7IZrNIt2g3B1mysShdQhmbT58+ExRdx3L5/PNomGU4kJkuA9ILYn+JP4CXOoDUoWO9
-IBhCSBCLTYCK+rqOg8CKvY6JPQhGxjkX1zyAdwrgAhTKWBDmxTUTC7Tcy5dHBiilL7cdaTsNGAwP
-7o32D4Q9HnWTrvsCiqIgdWgqDkJfkKgDU1MZcBGMhbKgj2B0LIle8eNhgiBsoMwFEY7rQDqVwlo5
-esUE/AAR81gUYIUT8UR2//4/rK+pLjs3MhIFEVJN9WwXK2oM+P1BREpQO0hjwkw+BzJWY1oOXB5L
-w9DIOGTQvYS4UFqigR9ZwUqEXFghVop059AjonqcAIZrqCKg31AS3OU66Adf4sabWqKvvHIYpoNh
-y+Vj4xMHVEW93eUuo0izhT4oRbcSIoALbRle4AVVkfBup6g9thwCzRX1VRQmdMeqLVETEIkW2ZNx
-H8oqzqAfXCGJEQ6XBQEgNQ2A7tq1C1a1tvaattOOrVFOqVSLCQhqU6QPx+DTsOU0GavLYUV20Qv4
-rEIymYNQuB48Wkg8QTA0NIQeYKB6NGTgH90jIcJEMikAi1dRRo9NLV583ek33jjpFAGIPw8++IAj
-e9SIRGm5wliraVosnTWLmmemUugBkTiPSS3AtgV8VQA9A8LxdfULYXBoEKv2wMhIn2BHGFR0DZ6d
-glQ6hUDT6A/RWVSSmfx5DjxRV1vzVkdHBzDAWLNmDezc+aQVqqz5dSY52Z63nLn9A33lI9myLXNL
-xv0Fq3gWutMN0BToxcso+AN+cKmOXI5A9P12mKDzYNXcZXDq1F+h+IboFgzb1VAhDULeJpxwC19G
-g/uMgOXVfXW1tbWCYM6mtdi8+YfiM4m/Y1UrHzkergyXz/3czImCnRjuHiW3qxpPqGFPy6SpHJC9
-IR+Sm+2N8i/dcMOMZdGeshcrS/S58+c3zU2Z8oVD50cbVfP8M4pGkymoUxLxsUzOVhtmQ+5432Rg
-oj6QOLFj28/caQk+EjMXraUV1eW+8dH06StQZnlnNbQefGTD92pWfu3I6TOT8oY7brv4hWUt3xiw
-2OrlDVVdRslsd2Fd469Q8sUB3c8uOW49SdHX1rbcePhoz3B7feuqlt5oZtBTv+ioSdXc7q3fHQaM
-fwtg6Vd/dEvn8Qssnzg/0Ns56jRcO6Nw4d1Af+/RH0/cdv+O/fRK7KnmBXPWGsQeDPhK9oWC6hdd
-R3pdUcg88Tx7U7Ej1y1qMjreGwjt/cnaF2YtvCXQe7bzxLkj+/sunT0Ry00OwHRI8DERLqeNmqGV
-JZJVC6Yu7UxMOfLFlV9pWQcYp57/013rb1u9ua29b0Ch4bsl4tKLY5P1sgxNJzsHDj136KzS3NTk
-9mTNusPvXJLrbnjUe/b16FDfsZ/3xC8d4/HoCQ4Anwzg91vWPL7+3pvvDM806sTY4IVyMxfrojO3
-BVubbyJMhnVVM3y+l187/nChIJ2ZpSs9hMD4qC6t6x6+0gkAoRC33/Sb8RdmXj9nzvWraivhP47g
-AyHxKb1mfWkRYHCjMb30nafeeWzerU9963w3L3/02c4f7D0y0NXTx3f3D/JTb7bzxpeODu55+PGT
-yy5F+ZmeD/iSrh5efeJd/hGZP5GBux+6cysY3w7H+16IVy65V6trnn3P9JqVjQ3JuSsdHhWW6hIL
-NuhyUpJgEF/ofSVBeLBuVtVjd3y55SHXhQ8UBht0DR4r98Fs+IRg/zrxlz2/2A7p5yYBY93Gu+4f
-H5xojLwOxfjd/WufOHhQ/IcD7eYVC5YyCjFMfkVV4NpMFvpTachoZeDaNryLnliOczsUCv1XBWD8
-YjF5MWJ9kcT757qenR7vf4bDoqWwHCvUUfPNsQQMWSZAZTlsw7nxYQQTcuDrjgQuPn7z/D7YivNt
-nPPfEDzwqcU75/j6SD/f8uG5vXs5dL7Hjb+d4gp8mnF8nAOabjcac+OBAxyuNiT4HyNwGZYgu0RW
-IDt/Icz4zAC0tXE4183rQ6XwU9uBXgLQ5Teg7GIv1+EqgsF/GY4DtCQALZMp2ITttmqoHzpWr756
-o/0d59+Lh3Y1HHcAAAAASUVORK5CYII=
---Apple-Mail=_34567890-1234-1234-1234-12345678
-Content-Transfer-Encoding: quoted-printable
-Content-Type: text/html;
-    charset=utf-8
-
-<html><head><meta name="qrichtext" content="1" /><style type="text/css">
-p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;">
-<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>
-</body></html>
-
---Apple-Mail=_34567890-1234-1234-1234-12345678--
-
---Apple-Mail=_23456789-1234-1234-1234-12345678--
-
---Apple-Mail=_12345678-1234-1234-1234-12345678
-Content-Transfer-Encoding: 7bit
-Content-Disposition: attachment;
-    filename=signature.asc
-Content-Type: application/pgp-signature;
-    name=signature.asc
-Content-Description: Message signed with OpenPGP using GPGMail
-
------BEGIN PGP SIGNATURE-----
-
-iQEzBAEBCAAdFiEEG6Mjkys/qoJhMseejZhgxY8kbeYFAlh/rcwACgkQjZhgxY8k
-beYaoQf+Miuj4cnVumYXMopVMHJs6AK6D+uKO4jXHl/XUK3TOg17kFUZDEN/9JFd
-SCN9oD5emzpBl4GSmYBbjvLvXTHTLHviVD6In35+wgMlQL+xfAv91Dx56QslCQMo
-UhDYGgFPiEAfCY2UozQD/R3KWOHFB9bNdtOM0hdT84D35W2PZhzTlz2q3hpq3bYw
-lNhFVebqURh9OEAZglB3Q9oDE13PJDtRLflKquC5ZU8N4Bj23TCOgxv4FzSyyAn/
-XalEKdwYrkZ8p4rRtd0YvAVevDUC4pQNGTgfsXgldoPEGUBXsdlczLPEj2sjLvNu
-HX1GMDrZL/+7DZsURYV5DjhsqWzExQ==
-=q0F6
------END PGP SIGNATURE-----
-
---Apple-Mail=_12345678-1234-1234-1234-12345678--
-
-
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-signed-apple.mbox.html b/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-signed-apple.mbox.html
deleted file mode 100644
index 234eaae4..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-signed-apple.mbox.html
+++ /dev/null
@@ -1,58 +0,0 @@
-<?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 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 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/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-signed-apple.mbox.inProgress.html b/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-signed-apple.mbox.inProgress.html
deleted file mode 100644
index b5236fe4..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-signed-apple.mbox.inProgress.html
+++ /dev/null
@@ -1,49 +0,0 @@
-<?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">
-                      <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 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="signInProgressH">
-            <td dir="ltr">End of signed message</td>
-          </tr>
-        </table>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-signed-apple.mbox.tree b/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-signed-apple.mbox.tree
deleted file mode 100644
index 3ade4efe..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-signed-apple.mbox.tree
+++ /dev/null
@@ -1,3 +0,0 @@
- * MimeTreeParser::MessagePartList
-  * MimeTreeParser::SignedMessagePart
-   * MimeTreeParser::AlternativeMessagePart
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-signed-base64-mailman-footer.mbox b/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-signed-base64-mailman-footer.mbox
deleted file mode 100644
index 70bf4ef8..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-signed-base64-mailman-footer.mbox
+++ /dev/null
@@ -1,117 +0,0 @@
-Return-Path: <kde-pim-bounces@kde.org>
-X-Sieve: CMU Sieve 2.3
-X-Virus-Scanned: amavisd-new at site
-Authentication-Results: linux.site (amavisd-new); dkim=pass (1024-bit key)
-        header.d=kde.org
-Received: from postbox.kde.org (localhost.localdomain [127.0.0.1])
-        by postbox.kde.org (Postfix) with ESMTP id 867B8BF274;
-        Sat, 22 Aug 2015 09:32:21 +0000 (UTC)
-DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=kde.org; s=default;
-        t=1440235945; bh=WhGhdxvdvRs04JdzjAkPcBVPmx7putlUE3ka9dvMIoc=;
-        h=From:To:Date:Subject:Reply-To:List-Id:List-Unsubscribe:List-Post:
-         List-Help:List-Subscribe:From;
-        b=mvxeMMGebkZKq7hekRypkPvt6S8lidA/8vQ3AC5Kft8HDmj8lDUpvOo0VXwCF0OG+
-         iAOPKxYtxclf8PgYvgK8NIzr56CwcdlNm3/PpoSe20P3I1DGFpDDMFtW5tOD05SSHz
-         5L6PCQyb+KFW1GrXgcm+eHshzJh3U8nHcyd8Vw2E=
-X-Original-To: kde-pim@kde.org
-Delivered-To: kde-pim@localhost.kde.org
-X-Virus-Scanned: amavisd-new at site
-From: Volker Krause <vkrause@kde.org>
-To: KDEPIM <kde-pim@kde.org>
-Date: Sat, 22 Aug 2015 11:31:38 +0200
-Message-ID: <11737387.KAAPH2KlE3@vkpc5>
-Organization: KDE
-User-Agent: KMail/4.14.3 (Linux/3.16.6-2-desktop; KDE/4.14.7; x86_64;
- git-c97b13e; 2014-12-30)
-MIME-Version: 1.0
-Subject: [Kde-pim] Phabricator Project Setup
-X-BeenThere: kde-pim@kde.org
-X-Mailman-Version: 2.1.16
-Precedence: list
-Reply-To: KDE PIM <kde-pim@kde.org>
-List-Id: KDE PIM <kde-pim.kde.org>
-List-Unsubscribe: <https://mail.kde.org/mailman/options/kde-pim>,
- <mailto:kde-pim-request@kde.org?subject=unsubscribe>
-List-Post: <mailto:kde-pim@kde.org>
-List-Help: <mailto:kde-pim-request@kde.org?subject=help>
-List-Subscribe: <https://mail.kde.org/mailman/listinfo/kde-pim>,
- <mailto:kde-pim-request@kde.org?subject=subscribe>
-Content-Type: multipart/mixed; boundary="===============1910646461178264940=="
-Errors-To: kde-pim-bounces@kde.org
-Sender: "kde-pim" <kde-pim-bounces@kde.org>
-
-
---===============1910646461178264940==
-Content-Type: multipart/signed; boundary="nextPart2440608.7aDuJBW7cK"; micalg="pgp-sha1"; protocol="application/pgp-signature"
-
---nextPart2440608.7aDuJBW7cK
-Content-Transfer-Encoding: quoted-printable
-Content-Type: text/plain; charset="us-ascii"
-
-Hi,
-
-I've talked to Ben, the current Phabricator test setup would actually b=
-e=20
-usable for "production" use for task/project management for us, without=
-=20
-causing the sysadmins unreasonable trouble when migrating to the full=20=
-
-production deployment of Phabricator eventually.
-
-Phabricator project layout it orthogonal to repo layout, so we can stru=
-cture=20
-this however we want. Among other teams I see at least the following la=
-youts:
-- single project for everything
-- a project per release
-- a project per component/module (ie. close to the repo layout)
-
-How do we want to structure this?
-
-I would start with a single project to not fragment this too much, as w=
-e have=20
-a relatively small team actually looking into this, so everyone is look=
-ing at=20
-most sub-projects anyway. And should we eventually hit scaling limits, =
-we can=20
-always expand this I think.
-
-We of course should also talk about what we actually want to put in the=
-re. My=20
-current motivation is having a place to collect the tasks for getting m=
-ore of=20
-the former pimlibs into KF5, and anything else I run into on the way th=
-ere=20
-that we eventually should clean up/improve.
-
-regards,
-Volker
-
---nextPart2440608.7aDuJBW7cK
-Content-Type: application/pgp-signature; name="signature.asc"
-Content-Description: This is a digitally signed message part.
-Content-Transfer-Encoding: 7Bit
-
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iD8DBQBV2EF9f5bM1k0S0kcRAk9cAJ4vHEh9JkT3Jy3EfxII7nP9HPmxrQCgjeLF
-eYXCyN9NRAyC6CHeNnWZN10=
-=Y8W4
------END PGP SIGNATURE-----
-
---nextPart2440608.7aDuJBW7cK--
-
-
---===============1910646461178264940==
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: base64
-Content-Disposition: inline
-
-X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KS0RFIFBJTSBt
-YWlsaW5nIGxpc3Qga2RlLXBpbUBrZGUub3JnCmh0dHBzOi8vbWFpbC5rZGUub3JnL21haWxtYW4v
-bGlzdGluZm8va2RlLXBpbQpLREUgUElNIGhvbWUgcGFnZSBhdCBodHRwOi8vcGltLmtkZS5vcmcv
-
---===============1910646461178264940==--
-
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-signed-base64-mailman-footer.mbox.html b/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-signed-base64-mailman-footer.mbox.html
deleted file mode 100644
index 50eddaa6..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-signed-base64-mailman-footer.mbox.html
+++ /dev/null
@@ -1,78 +0,0 @@
-<?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">
-          <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.1"/>
-                <div id="attachmentDiv1.1">
-                  <div class="noquote">
-                    <div dir="ltr">Hi,</div>
-                    <br/>
-                    <div dir="ltr">I've talked to Ben, the current Phabricator test setup would actually be&nbsp;</div>
-                    <div dir="ltr">usable for "production" use for task/project management for us, without&nbsp;</div>
-                    <div dir="ltr">causing the sysadmins unreasonable trouble when migrating to the full&nbsp;</div>
-                    <div dir="ltr">production deployment of Phabricator eventually.</div>
-                    <br/>
-                    <div dir="ltr">Phabricator project layout it orthogonal to repo layout, so we can structure&nbsp;</div>
-                    <div dir="ltr">this however we want. Among other teams I see at least the following layouts:</div>
-                    <div dir="ltr">- single project for everything</div>
-                    <div dir="ltr">- a project per release</div>
-                    <div dir="ltr">- a project per component/module (ie. close to the repo layout)</div>
-                    <br/>
-                    <div dir="ltr">How do we want to structure this?</div>
-                    <br/>
-                    <div dir="ltr">I would start with a single project to not fragment this too much, as we have&nbsp;</div>
-                    <div dir="ltr">a relatively small team actually looking into this, so everyone is looking at&nbsp;</div>
-                    <div dir="ltr">most sub-projects anyway. And should we eventually hit scaling limits, we can&nbsp;</div>
-                    <div dir="ltr">always expand this I think.</div>
-                    <br/>
-                    <div dir="ltr">We of course should also talk about what we actually want to put in there. My&nbsp;</div>
-                    <div dir="ltr">current motivation is having a place to collect the tasks for getting more of&nbsp;</div>
-                    <div dir="ltr">the former pimlibs into KF5, and anything else I run into on the way there&nbsp;</div>
-                    <div dir="ltr">that we eventually should clean up/improve.</div>
-                    <br/>
-                    <div dir="ltr">regards,</div>
-                    <div dir="ltr">Volker</div>
-                  </div>
-                </div>
-              </td>
-            </tr>
-            <tr class="signWarnH">
-              <td dir="ltr">End of signed message</td>
-            </tr>
-          </table>
-        </div>
-        <a name="att2"/>
-        <div id="attachmentDiv2">
-          <div class="noquote">
-            <div dir="ltr">_______________________________________________</div>
-            <div dir="ltr">KDE PIM mailing list <a href="mailto:kde-pim@kde.org">kde-pim@kde.org</a></div>
-            <div dir="ltr">
-              <a href="https://mail.kde.org/mailman/listinfo/kde-pim">https://mail.kde.org/mailman/listinfo/kde-pim</a>
-            </div>
-            <div dir="ltr">KDE PIM home page at <a href="http://pim.kde.org/">http://pim.kde.org/</a></div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-signed-base64-mailman-footer.mbox.tree b/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-signed-base64-mailman-footer.mbox.tree
deleted file mode 100644
index 2753978c..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-signed-base64-mailman-footer.mbox.tree
+++ /dev/null
@@ -1,7 +0,0 @@
- * MimeTreeParser::MessagePartList
-  * MimeTreeParser::MimeMessagePart
-   * MimeTreeParser::SignedMessagePart
-    * MimeTreeParser::TextMessagePart
-     * MimeTreeParser::MessagePart
-   * MimeTreeParser::AttachmentMessagePart
-    * MimeTreeParser::MessagePart
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-signed-encrypted-two-attachments.mbox b/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-signed-encrypted-two-attachments.mbox
deleted file mode 100644
index 7939af83..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-signed-encrypted-two-attachments.mbox
+++ /dev/null
@@ -1,52 +0,0 @@
-From: firstname.lastname@example.com
-To: test@kolab.org
-Subject: OpenPGP signed+encrypted with 2 text attachments
-Date: Sun, 30 Aug 2015 12:01:20 +0200
-Message-ID: <4368981.7YjI8cQ7Br@vkpc5>
-X-KMail-Identity: 402312391
-X-KMail-Dictionary: en_US
-User-Agent: KMail/5.0.42 pre (Linux/3.16.6-2-desktop; KDE/5.14.0; x86_64; ; )
-MIME-Version: 1.0
-Content-Type: multipart/encrypted; boundary="nextPart3246504.5GAivIUY6Q"; protocol="application/pgp-encrypted"
-
---nextPart3246504.5GAivIUY6Q
-Content-Type: application/pgp-encrypted
-Content-Disposition: attachment
-Content-Transfer-Encoding: 7Bit
-
-Version: 1
---nextPart3246504.5GAivIUY6Q
-Content-Type: application/octet-stream
-Content-Disposition: inline; filename="msg.asc"
-Content-Transfer-Encoding: 7Bit
-
------BEGIN PGP MESSAGE-----
-Version: GnuPG v2
-
-hQEMAwzOQ1qnzNo7AQf9Ge9nFjtqLOKSQNhobS+0iCB2GUdLP7LCIWu6gBo9pWa+
-9wCNLxwmhqWOYv37RAk6v5VXjCYUX3/7UF7e7epSqo7YjS7VsUOow0gszQjJqocK
-Gd1T1oyNknza6oaRGgVeWPOZVAPb+Gj+3yS8VZa33Aq2ay7F7eI8dvRUN7Z3TuAh
-BOVV+itwHHzanfNG8RoCvokcE1vkANfvI3u7R4Q93U8Q+Qmjh1L5ypPe37N5BtAF
-UCPCiD9XySHjm5PyXx8ImrJDeUgFs1YhYox4B6NKsCcmm7R8NdYZYGNo1kzR4yKV
-FzMu1NUU/bwtvrpRXLe4dBL1pEkO2PpuMYDUR9+WVNLpAafTDbeIHPi/Z8v48seQ
-JxscRehfOB3DG1xrvQTMFJc3UJEBqNMkM9gOxLKOQcCcZp79FMsfWB7EjjlPR1Oh
-gyA5NR+4HxNw75Q5FpZ7qziWvIrb1Kzwfbsb9Dimx+MmiNMX9kUEPqkPo4pspwZ9
-pLCfjYUnikcnYyQ0b2ojsjQmLotYlz8mK0GH9L40zfFb1+oYfuu4Y9FPzHdPzNjx
-aFRY8cJQy1CNkCITsz53kni5rk3zVsapq0+NeBDEBYoUqX815fo0W+HVF7/j/uhT
-lPkJhRnJZPwOr5XgzPk3Yk9GlSRLJiqKF4/G8ya/nKyiNIebKM7DTcldWCmZM95B
-BIftaRN4hvVBhl0ElFnZg0xLP1AePFuuplRQTDuW8gpaNKrxwXiF3d4XJdVmjh/p
-YmnieIhbogUHFXugc3g9rE8c3oHA8b514ajSHUm9DXc0cXqw/DrsxXZtKXb+IDpF
-uv9AiM7bSU7I0h/AlaAL5uU0mL58XhkXXFQtaTbMS+u4Rv/Ie1IsnlWR4QSc4m7x
-91rfC1fIf/U43wwwnR+UjIRyr2vWcgTTpwnsZFDD8eSoJ8WqinazJRlMud6Sv+L6
-gI2wiCYyEYHrFEHy0WuS2nUSMNl5AWm31zB+erfKSLZr4EIFBIy4dJWZKwYhi46Q
-pDbw1Svf7xVdHix+5UkkYy3AY70ipf5bxA7FTJ1geJa86VKShDkqVpU6EtT+YQIJ
-7geWCyskT0DTaPp6qc8QpjajmRYssDcjiTke5WiqLQAjm8BIuny0fNm6kNC8KMS7
-eGmaBI2nB92bgrqlAW+LhvW95YB0dfO8beg3jKk8s6OJ4gicGFEFp6hXFfEsEZiv
-gi7Q2QCVFvCV11884H8rtZYmMRFGmuVUvm6xh/z1xicmfSy0YUowgkA3jpi7o913
-fqmYOHAwzCxv8Zp7xBf9hLT8DxMXdxqYUnJ+FaEMRcFkJ1MAFBpQ9uDbbqAz5bd5
-F3d6o0JSleOOTDlNH7wpN15HYtaCx9v3mXLN9FY4Y1g4mE8wdU0JZn7sFEmgmAkV
-/vj9khHS6eB01GPiCA6sy/u2tSdCQQ==
-=1GHi
------END PGP MESSAGE-----
-
---nextPart3246504.5GAivIUY6Q--
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-signed-encrypted-two-attachments.mbox.html b/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-signed-encrypted-two-attachments.mbox.html
deleted file mode 100644
index 53856e74..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-signed-encrypted-two-attachments.mbox.html
+++ /dev/null
@@ -1,88 +0,0 @@
-<?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="encr">
-          <tr class="encrH">
-            <td dir="ltr">Encrypted message</td>
-          </tr>
-          <tr class="encrB">
-            <td>
-              <div style="position: relative; word-wrap: break-word">
-                <a name="att"/>
-                <div id="attachmentDiv">
-                  <table cellspacing="1" cellpadding="1" class="signOkKeyOk">
-                    <tr class="signOkKeyOkH">
-                      <td dir="ltr">
-                        <table cellspacing="0" cellpadding="0" width="100%">
-                          <tr>
-                            <td>Signed by <a href="mailto:test@kolab.org">test@kolab.org</a>.</td>
-                            <td align="right">
-                              <a href="kmail:showSignatureDetails">Show Details</a>
-                            </td>
-                          </tr>
-                        </table>
-                      </td>
-                    </tr>
-                    <tr class="signOkKeyOkB">
-                      <td>
-                        <a name="att1"/>
-                        <div id="attachmentDiv1">
-                          <a name="att1.1"/>
-                          <div id="attachmentDiv1.1">
-                            <div class="noquote">
-                              <div dir="ltr">this is the main body</div>
-                            </div>
-                          </div>
-                          <a name="att1.2"/>
-                          <div id="attachmentDiv1.2">
-                            <table cellspacing="1" class="textAtm">
-                              <tr class="textAtmH">
-                                <td dir="ltr">attachment1.txt</td>
-                              </tr>
-                              <tr class="textAtmB">
-                                <td>
-                                  <div class="noquote">
-                                    <div dir="ltr">this is one attachment</div>
-                                  </div>
-                                </td>
-                              </tr>
-                            </table>
-                          </div>
-                          <a name="att1.3"/>
-                          <div id="attachmentDiv1.3">
-                            <table cellspacing="1" class="textAtm">
-                              <tr class="textAtmH">
-                                <td dir="ltr">attachment2.txt</td>
-                              </tr>
-                              <tr class="textAtmB">
-                                <td>
-                                  <div class="noquote">
-                                    <div dir="ltr">this is the second attachment</div>
-                                  </div>
-                                </td>
-                              </tr>
-                            </table>
-                          </div>
-                        </div>
-                      </td>
-                    </tr>
-                    <tr class="signOkKeyOkH">
-                      <td dir="ltr">End of signed message</td>
-                    </tr>
-                  </table>
-                </div>
-              </div>
-            </td>
-          </tr>
-          <tr class="encrH">
-            <td dir="ltr">End of encrypted message</td>
-          </tr>
-        </table>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-signed-encrypted-two-attachments.mbox.tree b/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-signed-encrypted-two-attachments.mbox.tree
deleted file mode 100644
index 6705a4d7..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-signed-encrypted-two-attachments.mbox.tree
+++ /dev/null
@@ -1,10 +0,0 @@
- * MimeTreeParser::MessagePartList
-  * MimeTreeParser::EncryptedMessagePart
-   * MimeTreeParser::SignedMessagePart
-    * MimeTreeParser::MimeMessagePart
-     * MimeTreeParser::TextMessagePart
-      * MimeTreeParser::MessagePart
-     * MimeTreeParser::AttachmentMessagePart
-      * MimeTreeParser::MessagePart
-     * MimeTreeParser::AttachmentMessagePart
-      * MimeTreeParser::MessagePart
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-signed-encrypted.mbox b/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-signed-encrypted.mbox
deleted file mode 100644
index 6d723d52..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-signed-encrypted.mbox
+++ /dev/null
@@ -1,47 +0,0 @@
-From: OpenPGP Test <test@kolab.org>
-To: test@kolab.org
-Subject: OpenPGP signed and encrypted
-Date: Tue, 07 Sep 2010 18:08:44 +0200
-User-Agent: KMail/4.6 pre (Linux/2.6.34-rc2-2-default; KDE/4.5.60; x86_64; ; )
-MIME-Version: 1.0
-Content-Type: multipart/encrypted; boundary="nextPart25203163.0xtB501Z4V"; protocol="application/pgp-encrypted"
-Content-Transfer-Encoding: 7Bit
-
-
---nextPart25203163.0xtB501Z4V
-Content-Type: application/pgp-encrypted
-Content-Disposition: attachment
-
-Version: 1
---nextPart25203163.0xtB501Z4V
-Content-Type: application/octet-stream
-Content-Disposition: inline; filename="msg.asc"
-
------BEGIN PGP MESSAGE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-hQEMAwzOQ1qnzNo7AQf7BFYWaGiCTGtXY59bSh3LCXNnWZejblYALxIUNXOFEXbm
-y/YA95FmQsy3U5HRCAJV/DY1PEaJz1RTm9bcdIpDC3Ab2YzSwmOwV5fcoUOB2df4
-KjX19Q+2F3JxpPQ0N1gHf4dKfIu19LH+CKeFzUN13aJs5J4A5wlj+NjJikxzmxDS
-kDtNYndynPmo9DJQcsUFw3gpvx5HaHvx1cT4mAB2M5cd2l+vN1jYbaWb0x5Zq41z
-mRNI89aPieC3rcM2289m68fGloNbYvi8mZJu5RrI4Tbi/D7Rjm1y63lHgVV6AN88
-XAzRiedOeF99LoTBulrJdtT8AAgCs8nCetcWpIffdtLpAZiZkzHmYOU7nqGxqpRk
-OVeUTrCn9DW2SMmHjaP4IiKnMvzEycu5F4a72+V1LeMIhMSjTRTq+ZE2PTaqH59z
-QsMn7Nb6GlOICbTptRKNNtyJKO7xXlpT7YtvNKnCyEOkH2XrYH7GvpYCiuQ0/o+7
-SxV436ZejiYIg6DQDXJCoa2DXimGp0C10Jh0HwX0BixpoNtwEjkGRYcX6P/JzkH0
-oBood4Ly+Tiu6iVDisrK3AVGYpIzCrKkE9qULTw4R/jFKR2tcCqGb7Fxtk2LV7Md
-3S+DyOKrvKQ5GNwbp9OE97pwk+Lr1JS3UAvj5f6BR+1PVNcC0i0wWkgwDjPh1eGD
-enMQmorE6+N0uHtH2F4fOxo/TbbA3+zhI25kVW3bO03xyUl/cmQZeb52nvfOvtOo
-gSb2j6bPkzljDMPEzrtJjbFtGHJbPfUQYJgZv9OE2EQIqpg6goIw279alBq6GLIX
-pkO+dRmztzjcDyhcLxMuQ4cTizel/0J/bU7U6lvwHSyZVbT4Ev+opG5K70Hbqbwr
-NZcgdWXbSeesxGM/oQaMeSurOevxVl+/zrTVAek61aRRd1baAYqgi2pf2V7y4oK3
-qkdxzmoFpRdNlfrQW65NZWnHOi9rC9XxANIwnVn3kRcDf+t2K4PrFluI157lXM/o
-wX91j88fazysbJlQ6TjsApO9ETiPOFEBqouxCTtCZzlUgyVG8jpIjdHWFnagHeXH
-+lXNdYjxnTWTjTxMOZC9ySMpXkjWdFI1ecxVwu6Ik6RX51rvBJAAXWP75yUjPKJ4
-rRi5oQl/VLl0QznO7lvgMPtUwgDVNWO/r7Kn9B387h9fAJZ/kWFAEDW2yhAzABqO
-rCNKDzBPgfAwCnikCpMoCbOL7SU8BdbzQHD8/Lkv4m0pzliHQ/KkGF710koBzTmF
-N7+wk9pwIuvcrEBQj567
-=GV0c
------END PGP MESSAGE-----
-
---nextPart25203163.0xtB501Z4V--
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-signed-encrypted.mbox.html b/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-signed-encrypted.mbox.html
deleted file mode 100644
index 86a964b8..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-signed-encrypted.mbox.html
+++ /dev/null
@@ -1,55 +0,0 @@
-<?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="encr">
-          <tr class="encrH">
-            <td dir="ltr">Encrypted message</td>
-          </tr>
-          <tr class="encrB">
-            <td>
-              <div style="position: relative; word-wrap: break-word">
-                <a name="att"/>
-                <div id="attachmentDiv">
-                  <table cellspacing="1" cellpadding="1" class="signOkKeyOk">
-                    <tr class="signOkKeyOkH">
-                      <td dir="ltr">
-                        <table cellspacing="0" cellpadding="0" width="100%">
-                          <tr>
-                            <td>Signed by <a href="mailto:test@kolab.org">test@kolab.org</a>.</td>
-                            <td align="right">
-                              <a href="kmail:showSignatureDetails">Show Details</a>
-                            </td>
-                          </tr>
-                        </table>
-                      </td>
-                    </tr>
-                    <tr class="signOkKeyOkB">
-                      <td>
-                        <a name="att1"/>
-                        <div id="attachmentDiv1">
-                          <div class="noquote">
-                            <div dir="ltr">encrypted message text</div>
-                          </div>
-                        </div>
-                      </td>
-                    </tr>
-                    <tr class="signOkKeyOkH">
-                      <td dir="ltr">End of signed message</td>
-                    </tr>
-                  </table>
-                </div>
-              </div>
-            </td>
-          </tr>
-          <tr class="encrH">
-            <td dir="ltr">End of encrypted message</td>
-          </tr>
-        </table>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-signed-encrypted.mbox.tree b/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-signed-encrypted.mbox.tree
deleted file mode 100644
index 7d5bbeb7..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-signed-encrypted.mbox.tree
+++ /dev/null
@@ -1,5 +0,0 @@
- * MimeTreeParser::MessagePartList
-  * MimeTreeParser::EncryptedMessagePart
-   * MimeTreeParser::SignedMessagePart
-    * MimeTreeParser::TextMessagePart
-     * MimeTreeParser::MessagePart
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-signed-mailinglist+additional-children.mbox b/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-signed-mailinglist+additional-children.mbox
deleted file mode 100644
index dbca8d45..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-signed-mailinglist+additional-children.mbox
+++ /dev/null
@@ -1,126 +0,0 @@
-Return-Path: <plasma-devel-bounces@kde.org>
-Delivered-To: einar@heavensinferno.net
-Received: from localhost (localhost.localdomain [127.0.0.1])
-    by akihabara.dennogumi.org (Postfix) with ESMTP id 15AB75CD846
-    for <einar@heavensinferno.net>; Mon,  8 Apr 2013 12:15:03 +0200 (CEST)
-Authentication-Results: akihabara.dennogumi.org; dkim=pass
-    (1024-bit key; insecure key) header.i=@kde.org header.b=vQ0NnJ9g;
-    dkim-adsp=pass
-X-Virus-Scanned: Debian amavisd-new at akihabara.dennogumi.org
-X-Spam-Flag: NO
-X-Spam-Score: -3.818
-X-Spam-Level: 
-X-Spam-Status: No, score=-3.818 required=5 tests=[BAYES_50=0.8,
-    RCVD_IN_DNSWL_MED=-2.3, RP_MATCHES_RCVD=-2.328, T_DKIM_INVALID=0.01]
-    autolearn=unavailable
-Received: from akihabara.dennogumi.org ([127.0.0.1])
-    by localhost (akihabara.dennogumi.org [127.0.0.1]) (amavisd-new, port 10024)
-    with ESMTP id RMAq-XNJ040f for <einar@heavensinferno.net>;
-    Mon,  8 Apr 2013 12:14:44 +0200 (CEST)
-Received: from postbox.kde.org (postbox.kde.org [46.4.96.248])
-    by akihabara.dennogumi.org (Postfix) with ESMTP id 321675CD845
-    for <einar@heavensinferno.net>; Mon,  8 Apr 2013 12:14:44 +0200 (CEST)
-Authentication-Results: akihabara.dennogumi.org; dkim=pass
-    (1024-bit key; insecure key) header.i=@kde.org header.b=vQ0NnJ9g;
-    dkim-adsp=pass
-Received: from postbox.kde.org (localhost [IPv6:::1])
-    by postbox.kde.org (Postfix) with ESMTP id 9F5E1B37F95;
-    Mon,  8 Apr 2013 10:13:32 +0000 (UTC)
-DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=kde.org; s=default;
-    t=1365416012; bh=ZJtmtbDLoGFwSyJUINdTk4UpuX+xzxcjGp7LSPrKNUs=;
-    h=From:To:Subject:Date:Message-ID:MIME-Version:Reply-To:List-Id:
-     List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe:
-     Content-Type:Sender; b=vQ0NnJ9gjeyPLhPbQx6o9UxmILkS9KrhaKG6luAS/GR
-    6iR3HKXR3HE0BCkTMD5xmKL5ztFMGcU5e79fz0ch0sd2pnZ0y1WVw7KjCxsv/YtO9HM
-    OplAHmhwRI5zH8KKQbyvdPULvssI/ISdViAXmHw04hNPsBjsIGkTPgvNbPFuk=
-X-Original-To: plasma-devel@kde.org
-Delivered-To: plasma-devel@localhost.kde.org
-Received: from mail.bddf.ca (unknown [64.141.113.219])
- by postbox.kde.org (Postfix) with ESMTP id 782C6B37BE6
- for <plasma-devel@kde.org>; Mon,  8 Apr 2013 09:51:17 +0000 (UTC)
-Received: from freedom.localnet (242.13.24.31.ftth.as8758.net [31.24.13.242])
- (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
- (No client certificate requested)
- by mail.bddf.ca (Postfix) with ESMTPSA id 0CB712DC040
- for <plasma-devel@kde.org>; Mon,  8 Apr 2013 03:51:16 -0600 (MDT)
-From: "Aaron J. Seigo" <aseigo@kde.org>
-To: plasma-devel@kde.org
-Subject: activities_optional branch in kde-workspace
-Date: Mon, 08 Apr 2013 11:51:11 +0200
-Message-ID: <4143483.eqrJjo7JEn@freedom>
-User-Agent: KMail/4.11 pre (Linux/3.6.3-1-desktop; KDE/4.10.60; i686;
- git-da50be0; 2013-03-12)
-MIME-Version: 1.0
-X-Scanned-By: MIMEDefang 2.71 on 46.4.96.248
-X-BeenThere: plasma-devel@kde.org
-X-Mailman-Version: 2.1.14
-Precedence: list
-Reply-To: plasma-devel@kde.org
-List-Id: <plasma-devel.kde.org>
-List-Unsubscribe: <https://mail.kde.org/mailman/options/plasma-devel>,
- <mailto:plasma-devel-request@kde.org?subject=unsubscribe>
-List-Archive: <http://mail.kde.org/pipermail/plasma-devel>
-List-Post: <mailto:plasma-devel@kde.org>
-List-Help: <mailto:plasma-devel-request@kde.org?subject=help>
-List-Subscribe: <https://mail.kde.org/mailman/listinfo/plasma-devel>,
- <mailto:plasma-devel-request@kde.org?subject=subscribe>
-Content-Type: multipart/mixed; boundary="===============6664737512143839854=="
-Errors-To: plasma-devel-bounces@kde.org
-Sender: plasma-devel-bounces@kde.org
-
-
---===============6664737512143839854==
-Content-Type: multipart/signed; boundary="nextPart1996263.NlFDv9GTkA"; micalg="pgp-sha1"; protocol="application/pgp-signature"
-
-
---nextPart1996263.NlFDv9GTkA
-Content-Transfer-Encoding: 7Bit
-Content-Type: text/plain; charset="us-ascii"
-
-hi..
-
-i noticed a new branch when i pulled kde-workspace today (finally!): 
-activities_optional
-
-the lone commit in it was pushed on april 1, so maybe it's an april fools 
-joke, but if it isn't, it looks like someone is trying to do something that 
-makes no sense (and has no chance of being merged into master). so if this is 
-a "for reals" branch, perhaps the motivation behind it can be shared?
-
--- 
-Aaron J. Seigo
---nextPart1996263.NlFDv9GTkA
-Content-Type: application/pgp-signature; name="signature.asc"
-Content-Description: This is a digitally signed message part.
-Content-Transfer-Encoding: 7Bit
-
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iEUEABECAAYFAlFikxAACgkQ1rcusafx20MHbwCfeXOgTDwtR81XJwAdcQB40Lt7
-t2IAmJpIZxdU+SSruySeEfbQs3VXq/8=
-=BQPF
------END PGP SIGNATURE-----
---nextPart1996263.NlFDv9GTkA
-Content-Type: text/plain; name="broken.attachment"
-Content-Transfer-Encoding: 7Bit
-
-Let's break a signed message - This messageblock should not be here :D
-
---nextPart1996263.NlFDv9GTkA--
-
-
---===============6664737512143839854==
-Content-Type: text/plain; charset="us-ascii"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Content-Disposition: inline
-
-_______________________________________________
-Plasma-devel mailing list
-Plasma-devel@kde.org
-https://mail.kde.org/mailman/listinfo/plasma-devel
-
---===============6664737512143839854==--
-
-
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-signed-mailinglist+additional-children.mbox.html b/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-signed-mailinglist+additional-children.mbox.html
deleted file mode 100644
index a95252e4..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-signed-mailinglist+additional-children.mbox.html
+++ /dev/null
@@ -1,60 +0,0 @@
-<?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.1"/>
-          <div id="attachmentDiv1.1">
-            <div class="noquote">
-              <div dir="ltr">hi..</div>
-              <br/>
-              <div dir="ltr">i noticed a new branch when i pulled kde-workspace today (finally!):&nbsp;</div>
-              <div dir="ltr">activities_optional</div>
-              <br/>
-              <div dir="ltr">the lone commit in it was pushed on april 1, so maybe it's an april fools&nbsp;</div>
-              <div dir="ltr">joke, but if it isn't, it looks like someone is trying to do something that&nbsp;</div>
-              <div dir="ltr">makes no sense (and has no chance of being merged into master). so if this is&nbsp;</div>
-              <div dir="ltr">a "for reals" branch, perhaps the motivation behind it can be shared?</div>
-              <br/>
-              <div dir="ltr">--&nbsp;</div>
-              <div dir="ltr">Aaron J. Seigo</div>
-            </div>
-          </div>
-          <a name="att1.2"/>
-          <div id="attachmentDiv1.2">
-            <hr/>
-            <div>
-              <a href="attachment:1.2?place=body"><img align="center" height="48" width="48" src="file:application-pgp-signature.svg" border="0" style="max-width: 100%" alt=""/>signature.asc</a>
-            </div>
-            <div>This is a digitally signed message part.</div>
-          </div>
-          <a name="att1.3"/>
-          <div id="attachmentDiv1.3">
-            <hr/>
-            <div>
-              <a href="attachment:1.3?place=body"><img align="center" height="48" width="48" src="file:text-plain.svg" border="0" style="max-width: 100%" alt=""/>broken.attachment</a>
-            </div>
-            <div/>
-          </div>
-        </div>
-        <a name="att2"/>
-        <div id="attachmentDiv2">
-          <div class="noquote">
-            <div dir="ltr">_______________________________________________</div>
-            <div dir="ltr">Plasma-devel mailing list</div>
-            <div dir="ltr">
-              <a href="mailto:Plasma-devel@kde.org">Plasma-devel@kde.org</a>
-            </div>
-            <div dir="ltr">
-              <a href="https://mail.kde.org/mailman/listinfo/plasma-devel">https://mail.kde.org/mailman/listinfo/plasma-devel</a>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-signed-mailinglist+additional-children.mbox.tree b/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-signed-mailinglist+additional-children.mbox.tree
deleted file mode 100644
index 906e6274..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-signed-mailinglist+additional-children.mbox.tree
+++ /dev/null
@@ -1,10 +0,0 @@
- * MimeTreeParser::MessagePartList
-  * MimeTreeParser::MimeMessagePart
-   * MimeTreeParser::MimeMessagePart
-    * MimeTreeParser::TextMessagePart
-     * MimeTreeParser::MessagePart
-    * MimeTreeParser::AttachmentMessagePart
-    * MimeTreeParser::AttachmentMessagePart
-     * MimeTreeParser::MessagePart
-   * MimeTreeParser::AttachmentMessagePart
-    * MimeTreeParser::MessagePart
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-signed-mailinglist+old.mbox b/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-signed-mailinglist+old.mbox
deleted file mode 100644
index 362dff3e..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-signed-mailinglist+old.mbox
+++ /dev/null
@@ -1,67 +0,0 @@
-Return-Path: <plasma-devel-bounces@kde.org>
-Delivered-To: einar@heavensinferno.net
-From: "Aaron J. Seigo" <aseigo@kde.org>
-To: plasma-devel@kde.org
-Subject: activities_optional branch in kde-workspace
-Date: Mon, 08 Apr 2013 11:51:11 +0200
-Message-ID: <4143483.eqrJjo7JEn@freedom>
-User-Agent: KMail/4.11 pre (Linux/3.6.3-1-desktop; KDE/4.10.60; i686;
- git-da50be0; 2013-03-12)
-X-Mailman-Version: 2.1.14
-Precedence: list
-Reply-To: plasma-devel@kde.org
-List-Id: <plasma-devel.kde.org>
-List-Unsubscribe: <https://mail.kde.org/mailman/options/plasma-devel>,
- <mailto:plasma-devel-request@kde.org?subject=unsubscribe>
-List-Archive: <http://mail.kde.org/pipermail/plasma-devel>
-List-Post: <mailto:plasma-devel@kde.org>
-List-Help: <mailto:plasma-devel-request@kde.org?subject=help>
-List-Subscribe: <https://mail.kde.org/mailman/listinfo/plasma-devel>,
- <mailto:plasma-devel-request@kde.org?subject=subscribe>
-Errors-To: plasma-devel-bounces@kde.org
-Sender: plasma-devel-bounces@kde.org
-
-Oh man a header :)
-
---__--__--
-
-Message:
-MIME-Version: 1.0
-Content-Type: multipart/signed; boundary="nextPart1996263.NlFDv9GTkA"; micalg="pgp-sha1"; protocol="application/pgp-signature"
-
-
---nextPart1996263.NlFDv9GTkA
-Content-Transfer-Encoding: 7Bit
-Content-Type: text/plain; charset="us-ascii"
-
-hi..
-
-i noticed a new branch when i pulled kde-workspace today (finally!): 
-activities_optional
-
-the lone commit in it was pushed on april 1, so maybe it's an april fools 
-joke, but if it isn't, it looks like someone is trying to do something that 
-makes no sense (and has no chance of being merged into master). so if this is 
-a "for reals" branch, perhaps the motivation behind it can be shared?
-
--- 
-Aaron J. Seigo
---nextPart1996263.NlFDv9GTkA
-Content-Type: application/pgp-signature; name="signature.asc"
-Content-Description: This is a digitally signed message part.
-Content-Transfer-Encoding: 7Bit
-
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iEUEABECAAYFAlFikxAACgkQ1rcusafx20MHbwCfeXOgTDwtR81XJwAdcQB40Lt7
-t2IAmJpIZxdU+SSruySeEfbQs3VXq/8=
-=BQPF
------END PGP SIGNATURE-----
-
---__--__--
-
-_______________________________________________
-Plasma-devel mailing list
-Plasma-devel@kde.org
-https://mail.kde.org/mailman/listinfo/plasma-devel
\ No newline at end of file
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-signed-mailinglist+old.mbox.html b/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-signed-mailinglist+old.mbox.html
deleted file mode 100644
index 59c6d690..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-signed-mailinglist+old.mbox.html
+++ /dev/null
@@ -1,94 +0,0 @@
-<?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 style="position: relative; word-wrap: break-word">
-          <a name="att"/>
-          <div id="attachmentDiv">
-            <div class="noquote">
-              <div dir="ltr">Oh man a header :)</div>
-              <br/>
-            </div>
-          </div>
-        </div>
-        <div style="position: relative; word-wrap: break-word">
-          <a name="att"/>
-          <div id="attachmentDiv">
-            <table cellspacing="1" cellpadding="1" class="rfc822">
-              <tr class="rfc822H">
-                <td dir="ltr">
-                  <a href="attachment:e1:1?place=body">Encapsulated message</a>
-                </td>
-              </tr>
-              <tr class="rfc822B">
-                <td>
-                  <a name="att1"/>
-                  <div id="attachmentDiv1">
-                    <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.1"/>
-                          <div id="attachmentDiv1.1">
-                            <div class="noquote">
-                              <div dir="ltr">hi..</div>
-                              <br/>
-                              <div dir="ltr">i noticed a new branch when i pulled kde-workspace today (finally!):&nbsp;</div>
-                              <div dir="ltr">activities_optional</div>
-                              <br/>
-                              <div dir="ltr">the lone commit in it was pushed on april 1, so maybe it's an april fools&nbsp;</div>
-                              <div dir="ltr">joke, but if it isn't, it looks like someone is trying to do something that&nbsp;</div>
-                              <div dir="ltr">makes no sense (and has no chance of being merged into master). so if this is&nbsp;</div>
-                              <div dir="ltr">a "for reals" branch, perhaps the motivation behind it can be shared?</div>
-                              <br/>
-                              <div dir="ltr">--&nbsp;</div>
-                              <div dir="ltr">Aaron J. Seigo</div>
-                            </div>
-                          </div>
-                        </td>
-                      </tr>
-                      <tr class="signWarnH">
-                        <td dir="ltr">End of signed message</td>
-                      </tr>
-                    </table>
-                  </div>
-                </td>
-              </tr>
-              <tr class="rfc822H">
-                <td dir="ltr">End of encapsulated message</td>
-              </tr>
-            </table>
-          </div>
-        </div>
-        <div style="position: relative; word-wrap: break-word">
-          <a name="att"/>
-          <div id="attachmentDiv">
-            <div class="noquote">
-              <div dir="ltr">Plasma-devel mailing list</div>
-              <div dir="ltr">
-                <a href="mailto:Plasma-devel@kde.org">Plasma-devel@kde.org</a>
-              </div>
-              <div dir="ltr">
-                <a href="https://mail.kde.org/mailman/listinfo/plasma-devel">https://mail.kde.org/mailman/listinfo/plasma-devel</a>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-signed-mailinglist+old.mbox.tree b/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-signed-mailinglist+old.mbox.tree
deleted file mode 100644
index c8310bc1..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-signed-mailinglist+old.mbox.tree
+++ /dev/null
@@ -1,13 +0,0 @@
- * MimeTreeParser::MessagePartList
-  * MimeTreeParser::MessagePartList
-   * MimeTreeParser::MimeMessagePart
-    * MimeTreeParser::TextMessagePart
-     * MimeTreeParser::MessagePart
-   * MimeTreeParser::MimeMessagePart
-    * MimeTreeParser::EncapsulatedRfc822MessagePart
-     * MimeTreeParser::SignedMessagePart
-      * MimeTreeParser::TextMessagePart
-       * MimeTreeParser::MessagePart
-   * MimeTreeParser::MimeMessagePart
-    * MimeTreeParser::TextMessagePart
-     * MimeTreeParser::MessagePart
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-signed-mailinglist.mbox b/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-signed-mailinglist.mbox
deleted file mode 100644
index 8adb9f4c..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-signed-mailinglist.mbox
+++ /dev/null
@@ -1,121 +0,0 @@
-Return-Path: <plasma-devel-bounces@kde.org>
-Delivered-To: einar@heavensinferno.net
-Received: from localhost (localhost.localdomain [127.0.0.1])
-    by akihabara.dennogumi.org (Postfix) with ESMTP id 15AB75CD846
-    for <einar@heavensinferno.net>; Mon,  8 Apr 2013 12:15:03 +0200 (CEST)
-Authentication-Results: akihabara.dennogumi.org; dkim=pass
-    (1024-bit key; insecure key) header.i=@kde.org header.b=vQ0NnJ9g;
-    dkim-adsp=pass
-X-Virus-Scanned: Debian amavisd-new at akihabara.dennogumi.org
-X-Spam-Flag: NO
-X-Spam-Score: -3.818
-X-Spam-Level: 
-X-Spam-Status: No, score=-3.818 required=5 tests=[BAYES_50=0.8,
-    RCVD_IN_DNSWL_MED=-2.3, RP_MATCHES_RCVD=-2.328, T_DKIM_INVALID=0.01]
-    autolearn=unavailable
-Received: from akihabara.dennogumi.org ([127.0.0.1])
-    by localhost (akihabara.dennogumi.org [127.0.0.1]) (amavisd-new, port 10024)
-    with ESMTP id RMAq-XNJ040f for <einar@heavensinferno.net>;
-    Mon,  8 Apr 2013 12:14:44 +0200 (CEST)
-Received: from postbox.kde.org (postbox.kde.org [46.4.96.248])
-    by akihabara.dennogumi.org (Postfix) with ESMTP id 321675CD845
-    for <einar@heavensinferno.net>; Mon,  8 Apr 2013 12:14:44 +0200 (CEST)
-Authentication-Results: akihabara.dennogumi.org; dkim=pass
-    (1024-bit key; insecure key) header.i=@kde.org header.b=vQ0NnJ9g;
-    dkim-adsp=pass
-Received: from postbox.kde.org (localhost [IPv6:::1])
-    by postbox.kde.org (Postfix) with ESMTP id 9F5E1B37F95;
-    Mon,  8 Apr 2013 10:13:32 +0000 (UTC)
-DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=kde.org; s=default;
-    t=1365416012; bh=ZJtmtbDLoGFwSyJUINdTk4UpuX+xzxcjGp7LSPrKNUs=;
-    h=From:To:Subject:Date:Message-ID:MIME-Version:Reply-To:List-Id:
-     List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe:
-     Content-Type:Sender; b=vQ0NnJ9gjeyPLhPbQx6o9UxmILkS9KrhaKG6luAS/GR
-    6iR3HKXR3HE0BCkTMD5xmKL5ztFMGcU5e79fz0ch0sd2pnZ0y1WVw7KjCxsv/YtO9HM
-    OplAHmhwRI5zH8KKQbyvdPULvssI/ISdViAXmHw04hNPsBjsIGkTPgvNbPFuk=
-X-Original-To: plasma-devel@kde.org
-Delivered-To: plasma-devel@localhost.kde.org
-Received: from mail.bddf.ca (unknown [64.141.113.219])
- by postbox.kde.org (Postfix) with ESMTP id 782C6B37BE6
- for <plasma-devel@kde.org>; Mon,  8 Apr 2013 09:51:17 +0000 (UTC)
-Received: from freedom.localnet (242.13.24.31.ftth.as8758.net [31.24.13.242])
- (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
- (No client certificate requested)
- by mail.bddf.ca (Postfix) with ESMTPSA id 0CB712DC040
- for <plasma-devel@kde.org>; Mon,  8 Apr 2013 03:51:16 -0600 (MDT)
-From: "Aaron J. Seigo" <aseigo@kde.org>
-To: plasma-devel@kde.org
-Subject: activities_optional branch in kde-workspace
-Date: Mon, 08 Apr 2013 11:51:11 +0200
-Message-ID: <4143483.eqrJjo7JEn@freedom>
-User-Agent: KMail/4.11 pre (Linux/3.6.3-1-desktop; KDE/4.10.60; i686;
- git-da50be0; 2013-03-12)
-MIME-Version: 1.0
-X-Scanned-By: MIMEDefang 2.71 on 46.4.96.248
-X-BeenThere: plasma-devel@kde.org
-X-Mailman-Version: 2.1.14
-Precedence: list
-Reply-To: plasma-devel@kde.org
-List-Id: <plasma-devel.kde.org>
-List-Unsubscribe: <https://mail.kde.org/mailman/options/plasma-devel>,
- <mailto:plasma-devel-request@kde.org?subject=unsubscribe>
-List-Archive: <http://mail.kde.org/pipermail/plasma-devel>
-List-Post: <mailto:plasma-devel@kde.org>
-List-Help: <mailto:plasma-devel-request@kde.org?subject=help>
-List-Subscribe: <https://mail.kde.org/mailman/listinfo/plasma-devel>,
- <mailto:plasma-devel-request@kde.org?subject=subscribe>
-Content-Type: multipart/mixed; boundary="===============6664737512143839854=="
-Errors-To: plasma-devel-bounces@kde.org
-Sender: plasma-devel-bounces@kde.org
-
-
---===============6664737512143839854==
-Content-Type: multipart/signed; boundary="nextPart1996263.NlFDv9GTkA"; micalg="pgp-sha1"; protocol="application/pgp-signature"
-
-
---nextPart1996263.NlFDv9GTkA
-Content-Transfer-Encoding: 7Bit
-Content-Type: text/plain; charset="us-ascii"
-
-hi..
-
-i noticed a new branch when i pulled kde-workspace today (finally!): 
-activities_optional
-
-the lone commit in it was pushed on april 1, so maybe it's an april fools 
-joke, but if it isn't, it looks like someone is trying to do something that 
-makes no sense (and has no chance of being merged into master). so if this is 
-a "for reals" branch, perhaps the motivation behind it can be shared?
-
--- 
-Aaron J. Seigo
---nextPart1996263.NlFDv9GTkA
-Content-Type: application/pgp-signature; name="signature.asc"
-Content-Description: This is a digitally signed message part.
-Content-Transfer-Encoding: 7Bit
-
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iEUEABECAAYFAlFikxAACgkQ1rcusafx20MHbwCfeXOgTDwtR81XJwAdcQB40Lt7
-t2IAmJpIZxdU+SSruySeEfbQs3VXq/8=
-=BQPF
------END PGP SIGNATURE-----
-
---nextPart1996263.NlFDv9GTkA--
-
-
---===============6664737512143839854==
-Content-Type: text/plain; charset="us-ascii"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Content-Disposition: inline
-
-_______________________________________________
-Plasma-devel mailing list
-Plasma-devel@kde.org
-https://mail.kde.org/mailman/listinfo/plasma-devel
-
---===============6664737512143839854==--
-
-
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-signed-mailinglist.mbox.html b/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-signed-mailinglist.mbox.html
deleted file mode 100644
index 7acb6fbf..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-signed-mailinglist.mbox.html
+++ /dev/null
@@ -1,65 +0,0 @@
-<?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">
-          <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.1"/>
-                <div id="attachmentDiv1.1">
-                  <div class="noquote">
-                    <div dir="ltr">hi..</div>
-                    <br/>
-                    <div dir="ltr">i noticed a new branch when i pulled kde-workspace today (finally!):&nbsp;</div>
-                    <div dir="ltr">activities_optional</div>
-                    <br/>
-                    <div dir="ltr">the lone commit in it was pushed on april 1, so maybe it's an april fools&nbsp;</div>
-                    <div dir="ltr">joke, but if it isn't, it looks like someone is trying to do something that&nbsp;</div>
-                    <div dir="ltr">makes no sense (and has no chance of being merged into master). so if this is&nbsp;</div>
-                    <div dir="ltr">a "for reals" branch, perhaps the motivation behind it can be shared?</div>
-                    <br/>
-                    <div dir="ltr">--&nbsp;</div>
-                    <div dir="ltr">Aaron J. Seigo</div>
-                  </div>
-                </div>
-              </td>
-            </tr>
-            <tr class="signWarnH">
-              <td dir="ltr">End of signed message</td>
-            </tr>
-          </table>
-        </div>
-        <a name="att2"/>
-        <div id="attachmentDiv2">
-          <div class="noquote">
-            <div dir="ltr">_______________________________________________</div>
-            <div dir="ltr">Plasma-devel mailing list</div>
-            <div dir="ltr">
-              <a href="mailto:Plasma-devel@kde.org">Plasma-devel@kde.org</a>
-            </div>
-            <div dir="ltr">
-              <a href="https://mail.kde.org/mailman/listinfo/plasma-devel">https://mail.kde.org/mailman/listinfo/plasma-devel</a>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-signed-mailinglist.mbox.inProgress.html b/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-signed-mailinglist.mbox.inProgress.html
deleted file mode 100644
index 77c6b29b..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-signed-mailinglist.mbox.inProgress.html
+++ /dev/null
@@ -1,56 +0,0 @@
-<?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">
-          <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.1"/>
-                <div id="attachmentDiv1.1">
-                  <div class="noquote">
-                    <div dir="ltr">hi..</div>
-                    <br/>
-                    <div dir="ltr">i noticed a new branch when i pulled kde-workspace today (finally!):&nbsp;</div>
-                    <div dir="ltr">activities_optional</div>
-                    <br/>
-                    <div dir="ltr">the lone commit in it was pushed on april 1, so maybe it's an april fools&nbsp;</div>
-                    <div dir="ltr">joke, but if it isn't, it looks like someone is trying to do something that&nbsp;</div>
-                    <div dir="ltr">makes no sense (and has no chance of being merged into master). so if this is&nbsp;</div>
-                    <div dir="ltr">a "for reals" branch, perhaps the motivation behind it can be shared?</div>
-                    <br/>
-                    <div dir="ltr">--&nbsp;</div>
-                    <div dir="ltr">Aaron J. Seigo</div>
-                  </div>
-                </div>
-              </td>
-            </tr>
-            <tr class="signInProgressH">
-              <td dir="ltr">End of signed message</td>
-            </tr>
-          </table>
-        </div>
-        <a name="att2"/>
-        <div id="attachmentDiv2">
-          <div class="noquote">
-            <div dir="ltr">_______________________________________________</div>
-            <div dir="ltr">Plasma-devel mailing list</div>
-            <div dir="ltr">
-              <a href="mailto:Plasma-devel@kde.org">Plasma-devel@kde.org</a>
-            </div>
-            <div dir="ltr">
-              <a href="https://mail.kde.org/mailman/listinfo/plasma-devel">https://mail.kde.org/mailman/listinfo/plasma-devel</a>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-signed-mailinglist.mbox.tree b/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-signed-mailinglist.mbox.tree
deleted file mode 100644
index 2753978c..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-signed-mailinglist.mbox.tree
+++ /dev/null
@@ -1,7 +0,0 @@
- * MimeTreeParser::MessagePartList
-  * MimeTreeParser::MimeMessagePart
-   * MimeTreeParser::SignedMessagePart
-    * MimeTreeParser::TextMessagePart
-     * MimeTreeParser::MessagePart
-   * MimeTreeParser::AttachmentMessagePart
-    * MimeTreeParser::MessagePart
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-signed-no-protocol.mbox b/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-signed-no-protocol.mbox
deleted file mode 100644
index e50879b9..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-signed-no-protocol.mbox
+++ /dev/null
@@ -1,35 +0,0 @@
-Return-Path: <plasma-devel-bounces@kde.org>
-Delivered-To: einar@heavensinferno.net
-Content-Type: multipart/signed; boundary="nextPart1996263.NlFDv9GTkA"; micalg="pgp-sha1"; protocol="application/broken-signature"
-
-
---nextPart1996263.NlFDv9GTkA
-Content-Transfer-Encoding: 7Bit
-Content-Type: text/plain; charset="us-ascii"
-
-hi..
-
-i noticed a new branch when i pulled kde-workspace today (finally!): 
-activities_optional
-
-the lone commit in it was pushed on april 1, so maybe it's an april fools 
-joke, but if it isn't, it looks like someone is trying to do something that 
-makes no sense (and has no chance of being merged into master). so if this is 
-a "for reals" branch, perhaps the motivation behind it can be shared?
-
--- 
-Aaron J. Seigo
---nextPart1996263.NlFDv9GTkA
-Content-Type: application/broken-signature; name="signature.asc"
-Content-Description: This is a digitally signed message part.
-Content-Transfer-Encoding: 7Bit
-
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iEUEABECAAYFAlFikxAACgkQ1rcusafx20MHbwCfeXOgTDwtR81XJwAdcQB40Lt7
-t2IAmJpIZxdU+SSruySeEfbQs3VXq/8=
-=BQPF
------END PGP SIGNATURE-----
-
---nextPart1996263.NlFDv9GTkA--
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-signed-no-protocol.mbox.html b/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-signed-no-protocol.mbox.html
deleted file mode 100644
index 4a5f337b..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-signed-no-protocol.mbox.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<?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="noquote">
-            <div dir="ltr">hi..</div>
-            <br/>
-            <div dir="ltr">i noticed a new branch when i pulled kde-workspace today (finally!):&nbsp;</div>
-            <div dir="ltr">activities_optional</div>
-            <br/>
-            <div dir="ltr">the lone commit in it was pushed on april 1, so maybe it's an april fools&nbsp;</div>
-            <div dir="ltr">joke, but if it isn't, it looks like someone is trying to do something that&nbsp;</div>
-            <div dir="ltr">makes no sense (and has no chance of being merged into master). so if this is&nbsp;</div>
-            <div dir="ltr">a "for reals" branch, perhaps the motivation behind it can be shared?</div>
-            <br/>
-            <div dir="ltr">--&nbsp;</div>
-            <div dir="ltr">Aaron J. Seigo</div>
-          </div>
-        </div>
-        <a name="att2"/>
-        <div id="attachmentDiv2">
-          <hr/>
-          <div>
-            <a href="attachment:2?place=body"><img align="center" height="48" width="48" src="file:unknown.svg" border="0" style="max-width: 100%" alt=""/>signature.asc</a>
-          </div>
-          <div>This is a digitally signed message part.</div>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-signed-no-protocol.mbox.tree b/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-signed-no-protocol.mbox.tree
deleted file mode 100644
index d824a11b..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-signed-no-protocol.mbox.tree
+++ /dev/null
@@ -1,5 +0,0 @@
- * MimeTreeParser::MessagePartList
-  * MimeTreeParser::MimeMessagePart
-   * MimeTreeParser::TextMessagePart
-    * MimeTreeParser::MessagePart
-   * MimeTreeParser::AttachmentMessagePart
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-signed-two-attachments.mbox b/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-signed-two-attachments.mbox
deleted file mode 100644
index 462f62a3..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-signed-two-attachments.mbox
+++ /dev/null
@@ -1,54 +0,0 @@
-From: firstname.lastname@example.com
-To: test@kolab.org
-Subject: OpenPGP signed with 2 text attachments
-Date: Sun, 30 Aug 2015 12:02:56 +0200
-Message-ID: <2033829.IGepAdxqt9@vkpc5>
-X-KMail-Identity: 402312391
-X-KMail-Dictionary: en_US
-User-Agent: KMail/5.0.42 pre (Linux/3.16.6-2-desktop; KDE/5.14.0; x86_64; ; )
-MIME-Version: 1.0
-Content-Type: multipart/signed; boundary="nextPart3682207.KLrp2sxpbf"; micalg="pgp-sha1"; protocol="application/pgp-signature"
-
---nextPart3682207.KLrp2sxpbf
-Content-Type: multipart/mixed; boundary="nextPart2397422.QDHKUNdbyg"
-Content-Transfer-Encoding: 7Bit
-
-This is a multi-part message in MIME format.
-
---nextPart2397422.QDHKUNdbyg
-Content-Transfer-Encoding: 7Bit
-Content-Type: text/plain; charset="us-ascii"
-
-this is the main body text
---nextPart2397422.QDHKUNdbyg
-Content-Disposition: inline; filename="attachment1.txt"
-Content-Transfer-Encoding: 7Bit
-Content-Type: text/plain; charset="utf-8"; name="attachment1.txt"
-
-this is attachment one
---nextPart2397422.QDHKUNdbyg
-Content-Disposition: inline; filename="attachment2.txt"
-Content-Transfer-Encoding: 7Bit
-Content-Type: text/plain; charset="utf-8"; name="attachment2.txt"
-
-this is attachment two
---nextPart2397422.QDHKUNdbyg--
-
---nextPart3682207.KLrp2sxpbf
-Content-Type: application/pgp-signature; name="signature.asc"
-Content-Description: This is a digitally signed message part.
-Content-Transfer-Encoding: 7Bit
-
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQEVAwUAVeLU0I2YYMWPJG3mAQL/fgf+LXmO7bKafdd4g5OOVHHyXRprVmX/6hBq
-mZoor29KLIHkvAH9OJi4qBy/ZKwqqKLfttLzHb2UaAfl5kn4f0ckmnwUhU7u32Sm
-JZ0Q50SxrRVFRyvTvPG22ho9IwQUO1YSZrL4wO9v8ZBQ3vkfpmAiUQVxPQMINc8L
-i68xQEm4y1Dtoc+DTUkoIMeOOPnEl6PTMPrwn906K0r30hI4788fEGRn6uOXb+vD
-G/ISlXu+JHIxxf/J5/jVjKNbra+trrfSPzB3piJIjBLEPO5FvLx8SgQFJcJHt/kw
-ps8D5YULj/MVMLlsPtXDdZmbOi/G9pN0tr05MKcXsO5Ywe7n2BhASw==
-=2Nzb
------END PGP SIGNATURE-----
-
---nextPart3682207.KLrp2sxpbf--
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-signed-two-attachments.mbox.html b/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-signed-two-attachments.mbox.html
deleted file mode 100644
index 06718641..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-signed-two-attachments.mbox.html
+++ /dev/null
@@ -1,71 +0,0 @@
-<?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="signOkKeyOk">
-          <tr class="signOkKeyOkH">
-            <td dir="ltr">
-              <table cellspacing="0" cellpadding="0" width="100%">
-                <tr>
-                  <td>Signed by <a href="mailto:test@kolab.org">test@kolab.org</a>.</td>
-                  <td align="right">
-                    <a href="kmail:showSignatureDetails">Show Details</a>
-                  </td>
-                </tr>
-              </table>
-            </td>
-          </tr>
-          <tr class="signOkKeyOkB">
-            <td>
-              <a name="att1"/>
-              <div id="attachmentDiv1">
-                <a name="att1.1"/>
-                <div id="attachmentDiv1.1">
-                  <div class="noquote">
-                    <div dir="ltr">this is the main body text</div>
-                  </div>
-                </div>
-                <a name="att1.2"/>
-                <div id="attachmentDiv1.2">
-                  <table cellspacing="1" class="textAtm">
-                    <tr class="textAtmH">
-                      <td dir="ltr">attachment1.txt</td>
-                    </tr>
-                    <tr class="textAtmB">
-                      <td>
-                        <div class="noquote">
-                          <div dir="ltr">this is attachment one</div>
-                        </div>
-                      </td>
-                    </tr>
-                  </table>
-                </div>
-                <a name="att1.3"/>
-                <div id="attachmentDiv1.3">
-                  <table cellspacing="1" class="textAtm">
-                    <tr class="textAtmH">
-                      <td dir="ltr">attachment2.txt</td>
-                    </tr>
-                    <tr class="textAtmB">
-                      <td>
-                        <div class="noquote">
-                          <div dir="ltr">this is attachment two</div>
-                        </div>
-                      </td>
-                    </tr>
-                  </table>
-                </div>
-              </div>
-            </td>
-          </tr>
-          <tr class="signOkKeyOkH">
-            <td dir="ltr">End of signed message</td>
-          </tr>
-        </table>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-signed-two-attachments.mbox.tree b/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-signed-two-attachments.mbox.tree
deleted file mode 100644
index 7133f4be..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-signed-two-attachments.mbox.tree
+++ /dev/null
@@ -1,9 +0,0 @@
- * MimeTreeParser::MessagePartList
-  * MimeTreeParser::SignedMessagePart
-   * MimeTreeParser::MimeMessagePart
-    * MimeTreeParser::TextMessagePart
-     * MimeTreeParser::MessagePart
-    * MimeTreeParser::AttachmentMessagePart
-     * MimeTreeParser::MessagePart
-    * MimeTreeParser::AttachmentMessagePart
-     * MimeTreeParser::MessagePart
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/signed-forward-openpgp-signed-encrypted.mbox b/framework/src/domain/mimetreeparser/otp/autotests/data/signed-forward-openpgp-signed-encrypted.mbox
deleted file mode 100644
index 9b715161..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/signed-forward-openpgp-signed-encrypted.mbox
+++ /dev/null
@@ -1,92 +0,0 @@
-From test@kolab.org Wed, 08 Sep 2010 17:53:29 +0200
-From: OpenPGP Test <test@kolab.org>
-Subject: Signed Fwd: OpenPGP signed and encrypted
-Date: Wed, 08 Sep 2010 17:53:29 +0200
-User-Agent: KMail/4.6 pre (Linux/2.6.34-rc2-2-default; KDE/4.5.60; x86_64; ; )
-MIME-Version: 1.0
-Content-Type: multipart/signed; boundary="nextPart4350242.cT7m6ulPOV"; micalg="pgp-sha1"; protocol="application/pgp-signature"
-Content-Transfer-Encoding: 7Bit
-
-
---nextPart4350242.cT7m6ulPOV
-Content-Type: multipart/mixed; boundary="nextPart1512490.WQBKYaOrt8"
-Content-Transfer-Encoding: 7Bit
-
-
---nextPart1512490.WQBKYaOrt8
-Content-Transfer-Encoding: 7Bit
-Content-Type: text/plain; charset="us-ascii"
-
-bla bla bla
---nextPart1512490.WQBKYaOrt8
-Content-Type: message/rfc822
-Content-Disposition: inline; filename="forwarded message"
-Content-Description: OpenPGP Test <test@kolab.org>: OpenPGP signed and encrypted
-
-From: OpenPGP Test <test@kolab.org>
-To: test@kolab.org
-Subject: OpenPGP signed and encrypted
-Date: Tue, 07 Sep 2010 18:08:44 +0200
-User-Agent: KMail/4.6 pre (Linux/2.6.34-rc2-2-default; KDE/4.5.60; x86_64; ; )
-MIME-Version: 1.0
-Content-Type: multipart/encrypted; boundary="nextPart25203163.0xtB501Z4V"; protocol="application/pgp-encrypted"
-Content-Transfer-Encoding: 7Bit
-
-
---nextPart25203163.0xtB501Z4V
-Content-Type: application/pgp-encrypted
-Content-Disposition: attachment
-
-Version: 1
---nextPart25203163.0xtB501Z4V
-Content-Type: application/octet-stream
-Content-Disposition: inline; filename="msg.asc"
-
------BEGIN PGP MESSAGE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-hQEMAwzOQ1qnzNo7AQf7BFYWaGiCTGtXY59bSh3LCXNnWZejblYALxIUNXOFEXbm
-y/YA95FmQsy3U5HRCAJV/DY1PEaJz1RTm9bcdIpDC3Ab2YzSwmOwV5fcoUOB2df4
-KjX19Q+2F3JxpPQ0N1gHf4dKfIu19LH+CKeFzUN13aJs5J4A5wlj+NjJikxzmxDS
-kDtNYndynPmo9DJQcsUFw3gpvx5HaHvx1cT4mAB2M5cd2l+vN1jYbaWb0x5Zq41z
-mRNI89aPieC3rcM2289m68fGloNbYvi8mZJu5RrI4Tbi/D7Rjm1y63lHgVV6AN88
-XAzRiedOeF99LoTBulrJdtT8AAgCs8nCetcWpIffdtLpAZiZkzHmYOU7nqGxqpRk
-OVeUTrCn9DW2SMmHjaP4IiKnMvzEycu5F4a72+V1LeMIhMSjTRTq+ZE2PTaqH59z
-QsMn7Nb6GlOICbTptRKNNtyJKO7xXlpT7YtvNKnCyEOkH2XrYH7GvpYCiuQ0/o+7
-SxV436ZejiYIg6DQDXJCoa2DXimGp0C10Jh0HwX0BixpoNtwEjkGRYcX6P/JzkH0
-oBood4Ly+Tiu6iVDisrK3AVGYpIzCrKkE9qULTw4R/jFKR2tcCqGb7Fxtk2LV7Md
-3S+DyOKrvKQ5GNwbp9OE97pwk+Lr1JS3UAvj5f6BR+1PVNcC0i0wWkgwDjPh1eGD
-enMQmorE6+N0uHtH2F4fOxo/TbbA3+zhI25kVW3bO03xyUl/cmQZeb52nvfOvtOo
-gSb2j6bPkzljDMPEzrtJjbFtGHJbPfUQYJgZv9OE2EQIqpg6goIw279alBq6GLIX
-pkO+dRmztzjcDyhcLxMuQ4cTizel/0J/bU7U6lvwHSyZVbT4Ev+opG5K70Hbqbwr
-NZcgdWXbSeesxGM/oQaMeSurOevxVl+/zrTVAek61aRRd1baAYqgi2pf2V7y4oK3
-qkdxzmoFpRdNlfrQW65NZWnHOi9rC9XxANIwnVn3kRcDf+t2K4PrFluI157lXM/o
-wX91j88fazysbJlQ6TjsApO9ETiPOFEBqouxCTtCZzlUgyVG8jpIjdHWFnagHeXH
-+lXNdYjxnTWTjTxMOZC9ySMpXkjWdFI1ecxVwu6Ik6RX51rvBJAAXWP75yUjPKJ4
-rRi5oQl/VLl0QznO7lvgMPtUwgDVNWO/r7Kn9B387h9fAJZ/kWFAEDW2yhAzABqO
-rCNKDzBPgfAwCnikCpMoCbOL7SU8BdbzQHD8/Lkv4m0pzliHQ/KkGF710koBzTmF
-N7+wk9pwIuvcrEBQj567
-=GV0c
------END PGP MESSAGE-----
-
---nextPart25203163.0xtB501Z4V--
-
---nextPart1512490.WQBKYaOrt8--
-
---nextPart4350242.cT7m6ulPOV
-Content-Type: application/pgp-signature; name="signature.asc"
-Content-Description: This is a digitally signed message part.
-
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iQEcBAABAgAGBQJMh7F5AAoJEI2YYMWPJG3mOB0IALeHfwg8u7wK0tDKtKqxQSqC
-2Bbk4pTLuLw/VniQNauDG+kc1eUc5RJk/R31aB1ysiQCV5Q8ucI8c9vCDDMbd+s4
-t2bZUEzMpXrw/aFiHgYGXFAY+tpqZqDGNVRNHWsPYJKtx8cci9E5DLnBJcVXVqib
-3iiHlr9AQOok3PUmpPk1a61q2L0kk8wqRenC0yZXNw5qFn5WW/hFeCOfYB+t+s5N
-IuE6ihFCJIlvGborrvl6VgPJTCyUQ3XgI90vS6ABN8TFlCNr3grXOWUePc2a20or
-xFgh38cnSR64WJajU5K1nUL9/RgfIcs+PvyHuJaRf/iUFkj1jiMEuaSi9jVFco0=
-=bArV
------END PGP SIGNATURE-----
-
---nextPart4350242.cT7m6ulPOV--
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/signed-forward-openpgp-signed-encrypted.mbox.html b/framework/src/domain/mimetreeparser/otp/autotests/data/signed-forward-openpgp-signed-encrypted.mbox.html
deleted file mode 100644
index b91772b7..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/signed-forward-openpgp-signed-encrypted.mbox.html
+++ /dev/null
@@ -1,105 +0,0 @@
-<?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="signOkKeyOk">
-          <tr class="signOkKeyOkH">
-            <td dir="ltr">
-              <table cellspacing="0" cellpadding="0" width="100%">
-                <tr>
-                  <td>Signed by <a href="mailto:test@kolab.org">test@kolab.org</a>.</td>
-                  <td align="right">
-                    <a href="kmail:showSignatureDetails">Show Details</a>
-                  </td>
-                </tr>
-              </table>
-            </td>
-          </tr>
-          <tr class="signOkKeyOkB">
-            <td>
-              <a name="att1"/>
-              <div id="attachmentDiv1">
-                <a name="att1.1"/>
-                <div id="attachmentDiv1.1">
-                  <div class="noquote">
-                    <div dir="ltr">bla bla bla</div>
-                  </div>
-                </div>
-                <a name="att1.2"/>
-                <div id="attachmentDiv1.2">
-                  <table cellspacing="1" cellpadding="1" class="rfc822">
-                    <tr class="rfc822H">
-                      <td dir="ltr">
-                        <a href="attachment:1.2.1?place=body">Encapsulated message</a>
-                      </td>
-                    </tr>
-                    <tr class="rfc822B">
-                      <td>
-                        <a name="att1.2.1"/>
-                        <div id="attachmentDiv1.2.1">
-                          <table cellspacing="1" cellpadding="1" class="encr">
-                            <tr class="encrH">
-                              <td dir="ltr">Encrypted message</td>
-                            </tr>
-                            <tr class="encrB">
-                              <td>
-                                <div style="position: relative; word-wrap: break-word">
-                                  <a name="att"/>
-                                  <div id="attachmentDiv">
-                                    <table cellspacing="1" cellpadding="1" class="signOkKeyOk">
-                                      <tr class="signOkKeyOkH">
-                                        <td dir="ltr">
-                                          <table cellspacing="0" cellpadding="0" width="100%">
-                                            <tr>
-                                              <td>Signed by <a href="mailto:test@kolab.org">test@kolab.org</a>.</td>
-                                              <td align="right">
-                                                <a href="kmail:showSignatureDetails">Show Details</a>
-                                              </td>
-                                            </tr>
-                                          </table>
-                                        </td>
-                                      </tr>
-                                      <tr class="signOkKeyOkB">
-                                        <td>
-                                          <a name="att1"/>
-                                          <div id="attachmentDiv1">
-                                            <div class="noquote">
-                                              <div dir="ltr">encrypted message text</div>
-                                            </div>
-                                          </div>
-                                        </td>
-                                      </tr>
-                                      <tr class="signOkKeyOkH">
-                                        <td dir="ltr">End of signed message</td>
-                                      </tr>
-                                    </table>
-                                  </div>
-                                </div>
-                              </td>
-                            </tr>
-                            <tr class="encrH">
-                              <td dir="ltr">End of encrypted message</td>
-                            </tr>
-                          </table>
-                        </div>
-                      </td>
-                    </tr>
-                    <tr class="rfc822H">
-                      <td dir="ltr">End of encapsulated message</td>
-                    </tr>
-                  </table>
-                </div>
-              </div>
-            </td>
-          </tr>
-          <tr class="signOkKeyOkH">
-            <td dir="ltr">End of signed message</td>
-          </tr>
-        </table>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/signed-forward-openpgp-signed-encrypted.mbox.tree b/framework/src/domain/mimetreeparser/otp/autotests/data/signed-forward-openpgp-signed-encrypted.mbox.tree
deleted file mode 100644
index 818f894c..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/signed-forward-openpgp-signed-encrypted.mbox.tree
+++ /dev/null
@@ -1,10 +0,0 @@
- * MimeTreeParser::MessagePartList
-  * MimeTreeParser::SignedMessagePart
-   * MimeTreeParser::MimeMessagePart
-    * MimeTreeParser::TextMessagePart
-     * MimeTreeParser::MessagePart
-    * MimeTreeParser::EncapsulatedRfc822MessagePart
-     * MimeTreeParser::EncryptedMessagePart
-      * MimeTreeParser::SignedMessagePart
-       * MimeTreeParser::TextMessagePart
-        * MimeTreeParser::MessagePart
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/smime-cert.mbox b/framework/src/domain/mimetreeparser/otp/autotests/data/smime-cert.mbox
deleted file mode 100644
index b3c8a19e..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/smime-cert.mbox
+++ /dev/null
@@ -1,24 +0,0 @@
-From test@example.com Sat, 13 Apr 2013 01:54:30 +0200
-From: test <test@example.com>
-To: you@you.com
-Subject: test
-Date: Sat, 13 Apr 2013 01:54:30 +0200
-Message-ID: <1576646.QQxzHWx8dA@tabin>
-X-KMail-Identity: 505942601
-User-Agent: KMail/4.10.2 (Linux/3.9.0-rc4-experimental-amd64; KDE/4.10.60; x86_64; git-fc9b82c; 2013-04-11)
-MIME-Version: 1.0
-Content-Type: application/pkcs7-mime; name="smime.crt"; smime-type="certs-only"
-Content-Transfer-Encoding: base64
-Content-Disposition: attachment; filename="smime.crt"
-
-asdfasdfasdfasdfasdfasdfasdfasdf
-asdfasdfadsfsadfasdf
-asdfasdf
-sadfas
-dfasdf
-sadf
-sadf
-adsf
-adsf
-asdf
-
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/smime-cert.mbox.html b/framework/src/domain/mimetreeparser/otp/autotests/data/smime-cert.mbox.html
deleted file mode 100644
index 1b86390f..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/smime-cert.mbox.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<?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">Sorry, certificate could not be imported.<br/>Reason: BER error</div>
-    </div>
-  </body>
-</html>
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/smime-cert.mbox.tree b/framework/src/domain/mimetreeparser/otp/autotests/data/smime-cert.mbox.tree
deleted file mode 100644
index c34c2eca..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/smime-cert.mbox.tree
+++ /dev/null
@@ -1,2 +0,0 @@
- * MimeTreeParser::MessagePartList
-  * MimeTreeParser::CertMessagePart
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/smime-encrypted-octet-stream.mbox b/framework/src/domain/mimetreeparser/otp/autotests/data/smime-encrypted-octet-stream.mbox
deleted file mode 100644
index 887fe358..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/smime-encrypted-octet-stream.mbox
+++ /dev/null
@@ -1,23 +0,0 @@
-From test@example.com Sat, 13 Apr 2013 01:54:30 +0200
-From: test <test@example.com>
-To: you@you.com
-Subject: test
-Date: Sat, 13 Apr 2013 01:54:30 +0200
-Message-ID: <1576646.QQxzHWx8dA@tabin>
-X-KMail-Identity: 505942601
-User-Agent: KMail/4.10.2 (Linux/3.9.0-rc4-experimental-amd64; KDE/4.10.60; x86_64; git-fc9b82c; 2013-04-11)
-MIME-Version: 1.0
-Content-Type: application/octet-stream;
-  name="smime.p7m"
-Content-Transfer-Encoding: base64
-Content-Disposition: attachment; filename="smime.p7m"
-
-MIAGCSqGSIb3DQEHA6CAMIACAQAxgfwwgfkCAQAwYjBVMQswCQYDVQQGEwJVUzENMAsGA1UECgwE
-S0RBQjEWMBQGA1UEAwwNdW5pdHRlc3QgY2VydDEfMB0GCSqGSIb3DQEJARYQdGVzdEBleGFtcGxl
-LmNvbQIJANNFIDoYY4XJMA0GCSqGSIb3DQEBAQUABIGAJwmmaOeidXUHSQGOf2OBIsPYafVqdORe
-y54pEXbXiAfSVUWgI4a9CsiWwcDX8vlaX9ZLLr+L2VmOfr6Yc5214yxzausZVvnUFjy6LUXotuEX
-tSar4EW7XI9DjaZc1l985naMsTx9JUa5GyQ9J6PGqhosAKpKMGgKkFAHaOwE1/IwgAYJKoZIhvcN
-AQcBMBQGCCqGSIb3DQMHBAieDfmz3WGbN6CABHgEpsLrNn0PAZTDUfNomDypvSCl5bQH+9cKm80m
-upMV2r8RBiXS7OaP4SpCxq18afDTTPatvboHIoEX92taTbq8soiAgEs6raSGtEYZNvFL0IYqm7MA
-o5HCOmjiEcInyPf14lL3HnPk10FaP3hh58qTHUh4LPYtL7UECOZELYnUfUVhAAAAAAAAAAAAAA==
-
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/smime-encrypted-octet-stream.mbox.html b/framework/src/domain/mimetreeparser/otp/autotests/data/smime-encrypted-octet-stream.mbox.html
deleted file mode 100644
index 6b08c47e..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/smime-encrypted-octet-stream.mbox.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<?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="encr">
-          <tr class="encrH">
-            <td dir="ltr">Encrypted message</td>
-          </tr>
-          <tr class="encrB">
-            <td>
-              <div style="position: relative; word-wrap: break-word">
-                <a name="att"/>
-                <div id="attachmentDiv">
-                  <div class="noquote">
-                    <div dir="ltr">The quick brown fox jumped over the lazy dog.</div>
-                  </div>
-                </div>
-              </div>
-            </td>
-          </tr>
-          <tr class="encrH">
-            <td dir="ltr">End of encrypted message</td>
-          </tr>
-        </table>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/smime-encrypted-octet-stream.mbox.tree b/framework/src/domain/mimetreeparser/otp/autotests/data/smime-encrypted-octet-stream.mbox.tree
deleted file mode 100644
index 82f705c2..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/smime-encrypted-octet-stream.mbox.tree
+++ /dev/null
@@ -1,4 +0,0 @@
- * MimeTreeParser::MessagePartList
-  * MimeTreeParser::EncryptedMessagePart
-   * MimeTreeParser::TextMessagePart
-    * MimeTreeParser::MessagePart
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/smime-encrypted.mbox b/framework/src/domain/mimetreeparser/otp/autotests/data/smime-encrypted.mbox
deleted file mode 100644
index 6b6d6a0d..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/smime-encrypted.mbox
+++ /dev/null
@@ -1,22 +0,0 @@
-From test@example.com Sat, 13 Apr 2013 01:54:30 +0200
-From: test <test@example.com>
-To: you@you.com
-Subject: test
-Date: Sat, 13 Apr 2013 01:54:30 +0200
-Message-ID: <1576646.QQxzHWx8dA@tabin>
-X-KMail-Identity: 505942601
-User-Agent: KMail/4.10.2 (Linux/3.9.0-rc4-experimental-amd64; KDE/4.10.60; x86_64; git-fc9b82c; 2013-04-11)
-MIME-Version: 1.0
-Content-Type: application/pkcs7-mime; name="smime.p7m"; smime-type="enveloped-data"
-Content-Transfer-Encoding: base64
-Content-Disposition: attachment; filename="smime.p7m"
-
-MIAGCSqGSIb3DQEHA6CAMIACAQAxgfwwgfkCAQAwYjBVMQswCQYDVQQGEwJVUzENMAsGA1UECgwE
-S0RBQjEWMBQGA1UEAwwNdW5pdHRlc3QgY2VydDEfMB0GCSqGSIb3DQEJARYQdGVzdEBleGFtcGxl
-LmNvbQIJANNFIDoYY4XJMA0GCSqGSIb3DQEBAQUABIGAJwmmaOeidXUHSQGOf2OBIsPYafVqdORe
-y54pEXbXiAfSVUWgI4a9CsiWwcDX8vlaX9ZLLr+L2VmOfr6Yc5214yxzausZVvnUFjy6LUXotuEX
-tSar4EW7XI9DjaZc1l985naMsTx9JUa5GyQ9J6PGqhosAKpKMGgKkFAHaOwE1/IwgAYJKoZIhvcN
-AQcBMBQGCCqGSIb3DQMHBAieDfmz3WGbN6CABHgEpsLrNn0PAZTDUfNomDypvSCl5bQH+9cKm80m
-upMV2r8RBiXS7OaP4SpCxq18afDTTPatvboHIoEX92taTbq8soiAgEs6raSGtEYZNvFL0IYqm7MA
-o5HCOmjiEcInyPf14lL3HnPk10FaP3hh58qTHUh4LPYtL7UECOZELYnUfUVhAAAAAAAAAAAAAA==
-
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/smime-encrypted.mbox.html b/framework/src/domain/mimetreeparser/otp/autotests/data/smime-encrypted.mbox.html
deleted file mode 100644
index 6b08c47e..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/smime-encrypted.mbox.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<?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="encr">
-          <tr class="encrH">
-            <td dir="ltr">Encrypted message</td>
-          </tr>
-          <tr class="encrB">
-            <td>
-              <div style="position: relative; word-wrap: break-word">
-                <a name="att"/>
-                <div id="attachmentDiv">
-                  <div class="noquote">
-                    <div dir="ltr">The quick brown fox jumped over the lazy dog.</div>
-                  </div>
-                </div>
-              </div>
-            </td>
-          </tr>
-          <tr class="encrH">
-            <td dir="ltr">End of encrypted message</td>
-          </tr>
-        </table>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/smime-encrypted.mbox.inProgress.html b/framework/src/domain/mimetreeparser/otp/autotests/data/smime-encrypted.mbox.inProgress.html
deleted file mode 100644
index e5eb55d0..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/smime-encrypted.mbox.inProgress.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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="encr">
-          <tr class="encrH">
-            <td dir="ltr">Please wait while the message is being decrypted...</td>
-          </tr>
-          <tr class="encrB">
-            <td>
-              <div style="font-size:x-large; text-align:center; padding:20pt;"/>
-            </td>
-          </tr>
-          <tr class="encrH">
-            <td dir="ltr">End of encrypted message</td>
-          </tr>
-        </table>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/smime-encrypted.mbox.tree b/framework/src/domain/mimetreeparser/otp/autotests/data/smime-encrypted.mbox.tree
deleted file mode 100644
index 82f705c2..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/smime-encrypted.mbox.tree
+++ /dev/null
@@ -1,4 +0,0 @@
- * MimeTreeParser::MessagePartList
-  * MimeTreeParser::EncryptedMessagePart
-   * MimeTreeParser::TextMessagePart
-    * MimeTreeParser::MessagePart
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/smime-opaque-enc+sign.mbox b/framework/src/domain/mimetreeparser/otp/autotests/data/smime-opaque-enc+sign.mbox
deleted file mode 100644
index be75c1e2..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/smime-opaque-enc+sign.mbox
+++ /dev/null
@@ -1,37 +0,0 @@
-From test@example.com Fri Sep 11 10:18:48 2015
-From: test <test@example.com>
-To: you@you.com
-Subject: enc+sign
-Date: Fri, 11 Sep 2015 12:18:48 +0200
-Message-ID: <49743203.WFa6qKaG4S@tabin.local>
-X-KMail-Identity: 792434561
-User-Agent: KMail/4.13.0.1 (Linux/4.1.5-towo.1-siduction-amd64; KDE/4.14.2; x86_64; ; )
-MIME-Version: 1.0
-Content-Type: application/pkcs7-mime; name="smime.p7m"; smime-type="enveloped-data"
-Content-Transfer-Encoding: base64
-Content-Disposition: attachment; filename="smime.p7m"
-
-MIAGCSqGSIb3DQEHA6CAMIACAQAxgfwwgfkCAQAwYjBVMQswCQYDVQQGEwJVUzENMAsGA1UECgwE
-S0RBQjEWMBQGA1UEAwwNdW5pdHRlc3QgY2VydDEfMB0GCSqGSIb3DQEJARYQdGVzdEBleGFtcGxl
-LmNvbQIJANNFIDoYY4XJMA0GCSqGSIb3DQEBAQUABIGAkttyRl8OyZkRGfs3CMfzYchrG4rRMfbE
-WIkAFIXf64yAzPZfo6cCn0Il/6q4793FeKUrsJUvzP21KBLp4u1t5qLL5iPAmAzBdLg0teoEzLZe
-CEZHinM+WSMdz2wEV8lgAt8x/3yhXmDMB09FEapUaBCK5NhbLAFkpI2mFg66zxcwgAYJKoZIhvcN
-AQcBMB0GCWCGSAFlAwQBAgQQ6DSjjkXJNm5cXQNek9eozqCABIIDsI7lufqw58g/uVM2gymkldmb
-BOgdimxshJkYznbbG5sfQPNM9ROhXKRUOc8hfzgmZ9dOZvtAyzepROMHrcL1mFFx7c1vgyT85fai
-PLEqRs8FRoztXJ0I3q57r+sPW4BtYJp9WCBSerdLSrBFK1zvKpVQtSCYbbDCc3462KnSsBrE4XTf
-BiiLWkpok4fNIdqYG1aWPLgRbp7wwLiXcq5RxYCail1tlyAty6dWBrYE1+ABZoqnKUqNqbghxJUd
-X9t3EziUnzw7c0Hq03sJEShzbXI9BxOTs8ZZ+1Ktx3rdh6RhZZ7XfJ7XIuN0yYhusBeOgC8AuILN
-lYojgmXMin52VPFmz9siI8jnKaqsr1uUqVfMLNc+mLhZEjuOu99eAHwdJUS95BKWm9J8DBe/lpz3
-s09Oz2oOoiQx0WxKmQZ4GXW/UI9OwykfNLqWfmDrbMbGW4Mvq615ucHZixFdp2vf3kU72wfk8hFK
-EIU/1Ov85glDj96ELdXErXn02BNvVBQIsRx3DbBGEgj9tz+WHbCR6RjEK4eV5lhInZplFGmYr4Uu
-9ALS+MRGTYZnALNPrWu6b1aWprnlJCyKZeeyqUzpQVPoWOh7CfdvBxvQoil4Z9Neb9O0AGCZ0axc
-zZ4yYcS/LpHkLgYPC5BphNtpyciQh6ZFeexi8rsZuHRu+YUKnuM+DQyUxtUvDYhiX7CT49MMXIwt
-bdyA0IAbIXXb/Us9GGX11gAfz2EFI3QBDHtsyciEgCIlA32OiiJF0T5CnQsku2yu6c3TWC4k+feL
-jjTEhm/KPUL6SkksarFeEncJlVt7impW9FlHyBpISwlQF4RAxDYTRX475VTNu7wn3PQx376m8iBN
-K20MjdfIM162jcQh9IWnqTZ0nH/gT2kQPYe7GqjFi6XmU3bwdzW9SXR0G9A8juIXaaNR7aXcsB53
-/W4WHPcdJBwRELa0dT1/bPg8z3EV2vM7Flc/Q5ugTWHxk8GHNEPpotArpLq1sEAZu78mSCqzzEDA
-TwzEpj9LZYIv4rDYYLCAxUR9YGhiJ5Qm21YnklkE++4zfpsl/KJcwtNsp7SWdzeVuPoUYBNhsgp/
-PZgudzQoOhxcF4ChHMVSNk1f1tlvXZppeXwv9OwpSszz0zZUr46ievpkQwL0Sa1XAfKwAt7bFJwp
-i95ae7p58ZdizJVsz0QUhFDxIDL76qiPEYXC7nIf4ZPQ36dzLAfZ6OwWGffluxHpE6oqUoM3l320
-7yQT66xfRKLGl5Cr1Q8UBBABC6aR2dt6RVbsxbR3mB0PAAAAAAAAAAAAAA==
-
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/smime-opaque-enc+sign.mbox.html b/framework/src/domain/mimetreeparser/otp/autotests/data/smime-opaque-enc+sign.mbox.html
deleted file mode 100644
index 7f60c04f..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/smime-opaque-enc+sign.mbox.html
+++ /dev/null
@@ -1,57 +0,0 @@
-<?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="encr">
-          <tr class="encrH">
-            <td dir="ltr">Encrypted message</td>
-          </tr>
-          <tr class="encrB">
-            <td>
-              <div style="position: relative; word-wrap: break-word">
-                <a name="att"/>
-                <div id="attachmentDiv">
-                  <table cellspacing="1" cellpadding="1" class="signOkKeyOk">
-                    <tr class="signOkKeyOkH">
-                      <td dir="ltr">
-                        <table cellspacing="0" cellpadding="0" width="100%">
-                          <tr>
-                            <td>Signed by <a href="mailto:test@example.com">test@example.com</a>.</td>
-                            <td align="right">
-                              <a href="kmail:showSignatureDetails">Show Details</a>
-                            </td>
-                          </tr>
-                        </table>
-                      </td>
-                    </tr>
-                    <tr class="signOkKeyOkB">
-                      <td>
-                        <div style="position: relative; word-wrap: break-word">
-                          <a name="att"/>
-                          <div id="attachmentDiv">
-                            <div class="noquote">
-                              <div dir="ltr">Encrypted and signed mail.</div>
-                            </div>
-                          </div>
-                        </div>
-                      </td>
-                    </tr>
-                    <tr class="signOkKeyOkH">
-                      <td dir="ltr">End of signed message</td>
-                    </tr>
-                  </table>
-                </div>
-              </div>
-            </td>
-          </tr>
-          <tr class="encrH">
-            <td dir="ltr">End of encrypted message</td>
-          </tr>
-        </table>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/smime-opaque-enc+sign.mbox.tree b/framework/src/domain/mimetreeparser/otp/autotests/data/smime-opaque-enc+sign.mbox.tree
deleted file mode 100644
index 7d5bbeb7..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/smime-opaque-enc+sign.mbox.tree
+++ /dev/null
@@ -1,5 +0,0 @@
- * MimeTreeParser::MessagePartList
-  * MimeTreeParser::EncryptedMessagePart
-   * MimeTreeParser::SignedMessagePart
-    * MimeTreeParser::TextMessagePart
-     * MimeTreeParser::MessagePart
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/smime-opaque-sign.mbox b/framework/src/domain/mimetreeparser/otp/autotests/data/smime-opaque-sign.mbox
deleted file mode 100644
index 6e1739ac..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/smime-opaque-sign.mbox
+++ /dev/null
@@ -1,25 +0,0 @@
-From test@example.com Fri Sep 11 10:16:06 2015
-From: test <test@example.com>
-To: you@you.com
-Subject: sign only
-Date: Fri, 11 Sep 2015 12:16:06 +0200
-Message-ID: <3182420.pXWeMPZlAJ@tabin.local>
-X-KMail-Identity: 792434561
-User-Agent: KMail/4.13.0.1 (Linux/4.1.5-towo.1-siduction-amd64; KDE/4.14.2; x86_64; ; )
-MIME-Version: 1.0
-Content-Type: application/pkcs7-mime; name="smime.p7m"; smime-type="signed-data"
-Content-Transfer-Encoding: base64
-Content-Disposition: attachment; filename="smime.p7m"
-
-MIAGCSqGSIb3DQEHAqCAMIACAQExCzAJBgUrDgMCGgUAMIAGCSqGSIb3DQEHAaCAJIAEZUNvbnRl
-bnQtVHJhbnNmZXItRW5jb2Rpbmc6IDdCaXQKQ29udGVudC1UeXBlOiB0ZXh0L3BsYWluOyBjaGFy
-c2V0PSJ1dGYtOCIKCkEgc2ltcGxlIHNpZ25lZCBvbmx5IHRlc3QuAAAAAAAAMYIBkjCCAY4CAQEw
-YjBVMQswCQYDVQQGEwJVUzENMAsGA1UECgwES0RBQjEWMBQGA1UEAwwNdW5pdHRlc3QgY2VydDEf
-MB0GCSqGSIb3DQEJARYQdGVzdEBleGFtcGxlLmNvbQIJANNFIDoYY4XJMAkGBSsOAwIaBQCggYcw
-GAYJKoZIhvcNAQkDMQsGCSqGSIb3DQEHATAcBgkqhkiG9w0BCQUxDxcNMTMwMTEwMTU0ODEyWjAj
-BgkqhkiG9w0BCQQxFgQUvJ5zI7oyv5fNx1H1wabIa6atsdcwKAYJKoZIhvcNAQkPMRswGTALBglg
-hkgBZQMEAQIwCgYIKoZIhvcNAwcwDQYJKoZIhvcNAQEBBQAEgYAHFCw88FPy1n2lu5ql5sD2J4Yi
-2/N9gUQvNQF5F/kd48HncdihLPZRs7eEX7IzDZNeylTmyp2WIiGEwQrIHbxtqU32NRouc09Zv4bu
-iUwUoz1SM2s7qipikwayQMD3d5zWNhszNLBsw8z48uXAzjZAejBCfPP0/w3z7DZDJC2R2QAAAAAA
-AA==
-
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/smime-opaque-sign.mbox.html b/framework/src/domain/mimetreeparser/otp/autotests/data/smime-opaque-sign.mbox.html
deleted file mode 100644
index 6088bc72..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/smime-opaque-sign.mbox.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<?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="signOkKeyOk">
-          <tr class="signOkKeyOkH">
-            <td dir="ltr">
-              <table cellspacing="0" cellpadding="0" width="100%">
-                <tr>
-                  <td>Signed by <a href="mailto:test@example.com">test@example.com</a>.</td>
-                  <td align="right">
-                    <a href="kmail:showSignatureDetails">Show Details</a>
-                  </td>
-                </tr>
-              </table>
-            </td>
-          </tr>
-          <tr class="signOkKeyOkB">
-            <td>
-              <div style="position: relative; word-wrap: break-word">
-                <a name="att"/>
-                <div id="attachmentDiv">
-                  <div class="noquote">
-                    <div dir="ltr">A simple signed only test.</div>
-                  </div>
-                </div>
-              </div>
-            </td>
-          </tr>
-          <tr class="signOkKeyOkH">
-            <td dir="ltr">End of signed message</td>
-          </tr>
-        </table>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/smime-opaque-sign.mbox.inProgress.html b/framework/src/domain/mimetreeparser/otp/autotests/data/smime-opaque-sign.mbox.inProgress.html
deleted file mode 100644
index 45a999d3..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/smime-opaque-sign.mbox.inProgress.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<?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/>
-          </tr>
-          <tr class="signInProgressH">
-            <td dir="ltr">End of signed message</td>
-          </tr>
-        </table>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/smime-opaque-sign.mbox.tree b/framework/src/domain/mimetreeparser/otp/autotests/data/smime-opaque-sign.mbox.tree
deleted file mode 100644
index a469bb76..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/smime-opaque-sign.mbox.tree
+++ /dev/null
@@ -1,4 +0,0 @@
- * MimeTreeParser::MessagePartList
-  * MimeTreeParser::SignedMessagePart
-   * MimeTreeParser::TextMessagePart
-    * MimeTreeParser::MessagePart
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/smime-opaque-signed-encrypted-attachment.mbox b/framework/src/domain/mimetreeparser/otp/autotests/data/smime-opaque-signed-encrypted-attachment.mbox
deleted file mode 100644
index 2b1a0761..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/smime-opaque-signed-encrypted-attachment.mbox
+++ /dev/null
@@ -1,50 +0,0 @@
-From test@example.com Thu Jun 09 12:52:44 2016
-From: test@example.com
-To: test@example.com
-Subject: Opaque S/MIME signed and encrypted message with attachment
-Date: Thu, 09 Jun 2016 14:52:44 +0200
-MIME-Version: 1.0
-Content-Type: application/pkcs7-mime; name="smime.p7m"; smime-type="enveloped-data"
-Content-Transfer-Encoding: base64
-Content-Disposition: attachment; filename="smime.p7m"
-
-MIAGCSqGSIb3DQEHA6CAMIACAQAxgfwwgfkCAQAwYjBVMQswCQYDVQQGEwJVUzEN
-MAsGA1UECgwES0RBQjEWMBQGA1UEAwwNdW5pdHRlc3QgY2VydDEfMB0GCSqGSIb3
-DQEJARYQdGVzdEBleGFtcGxlLmNvbQIJANNFIDoYY4XJMA0GCSqGSIb3DQEBAQUA
-BIGAalG2EoXQOhvVPCef5ru1+++vAfIED/abw8gFPuqWmh1nK2x2Q13U+7I7bv6a
-uK2msunHmNwgvNetJ1j4PPMePCU5I0F0jGw5PB8A6lgF8IGzEzU5W9gz1PazKGl4
-PTwxAoJgCeflZwtddGEJvQ86f4OduXEnDmirFg64WUk1jjMwgAYJKoZIhvcNAQcB
-MB0GCWCGSAFlAwQBAgQQvthEtJX37uYX68Ri3kURq6CABIIGEOr7cxjOVKzXfAYk
-1eBd/HiYcpLlttlNCcwTuQwP0pDpE9YnDA+MfgZn05hxODZDACsOschWFZXBXVY1
-OY/ZTpVYRxAdYXgPymK8+r9fym0A+YiQ5/yKbWjezDmHdOOv6JF03Z+VzBmZtFcL
-q/LPr0+EcjiPA9r/EQTA7P1pj+tOAm3krk8s4P+9yDAIQLCQt9yUdbpMsgn1OyJv
-Njl7Mq5qcQXdnYYsTF6ODZ9araHOYDS64yP69h+Lh6nsBNWD7W6NvNsS6Hmgkzvg
-FK3TNxU+X5x1F7TvKyCSRyWicfV66F/sBXIEo6K8h/rSi978jALahJPZZzNoyQiQ
-eaMCjXwuBbeobcChwkRRzU12h07AXhGgZA9AkHIsFAAE4gwnu7yoogLrQqslm/MF
-NGlbO68zyw0znK3eqzsOaXDyeLWy1zJcTffOENPhqzbPAPYn4ctyOLucCgSJkRAb
-jiKuzgrugxu+J83CBnj5QgOhO++u5gl28UT/hC9eiEbbRZrYt9XCnSOrJiUhH8Gq
-i70l/ZQzRGEenc5Oox8gEPT712pBezX4zj1Ow9RibhaU50TPaP+HoCrb3hxX4AMZ
-+I9KZucVsgFlezf4IKjtAS/ro4jJLB/u0HhsT5Ury7T5/cobVhK1j2q+q6juKOac
-Z7ro/572cTonFqR9zZNOawZTeRpK3f+Dl+Q1S6wid626btg3Li1M1jQAdyGOaRDN
-JNcKMFB1XwuE9He4Xs4wvFlNIz4xvoBRwf8EybFmSEyaS3qLbl322Un/z9sCpeZM
-fsyUED+YaTHqJhi+XTjWAxy5VfycFu2Ev6EKNItnkkjXOoAXl0Fg7nrnVijKgo+a
-4C4RO3nu4IouJlel3Lt9YyFW6CqOb2sARjJHOZtirMHUORm2aAlCnmvcPlBT8s1/
-GaG6e5heeoCMRwD37+rWauAjCvMyMc5JsFF7EUECvQB/7nGQb4JZoPsTW1cQRXDE
-mY+horsIpVrXsnsdvYco7itilJAvQUz6YGsyGirMwdHktA8YClVrNArP/HfyLUu1
-uHAhDa0TG6/bouuReHQjrI0CL1k6J7dEfxXgQbAy1FH17/8JgvNT6R+TkL+KcgW6
-VV6tPsmivsZI7mCz1np/uXZX4+t4/6Ei5+kJCLsF1TmEd0mfBioJw7Mqd0Asr+bw
-BasZKQG4gVHRjg6EXdSjQ9RoGhR8Q+R2hsb+Pj/z6GVtJTg4dVYRRjRP52tOb3Qx
-W4XlzJR/lGjExe4h0D/x2vZnWlE5JvDPPq2Ni2yBeoX2+wgtFYqKGH1f319OMRXs
-/BSk/bF7wdeeGn9FDSiQHlvfKJpToC86Yt25ZjGmGH0gbvrFLAd+a5y1046iHauz
-mf9cQVM6NJJKngSDUK0JgDLQgdAvZCcqPp/vCfdKC0fzMTDXkkV6eqKTexHQ1oTu
-ryWYHdGA+qzQO3OKDwlXTaCLnPN0Ke8BaAB7CJw9hR5t0cdw5e2nSzY96BK97tZy
-qOlRKGbuSzv9GGp5RS6qFj9o8GrqCnZZTuDz2+D++yjT4Cg1QfL7Dp/YzpCeZ9vA
-v5DMnjM6NUePYX145NgNtVm6y+ThAx4hBm42+B8nZ94GmCXf2MZModpcsnpTZlPe
-4F7Hd/rBJG8MkEFPXgxuYF0B5HTlbr/33IsGtXYBEu1ucO19TBUi4ZDil3vl9/+1
-bYX+jn/wnOjtdM+kBj4TV9aCytdBV0my+mkv1nwTK0fiKFHsUG52mbGqq88A9Mmd
-Z3grDaR2Rsb5AgLaABFCMoooFDVQtmt7xl1U3t4UZtDqny17wcXRolxXY5+tfI3Y
-jWMqfO0QsBKHjfT4At5ToSDX5yjt4Q7UyhRKKprUyyVRYZv4EQZDqi2Hdx0wNDGr
-yOQkK/LvXep0r5AEYcMkLO1x4hReaKdnSEPFRdXF/x7daAlRMTkUe5i4zLeYYhvI
-Qsl3aErcSP/DWVUyQ2XbHkrG9suPbmLBou7BHNRWXdnFib0+jASQnVKuhVLGykUr
-wzTNpGrn7Axna1P3uMwSnlJgA0vSrkR2dONzyq0hzoMmAjfC3Eh1D7tYbb6Cswx7
-5/Emq2cEEGtbyTJ5Q6+omALrsoybx4YAAAAAAAAAAAAA
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/smime-signed-apple.mbox b/framework/src/domain/mimetreeparser/otp/autotests/data/smime-signed-apple.mbox
deleted file mode 100644
index d5cd06f1..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/smime-signed-apple.mbox
+++ /dev/null
@@ -1,197 +0,0 @@
-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;" =
-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"
-
-iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAAlwSFlzAAAb
-rwAAG68BXhqRHAAAAAd0SU1FB9gHFg8aNG8uqeIAAAAGYktHRAD/AP8A/6C9p5MAAAkqSURBVHja
-5VV7cFTVGf/OPefeu3fv3t1NdhMSCHkKASEpyEsaGwalWEWntLV1Wu0fdOxAx9Iq0xntAwac6ehY
-p+rwKLbjjLRFh9JadURKRGgFQTTECCYQE9nNgzzYZDe7m33d1+l3tpOOU61T2tF/+s1s7pzn9/t+
-v993Av/3QT6FO6WdO/d+M55Il8rMOdrT0x3Zt++3+c8EgM/nozseeviJiYmpe1zOQdM8BOOCIku/
-lIj1VrQ/0r9n9+78xwLgeAA3w4fHXV1d5Omnn6aapumlJSVVqalUJJvJZRdcu0RSfZQsaW7mjfPm
-cbF9+/btEIlEaq6Z03whXyhIjDFuGIZEKSP5fMFRVcVNT2Vf0jzsmMxYGtel9rff/vM/M8bjcZpM
-Jp1XX32VNDc3e7ovRP3JyZGVNdXVd1FGGwKBQEM8njiWTKV36IHgEACwibGx62LjU/cBd01Zljoc
-p9DHmLbHsmyK1UuKooJt24IMcLE+y3L45eEYLS8LgWH4YXR0bAPZtGmTVFvfoBZMEzKpFKmqqmqp
-qane4DhOteH3L1FkWZVlGSzLAtd1Oe4773C4LxoZvDWXh82OY2MtwAuFvCvSyDIFXdelYDDIvF4d
-xPzA0AgXFStMcWPxBPGoKvXpPh6JDG5hK1Zcv1H36Xc6tsMs21EMQ69CLSts2wGkDygTyW2CP8gX
-TKLIyvx0OrdDUXyLKXVUkdSne4QKtFAwuWmabjAYkDyqAgG/jziORh1EKaonkkQt2yRZRC5JHEGn
-L7OKyopNqqo2IbWQjqWgLOwFBFKsuGDa4PVyIssMk1sCACCjimXbrbquYKW41zJJOpXkeARyeZNQ
-SUKwHEqCKnBuAybkZeFSmssVSDKdhlBpCRgIcnQsdvKPB19sY4rMNIaH0BhQUVHKvXgpIiQF0wK/
-4QORnOEayoDzOSBMXK4BSgpeTcMECqiqTDKZHDKmct3LCI55Kp0mQgK/3yDYkgIc3kNhfHzCkRk9
-p6nk+yPD3SmWzeZiKNkciUrg2g5BjQWdSBchiEvQjzoWAFkUYPDrCjBFUEJ8AhSIRyl2jcfjEL9h
-AFJODL8B6H7IZrNIt2g3B1mysShdQhmbT58+ExRdx3L5/PNomGU4kJkuA9ILYn+JP4CXOoDUoWO9
-IBhCSBCLTYCK+rqOg8CKvY6JPQhGxjkX1zyAdwrgAhTKWBDmxTUTC7Tcy5dHBiilL7cdaTsNGAwP
-7o32D4Q9HnWTrvsCiqIgdWgqDkJfkKgDU1MZcBGMhbKgj2B0LIle8eNhgiBsoMwFEY7rQDqVwlo5
-esUE/AAR81gUYIUT8UR2//4/rK+pLjs3MhIFEVJN9WwXK2oM+P1BREpQO0hjwkw+BzJWY1oOXB5L
-w9DIOGTQvYS4UFqigR9ZwUqEXFghVop059AjonqcAIZrqCKg31AS3OU66Adf4sabWqKvvHIYpoNh
-y+Vj4xMHVEW93eUuo0izhT4oRbcSIoALbRle4AVVkfBup6g9thwCzRX1VRQmdMeqLVETEIkW2ZNx
-H8oqzqAfXCGJEQ6XBQEgNQ2A7tq1C1a1tvaattOOrVFOqVSLCQhqU6QPx+DTsOU0GavLYUV20Qv4
-rEIymYNQuB48Wkg8QTA0NIQeYKB6NGTgH90jIcJEMikAi1dRRo9NLV583ek33jjpFAGIPw8++IAj
-e9SIRGm5wliraVosnTWLmmemUugBkTiPSS3AtgV8VQA9A8LxdfULYXBoEKv2wMhIn2BHGFR0DZ6d
-glQ6hUDT6A/RWVSSmfx5DjxRV1vzVkdHBzDAWLNmDezc+aQVqqz5dSY52Z63nLn9A33lI9myLXNL
-xv0Fq3gWutMN0BToxcso+AN+cKmOXI5A9P12mKDzYNXcZXDq1F+h+IboFgzb1VAhDULeJpxwC19G
-g/uMgOXVfXW1tbWCYM6mtdi8+YfiM4m/Y1UrHzkergyXz/3czImCnRjuHiW3qxpPqGFPy6SpHJC9
-IR+Sm+2N8i/dcMOMZdGeshcrS/S58+c3zU2Z8oVD50cbVfP8M4pGkymoUxLxsUzOVhtmQ+5432Rg
-oj6QOLFj28/caQk+EjMXraUV1eW+8dH06StQZnlnNbQefGTD92pWfu3I6TOT8oY7brv4hWUt3xiw
-2OrlDVVdRslsd2Fd469Q8sUB3c8uOW49SdHX1rbcePhoz3B7feuqlt5oZtBTv+ioSdXc7q3fHQaM
-fwtg6Vd/dEvn8Qssnzg/0Ns56jRcO6Nw4d1Af+/RH0/cdv+O/fRK7KnmBXPWGsQeDPhK9oWC6hdd
-R3pdUcg88Tx7U7Ej1y1qMjreGwjt/cnaF2YtvCXQe7bzxLkj+/sunT0Ry00OwHRI8DERLqeNmqGV
-JZJVC6Yu7UxMOfLFlV9pWQcYp57/013rb1u9ua29b0Ch4bsl4tKLY5P1sgxNJzsHDj136KzS3NTk
-9mTNusPvXJLrbnjUe/b16FDfsZ/3xC8d4/HoCQ4Anwzg91vWPL7+3pvvDM806sTY4IVyMxfrojO3
-BVubbyJMhnVVM3y+l187/nChIJ2ZpSs9hMD4qC6t6x6+0gkAoRC33/Sb8RdmXj9nzvWraivhP47g
-AyHxKb1mfWkRYHCjMb30nafeeWzerU9963w3L3/02c4f7D0y0NXTx3f3D/JTb7bzxpeODu55+PGT
-yy5F+ZmeD/iSrh5efeJd/hGZP5GBux+6cysY3w7H+16IVy65V6trnn3P9JqVjQ3JuSsdHhWW6hIL
-NuhyUpJgEF/ofSVBeLBuVtVjd3y55SHXhQ8UBht0DR4r98Fs+IRg/zrxlz2/2A7p5yYBY93Gu+4f
-H5xojLwOxfjd/WufOHhQ/IcD7eYVC5YyCjFMfkVV4NpMFvpTachoZeDaNryLnliOczsUCv1XBWD8
-YjF5MWJ9kcT757qenR7vf4bDoqWwHCvUUfPNsQQMWSZAZTlsw7nxYQQTcuDrjgQuPn7z/D7YivNt
-nPPfEDzwqcU75/j6SD/f8uG5vXs5dL7Hjb+d4gp8mnF8nAOabjcac+OBAxyuNiT4HyNwGZYgu0RW
-IDt/Icz4zAC0tXE4183rQ6XwU9uBXgLQ5Teg7GIv1+EqgsF/GY4DtCQALZMp2ITttmqoHzpWr756
-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/framework/src/domain/mimetreeparser/otp/autotests/data/smime-signed-apple.mbox.html b/framework/src/domain/mimetreeparser/otp/autotests/data/smime-signed-apple.mbox.html
deleted file mode 100644
index 11652a14..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/smime-signed-apple.mbox.html
+++ /dev/null
@@ -1,58 +0,0 @@
-<?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>
-                  <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/framework/src/domain/mimetreeparser/otp/autotests/data/smime-signed-apple.mbox.inProgress.html b/framework/src/domain/mimetreeparser/otp/autotests/data/smime-signed-apple.mbox.inProgress.html
deleted file mode 100644
index 5b57b937..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/smime-signed-apple.mbox.inProgress.html
+++ /dev/null
@@ -1,49 +0,0 @@
-<?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>
-                  <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>
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/smime-signed-apple.mbox.tree b/framework/src/domain/mimetreeparser/otp/autotests/data/smime-signed-apple.mbox.tree
deleted file mode 100644
index 3ade4efe..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/smime-signed-apple.mbox.tree
+++ /dev/null
@@ -1,3 +0,0 @@
- * MimeTreeParser::MessagePartList
-  * MimeTreeParser::SignedMessagePart
-   * MimeTreeParser::AlternativeMessagePart
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/smime-signed-encrypted.mbox b/framework/src/domain/mimetreeparser/otp/autotests/data/smime-signed-encrypted.mbox
deleted file mode 100644
index 49857e15..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/smime-signed-encrypted.mbox
+++ /dev/null
@@ -1,38 +0,0 @@
-From test@example.com Wed, 08 Sep 2010 17:51:32 +0200
-From: S/MIME Test <test@example.com>
-To: test@example.com
-Subject: S/MIME signed and encrypted
-Date: Wed, 08 Sep 2010 17:51:32 +0200
-User-Agent: KMail/4.6 pre (Linux/2.6.34-rc2-2-default; KDE/4.5.60; x86_64; ; )
-MIME-Version: 1.0
-Content-Type: application/pkcs7-mime; name="smime.p7m"; smime-type="enveloped-data"
-Content-Disposition: attachment; filename="smime.p7m"
-Content-Transfer-Encoding: base64
-
-MIAGCSqGSIb3DQEHA6CAMIACAQAxgfwwgfkCAQAwYjBVMQswCQYDVQQGEwJVUzENMAsGA1UECgwE
-S0RBQjEWMBQGA1UEAwwNdW5pdHRlc3QgY2VydDEfMB0GCSqGSIb3DQEJARYQdGVzdEBleGFtcGxl
-LmNvbQIJANNFIDoYY4XJMA0GCSqGSIb3DQEBAQUABIGAl7xMheBEpCAwYsr64BE1WY6ohFTuoxV4
-/F8NXDyH+RZqpdpF6ltEThAgZBsYlhx2olMHIINfifsnzkxYiSwvuZkD94KMcegdn1XGPAYTQnR6
-8IK+grfHM5kWYW36XAbZmHNgl1lTh1/tqCyqDCI+Yah6UtBaJbR4gflMmGM5f+IwgAYJKoZIhvcN
-AQcBMBQGCCqGSIb3DQMHBAhWM773SZc7KaCABIIEmKhZSl2YtYYlvthLk4/hEmyK5c2xx/MCqIxM
-hh3vbaDK2TWspQwtbBm/96xQbCDzZU9NeNv0rmjRAELK3AgqUVTnbi3Ozf6MLrEUsuXvlR214OPs
-sv374AF1ZoLJRaHyRo8/RkcwEbCMZbRPT56qM58tQQ54G7lTmWAHhV6zRx9B7ODgikt6CjgQr7Wn
-EAV33Pei17sM6Pa+mtZhz+tlUOQBRuZI6EOgbG1hixSaClgPnyphLxpwjiN3pym2tiVqsQxnSJ3f
-XRCx9E/kSWrJelME3aEU6++RXTuxbGJceDweo9SWQsXobU3Ot71pCIcZC7Tfv6qnICHsTAxc3Igw
-xHGHufnVoU7HZCXLi5AbhHvZYdLftEX2/6eA6/efEn4Jnrn9EMzOeLnySEaW5mE0AW8d27LDK62J
-+Mag1TTC2BivRhKRY0/GZCSiT8LepPb0DVYxb5vc2D5COVjG4ZhnDd0JbO2YnXoxfsi92M1CmssN
-YjBlB7R+HAFOoFGE+xuSGZZr+Ox4Q8+l7/cebLHjXcAsJ81fRlcWZNVreh4b5x3vZm9vRLNiHsqB
-h5wXeu5jV1zQ7okhT4mKGp5RbIVYOaBic0mg7+Z2iF4gn37tisU1yahboj2YMYP3pPVYgwuSnv3H
-308EAyFRu5/a5gGhj5ze2L5+vDgE5jk2REDYt9EH1kNtllDn8vN8e/6YfLBqDHQE+Hv5iC3YAygI
-mVNdSL0V8xMrUbqqmXXx23URwic1BetW6L4oDQpPhuMf4wrwXYwmQtCZj9EGZq+NpFxb6xSIvvRG
-n5mAT07HmI69EYnx4SbZq1YhWsY2AQHpxIFtLD2olW5SDISjbUKyxtcCdTuwk0ykajaxYHOC3t9E
-wQ7GreQAGY+kBIyDhB/L8sD46gPmmP+hO7QVXKESyOIfTnbo2rWVhToXPGMVD2dr/GJOP6DUmRj8
-3ba/9l1bFKMxWFBYm/MgdNN5H/SOWlhN1N+Fl820HYCXZTSWLTUH6Bq8kf3FuKz+MJDwbl417ctL
-+ojLATnLgKu+x/B6H1sOd2E6KY73SlCoKG/AfzSelbVPUZbbUU7kOECvzKWY/Zx/a55FBkF6ASm9
-6CgFk5VVuyG2VbncLtesluJJOTTYEHl20RaiGYJNUL22tTe5nCIdIrKzOI4xMXQBAZcPSdojlNIj
-bSRRX+9jJIRUIExncNZvWn7VtsD1v7gLFD+BN98Cy5E7n/1NByQTOpoislrVi/sMRJQ9bPs/j5sL
-B2tzVR08ODQYfdWWT+1ynbvegBx4wi8I2Orc5BEW+0NjUdnUHTFORBEnq8CjSRgHyckcsJMJommM
-m4wvkQj7YX/cps8QqCPzEKAdykU2hsd6sEycKtxi3gW6uDIOMwzapkxZSH7IcMriWBDXRsMebHsv
-+R0A8eT7dC09cgQw+kScSe+cYgRZk0R/26eqhukprECaf9SptYll10GQ0eLcIpX4deXr0ZNmAHYy
-+5D7yoysVFNyC5QE3tAhS1HapixB8lPeJUndifGfbt3u8lpFb7lodnJIj2oHgo5MUNkxhPchHW0t
-GJMpP9esdvIZxwQInpSuNeUy6Z8AAAAAAAAAAAAA
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/smime-signed-encrypted.mbox.html b/framework/src/domain/mimetreeparser/otp/autotests/data/smime-signed-encrypted.mbox.html
deleted file mode 100644
index e13d6841..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/smime-signed-encrypted.mbox.html
+++ /dev/null
@@ -1,55 +0,0 @@
-<?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="encr">
-          <tr class="encrH">
-            <td dir="ltr">Encrypted message</td>
-          </tr>
-          <tr class="encrB">
-            <td>
-              <div style="position: relative; word-wrap: break-word">
-                <a name="att"/>
-                <div id="attachmentDiv">
-                  <table cellspacing="1" cellpadding="1" class="signOkKeyOk">
-                    <tr class="signOkKeyOkH">
-                      <td dir="ltr">
-                        <table cellspacing="0" cellpadding="0" width="100%">
-                          <tr>
-                            <td>Signed by <a href="mailto:test@example.com">test@example.com</a>.</td>
-                            <td align="right">
-                              <a href="kmail:showSignatureDetails">Show Details</a>
-                            </td>
-                          </tr>
-                        </table>
-                      </td>
-                    </tr>
-                    <tr class="signOkKeyOkB">
-                      <td>
-                        <a name="att1"/>
-                        <div id="attachmentDiv1">
-                          <div class="noquote">
-                            <div dir="ltr">encrypted message text</div>
-                          </div>
-                        </div>
-                      </td>
-                    </tr>
-                    <tr class="signOkKeyOkH">
-                      <td dir="ltr">End of signed message</td>
-                    </tr>
-                  </table>
-                </div>
-              </div>
-            </td>
-          </tr>
-          <tr class="encrH">
-            <td dir="ltr">End of encrypted message</td>
-          </tr>
-        </table>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/smime-signed-encrypted.mbox.tree b/framework/src/domain/mimetreeparser/otp/autotests/data/smime-signed-encrypted.mbox.tree
deleted file mode 100644
index 7d5bbeb7..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/smime-signed-encrypted.mbox.tree
+++ /dev/null
@@ -1,5 +0,0 @@
- * MimeTreeParser::MessagePartList
-  * MimeTreeParser::EncryptedMessagePart
-   * MimeTreeParser::SignedMessagePart
-    * MimeTreeParser::TextMessagePart
-     * MimeTreeParser::MessagePart
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/text+html-maillinglist.mbox b/framework/src/domain/mimetreeparser/otp/autotests/data/text+html-maillinglist.mbox
deleted file mode 100644
index f9c6387f..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/text+html-maillinglist.mbox
+++ /dev/null
@@ -1,163 +0,0 @@
-Return-Path: <bugzilla-bounces@lists.kolabsys.com>
-Received: from kolab01.kolabsys.com ([unix socket])
-         by kolab01.kolabsys.com (Cyrus v2.4.17-Kolab-2.4.17-1.el6.kolab_3.0) with LMTPA;
-         Thu, 11 Apr 2013 09:03:01 +0200
-X-Sieve: CMU Sieve 2.4
-Received: from ext-mx01.kolabsys.com (unknown [10.10.20.253])
-        by kolab01.kolabsys.com (Postfix) with ESMTP id 3D8A9C0AE3
-        for <shared+shared/lists/kolabsys.com/bugzilla@kolabsys.com>; Thu, 11 Apr 2013 09:03:01 +0200 (CEST)
-Received: from localhost (localhost [127.0.0.1])
-        by ext-mx01.kolabsys.com (Postfix) with ESMTP id 89D4E10057E
-        for <shared+shared/lists/kolabsys.com/bugzilla@kolabsys.com>; Thu, 11 Apr 2013 09:02:38 +0200 (CEST)
-X-Virus-Scanned: amavisd-new at example.com
-X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "MIME-Version"
-Received: from ext-mx01.kolabsys.com ([127.0.0.1])
-        by localhost (fw01.kolabsys.com [127.0.0.1]) (amavisd-new, port 10024)
-        with ESMTP id BJxrh9Yst1Ac
-        for <shared+shared/lists/kolabsys.com/bugzilla@kolabsys.com>;
-        Thu, 11 Apr 2013 09:02:38 +0200 (CEST)
-Received: from lists.kolabsys.com (static.253.32.46.78.clients.your-server.de [78.46.32.253])
-        by ext-mx01.kolabsys.com (Postfix) with ESMTP id 609821004A7
-        for <shared+shared/lists/kolabsys.com/bugzilla@kolabsys.com>; Thu, 11 Apr 2013 09:02:38 +0200 (CEST)
-Received: from localhost (localhost [127.0.0.1])
-        by lists.kolabsys.com (Postfix) with ESMTP id BFA6941D4EAD;
-        Thu, 11 Apr 2013 09:03:00 +0200 (CEST)
-X-Virus-Scanned: Debian amavisd-new at lists.kolabsys.com
-X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "MIME-Version"
-Received: from lists.kolabsys.com ([127.0.0.1])
-        by localhost (lists.kolabsys.com [127.0.0.1]) (amavisd-new, port 10024)
-        with ESMTP id TYU5eAMK5J6T; Thu, 11 Apr 2013 09:02:58 +0200 (CEST)
-Received: from lists.kolabsys.com (localhost [127.0.0.1])
-        by lists.kolabsys.com (Postfix) with ESMTP id 182FC41D2A3B;
-        Thu, 11 Apr 2013 09:02:58 +0200 (CEST)
-Received: from localhost (localhost [127.0.0.1])
-        by lists.kolabsys.com (Postfix) with ESMTP id A2B3641D4EC2
-        for <bugzilla@lists.kolabsys.com>;
-        Thu, 11 Apr 2013 09:02:56 +0200 (CEST)
-X-Virus-Scanned: Debian amavisd-new at lists.kolabsys.com
-Received: from lists.kolabsys.com ([127.0.0.1])
-        by localhost (lists.kolabsys.com [127.0.0.1]) (amavisd-new, port 10024)
-        with ESMTP id cyO-CNB3vFwu for <bugzilla@lists.kolabsys.com>;
-        Thu, 11 Apr 2013 09:02:54 +0200 (CEST)
-Received: from ext-mx02.kolabsys.com (ext-mx02.kolabsys.com [94.230.208.222])
-        by lists.kolabsys.com (Postfix) with ESMTP id 1640E41D2A3B
-        for <bugzilla@lists.kolabsys.com>;
-        Thu, 11 Apr 2013 09:02:54 +0200 (CEST)
-Received: from localhost (localhost [127.0.0.1])
-        by ext-mx01.kolabsys.com (Postfix) with ESMTP id 58CBC160522
-        for <bugzilla@lists.kolabsys.com>;
-        Thu, 11 Apr 2013 10:02:44 +0200 (CEST)
-X-Virus-Scanned: amavisd-new at example.com
-Received: from ext-mx02.kolabsys.com ([127.0.0.1])
-        by localhost (fw02.kolabsys.com [127.0.0.1]) (amavisd-new, port 10024)
-        with ESMTP id 4VjnHg6Y6jo7 for <bugzilla@lists.kolabsys.com>;
-        Thu, 11 Apr 2013 10:02:42 +0200 (CEST)
-Received: from app04.kolabsys.com (unknown [10.10.20.16])
-        by ext-mx02.kolabsys.com (Postfix) with ESMTP id 062DF160521
-        for <bugzilla@lists.kolabsys.com>;
-        Thu, 11 Apr 2013 10:02:42 +0200 (CEST)
-Received: by app04.kolabsys.com (Postfix, from userid 48)
-        id 8E7524048C; Thu, 11 Apr 2013 09:02:51 +0200 (CEST)
-From: Kolab Bugzilla <noreply@kolab.org>
-To: bugzilla@lists.kolabsys.com
-Subject: [Bug 1741] Standard folder name configuration ignored on creating
-        new users
-Date: Thu, 11 Apr 2013 07:02:43 +0000
-X-Bugzilla-Reason: GlobalWatcher
-X-Bugzilla-Type: changed
-X-Bugzilla-Watch-Reason: None
-X-Bugzilla-Product: UCS
-X-Bugzilla-Component: roundcube
-X-Bugzilla-Keywords: 
-X-Bugzilla-Severity: normal
-X-Bugzilla-Who: wickert@kolabsys.com
-X-Bugzilla-Status: NEW
-X-Bugzilla-Priority: P3
-X-Bugzilla-Assigned-To: machniak@kolabsys.com
-X-Bugzilla-Target-Milestone: 3.1-next
-X-Bugzilla-Changed-Fields: 
-Message-ID: <bug-1741-12-HOSaBe3Z8l@http.issues.kolab.org/>
-In-Reply-To: <bug-1741-12@http.issues.kolab.org/>
-References: <bug-1741-12@http.issues.kolab.org/>
-X-Bugzilla-URL: http://issues.kolab.org/
-Auto-Submitted: auto-generated
-MIME-Version: 1.0
-X-BeenThere: bugzilla@lists.kolabsys.com
-X-Mailman-Version: 2.1.11
-Precedence: list
-Reply-To: server-team@lists.kolabsys.com
-List-Id: All Bugzilla email notifications <bugzilla.lists.kolabsys.com>
-List-Unsubscribe: <https://lists.kolabsys.com/mailman/options/bugzilla>,
-        <mailto:bugzilla-request@lists.kolabsys.com?subject=unsubscribe>
-List-Archive: <http://lists.kolabsys.com/pipermail/bugzilla>
-List-Post: <mailto:bugzilla@lists.kolabsys.com>
-List-Help: <mailto:bugzilla-request@lists.kolabsys.com?subject=help>
-List-Subscribe: <https://lists.kolabsys.com/mailman/listinfo/bugzilla>,
-        <mailto:bugzilla-request@lists.kolabsys.com?subject=subscribe>
-Content-Type: multipart/mixed; boundary="===============1778809852=="
-Mime-version: 1.0
-Sender: bugzilla-bounces@lists.kolabsys.com
-Errors-To: bugzilla-bounces@lists.kolabsys.com
-
-
---===============1778809852==
-Content-Type: multipart/alternative; boundary="1365663771.ec4d382.10226"; charset="us-ascii"
-
-
---1365663771.ec4d382.10226
-Date: Thu, 11 Apr 2013 09:02:51 +0200
-MIME-Version: 1.0
-Content-Type: text/plain; charset="UTF-8"
-
-https://issues.kolab.org/show_bug.cgi?id=1741
-
---- Comment #4 from Christoph Wickert <wickert@kolabsys.com> ---
-You can get everything you need on test93-18.
-
--- 
-You are receiving this mail because:
-You are watching all bug changes.
-
---1365663771.ec4d382.10226
-Date: Thu, 11 Apr 2013 09:02:51 +0200
-MIME-Version: 1.0
-Content-Type: text/html; charset="UTF-8"
-
-<html>
-    <head>
-      <base href="https://issues.kolab.org/" />
-    </head>
-    <body>
-      <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&#64;kolabsys.com" title="Christoph Wickert &lt;wickert&#64;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>
-    </body>
-</html>
-
---1365663771.ec4d382.10226--
-
---===============1778809852==
-Content-Type: text/plain; charset="us-ascii"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Content-Disposition: inline
-
-_______________________________________________
-bugzilla mailing list
-bugzilla@lists.kolabsys.com
-https://lists.kolabsys.com/mailman/listinfo/bugzilla
-
---===============1778809852==--
- 
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/text+html-maillinglist.mbox.html b/framework/src/domain/mimetreeparser/otp/autotests/data/text+html-maillinglist.mbox.html
deleted file mode 100644
index 2b5af631..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/text+html-maillinglist.mbox.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<?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 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>
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/text+html-maillinglist.mbox.tree b/framework/src/domain/mimetreeparser/otp/autotests/data/text+html-maillinglist.mbox.tree
deleted file mode 100644
index 3738cb37..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/text+html-maillinglist.mbox.tree
+++ /dev/null
@@ -1,5 +0,0 @@
- * MimeTreeParser::MessagePartList
-  * MimeTreeParser::MimeMessagePart
-   * MimeTreeParser::AlternativeMessagePart
-   * MimeTreeParser::AttachmentMessagePart
-    * MimeTreeParser::MessagePart
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/kdepim_add_gpg_crypto_test.cmake b/framework/src/domain/mimetreeparser/otp/autotests/kdepim_add_gpg_crypto_test.cmake
deleted file mode 100644
index ea0ab8d2..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/kdepim_add_gpg_crypto_test.cmake
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright (c) 2013 Sandro Knauß <mail@sandroknauss.de>
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-set( MIMETREEPARSERRELPATH framework/src/domain/mimetreeparser)
-set( GNUPGHOME ${CMAKE_BINARY_DIR}/${MIMETREEPARSERRELPATH}/tests/gnupg_home )
-add_definitions( -DGNUPGHOME="${GNUPGHOME}" )
-
-macro (ADD_GPG_CRYPTO_TEST _target _testname)
-   if (UNIX)
-      if (APPLE)
-         set(_library_path_variable "DYLD_LIBRARY_PATH")
-      elseif (CYGWIN)
-         set(_library_path_variable "PATH")
-      else (APPLE)
-         set(_library_path_variable "LD_LIBRARY_PATH")
-      endif (APPLE)
-
-      if (APPLE)
-         # DYLD_LIBRARY_PATH does not work like LD_LIBRARY_PATH
-         # OSX already has the RPATH in libraries and executables, putting runtime directories in
-         # DYLD_LIBRARY_PATH actually breaks things
-         set(_ld_library_path "${LIBRARY_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/")
-      else (APPLE)
-         set(_ld_library_path "${LIBRARY_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/:${LIB_INSTALL_DIR}:${QT_LIBRARY_DIR}")
-      endif (APPLE)
-      set(_executable "$<TARGET_FILE:${_target}>")
-
-      # use add_custom_target() to have the sh-wrapper generated during build time instead of cmake time
-      add_custom_command(TARGET ${_target} POST_BUILD
-        COMMAND ${CMAKE_COMMAND}
-        -D_filename=${_executable}.shell -D_library_path_variable=${_library_path_variable}
-        -D_ld_library_path="${_ld_library_path}" -D_executable=$<TARGET_FILE:${_target}>
-        -D_gnupghome="${GNUPGHOME}"
-        -P ${CMAKE_SOURCE_DIR}/${MIMETREEPARSERRELPATH}/tests/kdepim_generate_crypto_test_wrapper.cmake
-      )
-
-      set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES "${_executable}.shell" )
-      add_test(NAME ${_testname} COMMAND ${_executable}.shell)
-
-   else (UNIX)
-      # under windows, set the property WRAPPER_SCRIPT just to the name of the executable
-      # maybe later this will change to a generated batch file (for setting the PATH so that the Qt libs are found)
-      set(_ld_library_path "${LIBRARY_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}\;${LIB_INSTALL_DIR}\;${QT_LIBRARY_DIR}")
-      set(_executable "$<TARGET_FILE:${_target}>")
-
-      # use add_custom_target() to have the batch-file-wrapper generated during build time instead of cmake time
-      add_custom_command(TARGET ${_target} POST_BUILD
-         COMMAND ${CMAKE_COMMAND}
-         -D_filename="${_executable}.bat"
-         -D_ld_library_path="${_ld_library_path}" -D_executable="${_executable}"
-         -D_gnupghome="${GNUPGHOME}"
-         -P ${CMAKE_SOURCE_DIR}/${MIMETREEPARSERRELPATH}/tests/kdepim_generate_crypto_test_wrapper.cmake
-         )
-
-      add_test(NAME ${_testname} COMMAND ${_executable}.bat)
-
-   endif (UNIX)
-endmacro (ADD_GPG_CRYPTO_TEST)
-
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/kdepim_generate_crypto_test_wrapper.cmake b/framework/src/domain/mimetreeparser/otp/autotests/kdepim_generate_crypto_test_wrapper.cmake
deleted file mode 100644
index e1412f37..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/kdepim_generate_crypto_test_wrapper.cmake
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright (c) 2006, Alexander Neundorf, <neundorf@kde.org>
-# Copyright (c) 2013, Sandro Knauß <mail@sandroknauss.de>
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-
-if (UNIX)
-
-file(WRITE "${_filename}"
-"#!/bin/sh
-# created by cmake, don't edit, changes will be lost
-
-# don't mess with a gpg-agent already running on the system
-unset GPG_AGENT_INFO
-
-${_library_path_variable}=${_ld_library_path}\${${_library_path_variable}:+:\$${_library_path_variable}} GNUPGHOME=${_gnupghome} gpg-agent --daemon \"${_executable}\" \"$@\"
-_result=$?
-_pid=`echo GETINFO pid | GNUPGHOME=${_gnupghome} gpg-connect-agent | grep 'D' | cut -d' ' -f2`
-if [ ! -z \"\$_pid\" ]; then
-    echo \"Waiting for gpg-agent to terminate (PID: $_pid)...\"
-    while kill -0 \"\$_pid\"; do
-        sleep 1
-    done
-fi
-exit \$_result
-")
-
-# make it executable
-# since this is only executed on UNIX, it is safe to call chmod
-exec_program(chmod ARGS ug+x \"${_filename}\" OUTPUT_VARIABLE _dummy )
-
-else (UNIX)
-
-file(TO_NATIVE_PATH "${_ld_library_path}" win_path)
-file(TO_NATIVE_PATH "${_gnupghome}" win_gnupghome)
-
-file(WRITE "${_filename}"
-"
-set PATH=${win_path};$ENV{PATH}
-set GNUPGHOME=${win_gnupghome};$ENV{GNUPGHOME}
-gpg-agent --daemon \"${_executable}\" %*
-")
-
-endif (UNIX)
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/nodehelpertest.cpp b/framework/src/domain/mimetreeparser/otp/autotests/nodehelpertest.cpp
deleted file mode 100644
index d2a5d605..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/nodehelpertest.cpp
+++ /dev/null
@@ -1,275 +0,0 @@
-/* Copyright 2015 Sandro Knauß <bugs@sandroknauss.de>
-
-   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) version 3 or any later version
-   accepted by the membership of KDE e.V. (or its successor approved
-   by the membership of KDE e.V.), which shall act as a proxy
-   defined in Section 14 of version 3 of the license.
-
-   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, see <http://www.gnu.org/licenses/>.
-*/
-#include "nodehelpertest.h"
-
-#include "nodehelper.h"
-
-#include <qtest.h>
-
-using namespace MimeTreeParser;
-
-NodeHelperTest::NodeHelperTest()
-    : QObject()
-{
-
-}
-
-void NodeHelperTest::testPersistentIndex()
-{
-    NodeHelper helper;
-
-    KMime::Content *node = new KMime::Content();
-    KMime::Content *node2 = new KMime::Content();
-    KMime::Content *node2Extra = new KMime::Content();
-    KMime::Content *subNode = new KMime::Content();
-    KMime::Content *subsubNode = new KMime::Content(), *subsubNode2 = new KMime::Content();
-    KMime::Content *node2ExtraSubNode = new KMime::Content();
-    KMime::Content *node2ExtraSubsubNode = new KMime::Content();
-    KMime::Content *node2ExtraSubsubNode2 = new KMime::Content();
-    KMime::Content *extra = new KMime::Content(), *extra2 = new KMime::Content();
-    KMime::Content *subExtra = new KMime::Content();
-    KMime::Content *subsubExtra = new KMime::Content();
-    KMime::Content *subsubExtraNode = new KMime::Content();
-
-    subNode->addContent(subsubNode);
-    subNode->addContent(subsubNode2);
-    node->addContent(subNode);
-    subsubExtra->addContent(subsubExtraNode);
-    helper.attachExtraContent(node, extra);
-    helper.attachExtraContent(node, extra2);
-    helper.attachExtraContent(subNode, subExtra);
-    helper.attachExtraContent(subsubNode2, subsubExtra);
-
-    // This simulates Opaque S/MIME signed and encrypted message with attachment
-    // (attachment is node2SubsubNode2)
-    node2Extra->addContent(node2ExtraSubNode);
-    node2ExtraSubNode->addContent(node2ExtraSubsubNode);
-    node2ExtraSubNode->addContent(node2ExtraSubsubNode2);
-    helper.attachExtraContent(node2, node2Extra);
-
-    /*  all content has a internal first child, so indexes starts at 2
-     * node                 ""
-     * -> subNode           "2"
-     *    -> subsubNode     "2.2"
-     *    -> subsubNode2    "2.3"
-     *
-     * node                 ""
-     * -> extra             "e0"
-     * -> extra2            "e1"
-     *
-     * subNode              "2"
-     * -> subExtra          "2:e0"
-     *
-     * subsubNode2          "2.3"
-     * -> subsubExtra       "2.3:e0"
-     *    -> subsubExtraNode    "2.3:e0:2"
-     *
-     * node2                ""
-     *
-     * node2                ""
-     * -> node2Extra        "e0"
-     *    -> node2ExtraSubNode        "e0:2"
-     *       -> node2ExtraSubsubNode  "e0:2.2"
-     *       -> node2ExtraSubsubNode2 "e0:2.3"
-     */
-
-    QCOMPARE(helper.persistentIndex(node), QStringLiteral(""));
-    QCOMPARE(helper.contentFromIndex(node, QStringLiteral("")), node);
-
-    QCOMPARE(helper.persistentIndex(node->contents()[0]), QStringLiteral("1"));
-    QCOMPARE(helper.contentFromIndex(node, QStringLiteral("1")), node->contents()[0]);
-
-    QCOMPARE(helper.persistentIndex(subNode), QStringLiteral("2"));
-    QCOMPARE(helper.contentFromIndex(node, QStringLiteral("2")), subNode);
-
-    QCOMPARE(helper.persistentIndex(subsubNode), QStringLiteral("2.2"));
-    QCOMPARE(helper.contentFromIndex(node, QStringLiteral("2.2")), subsubNode);
-
-    QCOMPARE(helper.persistentIndex(subsubNode2), QStringLiteral("2.3"));
-    QCOMPARE(helper.contentFromIndex(node, QStringLiteral("2.3")), subsubNode2);
-
-    QCOMPARE(helper.persistentIndex(extra), QStringLiteral("e0"));
-    QCOMPARE(helper.contentFromIndex(node, QStringLiteral("e0")), extra);
-
-    QCOMPARE(helper.persistentIndex(extra2), QStringLiteral("e1"));
-    QCOMPARE(helper.contentFromIndex(node, QStringLiteral("e1")), extra2);
-
-    QCOMPARE(helper.persistentIndex(subExtra), QStringLiteral("2:e0"));
-    QCOMPARE(helper.contentFromIndex(node, QStringLiteral("2:e0")), subExtra);
-
-    QCOMPARE(helper.persistentIndex(subsubExtra), QStringLiteral("2.3:e0"));
-    QCOMPARE(helper.contentFromIndex(node, QStringLiteral("2.3:e0")), subsubExtra);
-
-    QCOMPARE(helper.persistentIndex(subsubExtraNode), QStringLiteral("2.3:e0:2"));
-    QCOMPARE(helper.contentFromIndex(node, QStringLiteral("2.3:e0:2")), subsubExtraNode);
-
-    QCOMPARE(helper.persistentIndex(node2ExtraSubsubNode2), QStringLiteral("e0:2.3"));
-    QCOMPARE(helper.contentFromIndex(node2, QStringLiteral("e0:2.3")), node2ExtraSubsubNode2);
-
-    delete node;
-}
-
-void NodeHelperTest::testHREF()
-{
-    NodeHelper helper;
-    KMime::Message::Ptr msg(new KMime::Message);
-    QUrl url;
-
-    KMime::Content *node = msg->topLevel();
-    KMime::Content *subNode = new KMime::Content();
-    KMime::Content *subsubNode = new KMime::Content(), *subsubNode2 = new KMime::Content();
-    KMime::Content *extra = new KMime::Content(), *extra2 = new KMime::Content();
-    KMime::Content *subExtra = new KMime::Content();
-    KMime::Content *subsubExtra = new KMime::Content();
-    KMime::Content *subsubExtraNode = new KMime::Content();
-
-    subNode->addContent(subsubNode);
-    subNode->addContent(subsubNode2);
-    node->addContent(subNode);
-    subsubExtra->addContent(subsubExtraNode);
-    helper.attachExtraContent(node, extra);
-    helper.attachExtraContent(node, extra2);
-    helper.attachExtraContent(subNode, subExtra);
-    helper.attachExtraContent(subsubNode2, subsubExtra);
-
-    url = QUrl(QStringLiteral(""));
-    QCOMPARE(helper.fromHREF(msg, url), node);
-
-    url = QUrl(QStringLiteral("attachment:e0?place=body"));
-    QCOMPARE(helper.fromHREF(msg, url), extra);
-
-    url = QUrl(QStringLiteral("attachment:2.2?place=body"));
-    QCOMPARE(helper.fromHREF(msg, url), subsubNode);
-
-    url = QUrl(QStringLiteral("attachment:2.3:e0:2?place=body"));
-    QCOMPARE(helper.fromHREF(msg, url), subsubExtraNode);
-
-    QCOMPARE(helper.asHREF(node, QStringLiteral("body")), QStringLiteral("attachment:?place=body"));
-    QCOMPARE(helper.asHREF(extra, QStringLiteral("body")), QStringLiteral("attachment:e0?place=body"));
-    QCOMPARE(helper.asHREF(subsubNode, QStringLiteral("body")), QStringLiteral("attachment:2.2?place=body"));
-    QCOMPARE(helper.asHREF(subsubExtraNode, QStringLiteral("body")), QStringLiteral("attachment:2.3:e0:2?place=body"));
-}
-
-void NodeHelperTest::testLocalFiles()
-{
-    NodeHelper helper;
-    KMime::Message::Ptr msg(new KMime::Message);
-
-    KMime::Content *node = msg->topLevel();
-    KMime::Content *subNode = new KMime::Content();
-    KMime::Content *subsubNode = new KMime::Content(), *subsubNode2 = new KMime::Content();
-    KMime::Content *extra = new KMime::Content(), *extra2 = new KMime::Content();
-    KMime::Content *subExtra = new KMime::Content();
-    KMime::Content *subsubExtra = new KMime::Content();
-    KMime::Content *subsubExtraNode = new KMime::Content();
-
-    subNode->addContent(subsubNode);
-    subNode->addContent(subsubNode2);
-    node->addContent(subNode);
-    subsubExtra->addContent(subsubExtraNode);
-    helper.attachExtraContent(node, extra);
-    helper.attachExtraContent(node, extra2);
-    helper.attachExtraContent(subNode, subExtra);
-    helper.attachExtraContent(subsubNode2, subsubExtra);
-
-    helper.writeNodeToTempFile(node);
-    QCOMPARE(helper.fromHREF(msg, helper.tempFileUrlFromNode(node)), node);
-    helper.writeNodeToTempFile(subNode);
-    QCOMPARE(helper.fromHREF(msg, helper.tempFileUrlFromNode(subNode)), subNode);
-    helper.writeNodeToTempFile(subsubNode);
-    QCOMPARE(helper.fromHREF(msg, helper.tempFileUrlFromNode(subsubNode)), subsubNode);
-    helper.writeNodeToTempFile(subsubNode2);
-    QCOMPARE(helper.fromHREF(msg, helper.tempFileUrlFromNode(subsubNode2)), subsubNode2);
-    helper.writeNodeToTempFile(extra);
-    QCOMPARE(helper.fromHREF(msg, helper.tempFileUrlFromNode(extra)), extra);
-    helper.writeNodeToTempFile(subExtra);
-    QCOMPARE(helper.fromHREF(msg, helper.tempFileUrlFromNode(subExtra)), subExtra);
-    helper.writeNodeToTempFile(subsubExtra);
-    QCOMPARE(helper.fromHREF(msg, helper.tempFileUrlFromNode(subsubExtra)), subsubExtra);
-    helper.writeNodeToTempFile(subsubExtraNode);
-    QCOMPARE(helper.fromHREF(msg, helper.tempFileUrlFromNode(subsubExtraNode)), subsubExtraNode);
-}
-
-void NodeHelperTest::testCreateTempDir()
-{
-    QString path;
-    {
-        NodeHelper helper;
-        path = helper.createTempDir(QStringLiteral("foo"));
-
-        QVERIFY(path.endsWith(QStringLiteral(".index.foo")));
-        QVERIFY(QDir(path).exists());
-        QVERIFY(QFile(path).permissions() & QFileDevice::WriteUser);
-        QVERIFY(QFile(path).permissions() & QFileDevice::ExeUser);
-        QVERIFY(QFile(path).permissions() & QFileDevice::ReadUser);
-    }
-    QVERIFY(!QDir(path).exists());
-}
-
-void NodeHelperTest::testFromAsString()
-{
-    const QString tlSender = QStringLiteral("Foo <foo@example.com>");
-    const QString encSender = QStringLiteral("Bar <bar@example.com>");
-
-    NodeHelper helper;
-
-    // msg (KMime::Message)
-    //  |- subNode
-    //  |- encNode (KMime::Message)
-    //      |- encSubNode
-    //
-    // subNode
-    //  |- subExtra
-    //
-    // encSubNode
-    //  |- encSubExtra
-
-    KMime::Message msg;
-    msg.from(true)->fromUnicodeString(tlSender, "UTF-8");
-    auto node = msg.topLevel();
-    auto subNode = new KMime::Content();
-    auto subExtra = new KMime::Content();
-
-    // Encapsulated message
-    KMime::Message *encMsg = new KMime::Message;
-    encMsg->from(true)->fromUnicodeString(encSender, "UTF-8");
-    auto encNode = encMsg->topLevel();
-    auto encSubNode = new KMime::Content();
-    auto encSubExtra = new KMime::Content();
-
-    node->addContent(subNode);
-    node->addContent(encMsg);
-    encNode->addContent(encSubNode);
-
-    helper.attachExtraContent(subNode, subExtra);
-    helper.attachExtraContent(encSubNode, encSubExtra);
-
-    QCOMPARE(helper.fromAsString(node), tlSender);
-    QCOMPARE(helper.fromAsString(subNode), tlSender);
-    QCOMPARE(helper.fromAsString(subExtra), tlSender);
-    QEXPECT_FAIL("", "Returning sender of encapsulated message is not yet implemented", Continue);
-    QCOMPARE(helper.fromAsString(encNode), encSender);
-    QEXPECT_FAIL("", "Returning sender of encapsulated message is not yet implemented", Continue);
-    QCOMPARE(helper.fromAsString(encSubNode), encSender);
-    QEXPECT_FAIL("", "Returning sender of encapsulated message is not yet implemented", Continue);
-    QCOMPARE(helper.fromAsString(encSubExtra), encSender);
-}
-
-QTEST_GUILESS_MAIN(NodeHelperTest)
-
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/nodehelpertest.h b/framework/src/domain/mimetreeparser/otp/autotests/nodehelpertest.h
deleted file mode 100644
index d2ed772a..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/nodehelpertest.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/* Copyright 2015 Sandro Knauß <bugs@sandroknauss.de>
-
-   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) version 3 or any later version
-   accepted by the membership of KDE e.V. (or its successor approved
-   by the membership of KDE e.V.), which shall act as a proxy
-   defined in Section 14 of version 3 of the license.
-
-   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, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef NODEHELPERTEST_H
-#define NODEHELPERTEST_H
-
-#include <QObject>
-
-#include <KMime/Message>
-
-namespace MimeTreeParser
-{
-
-class NodeHelperTest : public QObject
-{
-    Q_OBJECT
-
-public:
-    NodeHelperTest();
-
-private Q_SLOTS:
-    void testPersistentIndex();
-    void testLocalFiles();
-    void testHREF();
-    void testCreateTempDir();
-    void testFromAsString();
-};
-
-}
-#endif
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/setupenv.cpp b/framework/src/domain/mimetreeparser/otp/autotests/setupenv.cpp
deleted file mode 100644
index be7a8685..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/setupenv.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-  Copyright (C) 2010 Klaralvdalens Datakonsult AB, a KDAB Group company, info@kdab.com
-  Copyright (c) 2010 Leo Franchi <lfranchi@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 "setupenv.h"
-
-#include <QStandardPaths>
-
-#include <QFile>
-#include <QDir>
-
-void MimeTreeParser::Test::setupEnv()
-{
-    setenv("LC_ALL", "C", 1);
-    setenv("KDEHOME", QFile::encodeName(QDir::homePath() + QString::fromLatin1("/.qttest")).constData(), 1);
-    QStandardPaths::setTestModeEnabled(true);
-}
-
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/setupenv.h b/framework/src/domain/mimetreeparser/otp/autotests/setupenv.h
deleted file mode 100644
index 3582853e..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/setupenv.h
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
-  Copyright (C) 2010 Klaralvdalens Datakonsult AB, a KDAB Group company, info@kdab.com
-  Copyright (c) 2010 Leo Franchi <lfranchi@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.
-*/
-
-#ifndef MESSAGECORE_TESTS_UTIL_H
-#define MESSAGECORE_TESTS_UTIL_H
-
-#include <gpgme++/key.h>
-#include <attachmentstrategy.h>
-#include <bodypartformatter.h>
-#include <bodypartformatterbasefactory.h>
-#include <messagepartrenderer.h>
-#include <objecttreesource.h>
-
-namespace MimeTreeParser
-{
-
-namespace Test
-{
-
-/**
-* setup a environment variables for tests:
-* * set LC_ALL to C
-* * set KDEHOME
-*/
-void setupEnv();
-
-// We can't use EmptySource, since we need to control some emelnets of the source for tests to also test
-// loadExternal and htmlMail.
-class TestObjectTreeSource : public MimeTreeParser::Interface::ObjectTreeSource
-{
-public:
-    TestObjectTreeSource(MimeTreeParser::HtmlWriter *writer)
-        : mWriter(writer)
-        , mAttachmentStrategy(QStringLiteral("smart"))
-        , mPreferredMode(Util::Html)
-        , mHtmlLoadExternal(false)
-        , mDecryptMessage(false)
-    {
-    }
-
-    MimeTreeParser::HtmlWriter *htmlWriter() Q_DECL_OVERRIDE {
-        return mWriter;
-    }
-
-    bool htmlLoadExternal() const Q_DECL_OVERRIDE
-    {
-        return mHtmlLoadExternal;
-    }
-
-    void setHtmlLoadExternal(bool loadExternal)
-    {
-        mHtmlLoadExternal = loadExternal;
-    }
-
-    void setAttachmentStrategy(QString strategy)
-    {
-        mAttachmentStrategy = strategy;
-    }
-
-    const AttachmentStrategy *attachmentStrategy() Q_DECL_OVERRIDE {
-        return  AttachmentStrategy::create(mAttachmentStrategy);
-    }
-
-    bool autoImportKeys() const Q_DECL_OVERRIDE
-    {
-        return true;
-    }
-
-    bool showEmoticons() const Q_DECL_OVERRIDE
-    {
-        return false;
-    }
-
-    bool showExpandQuotesMark() const Q_DECL_OVERRIDE
-    {
-        return false;
-    }
-
-    const BodyPartFormatterBaseFactory *bodyPartFormatterFactory() Q_DECL_OVERRIDE {
-        return &mBodyPartFormatterBaseFactory;
-    }
-
-    bool decryptMessage() const Q_DECL_OVERRIDE
-    {
-        return mDecryptMessage;
-    }
-
-    void setAllowDecryption(bool allowDecryption)
-    {
-        mDecryptMessage = allowDecryption;
-    }
-
-    void setShowSignatureDetails(bool showSignatureDetails)
-    {
-        mShowSignatureDetails = showSignatureDetails;
-    }
-
-    bool showSignatureDetails() const Q_DECL_OVERRIDE
-    {
-        return mShowSignatureDetails;
-    }
-
-    void setHtmlMode(MimeTreeParser::Util::HtmlMode mode, const QList<MimeTreeParser::Util::HtmlMode> &availableModes) Q_DECL_OVERRIDE {
-        Q_UNUSED(mode);
-        Q_UNUSED(availableModes);
-    }
-
-    MimeTreeParser::Util::HtmlMode preferredMode() const Q_DECL_OVERRIDE
-    {
-        return mPreferredMode;
-    }
-
-    void setPreferredMode(MimeTreeParser::Util::HtmlMode mode)
-    {
-        mPreferredMode = mode;
-    }
-
-    int levelQuote() const Q_DECL_OVERRIDE
-    {
-        return 1;
-    }
-
-    const QTextCodec *overrideCodec() Q_DECL_OVERRIDE {
-        return nullptr;
-    }
-
-    QString createMessageHeader(KMime::Message *message) Q_DECL_OVERRIDE {
-        Q_UNUSED(message);
-        return QString(); //do nothing
-    }
-
-    QObject *sourceObject() Q_DECL_OVERRIDE {
-        return nullptr;
-    }
-
-    Interface::MessagePartRenderer::Ptr messagePartTheme(Interface::MessagePart::Ptr msgPart) Q_DECL_OVERRIDE {
-        Q_UNUSED(msgPart);
-        return  Interface::MessagePartRenderer::Ptr();
-    }
-    bool isPrinting() const Q_DECL_OVERRIDE
-    {
-        return false;
-    }
-private:
-    MimeTreeParser::HtmlWriter *mWriter;
-    QString mAttachmentStrategy;
-    BodyPartFormatterBaseFactory mBodyPartFormatterBaseFactory;
-    MimeTreeParser::Util::HtmlMode mPreferredMode;
-    bool mHtmlLoadExternal;
-    bool mDecryptMessage;
-    bool mShowSignatureDetails;
-};
-
-}
-
-}
-
-#endif
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/testcsshelper.cpp b/framework/src/domain/mimetreeparser/otp/autotests/testcsshelper.cpp
deleted file mode 100644
index 0e411e8f..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/testcsshelper.cpp
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
-    testcsshelper.cpp
-
-    This file is part of KMail, the KDE mail client.
-    Copyright (c) 2013 Sandro Knauß <bugs@sandroknauss.de>
-
-    KMail 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.
-
-    KMail 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 "testcsshelper.h"
-
-#include <QColor>
-#include <QFont>
-#include <QPalette>
-#include <QApplication>
-
-namespace MimeTreeParser
-{
-
-TestCSSHelper::TestCSSHelper(const QPaintDevice *pd) :
-    CSSHelperBase(pd)
-{
-    mRecycleQuoteColors = false;
-    mBackgroundColor = QColor(0xff, 0xff, 0xff);
-    mForegroundColor = QColor(0x1f, 0x1c, 0x1b);
-    mLinkColor = QColor(0x00, 0x57, 0xae);
-    cPgpEncrH = QColor(0x00, 0x80, 0xff);
-    cPgpOk1H  = QColor(0x40, 0xff, 0x40);
-    cPgpOk0H  = QColor(0xff, 0xff, 0x40);
-    cPgpWarnH = QColor(0xff, 0xff, 0x40);
-    cPgpErrH  = QColor(0xff, 0x00, 0x00);
-
-    cPgpEncrHT = QColor(0xff, 0xff, 0xff);
-    cPgpOk1HT  = QColor(0x27, 0xae, 0x60);
-    cPgpOk0HT  = QColor(0xf6, 0x74, 0x00);
-    cPgpWarnHT = QColor(0xf6, 0x74, 0x00);
-    cPgpErrHT  = QColor(0xda, 0x44, 0x53);
-
-    cHtmlWarning = QColor(0xff, 0x40, 0x40);
-    for (int i = 0; i < 3; ++i) {
-        mQuoteColor[i] = QColor(0x00, 0x80 - i * 0x10, 0x00);
-    }
-
-    QFont defaultFont = QFont(QStringLiteral("Sans Serif"), 9);
-    mBodyFont = defaultFont;
-    mPrintFont = defaultFont;
-    mFixedFont = defaultFont;
-    mFixedPrintFont = defaultFont;
-    defaultFont.setItalic(true);
-    for (int i = 0; i < 3; ++i) {
-        mQuoteFont[i] = defaultFont;
-    }
-
-    mShrinkQuotes = false;
-
-    QPalette pal;
-
-    pal.setColor(QPalette::Background, QColor(0xd6, 0xd2, 0xd0));
-    pal.setColor(QPalette::Foreground, QColor(0x22, 0x1f, 0x1e));
-    pal.setColor(QPalette::Highlight, QColor(0x43, 0xac, 0xe8));
-    pal.setColor(QPalette::HighlightedText, QColor(0xff, 0xff, 0xff));
-    pal.setColor(QPalette::Mid, QColor(0xb3, 0xab, 0xa7));
-
-    QApplication::setPalette(pal);
-
-    recalculatePGPColors();
-}
-
-TestCSSHelper::~TestCSSHelper()
-{
-
-}
-
-QString TestCSSHelper::htmlHead(bool fixed) const
-{
-    Q_UNUSED(fixed);
-    return
-        QStringLiteral("<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">\n"
-                       "<html>\n"
-                       "<body>\n");
-}
-
-}
-
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/testcsshelper.h b/framework/src/domain/mimetreeparser/otp/autotests/testcsshelper.h
deleted file mode 100644
index c21935cf..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/testcsshelper.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*  -*- c++ -*-
-    testcsshelper.h
-
-    This file is part of KMail, the KDE mail client.
-    Copyright (c) 2013 Sandro Knauß <bugs@sandroknauss.de>
-
-    KMail 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.
-
-    KMail 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.
-*/
-
-#ifndef __MIMETREEPARSER_TESTCSSHELPER_H__
-#define __MIMETREEPARSER_TESTCSSHELPER_H__
-
-#include "viewer/csshelperbase.h"
-
-namespace MimeTreeParser
-{
-
-class TestCSSHelper : public CSSHelperBase
-{
-public:
-    explicit TestCSSHelper(const QPaintDevice *pd);
-    virtual ~TestCSSHelper();
-    QString htmlHead(bool fixed) const Q_DECL_OVERRIDE;
-};
-
-}
-
-#endif // __MIMETREEPARSER_TESTCSSHELPER_H__
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/util.cpp b/framework/src/domain/mimetreeparser/otp/autotests/util.cpp
deleted file mode 100644
index 5ea415b7..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/util.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-  Copyright (c) 2010 Thomas McGuire <thomas.mcguire@kdab.com>
-
-  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 "util.h"
-
-#include <QFile>
-
-KMime::Message::Ptr readAndParseMail(const QString &mailFile)
-{
-    QFile file(QLatin1String(MAIL_DATA_DIR) + QLatin1Char('/') + mailFile);
-    file.open(QIODevice::ReadOnly);
-    Q_ASSERT(file.isOpen());
-    const QByteArray data = KMime::CRLFtoLF(file.readAll());
-    Q_ASSERT(!data.isEmpty());
-    KMime::Message::Ptr msg(new KMime::Message);
-    msg->setContent(data);
-    msg->parse();
-    return msg;
-}
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/util.h b/framework/src/domain/mimetreeparser/otp/autotests/util.h
deleted file mode 100644
index ac4aa54f..00000000
--- a/framework/src/domain/mimetreeparser/otp/autotests/util.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
-  Copyright (c) 2010 Thomas McGuire <thomas.mcguire@kdab.com>
-
-  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 "htmlwriter.h"
-
-#include <KMime/Message>
-
-class TestHtmlWriter : public MimeTreeParser::HtmlWriter
-{
-public:
-    explicit TestHtmlWriter() {}
-    virtual ~TestHtmlWriter() {}
-
-    void begin(const QString &) Q_DECL_OVERRIDE {}
-    void write(const QString &) Q_DECL_OVERRIDE {}
-    void end() Q_DECL_OVERRIDE {}
-    void reset() Q_DECL_OVERRIDE {}
-    void queue(const QString &str) Q_DECL_OVERRIDE {
-        html.append(str);
-    }
-    void flush() Q_DECL_OVERRIDE {}
-    void embedPart(const QByteArray &, const QString &) Q_DECL_OVERRIDE {}
-    void extraHead(const QString &) Q_DECL_OVERRIDE {}
-
-    QString html;
-};
-
-KMime::Message::Ptr readAndParseMail(const QString &mailFile);
diff --git a/framework/src/domain/mimetreeparser/otp/bodypart.cpp b/framework/src/domain/mimetreeparser/otp/bodypart.cpp
deleted file mode 100644
index 62e92d0c..00000000
--- a/framework/src/domain/mimetreeparser/otp/bodypart.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
-    This file is part of KMail's plugin interface.
-    Copyright (c) 2004 Marc Mutz <mutz@kde.org>,
-                       Ingo Kloecker <kloecker@kde.org>
-
-    KMail 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.
-
-    KMail 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 "bodypart.h"
-
-MimeTreeParser::Interface::BodyPartMemento::~BodyPartMemento()
-{
-}
-
-MimeTreeParser::Interface::BodyPart::~BodyPart()
-{
-}
-
diff --git a/framework/src/domain/mimetreeparser/otp/bodypart.h b/framework/src/domain/mimetreeparser/otp/bodypart.h
deleted file mode 100644
index f50c0360..00000000
--- a/framework/src/domain/mimetreeparser/otp/bodypart.h
+++ /dev/null
@@ -1,209 +0,0 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
-    bodypart.h
-
-    This file is part of KMail's plugin interface.
-    Copyright (c) 2004 Marc Mutz <mutz@kde.org>,
-                       Ingo Kloecker <kloecker@kde.org>
-
-    KMail 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.
-
-    KMail 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.
-*/
-
-#ifndef __MIMETREEPARSER_INTERFACES_BODYPART_H__
-#define __MIMETREEPARSER_INTERFACES_BODYPART_H__
-
-#include <QByteArray>
-#include <QString>
-
-namespace KMime
-{
-class Content;
-}
-
-namespace MimeTreeParser
-{
-class NodeHelper;
-class ObjectTreeParser;
-class ProcessResult;
-
-namespace Interface
-{
-
-class ObjectTreeSource;
-
-/*FIXME(Andras) review, port
-  class Observer;
-  class Observable;
-*/
-/**
-    @short interface of classes that implement status for BodyPartFormatters.
-*/
-class BodyPartMemento
-{
-public:
-    virtual ~BodyPartMemento();
-
-    virtual void detach() = 0;
-#if 0
-//FIXME(Andras) review, port
-    /** If your BodyPartMemento implementation also implements the
-    Observer interface, simply implement these as
-    <code>return this;</code>, else as <code>return
-    0;</code>. This is needed to avoid forcing a dependency of
-    plugins on internal KMail classes.
-    */
-    virtual Observer *asObserver() = 0;
-
-    /** If your BodyPartMemento implementation also implements the
-    Observable interface, simply implement these as
-    <code>return this;</code>, else as <code>return
-    0;</code>. This is needed to avoid forcing a dependency of
-    plugins on internal KMail classes.
-    */
-    virtual Observable *asObservable() = 0;
-#endif
-};
-
-/**
-    @short interface of message body parts.
-*/
-class BodyPart
-{
-public:
-    virtual ~BodyPart();
-
-    /**
-    @return a string respresentation of an URL that can be used
-    to invoke a BodyPartURLHandler for this body part.
-    */
-    virtual QString makeLink(const QString &path) const = 0;
-
-    /**
-    @return the decoded (CTE, canonicalisation, and charset
-    encoding undone) text contained in the body part, or
-    QString(), it the body part is not of type "text".
-    */
-    virtual QString asText() const = 0;
-
-    /**
-    @return the decoded (CTE undone) content of the body part, or
-    a null array if this body part instance is of type text.
-    */
-    virtual QByteArray asBinary() const = 0;
-
-    /**
-    @return the value of the content-type header field parameter
-    with name \a parameter, or QString(), if that that
-    parameter is not present in the body's content-type header
-    field. RFC 2231 encoding is removed first.
-
-    Note that this method will suppress queries to certain
-    standard parameters (most notably "charset") to keep plugins
-    decent.
-
-    Note2 that this method preserves the case of the parameter
-    value returned. So, if the parameter you want to use defines
-    the value to be case-insensitive (such as the smime-type
-    parameter), you need to make sure you do the casemap yourself
-    before comparing to a reference value.
-    */
-    virtual QString contentTypeParameter(const char *parameter) const = 0;
-
-    /**
-    @return the content of the content-description header field,
-    or QString() if that header is not present in this body
-    part. RFC 2047 encoding is decoded first.
-    */
-    virtual QString contentDescription() const = 0;
-
-    //virtual int contentDisposition() const = 0;
-    /**
-    @return the value of the content-disposition header field
-    parameter with name \a parameter, or QString() if that
-    parameter is not present in the body's content-disposition
-    header field. RFC 2231 encoding is removed first.
-
-    The notes made for contentTypeParameter() above apply here as
-    well.
-    */
-    virtual QString contentDispositionParameter(const char *parameter) const = 0;
-
-    /**
-    @return whether this part already has it's complete body
-    fetched e.g. from an IMAP server.
-    */
-    virtual bool hasCompleteBody() const = 0;
-
-    /**
-    @return the BodyPartMemento set for this part, or null, if
-    none is set.
-    */
-    virtual BodyPartMemento *memento() const = 0;
-
-    /**
-    @return register an implementation of the BodyPartMemento
-    interface as a status object with this part.
-    */
-    virtual void setBodyPartMemento(BodyPartMemento *) = 0;
-
-    enum Display { None, AsIcon, Inline };
-    /**
-      @return whether this body part should be displayed iconic or inline
-      */
-    virtual Display defaultDisplay() const = 0;
-
-    /** Returns the KMime::Content node represented here. Makes most of the above obsolete
-        and probably should be used in the interfaces in the first place.
-    */
-    virtual KMime::Content *content() const = 0;
-
-    /**
-     * Returns the top-level content.
-     * Note that this is _not_ necessarily the same as content()->topLevel(), for example the later
-     * will not work for "extra nodes", i.e. nodes in encrypted parts of the mail.
-     * topLevelContent() will return the correct result in this case. Also note that
-     * topLevelContent()
-     */
-    virtual KMime::Content *topLevelContent() const = 0;
-
-    /**
-     * Ok, this is ugly, exposing the node helper here, but there is too much useful stuff in there
-     * for real-world plugins. Still, there should be a nicer way for this.
-     */
-    virtual MimeTreeParser::NodeHelper *nodeHelper() const = 0;
-
-    /**
-     * For making it easier to refactor, add objectTreeParser
-     */
-    virtual MimeTreeParser::ObjectTreeParser *objectTreeParser() const = 0;
-    virtual MimeTreeParser::Interface::ObjectTreeSource *source() const = 0;
-    virtual MimeTreeParser::ProcessResult *processResult() const = 0;
-};
-
-} // namespace Interface
-
-}
-
-#endif // __MIMETREEPARSER_INTERFACES_BODYPART_H__
diff --git a/framework/src/domain/mimetreeparser/otp/bodypartformatter.cpp b/framework/src/domain/mimetreeparser/otp/bodypartformatter.cpp
deleted file mode 100644
index 63d7e92c..00000000
--- a/framework/src/domain/mimetreeparser/otp/bodypartformatter.cpp
+++ /dev/null
@@ -1,147 +0,0 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
-    bodypartformatter.cpp
-
-    This file is part of KMail's plugin interface.
-    Copyright (c) 2016 Sandro Knauß <sknauss@kde.org>
-
-    KMail 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.
-
-    KMail 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 "bodypartformatter.h"
-
-#include "bodypart.h"
-#include "queuehtmlwriter.h"
-#include "objecttreeparser.h"
-
-using namespace MimeTreeParser::Interface;
-
-namespace MimeTreeParser
-{
-namespace Interface
-{
-
-class MessagePartPrivate
-{
-public:
-    MessagePartPrivate(const BodyPart *part)
-        : mHtmlWriter(nullptr)
-        , mPart(part)
-        , mParentPart(nullptr)
-        , mCreatedWriter(false)
-    {
-    }
-
-    ~MessagePartPrivate()
-    {
-        if (mCreatedWriter) {
-            delete mHtmlWriter;
-        }
-    }
-
-    MimeTreeParser::HtmlWriter *htmlWriter()
-    {
-        if (!mHtmlWriter && mPart) {
-            mHtmlWriter = mPart->objectTreeParser()->htmlWriter();
-        }
-        return mHtmlWriter;
-    }
-
-    MimeTreeParser::HtmlWriter *mHtmlWriter;
-    const BodyPart *mPart;
-    MessagePart *mParentPart;
-    bool mCreatedWriter;
-
-};
-}
-}
-
-MessagePart::MessagePart()
-    : QObject()
-    , d(new MessagePartPrivate(nullptr))
-{
-}
-
-MessagePart::MessagePart(const BodyPart &part)
-    : QObject()
-    , d(new MessagePartPrivate(&part))
-{
-}
-
-MessagePart::~MessagePart()
-{
-    delete d;
-}
-
-void MessagePart::html(bool decorate)
-{
-    Q_UNUSED(decorate);
-    static_cast<QueueHtmlWriter *>(d->mHtmlWriter)->replay();
-}
-
-QString MessagePart::text() const
-{
-    return QString();
-}
-
-MessagePart *MessagePart::parentPart() const
-{
-    return d->mParentPart;
-}
-
-void MessagePart::setParentPart(MessagePart *parentPart)
-{
-    d->mParentPart = parentPart;
-}
-
-QString MessagePart::htmlContent() const
-{
-    return text();
-}
-
-QString MessagePart::plaintextContent() const
-{
-    return text();
-}
-
-MimeTreeParser::HtmlWriter *MessagePart::htmlWriter() const
-{
-    return d->htmlWriter();
-}
-
-void MessagePart::setHtmlWriter(MimeTreeParser::HtmlWriter *htmlWriter) const
-{
-    if (d->mHtmlWriter) {
-        d->mHtmlWriter = htmlWriter;
-    }
-}
-
-MessagePart::Ptr BodyPartFormatter::process(BodyPart &part) const
-{
-    auto mp = MessagePart::Ptr(new MessagePart(part));
-    mp->setHtmlWriter(new QueueHtmlWriter(mp->htmlWriter()));
-    mp->d->mCreatedWriter = true;
-    return mp;
-}
diff --git a/framework/src/domain/mimetreeparser/otp/bodypartformatter.h b/framework/src/domain/mimetreeparser/otp/bodypartformatter.h
deleted file mode 100644
index 0116c2e4..00000000
--- a/framework/src/domain/mimetreeparser/otp/bodypartformatter.h
+++ /dev/null
@@ -1,149 +0,0 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
-    bodypartformatter.h
-
-    This file is part of KMail's plugin interface.
-    Copyright (c) 2004 Marc Mutz <mutz@kde.org>,
-                       Ingo Kloecker <kloecker@kde.org>
-
-    KMail 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.
-
-    KMail 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.
-*/
-
-#ifndef __MIMETREEPARSER_INTERFACE_BODYPARTFORMATTER_H__
-#define __MIMETREEPARSER_INTERFACE_BODYPARTFORMATTER_H__
-
-#include <QObject>
-#include <QSharedPointer>
-
-#include "objecttreeparser.h"
-
-namespace MimeTreeParser
-{
-class HtmlWriter;
-
-namespace Interface
-{
-
-class BodyPartURLHandler;
-class BodyPart;
-class MessagePartPrivate;
-
-class MessagePart : public QObject
-{
-    Q_OBJECT
-    Q_PROPERTY(QString plaintextContent READ plaintextContent)
-    Q_PROPERTY(QString htmlContent READ htmlContent)
-public:
-    typedef QSharedPointer<MessagePart> Ptr;
-    explicit MessagePart();
-    explicit MessagePart(const BodyPart &part);
-    virtual ~MessagePart();
-
-    virtual void html(bool decorate);
-    virtual QString text() const;
-
-    void setParentPart(MessagePart *parentPart);
-    MessagePart *parentPart() const;
-
-    virtual QString plaintextContent() const;
-    virtual QString htmlContent() const;
-
-    virtual MimeTreeParser::HtmlWriter *htmlWriter() const;
-    virtual void setHtmlWriter(MimeTreeParser::HtmlWriter *htmlWriter) const;
-private:
-    MessagePartPrivate *d;
-
-    friend class BodyPartFormatter;
-};
-
-class BodyPartFormatter
-{
-public:
-    virtual ~BodyPartFormatter() {}
-
-    /**
-    @li Ok returned when format() generated some HTML
-    @li NeedContent returned when format() needs the body of the part
-    @li AsIcon returned when the part should be shown iconified
-    @li Failed returned when formatting failed. Currently equivalent to Ok
-    */
-    enum Result { Ok, NeedContent, AsIcon, Failed };
-
-    /**
-    Format body part \a part by generating some HTML and writing
-    that to \a writer.
-
-    @return the result code (see above)
-    */
-    virtual Result format(BodyPart *part, MimeTreeParser::HtmlWriter *writer) const = 0;
-
-    /**
-      Variant of format that allows implementors to hook notifications up to
-      a listener interested in the result, for async operations.
-
-      @return the result code (see above)
-    */
-    virtual Result format(BodyPart *part, MimeTreeParser::HtmlWriter *writer, QObject *asyncResultObserver) const
-    {
-        Q_UNUSED(asyncResultObserver);
-        return format(part, writer);
-    }
-
-    virtual void adaptProcessResult(ProcessResult &result) const
-    {
-        Q_UNUSED(result);
-    }
-    virtual MessagePart::Ptr process(BodyPart &part) const;
-};
-
-/**
-    @short interface for BodyPartFormatter plugins
-
-    The interface is queried by for types, subtypes, and the
-    corresponding bodypart formatter, and the result inserted into
-    the bodypart formatter factory.
-
-    Subtype alone or both type and subtype may be "*", which is
-    taken as a wildcard, so that e.g. type=text subtype=* matches
-    any text subtype, but with lesser specificity than a concrete
-    mimetype such as text/plain. type=* is only allowed when
-    subtype=*, too.
-*/
-class BodyPartFormatterPlugin
-{
-public:
-    virtual ~BodyPartFormatterPlugin() {}
-
-    virtual const BodyPartFormatter *bodyPartFormatter(int idx) const = 0;
-    virtual const char *type(int idx) const = 0;
-    virtual const char *subtype(int idx) const = 0;
-
-    virtual const BodyPartURLHandler *urlHandler(int idx) const = 0;
-};
-
-} // namespace Interface
-
-}
-#endif // __MIMETREEPARSER_INTERFACE_BODYPARTFORMATTER_H__
diff --git a/framework/src/domain/mimetreeparser/otp/bodypartformatter_impl.cpp b/framework/src/domain/mimetreeparser/otp/bodypartformatter_impl.cpp
deleted file mode 100644
index c8622ba3..00000000
--- a/framework/src/domain/mimetreeparser/otp/bodypartformatter_impl.cpp
+++ /dev/null
@@ -1,193 +0,0 @@
-/*  -*- c++ -*-
-    bodypartformatter.cpp
-
-    This file is part of KMail, the KDE mail client.
-    Copyright (c) 2003 Marc Mutz <mutz@kde.org>
-
-    KMail 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.
-
-    KMail 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 "mimetreeparser_debug.h"
-
-#include "applicationpgpencrypted.h"
-#include "applicationpkcs7mime.h"
-#include "mailman.h"
-#include "multipartalternative.h"
-#include "multipartmixed.h"
-#include "multipartencrypted.h"
-#include "multipartsigned.h"
-#include "texthtml.h"
-#include "textplain.h"
-
-#include "bodypartformatter.h"
-#include "bodypart.h"
-
-#include "bodypartformatterbasefactory.h"
-#include "bodypartformatterbasefactory_p.h"
-
-#include "attachmentstrategy.h"
-#include "objecttreeparser.h"
-#include "messagepart.h"
-
-#include <KMime/Content>
-
-using namespace MimeTreeParser;
-
-namespace
-{
-class AnyTypeBodyPartFormatter
-    : public MimeTreeParser::Interface::BodyPartFormatter
-{
-    static const AnyTypeBodyPartFormatter *self;
-public:
-    Result format(Interface::BodyPart *, HtmlWriter *) const Q_DECL_OVERRIDE
-    {
-        qCDebug(MIMETREEPARSER_LOG) << "Acting as a Interface::BodyPartFormatter!";
-        return AsIcon;
-    }
-
-    // unhide the overload with three arguments
-    using MimeTreeParser::Interface::BodyPartFormatter::format;
-
-    void adaptProcessResult(ProcessResult &result) const Q_DECL_OVERRIDE
-    {
-        result.setNeverDisplayInline(true);
-    }
-    static const MimeTreeParser::Interface::BodyPartFormatter *create()
-    {
-        if (!self) {
-            self = new AnyTypeBodyPartFormatter();
-        }
-        return self;
-    }
-};
-
-const AnyTypeBodyPartFormatter *AnyTypeBodyPartFormatter::self = nullptr;
-
-class ImageTypeBodyPartFormatter
-    : public MimeTreeParser::Interface::BodyPartFormatter
-{
-    static const ImageTypeBodyPartFormatter *self;
-public:
-    Result format(Interface::BodyPart *, HtmlWriter *) const Q_DECL_OVERRIDE
-    {
-        return AsIcon;
-    }
-
-    // unhide the overload with three arguments
-    using MimeTreeParser::Interface::BodyPartFormatter::format;
-
-    void adaptProcessResult(ProcessResult &result) const Q_DECL_OVERRIDE
-    {
-        result.setNeverDisplayInline(false);
-        result.setIsImage(true);
-    }
-    static const MimeTreeParser::Interface::BodyPartFormatter *create()
-    {
-        if (!self) {
-            self = new ImageTypeBodyPartFormatter();
-        }
-        return self;
-    }
-};
-
-const ImageTypeBodyPartFormatter *ImageTypeBodyPartFormatter::self = nullptr;
-
-class MessageRfc822BodyPartFormatter
-    : public MimeTreeParser::Interface::BodyPartFormatter
-{
-    static const MessageRfc822BodyPartFormatter *self;
-public:
-    Interface::MessagePart::Ptr process(Interface::BodyPart &) const Q_DECL_OVERRIDE;
-    MimeTreeParser::Interface::BodyPartFormatter::Result format(Interface::BodyPart *, HtmlWriter *) const Q_DECL_OVERRIDE;
-    using MimeTreeParser::Interface::BodyPartFormatter::format;
-    static const MimeTreeParser::Interface::BodyPartFormatter *create();
-};
-
-const MessageRfc822BodyPartFormatter *MessageRfc822BodyPartFormatter::self;
-
-const MimeTreeParser::Interface::BodyPartFormatter *MessageRfc822BodyPartFormatter::create()
-{
-    if (!self) {
-        self = new MessageRfc822BodyPartFormatter();
-    }
-    return self;
-}
-
-Interface::MessagePart::Ptr MessageRfc822BodyPartFormatter::process(Interface::BodyPart &part) const
-{
-    const KMime::Message::Ptr message = part.content()->bodyAsMessage();
-    return MessagePart::Ptr(new EncapsulatedRfc822MessagePart(part.objectTreeParser(), part.content(), message));
-}
-
-Interface::BodyPartFormatter::Result MessageRfc822BodyPartFormatter::format(Interface::BodyPart *part, HtmlWriter *writer) const
-{
-    Q_UNUSED(writer)
-    const ObjectTreeParser *otp = part->objectTreeParser();
-    const auto p = process(*part);
-    const auto mp =  static_cast<MessagePart *>(p.data());
-    if (mp) {
-        if (!otp->attachmentStrategy()->inlineNestedMessages() && !otp->showOnlyOneMimePart()) {
-            return Failed;
-        } else {
-            mp->html(true);
-            return Ok;
-        }
-    } else {
-        return Failed;
-    }
-}
-
-typedef TextPlainBodyPartFormatter ApplicationPgpBodyPartFormatter;
-
-} // anon namespace
-
-void BodyPartFormatterBaseFactoryPrivate::messageviewer_create_builtin_bodypart_formatters()
-{
-    insert("application", "octet-stream", AnyTypeBodyPartFormatter::create());
-    insert("application", "pgp", ApplicationPgpBodyPartFormatter::create());
-    insert("application", "pkcs7-mime", ApplicationPkcs7MimeBodyPartFormatter::create());
-    insert("application", "x-pkcs7-mime", ApplicationPkcs7MimeBodyPartFormatter::create());
-    insert("application", "pgp-encrypted", ApplicationPGPEncryptedBodyPartFormatter::create());
-    insert("application", "*", AnyTypeBodyPartFormatter::create());
-
-    insert("text", "html", TextHtmlBodyPartFormatter::create());
-    insert("text", "rtf", AnyTypeBodyPartFormatter::create());
-    insert("text", "plain", MailmanBodyPartFormatter::create());
-    insert("text", "plain", TextPlainBodyPartFormatter::create());
-    insert("text", "*", MailmanBodyPartFormatter::create());
-    insert("text", "*", TextPlainBodyPartFormatter::create());
-
-    insert("image", "*", ImageTypeBodyPartFormatter::create());
-
-    insert("message", "rfc822", MessageRfc822BodyPartFormatter::create());
-    insert("message", "*", AnyTypeBodyPartFormatter::create());
-
-    insert("multipart", "alternative", MultiPartAlternativeBodyPartFormatter::create());
-    insert("multipart", "encrypted", MultiPartEncryptedBodyPartFormatter::create());
-    insert("multipart", "signed", MultiPartSignedBodyPartFormatter::create());
-    insert("multipart", "*", MultiPartMixedBodyPartFormatter::create());
-    insert("*", "*", AnyTypeBodyPartFormatter::create());
-}
diff --git a/framework/src/domain/mimetreeparser/otp/bodypartformatterbasefactory.cpp b/framework/src/domain/mimetreeparser/otp/bodypartformatterbasefactory.cpp
deleted file mode 100644
index fb02945b..00000000
--- a/framework/src/domain/mimetreeparser/otp/bodypartformatterbasefactory.cpp
+++ /dev/null
@@ -1,179 +0,0 @@
-/*
-    bodypartformatterfactory.cpp
-
-    This file is part of KMail, the KDE mail client.
-    Copyright (c) 2004 Marc Mutz <mutz@kde.org>,
-                       Ingo Kloecker <kloecker@kde.org>
-
-    KMail 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.
-
-    KMail 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 "bodypartformatterbasefactory.h"
-#include "bodypartformatterbasefactory_p.h"
-#include "mimetreeparser_debug.h"
-
-// Qt
-
-#include <assert.h>
-
-using namespace MimeTreeParser;
-
-BodyPartFormatterBaseFactoryPrivate::BodyPartFormatterBaseFactoryPrivate(BodyPartFormatterBaseFactory *factory)
-    : q(factory)
-    , all(nullptr)
-{
-}
-
-BodyPartFormatterBaseFactoryPrivate::~BodyPartFormatterBaseFactoryPrivate()
-{
-    if (all) {
-        delete all;
-        all = nullptr;
-    }
-}
-
-void BodyPartFormatterBaseFactoryPrivate::setup()
-{
-    if (!all) {
-        all = new TypeRegistry();
-        messageviewer_create_builtin_bodypart_formatters();
-        q->loadPlugins();
-    }
-}
-
-void BodyPartFormatterBaseFactoryPrivate::insert(const char *type, const char *subtype, const Interface::BodyPartFormatter *formatter)
-{
-    if (!type || !*type || !subtype || !*subtype || !formatter || !all) {
-        return;
-    }
-
-    TypeRegistry::iterator type_it = all->find(type);
-    if (type_it == all->end()) {
-        qCDebug(MIMETREEPARSER_LOG) << "BodyPartFormatterBaseFactory: instantiating new Subtype Registry for \""
-                                    << type << "\"";
-        type_it = all->insert(std::make_pair(type, SubtypeRegistry())).first;
-        assert(type_it != all->end());
-    }
-
-    SubtypeRegistry &subtype_reg = type_it->second;
-
-    subtype_reg.insert(std::make_pair(subtype, formatter));
-}
-
-BodyPartFormatterBaseFactory::BodyPartFormatterBaseFactory()
-    : d(new BodyPartFormatterBaseFactoryPrivate(this))
-{
-}
-
-BodyPartFormatterBaseFactory::~BodyPartFormatterBaseFactory()
-{
-    delete d;
-}
-
-void BodyPartFormatterBaseFactory::insert(const char *type, const char *subtype, const Interface::BodyPartFormatter *formatter)
-{
-    d->insert(type, subtype, formatter);
-}
-
-const SubtypeRegistry &BodyPartFormatterBaseFactory::subtypeRegistry(const char *type) const
-{
-    if (!type || !*type) {
-        type = "*";    //krazy:exclude=doublequote_chars
-    }
-
-    d->setup();
-    assert(d->all);
-
-    static SubtypeRegistry emptyRegistry;
-    if (d->all->empty()) {
-        return emptyRegistry;
-    }
-
-    TypeRegistry::const_iterator type_it = d->all->find(type);
-    if (type_it == d->all->end()) {
-        type_it = d->all->find("*");
-    }
-    if (type_it == d->all->end()) {
-        return emptyRegistry;
-    }
-
-    const SubtypeRegistry &subtype_reg = type_it->second;
-    if (subtype_reg.empty()) {
-        return emptyRegistry;
-    }
-    return subtype_reg;
-}
-
-SubtypeRegistry::const_iterator BodyPartFormatterBaseFactory::createForIterator(const char *type, const char *subtype) const
-{
-    if (!type || !*type) {
-        type = "*";    //krazy:exclude=doublequote_chars
-    }
-    if (!subtype || !*subtype) {
-        subtype = "*";    //krazy:exclude=doublequote_chars
-    }
-
-    d->setup();
-    assert(d->all);
-
-    if (d->all->empty()) {
-        return SubtypeRegistry::const_iterator();
-    }
-
-    TypeRegistry::const_iterator type_it = d->all->find(type);
-    if (type_it == d->all->end()) {
-        type_it = d->all->find("*");
-    }
-    if (type_it == d->all->end()) {
-        return SubtypeRegistry::const_iterator();
-    }
-
-    const SubtypeRegistry &subtype_reg = type_it->second;
-    if (subtype_reg.empty()) {
-        return SubtypeRegistry::const_iterator();
-    }
-
-    SubtypeRegistry::const_iterator subtype_it = subtype_reg.find(subtype);
-    qCWarning(MIMETREEPARSER_LOG) << type << subtype << subtype_reg.size();
-    if (subtype_it == subtype_reg.end()) {
-        subtype_it = subtype_reg.find("*");
-    }
-    if (subtype_it == subtype_reg.end()) {
-        return SubtypeRegistry::const_iterator();
-    }
-
-    if (!(*subtype_it).second) {
-        qCWarning(MIMETREEPARSER_LOG) << "BodyPartFormatterBaseFactory: a null bodypart formatter sneaked in for \""
-                                      << type << "/" << subtype << "\"!";
-    }
-
-    return subtype_it;
-}
-
-void BodyPartFormatterBaseFactory::loadPlugins()
-{
-    qCDebug(MIMETREEPARSER_LOG) << "plugin loading is not enabled in libmimetreeparser";
-}
diff --git a/framework/src/domain/mimetreeparser/otp/bodypartformatterbasefactory.h b/framework/src/domain/mimetreeparser/otp/bodypartformatterbasefactory.h
deleted file mode 100644
index 2bba551d..00000000
--- a/framework/src/domain/mimetreeparser/otp/bodypartformatterbasefactory.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
-    bodypartformatterfactory.h
-
-    This file is part of KMail, the KDE mail client.
-    Copyright (c) 2004 Marc Mutz <mutz@kde.org>,
-                       Ingo Kloecker <kloecker@kde.org>
-
-    KMail 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.
-
-    KMail 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.
-*/
-
-#ifndef __MIMETREEPARSER_BODYPARTFORMATTERBASEFACTORY_H__
-#define __MIMETREEPARSER_BODYPARTFORMATTERBASEFACTORY_H__
-
-#include <map>
-#include <QByteArray>
-
-namespace MimeTreeParser
-{
-
-namespace Interface
-{
-class BodyPartFormatter;
-}
-
-struct ltstr {
-    bool operator()(const char *s1, const char *s2) const
-    {
-        return qstricmp(s1, s2) < 0;
-    }
-};
-
-typedef std::multimap<const char *, const Interface::BodyPartFormatter *, ltstr> SubtypeRegistry;
-typedef std::map<const char *, MimeTreeParser::SubtypeRegistry, MimeTreeParser::ltstr> TypeRegistry;
-
-class BodyPartFormatterBaseFactoryPrivate;
-
-class BodyPartFormatterBaseFactory
-{
-public:
-    BodyPartFormatterBaseFactory();
-    virtual ~BodyPartFormatterBaseFactory();
-
-    SubtypeRegistry::const_iterator createForIterator(const char *type, const char *subtype) const;
-    const SubtypeRegistry &subtypeRegistry(const char *type) const;
-
-protected:
-    void insert(const char *type, const char *subtype, const Interface::BodyPartFormatter *formatter);
-    virtual void loadPlugins();
-private:
-    static BodyPartFormatterBaseFactory *mSelf;
-
-    BodyPartFormatterBaseFactoryPrivate *d;
-    friend class BodyPartFormatterBaseFactoryPrivate;
-private:
-    // disabled
-    const BodyPartFormatterBaseFactory &operator=(const BodyPartFormatterBaseFactory &);
-    BodyPartFormatterBaseFactory(const BodyPartFormatterBaseFactory &);
-};
-
-}
-
-#endif // __MIMETREEPARSER_BODYPARTFORMATTERFACTORY_H__
diff --git a/framework/src/domain/mimetreeparser/otp/bodypartformatterbasefactory_p.h b/framework/src/domain/mimetreeparser/otp/bodypartformatterbasefactory_p.h
deleted file mode 100644
index 1f71f183..00000000
--- a/framework/src/domain/mimetreeparser/otp/bodypartformatterbasefactory_p.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
-    bodypartformatterfactory.h
-
-    This file is part of KMail, the KDE mail client.
-    Copyright (c) 2004 Marc Mutz <mutz@kde.org>,
-                       Ingo Kloecker <kloecker@kde.org>
-
-    KMail 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.
-
-    KMail 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.
-*/
-
-#ifndef __MIMETREEPARSER_BODYPARTFORMATTERBASEFACTORY_P_H__
-#define __MIMETREEPARSER_BODYPARTFORMATTERBASEFACTORY_P_H__
-
-namespace MimeTreeParser
-{
-class BodyPartFormatterBaseFactory;
-
-class BodyPartFormatterBaseFactoryPrivate
-{
-public:
-    BodyPartFormatterBaseFactoryPrivate(BodyPartFormatterBaseFactory *factory);
-    ~BodyPartFormatterBaseFactoryPrivate();
-
-    void setup();
-    void messageviewer_create_builtin_bodypart_formatters();        //defined in bodypartformatter.cpp
-    void insert(const char *type, const char *subtype, const Interface::BodyPartFormatter *formatter);
-
-    BodyPartFormatterBaseFactory *q;
-    TypeRegistry *all;
-};
-
-}
-
-#endif // __MIMETREEPARSER_BODYPARTFORMATTERFACTORY_P_H__
diff --git a/framework/src/domain/mimetreeparser/otp/cryptobodypartmemento.cpp b/framework/src/domain/mimetreeparser/otp/cryptobodypartmemento.cpp
deleted file mode 100644
index a884ec36..00000000
--- a/framework/src/domain/mimetreeparser/otp/cryptobodypartmemento.cpp
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
-  Copyright (c) 2014-2017 Montel Laurent <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 "cryptobodypartmemento.h"
-
-using namespace GpgME;
-using namespace MimeTreeParser;
-
-CryptoBodyPartMemento::CryptoBodyPartMemento()
-    : QObject(nullptr),
-      Interface::BodyPartMemento(),
-      m_running(false)
-{
-
-}
-
-CryptoBodyPartMemento::~CryptoBodyPartMemento()
-{
-
-}
-
-bool CryptoBodyPartMemento::isRunning() const
-{
-    return m_running;
-}
-
-void CryptoBodyPartMemento::setAuditLog(const Error &err, const QString &log)
-{
-    m_auditLogError = err;
-    m_auditLog = log;
-}
-
-void CryptoBodyPartMemento::setRunning(bool running)
-{
-    m_running = running;
-}
-
-void CryptoBodyPartMemento::detach()
-{
-    disconnect(this, SIGNAL(update(MimeTreeParser::UpdateMode)), nullptr, nullptr);
-}
-
diff --git a/framework/src/domain/mimetreeparser/otp/cryptobodypartmemento.h b/framework/src/domain/mimetreeparser/otp/cryptobodypartmemento.h
deleted file mode 100644
index 076ed890..00000000
--- a/framework/src/domain/mimetreeparser/otp/cryptobodypartmemento.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
-  Copyright (c) 2014-2016 Montel Laurent <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
-*/
-
-#ifndef __MIMETREEPARSER_CRYPTOBODYPARTMEMENTO_H__
-#define __MIMETREEPARSER_CRYPTOBODYPARTMEMENTO_H__
-
-#include <gpgme++/error.h>
-
-#include <QObject>
-#include <QString>
-
-#include "bodypart.h"
-#include "enums.h"
-
-namespace MimeTreeParser
-{
-
-class CryptoBodyPartMemento
-    : public QObject,
-      public Interface::BodyPartMemento
-{
-    Q_OBJECT
-public:
-    CryptoBodyPartMemento();
-    ~CryptoBodyPartMemento();
-
-    virtual bool start() = 0;
-    virtual void exec() = 0;
-    bool isRunning() const;
-
-    const QString &auditLogAsHtml() const
-    {
-        return m_auditLog;
-    }
-    GpgME::Error auditLogError() const
-    {
-        return m_auditLogError;
-    }
-
-    void detach() Q_DECL_OVERRIDE;
-
-Q_SIGNALS:
-    void update(MimeTreeParser::UpdateMode);
-
-protected Q_SLOTS:
-    void notify()
-    {
-        Q_EMIT update(MimeTreeParser::Force);
-    }
-
-protected:
-    void setAuditLog(const GpgME::Error &err, const QString &log);
-    void setRunning(bool running);
-
-private:
-    bool m_running;
-    QString m_auditLog;
-    GpgME::Error m_auditLogError;
-};
-}
-#endif // __MIMETREEPARSER_CRYPTOBODYPARTMEMENTO_H__
diff --git a/framework/src/domain/mimetreeparser/otp/cryptohelper.cpp b/framework/src/domain/mimetreeparser/otp/cryptohelper.cpp
deleted file mode 100644
index 8e5df576..00000000
--- a/framework/src/domain/mimetreeparser/otp/cryptohelper.cpp
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
-    Copyright (C) 2015 Sandro Knauß <knauss@kolabsys.com>
-    Copyright (C) 2001,2002 the KPGP authors
-    See file AUTHORS.kpgp for details
-
-    Kmail 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.
-
-    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 "cryptohelper.h"
-
-using namespace MimeTreeParser;
-
-PGPBlockType Block::determineType() const
-{
-    const QByteArray data = text();
-    if (data.startsWith("-----BEGIN PGP SIGNED")) {
-        return ClearsignedBlock;
-    } else if (data.startsWith("-----BEGIN PGP SIGNATURE")) {
-        return SignatureBlock;
-    } else if (data.startsWith("-----BEGIN PGP PUBLIC")) {
-        return PublicKeyBlock;
-    } else if (data.startsWith("-----BEGIN PGP PRIVATE")
-               || data.startsWith("-----BEGIN PGP SECRET")) {
-        return PrivateKeyBlock;
-    } else if (data.startsWith("-----BEGIN PGP MESSAGE")) {
-        if (data.startsWith("-----BEGIN PGP MESSAGE PART")) {
-            return MultiPgpMessageBlock;
-        } else {
-            return PgpMessageBlock;
-        }
-    } else if (data.startsWith("-----BEGIN PGP ARMORED FILE")) {
-        return PgpMessageBlock;
-    } else if (data.startsWith("-----BEGIN PGP ")) {
-        return UnknownBlock;
-    } else {
-        return NoPgpBlock;
-    }
-}
-
-QList<Block> MimeTreeParser::prepareMessageForDecryption(const QByteArray &msg)
-{
-    PGPBlockType pgpBlock = NoPgpBlock;
-    QList<Block>  blocks;
-    int start = -1;   // start of the current PGP block
-    int lastEnd = -1; // end of the last PGP block
-    const int length = msg.length();
-
-    if (msg.isEmpty()) {
-        return blocks;
-    }
-
-    if (msg.startsWith("-----BEGIN PGP ")) {
-        start = 0;
-    } else {
-        start = msg.indexOf("\n-----BEGIN PGP ") + 1;
-        if (start == 0) {
-            blocks.append(Block(msg, NoPgpBlock));
-            return blocks;
-        }
-    }
-
-    while (start != -1) {
-        int nextEnd, nextStart;
-
-        // is the PGP block a clearsigned block?
-        if (!strncmp(msg.constData() + start + 15, "SIGNED", 6)) {
-            pgpBlock = ClearsignedBlock;
-        } else {
-            pgpBlock = UnknownBlock;
-        }
-
-        nextEnd = msg.indexOf("\n-----END PGP ", start + 15);
-        nextStart = msg.indexOf("\n-----BEGIN PGP ", start + 15);
-
-        if (nextEnd == -1) {        // Missing END PGP line
-            if (lastEnd != -1) {
-                blocks.append(Block(msg.mid(lastEnd + 1), UnknownBlock));
-            } else {
-                blocks.append(Block(msg.mid(start), UnknownBlock));
-            }
-            break;
-        }
-
-        if ((nextStart == -1) || (nextEnd < nextStart) || (pgpBlock == ClearsignedBlock)) {
-            // most likely we found a PGP block (but we don't check if it's valid)
-
-            // store the preceding non-PGP block
-            if (start - lastEnd - 1 > 0) {
-                blocks.append(Block(msg.mid(lastEnd + 1, start - lastEnd - 1), NoPgpBlock));
-            }
-
-            lastEnd = msg.indexOf("\n", nextEnd + 14);
-            if (lastEnd == -1) {
-                if (start < length) {
-                    blocks.append(Block(msg.mid(start)));
-                }
-                break;
-            } else {
-                blocks.append(Block(msg.mid(start, lastEnd + 1 - start)));
-                if ((nextStart != -1) && (nextEnd > nextStart)) {
-                    nextStart = msg.indexOf("\n-----BEGIN PGP ", lastEnd + 1);
-                }
-            }
-        }
-
-        start = nextStart;
-
-        if (start == -1) {
-            if (lastEnd + 1 < length) {
-                //rest of mail is no PGP Block
-                blocks.append(Block(msg.mid(lastEnd + 1), NoPgpBlock));
-            }
-            break;
-        } else {
-            start++; // move start behind the '\n'
-        }
-    }
-
-    return blocks;
-}
-
-Block::Block(const QByteArray &m)
-    : msg(m)
-{
-    mType = determineType();
-}
-
-Block::Block(const QByteArray &m, PGPBlockType t)
-    : msg(m)
-    , mType(t)
-{
-
-}
-
-QByteArray MimeTreeParser::Block::text() const
-{
-    return msg;
-}
-
-PGPBlockType Block::type() const
-{
-    return mType;
-}
diff --git a/framework/src/domain/mimetreeparser/otp/cryptohelper.h b/framework/src/domain/mimetreeparser/otp/cryptohelper.h
deleted file mode 100644
index f09771c3..00000000
--- a/framework/src/domain/mimetreeparser/otp/cryptohelper.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
-    cryptohelper.h
-
-    Copyright (C) 2015 Sandro Knauß <knauss@kolabsys.com>
-    Copyright (C) 2001,2002 the KPGP authors
-    See file AUTHORS.kpgp for details
-
-    KMail 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.
-
-    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
- */
-
-#ifndef __MIMETREEPARSER_CRYPTOHELPER_H__
-#define __MIMETREEPARSER_CRYPTOHELPER_H__
-
-#include <QByteArray>
-#include <QList>
-
-namespace MimeTreeParser
-{
-
-enum PGPBlockType {
-    UnknownBlock = -1,        // BEGIN PGP ???
-    NoPgpBlock = 0,
-    PgpMessageBlock = 1,      // BEGIN PGP MESSAGE
-    MultiPgpMessageBlock = 2, // BEGIN PGP MESSAGE, PART X[/Y]
-    SignatureBlock = 3,       // BEGIN PGP SIGNATURE
-    ClearsignedBlock = 4,     // BEGIN PGP SIGNED MESSAGE
-    PublicKeyBlock = 5,       // BEGIN PGP PUBLIC KEY BLOCK
-    PrivateKeyBlock = 6       // BEGIN PGP PRIVATE KEY BLOCK (PGP 2.x: ...SECRET...)
-};
-
-class Block
-{
-public:
-    Block(const QByteArray &m);
-
-    Block(const QByteArray &m, PGPBlockType t);
-
-    QByteArray text() const;
-    PGPBlockType type() const;
-    PGPBlockType determineType() const;
-
-    QByteArray msg;
-    PGPBlockType mType;
-};
-
-/** Parses the given message and splits it into OpenPGP blocks and
-    Non-OpenPGP blocks.
-*/
-QList<Block> prepareMessageForDecryption(const QByteArray &msg);
-
-} // namespace MimeTreeParser
-
-Q_DECLARE_TYPEINFO(MimeTreeParser::Block, Q_MOVABLE_TYPE);
-
-#endif
diff --git a/framework/src/domain/mimetreeparser/otp/decryptverifybodypartmemento.cpp b/framework/src/domain/mimetreeparser/otp/decryptverifybodypartmemento.cpp
deleted file mode 100644
index 9810797a..00000000
--- a/framework/src/domain/mimetreeparser/otp/decryptverifybodypartmemento.cpp
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
-  Copyright (c) 2014-2017 Montel Laurent <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 "decryptverifybodypartmemento.h"
-
-#include <QGpgME/DecryptVerifyJob>
-
-#include <qstringlist.h>
-
-using namespace QGpgME;
-using namespace GpgME;
-using namespace MimeTreeParser;
-
-DecryptVerifyBodyPartMemento::DecryptVerifyBodyPartMemento(DecryptVerifyJob *job, const QByteArray &cipherText)
-    : CryptoBodyPartMemento(),
-      m_cipherText(cipherText),
-      m_job(job)
-{
-    Q_ASSERT(m_job);
-}
-
-DecryptVerifyBodyPartMemento::~DecryptVerifyBodyPartMemento()
-{
-    if (m_job) {
-        m_job->slotCancel();
-    }
-}
-
-bool DecryptVerifyBodyPartMemento::start()
-{
-    Q_ASSERT(m_job);
-    if (const Error err = m_job->start(m_cipherText)) {
-        m_dr = DecryptionResult(err);
-        return false;
-    }
-    connect(m_job.data(), &DecryptVerifyJob::result,
-            this, &DecryptVerifyBodyPartMemento::slotResult);
-    setRunning(true);
-    return true;
-}
-
-void DecryptVerifyBodyPartMemento::exec()
-{
-    Q_ASSERT(m_job);
-    QByteArray plainText;
-    setRunning(true);
-    const std::pair<DecryptionResult, VerificationResult> p = m_job->exec(m_cipherText, plainText);
-    saveResult(p.first, p.second, plainText);
-    m_job->deleteLater(); // exec'ed jobs don't delete themselves
-    m_job = nullptr;
-}
-
-void DecryptVerifyBodyPartMemento::saveResult(const DecryptionResult &dr,
-        const VerificationResult &vr,
-        const QByteArray &plainText)
-{
-    Q_ASSERT(m_job);
-    setRunning(false);
-    m_dr = dr;
-    m_vr = vr;
-    m_plainText = plainText;
-    setAuditLog(m_job->auditLogError(), m_job->auditLogAsHtml());
-}
-
-void DecryptVerifyBodyPartMemento::slotResult(const DecryptionResult &dr,
-        const VerificationResult &vr,
-        const QByteArray &plainText)
-{
-    saveResult(dr, vr, plainText);
-    m_job = nullptr;
-    notify();
-}
diff --git a/framework/src/domain/mimetreeparser/otp/decryptverifybodypartmemento.h b/framework/src/domain/mimetreeparser/otp/decryptverifybodypartmemento.h
deleted file mode 100644
index 4781abe2..00000000
--- a/framework/src/domain/mimetreeparser/otp/decryptverifybodypartmemento.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
-  Copyright (c) 2014-2016 Montel Laurent <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
-*/
-
-#ifndef __MIMETREEPARSER_DECRYPTVERIFYBODYPARTMEMENTO_H__
-#define __MIMETREEPARSER_DECRYPTVERIFYBODYPARTMEMENTO_H__
-
-#include "cryptobodypartmemento.h"
-
-#include <gpgme++/verificationresult.h>
-#include <gpgme++/decryptionresult.h>
-
-#include <QPointer>
-
-#include "bodypart.h"
-
-namespace QGpgME
-{
-class DecryptVerifyJob;
-}
-
-namespace MimeTreeParser
-{
-
-class DecryptVerifyBodyPartMemento
-    : public CryptoBodyPartMemento
-{
-    Q_OBJECT
-public:
-    DecryptVerifyBodyPartMemento(QGpgME::DecryptVerifyJob *job, const QByteArray &cipherText);
-    ~DecryptVerifyBodyPartMemento();
-
-    bool start() Q_DECL_OVERRIDE;
-    void exec() Q_DECL_OVERRIDE;
-
-    const QByteArray &plainText() const
-    {
-        return m_plainText;
-    }
-    const GpgME::DecryptionResult &decryptResult() const
-    {
-        return m_dr;
-    }
-    const GpgME::VerificationResult &verifyResult() const
-    {
-        return m_vr;
-    }
-
-private Q_SLOTS:
-    void slotResult(const GpgME::DecryptionResult &dr,
-                    const GpgME::VerificationResult &vr,
-                    const QByteArray &plainText);
-
-private:
-    void saveResult(const GpgME::DecryptionResult &,
-                    const GpgME::VerificationResult &,
-                    const QByteArray &);
-private:
-    // input:
-    const QByteArray m_cipherText;
-    QPointer<QGpgME::DecryptVerifyJob> m_job;
-    // output:
-    GpgME::DecryptionResult m_dr;
-    GpgME::VerificationResult m_vr;
-    QByteArray m_plainText;
-};
-}
-#endif // __MIMETREEPARSER_DECRYPTVERIFYBODYPARTMEMENTO_H__
diff --git a/framework/src/domain/mimetreeparser/otp/enums.h b/framework/src/domain/mimetreeparser/otp/enums.h
deleted file mode 100644
index bec5a028..00000000
--- a/framework/src/domain/mimetreeparser/otp/enums.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
-  Copyright (c) 2016 Sandro Knauß <sknauss@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.
-
-  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.
-*/
-
-#ifndef __MIMETREEPARSER_ENUMS_H__
-#define __MIMETREEPARSER_ENUMS_H__
-
-namespace MimeTreeParser
-{
-
-/**
- * The display update mode: Force updates the display immediately, Delayed updates
- * after some time (150ms by default)
- */
-enum UpdateMode {
-    Force = 0,
-    Delayed
-};
-
-/** Flags for the encryption state. */
-typedef enum {
-    KMMsgEncryptionStateUnknown = ' ',
-    KMMsgNotEncrypted = 'N',
-    KMMsgPartiallyEncrypted = 'P',
-    KMMsgFullyEncrypted = 'F',
-    KMMsgEncryptionProblematic = 'X'
-} KMMsgEncryptionState;
-
-/** Flags for the signature state. */
-typedef enum {
-    KMMsgSignatureStateUnknown = ' ',
-    KMMsgNotSigned = 'N',
-    KMMsgPartiallySigned = 'P',
-    KMMsgFullySigned = 'F',
-    KMMsgSignatureProblematic = 'X'
-} KMMsgSignatureState;
-
-}
-
-#endif
diff --git a/framework/src/domain/mimetreeparser/otp/filehtmlwriter.cpp b/framework/src/domain/mimetreeparser/otp/filehtmlwriter.cpp
deleted file mode 100644
index a143f944..00000000
--- a/framework/src/domain/mimetreeparser/otp/filehtmlwriter.cpp
+++ /dev/null
@@ -1,119 +0,0 @@
-/*  -*- c++ -*-
-    filehtmlwriter.cpp
-
-    This file is part of KMail, the KDE mail client.
-    Copyright (c) 2003 Marc Mutz <mutz@kde.org>
-
-    KMail 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.
-
-    KMail 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 "filehtmlwriter.h"
-
-#include "mimetreeparser_debug.h"
-
-namespace MimeTreeParser
-{
-
-FileHtmlWriter::FileHtmlWriter(const QString &filename)
-    : HtmlWriter(),
-      mFile(filename.isEmpty() ? QStringLiteral("filehtmlwriter.out") : filename)
-{
-}
-
-FileHtmlWriter::~FileHtmlWriter()
-{
-    if (mFile.isOpen()) {
-        qCWarning(MIMETREEPARSER_LOG) << "FileHtmlWriter: file still open!";
-        mStream.setDevice(nullptr);
-        mFile.close();
-    }
-}
-
-void FileHtmlWriter::begin(const QString &css)
-{
-    openOrWarn();
-    if (!css.isEmpty()) {
-        write(QLatin1String("<!-- CSS Definitions \n") + css + QLatin1String("-->\n"));
-    }
-}
-
-void FileHtmlWriter::end()
-{
-    flush();
-    mStream.setDevice(nullptr);
-    mFile.close();
-}
-
-void FileHtmlWriter::reset()
-{
-    if (mFile.isOpen()) {
-        mStream.setDevice(nullptr);
-        mFile.close();
-    }
-}
-
-void FileHtmlWriter::write(const QString &str)
-{
-    mStream << str;
-    flush();
-}
-
-void FileHtmlWriter::queue(const QString &str)
-{
-    write(str);
-}
-
-void FileHtmlWriter::flush()
-{
-    mStream.flush();
-    mFile.flush();
-}
-
-void FileHtmlWriter::openOrWarn()
-{
-    if (mFile.isOpen()) {
-        qCWarning(MIMETREEPARSER_LOG) << "FileHtmlWriter: file still open!";
-        mStream.setDevice(nullptr);
-        mFile.close();
-    }
-    if (!mFile.open(QIODevice::WriteOnly)) {
-        qCWarning(MIMETREEPARSER_LOG) << "FileHtmlWriter: Cannot open file" << mFile.fileName();
-    } else {
-        mStream.setDevice(&mFile);
-        mStream.setCodec("UTF-8");
-    }
-}
-
-void FileHtmlWriter::embedPart(const QByteArray &contentId, const QString &url)
-{
-    mStream << "<!-- embedPart(contentID=" << contentId << ", url=" << url << ") -->" << endl;
-    flush();
-}
-void FileHtmlWriter::extraHead(const QString &)
-{
-
-}
-
-} //
diff --git a/framework/src/domain/mimetreeparser/otp/filehtmlwriter.h b/framework/src/domain/mimetreeparser/otp/filehtmlwriter.h
deleted file mode 100644
index 5dafb593..00000000
--- a/framework/src/domain/mimetreeparser/otp/filehtmlwriter.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*  -*- c++ -*-
-    filehtmlwriter.h
-
-    This file is part of KMail, the KDE mail client.
-    Copyright (c) 2003 Marc Mutz <mutz@kde.org>
-
-    KMail 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.
-
-    KMail 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.
-*/
-
-#ifndef __MIMETREEPARSER_FILEHTMLWRITER_H__
-#define __MIMETREEPARSER_FILEHTMLWRITER_H__
-
-#include "mimetreeparser_export.h"
-#include "mimetreeparser/htmlwriter.h"
-
-#include <QFile>
-#include <QTextStream>
-
-class QString;
-
-namespace MimeTreeParser
-{
-
-class MIMETREEPARSER_EXPORT FileHtmlWriter : public HtmlWriter
-{
-public:
-    explicit FileHtmlWriter(const QString &filename);
-    virtual ~FileHtmlWriter();
-
-    void begin(const QString &cssDefs) Q_DECL_OVERRIDE;
-    void end() Q_DECL_OVERRIDE;
-    void reset() Q_DECL_OVERRIDE;
-    void write(const QString &str) Q_DECL_OVERRIDE;
-    void queue(const QString &str) Q_DECL_OVERRIDE;
-    void flush() Q_DECL_OVERRIDE;
-    void embedPart(const QByteArray &contentId, const QString &url) Q_DECL_OVERRIDE;
-    void extraHead(const QString &str) Q_DECL_OVERRIDE;
-private:
-    void openOrWarn();
-
-private:
-    QFile mFile;
-    QTextStream mStream;
-};
-
-} // namespace MimeTreeParser
-
-#endif // __MIMETREEPARSER_FILEHTMLWRITER_H__
diff --git a/framework/src/domain/mimetreeparser/otp/htmlwriter.cpp b/framework/src/domain/mimetreeparser/otp/htmlwriter.cpp
deleted file mode 100644
index 3c98d997..00000000
--- a/framework/src/domain/mimetreeparser/otp/htmlwriter.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
-    This file is part of KMail's plugin interface.
-    Copyright (c) 2003 Marc Mutz <mutz@kde.org>
-
-    KMail 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.
-
-    KMail 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 "htmlwriter.h"
-
-MimeTreeParser::Interface::HtmlWriter::~HtmlWriter()
-{
-}
-
-MimeTreeParser::HtmlWriter::~HtmlWriter()
-{
-}
-
diff --git a/framework/src/domain/mimetreeparser/otp/htmlwriter.h b/framework/src/domain/mimetreeparser/otp/htmlwriter.h
deleted file mode 100644
index 382c80fb..00000000
--- a/framework/src/domain/mimetreeparser/otp/htmlwriter.h
+++ /dev/null
@@ -1,125 +0,0 @@
-/*  -*- c++ -*-
-    interfaces/htmlwriter.h
-
-    This file is part of KMail's plugin interface.
-    Copyright (c) 2003 Marc Mutz <mutz@kde.org>
-
-    KMail 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.
-
-    KMail 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.
-*/
-
-#ifndef __MIMETREEPARSER_INTERFACES_HTMLWRITER_H__
-#define __MIMETREEPARSER_INTERFACES_HTMLWRITER_H__
-
-class QByteArray;
-class QString;
-
-namespace MimeTreeParser
-{
-/**
-  * @short An interface for HTML sinks.
-  * @author Marc Mutz <mutz@kde.org>
-  *
-  */
-namespace Interface
-{
-class HtmlWriter
-{
-public:
-    virtual ~HtmlWriter();
-
-    /** Signal the begin of stuff to write, and give the CSS definitions */
-    virtual void begin(const QString &cssDefinitions) = 0;
-    /** Write out a chunk of text. No HTML escaping is performed. */
-    virtual void write(const QString &html) = 0;
-    /** Signal the end of stuff to write. */
-    virtual void end() = 0;
-};
-}
-
-/**
-  * @short An interface to HTML sinks
-  * @author Marc Mutz <mutz@kde.org>
-  *
-  * @deprecated KMail should be ported to Interface::HtmlWriter. This
-  * interface exposes internal working models. The queuing
-  * vs. writing() issues exposed here should be hidden by using two
-  * different implementations of KHTMLPartHtmlWriter: one for
-  * queuing, and one for writing. This should be fixed before the
-  * release, so we an keep the plugin interface stable.
-  *
-  * Operate this interface in one and only one of the following two
-  * modes:
-  *
-  * @section Sync Mode
-  *
-  * In sync mode, use #begin() to initiate a session, then
-  * #write() some chunks of HTML code and finally #end() the session.
-  *
-  * @section Async Mode
-  *
-  * In async mode, use #begin() to initialize a session, then
-  * #queue() some chunks of HTML code and finally end the
-  * session by calling #flush().
-  *
-  * Queued HTML code is fed to the html sink using a timer. For this
-  * to work, control must return to the event loop so timer events
-  * are delivered.
-  *
-  * @section Combined mode
-  *
-  * You may combine the two modes in the following way only. Any
-  * number of #write() calls can precede #queue() calls,
-  * but once a chunk has been queued, you @em must @em not
-  * #write() more data, only #queue() it.
-  *
-  * Naturally, whenever you queued data in a given session, that
-  * session must be ended by calling #flush(), not #end().
-  */
-class HtmlWriter : public Interface::HtmlWriter
-{
-public:
-    virtual ~HtmlWriter();
-
-    /** Stop all possibly pending processing in order to be able to
-      *  call #begin() again. */
-    virtual void reset() = 0;
-
-    virtual void queue(const QString &str) = 0;
-    /** (Start) flushing internal buffers, if any. */
-    virtual void flush() = 0;
-
-    /**
-      * Embed a part with Content-ID @p contentId, using url @p url.
-      */
-    virtual void embedPart(const QByteArray &contentId, const QString &url) = 0;
-
-    virtual void extraHead(const QString &str) = 0;
-};
-
-}
-
-#endif // __MIMETREEPARSER_INTERFACES_HTMLWRITER_H__
-
diff --git a/framework/src/domain/mimetreeparser/otp/mailman.cpp b/framework/src/domain/mimetreeparser/otp/mailman.cpp
deleted file mode 100644
index e79ef0fa..00000000
--- a/framework/src/domain/mimetreeparser/otp/mailman.cpp
+++ /dev/null
@@ -1,183 +0,0 @@
-/*
-   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 "mailman.h"
-
-#include "utils.h"
-
-#include "objecttreeparser.h"
-#include "messagepart.h"
-
-#include <KMime/Content>
-
-#include "mimetreeparser_debug.h"
-
-using namespace MimeTreeParser;
-
-const MailmanBodyPartFormatter *MailmanBodyPartFormatter::self;
-
-const Interface::BodyPartFormatter *MailmanBodyPartFormatter::create()
-{
-    if (!self) {
-        self = new MailmanBodyPartFormatter();
-    }
-    return self;
-}
-Interface::BodyPartFormatter::Result MailmanBodyPartFormatter::format(Interface::BodyPart *part, HtmlWriter *writer) const
-{
-    Q_UNUSED(writer)
-    const auto p = process(*part);
-    const auto mp = static_cast<MessagePart *>(p.data());
-    if (mp) {
-        mp->html(false);
-        return Ok;
-    }
-    return Failed;
-}
-
-bool MailmanBodyPartFormatter::isMailmanMessage(KMime::Content *curNode) const
-{
-    if (!curNode || curNode->head().isEmpty()) {
-        return false;
-    }
-    if (curNode->hasHeader("X-Mailman-Version")) {
-        return true;
-    }
-    if (KMime::Headers::Base *header = curNode->headerByType("X-Mailer")) {
-        if (header->asUnicodeString().contains(QStringLiteral("MAILMAN"), Qt::CaseInsensitive)) {
-            return true;
-        }
-    }
-    return false;
-}
-
-Interface::MessagePart::Ptr MailmanBodyPartFormatter::process(Interface::BodyPart &part) const
-{
-    KMime::Content *curNode = part.content();
-
-    if (!isMailmanMessage(curNode)) {
-        return MessagePart::Ptr();
-    }
-
-    const QString str = QString::fromLatin1(curNode->decodedContent());
-
-    //###
-    const QLatin1String delim1("--__--__--\n\nMessage:");
-    const QLatin1String delim2("--__--__--\r\n\r\nMessage:");
-    const QLatin1String delimZ2("--__--__--\n\n_____________");
-    const QLatin1String delimZ1("--__--__--\r\n\r\n_____________");
-    QString partStr, digestHeaderStr;
-    int thisDelim = str.indexOf(delim1, Qt::CaseInsensitive);
-    if (thisDelim == -1) {
-        thisDelim = str.indexOf(delim2, Qt::CaseInsensitive);
-    }
-    if (thisDelim == -1) {
-        return MessagePart::Ptr();
-    }
-
-    int nextDelim = str.indexOf(delim1, thisDelim + 1, Qt::CaseInsensitive);
-    if (-1 == nextDelim) {
-        nextDelim = str.indexOf(delim2, thisDelim + 1, Qt::CaseInsensitive);
-    }
-    if (-1 == nextDelim) {
-        nextDelim = str.indexOf(delimZ1, thisDelim + 1, Qt::CaseInsensitive);
-    }
-    if (-1 == nextDelim) {
-        nextDelim = str.indexOf(delimZ2, thisDelim + 1, Qt::CaseInsensitive);
-    }
-    if (nextDelim < 0) {
-        return MessagePart::Ptr();
-    }
-
-    //if ( curNode->mRoot )
-    //  curNode = curNode->mRoot;
-
-    // at least one message found: build a mime tree
-    digestHeaderStr = QStringLiteral("Content-Type: text/plain\nContent-Description: digest header\n\n");
-    digestHeaderStr += str.midRef(0, thisDelim);
-
-    MessagePartList::Ptr mpl(new MessagePartList(part.objectTreeParser()));
-    mpl->appendSubPart(createAndParseTempNode(part, part.topLevelContent(), digestHeaderStr.toLatin1().constData(), "Digest Header"));
-    //mReader->queueHtml("<br><hr><br>");
-    // temporarily change curent node's Content-Type
-    // to get our embedded RfC822 messages properly inserted
-    curNode->contentType()->setMimeType("multipart/digest");
-    while (-1 < nextDelim) {
-        int thisEoL = str.indexOf(QLatin1String("\nMessage:"), thisDelim, Qt::CaseInsensitive);
-        if (-1 < thisEoL) {
-            thisDelim = thisEoL + 1;
-        } else {
-            thisEoL = str.indexOf(QLatin1String("\n_____________"), thisDelim, Qt::CaseInsensitive);
-            if (-1 < thisEoL) {
-                thisDelim = thisEoL + 1;
-            }
-        }
-        thisEoL = str.indexOf(QLatin1Char('\n'), thisDelim);
-        if (-1 < thisEoL) {
-            thisDelim = thisEoL + 1;
-        } else {
-            thisDelim = thisDelim + 1;
-        }
-        //while( thisDelim < cstr.size() && '\n' == cstr[thisDelim] )
-        //  ++thisDelim;
-
-        partStr = QStringLiteral("Content-Type: message/rfc822\nContent-Description: embedded message\n\n");
-        partStr += str.midRef(thisDelim, nextDelim - thisDelim);
-        QString subject = QStringLiteral("embedded message");
-        QString subSearch = QStringLiteral("\nSubject:");
-        int subPos = partStr.indexOf(subSearch, 0, Qt::CaseInsensitive);
-        if (-1 < subPos) {
-            subject = partStr.mid(subPos + subSearch.length());
-            thisEoL = subject.indexOf(QLatin1Char('\n'));
-            if (-1 < thisEoL) {
-                subject.truncate(thisEoL);
-            }
-        }
-        qCDebug(MIMETREEPARSER_LOG) << "        embedded message found: \"" << subject;
-        mpl->appendSubPart(createAndParseTempNode(part, part.topLevelContent(), partStr.toLatin1().constData(), subject.toLatin1().constData()));
-        //mReader->queueHtml("<br><hr><br>");
-        thisDelim = nextDelim + 1;
-        nextDelim = str.indexOf(delim1, thisDelim, Qt::CaseInsensitive);
-        if (-1 == nextDelim) {
-            nextDelim = str.indexOf(delim2, thisDelim, Qt::CaseInsensitive);
-        }
-        if (-1 == nextDelim) {
-            nextDelim = str.indexOf(delimZ1, thisDelim, Qt::CaseInsensitive);
-        }
-        if (-1 == nextDelim) {
-            nextDelim = str.indexOf(delimZ2, thisDelim, Qt::CaseInsensitive);
-        }
-    }
-    // reset curent node's Content-Type
-    curNode->contentType()->setMimeType("text/plain");
-    int thisEoL = str.indexOf(QLatin1String("_____________"), thisDelim);
-    if (-1 < thisEoL) {
-        thisDelim = thisEoL;
-        thisEoL = str.indexOf(QLatin1Char('\n'), thisDelim);
-        if (-1 < thisEoL) {
-            thisDelim = thisEoL + 1;
-        }
-    } else {
-        thisDelim = thisDelim + 1;
-    }
-    partStr = QStringLiteral("Content-Type: text/plain\nContent-Description: digest footer\n\n");
-    partStr += str.midRef(thisDelim);
-    mpl->appendSubPart(createAndParseTempNode(part, part.topLevelContent(), partStr.toLatin1().constData(), "Digest Footer"));
-    return mpl;
-}
diff --git a/framework/src/domain/mimetreeparser/otp/mailman.h b/framework/src/domain/mimetreeparser/otp/mailman.h
deleted file mode 100644
index 742830b2..00000000
--- a/framework/src/domain/mimetreeparser/otp/mailman.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
-   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.
-*/
-
-#ifndef __MIMETREEPARSER_BODYFORAMATTER_MAILMAN_H__
-#define __MIMETREEPARSER_BODYFORAMATTER_MAILMAN_H__
-
-#include "bodypartformatter.h"
-#include "bodypart.h"
-
-namespace MimeTreeParser
-{
-
-class MailmanBodyPartFormatter : public Interface::BodyPartFormatter
-{
-    static const MailmanBodyPartFormatter *self;
-public:
-    Interface::MessagePart::Ptr process(Interface::BodyPart &part) const Q_DECL_OVERRIDE;
-    Interface::BodyPartFormatter::Result format(Interface::BodyPart *, HtmlWriter *) const Q_DECL_OVERRIDE;
-    using Interface::BodyPartFormatter::format;
-    static const Interface::BodyPartFormatter *create();
-
-private:
-    bool isMailmanMessage(KMime::Content *curNode) const;
-};
-
-}
-
-#endif
diff --git a/framework/src/domain/mimetreeparser/otp/messagepart.cpp b/framework/src/domain/mimetreeparser/otp/messagepart.cpp
deleted file mode 100644
index 3228a387..00000000
--- a/framework/src/domain/mimetreeparser/otp/messagepart.cpp
+++ /dev/null
@@ -1,1352 +0,0 @@
-/*
-   Copyright (c) 2015 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 "messagepart.h"
-#include "mimetreeparser_debug.h"
-#include "attachmentstrategy.h"
-#include "cryptohelper.h"
-#include "objecttreeparser.h"
-#include "htmlwriter.h"
-#include "qgpgmejobexecutor.h"
-
-#include "cryptobodypartmemento.h"
-#include "decryptverifybodypartmemento.h"
-#include "verifydetachedbodypartmemento.h"
-#include "verifyopaquebodypartmemento.h"
-
-#include "utils.h"
-
-#include <KMime/Content>
-
-#include <QGpgME/DN>
-#include <QGpgME/Protocol>
-#include <QGpgME/ImportJob>
-#include <QGpgME/KeyListJob>
-#include <QGpgME/VerifyDetachedJob>
-#include <QGpgME/VerifyOpaqueJob>
-
-#include <gpgme++/key.h>
-#include <gpgme++/keylistresult.h>
-#include <gpgme.h>
-
-#include <KLocalizedString>
-
-#include <QTextCodec>
-
-using namespace MimeTreeParser;
-
-//------MessagePart-----------------------
-MessagePart::MessagePart(ObjectTreeParser *otp,
-                         const QString &text)
-    : mText(text)
-    , mOtp(otp)
-    , mAttachmentNode(nullptr)
-    , mRoot(false)
-{
-}
-
-MessagePart::~MessagePart()
-{
-}
-
-PartMetaData *MessagePart::partMetaData()
-{
-    return &mMetaData;
-}
-
-void MessagePart::setAttachmentFlag(KMime::Content *node)
-{
-    mAttachmentNode = node;
-}
-
-bool MessagePart::isAttachment() const
-{
-    return mAttachmentNode;
-}
-
-KMime::Content *MessagePart::attachmentNode() const
-{
-    return mAttachmentNode;
-}
-
-void MessagePart::setIsRoot(bool root)
-{
-    mRoot = root;
-}
-
-bool MessagePart::isRoot() const
-{
-    return mRoot;
-}
-
-QString MessagePart::text() const
-{
-    return mText;
-}
-
-void MessagePart::setText(const QString &text)
-{
-    mText = text;
-}
-
-bool MessagePart::isHtml() const
-{
-    return false;
-}
-
-bool MessagePart::isHidden() const
-{
-    return false;
-}
-
-Interface::ObjectTreeSource *MessagePart::source() const
-{
-    Q_ASSERT(mOtp);
-    return mOtp->mSource;
-}
-
-HtmlWriter *MessagePart::htmlWriter() const
-{
-    Q_ASSERT(mOtp);
-    return mOtp->htmlWriter();
-}
-
-void MessagePart::setHtmlWriter(HtmlWriter *htmlWriter) const
-{
-    mOtp->mHtmlWriter = htmlWriter;
-}
-
-void MessagePart::parseInternal(KMime::Content *node, bool onlyOneMimePart)
-{
-    auto subMessagePart = mOtp->parseObjectTreeInternal(node, onlyOneMimePart);
-    mRoot = subMessagePart->isRoot();
-    foreach (const auto &part, subMessagePart->subParts()) {
-        appendSubPart(part);
-    }
-}
-
-QString MessagePart::renderInternalText() const
-{
-    QString text;
-    foreach (const auto &mp, subParts()) {
-        text += mp->text();
-    }
-    return text;
-}
-
-void MessagePart::copyContentFrom() const
-{
-    foreach (const auto &mp, subParts()) {
-        const auto m = mp.dynamicCast<MessagePart>();
-        if (m) {
-            m->copyContentFrom();
-        }
-    }
-}
-
-void MessagePart::fix() const
-{
-    foreach (const auto &mp, subParts()) {
-        const auto m = mp.dynamicCast<MessagePart>();
-        if (m) {
-            m->fix();
-        }
-    }
-}
-
-void MessagePart::appendSubPart(const Interface::MessagePart::Ptr &messagePart)
-{
-    messagePart->setParentPart(this);
-    mBlocks.append(messagePart);
-}
-
-const QVector<Interface::MessagePart::Ptr> &MessagePart::subParts() const
-{
-    return mBlocks;
-}
-
-bool MessagePart::hasSubParts() const
-{
-    return !mBlocks.isEmpty();
-}
-
-//-----MessagePartList----------------------
-MessagePartList::MessagePartList(ObjectTreeParser *otp)
-    : MessagePart(otp, QString())
-{
-}
-
-MessagePartList::~MessagePartList()
-{
-
-}
-
-QString MessagePartList::text() const
-{
-    return renderInternalText();
-}
-
-QString MessagePartList::plaintextContent() const
-{
-    return QString();
-}
-
-QString MessagePartList::htmlContent() const
-{
-    return QString();
-}
-
-//-----TextMessageBlock----------------------
-
-TextMessagePart::TextMessagePart(ObjectTreeParser *otp, KMime::Content *node, bool drawFrame, bool showLink, bool decryptMessage)
-    : MessagePartList(otp)
-    , mNode(node)
-    , mDrawFrame(drawFrame)
-    , mShowLink(showLink)
-    , mDecryptMessage(decryptMessage)
-    , mIsHidden(false)
-{
-    if (!mNode) {
-        qCWarning(MIMETREEPARSER_LOG) << "not a valid node";
-        return;
-    }
-
-    mIsHidden = mOtp->nodeHelper()->isNodeDisplayedHidden(mNode);
-
-    parseContent();
-}
-
-TextMessagePart::~TextMessagePart()
-{
-
-}
-
-bool TextMessagePart::decryptMessage() const
-{
-    return mDecryptMessage;
-}
-
-void TextMessagePart::parseContent()
-{
-    const auto aCodec = mOtp->codecFor(mNode);
-    const QString &fromAddress = mOtp->nodeHelper()->fromAsString(mNode);
-    mSignatureState  = KMMsgNotSigned;
-    mEncryptionState = KMMsgNotEncrypted;
-    const auto blocks = prepareMessageForDecryption(mNode->decodedContent());
-
-    const auto cryptProto = QGpgME::openpgp();
-
-    if (!blocks.isEmpty()) {
-
-        /* The (overall) signature/encrypted status is broken
-         * if one unencrypted part is at the beginning or in the middle
-         * because mailmain adds an unencrypted part at the end this should not break the overall status
-         *
-         * That's why we first set the tmp status and if one crypted/signed block comes afterwards, than
-         * the status is set to unencryped
-         */
-        bool fullySignedOrEncrypted = true;
-        bool fullySignedOrEncryptedTmp = true;
-
-        for (const auto &block : blocks) {
-
-            if (!fullySignedOrEncryptedTmp) {
-                fullySignedOrEncrypted = false;
-            }
-
-            if (block.type() == NoPgpBlock && !block.text().trimmed().isEmpty()) {
-                fullySignedOrEncryptedTmp = false;
-                appendSubPart(MessagePart::Ptr(new MessagePart(mOtp, aCodec->toUnicode(block.text()))));
-            } else if (block.type() == PgpMessageBlock) {
-                EncryptedMessagePart::Ptr mp(new EncryptedMessagePart(mOtp, QString(), cryptProto, fromAddress, nullptr));
-                mp->setDecryptMessage(decryptMessage());
-                mp->setIsEncrypted(true);
-                appendSubPart(mp);
-                if (!decryptMessage()) {
-                    continue;
-                }
-                mp->startDecryption(block.text(), aCodec);
-                if (mp->partMetaData()->inProgress) {
-                    continue;
-                }
-            } else if (block.type() == ClearsignedBlock) {
-                SignedMessagePart::Ptr mp(new SignedMessagePart(mOtp, QString(), cryptProto, fromAddress, nullptr));
-                appendSubPart(mp);
-                mp->startVerification(block.text(), aCodec);
-            } else {
-                continue;
-            }
-
-            const auto mp = subParts().last().staticCast<MessagePart>();
-            const PartMetaData *messagePart(mp->partMetaData());
-
-            if (!messagePart->isEncrypted && !messagePart->isSigned && !block.text().trimmed().isEmpty()) {
-                mp->setText(aCodec->toUnicode(block.text()));
-            }
-
-            if (messagePart->isEncrypted) {
-                mEncryptionState = KMMsgPartiallyEncrypted;
-            }
-
-            if (messagePart->isSigned) {
-                mSignatureState = KMMsgPartiallySigned;
-            }
-        }
-
-        //Do we have an fully Signed/Encrypted Message?
-        if (fullySignedOrEncrypted) {
-            if (mSignatureState == KMMsgPartiallySigned) {
-                mSignatureState = KMMsgFullySigned;
-            }
-            if (mEncryptionState == KMMsgPartiallyEncrypted) {
-                mEncryptionState = KMMsgFullyEncrypted;
-            }
-        }
-    }
-}
-
-KMMsgEncryptionState TextMessagePart::encryptionState() const
-{
-    return mEncryptionState;
-}
-
-KMMsgSignatureState TextMessagePart::signatureState() const
-{
-    return mSignatureState;
-}
-
-bool TextMessagePart::isHidden() const
-{
-    return mIsHidden;
-}
-
-bool TextMessagePart::showLink() const
-{
-    return mShowLink;
-}
-
-bool TextMessagePart::showTextFrame() const
-{
-    return mDrawFrame;
-}
-
-//-----AttachmentMessageBlock----------------------
-
-AttachmentMessagePart::AttachmentMessagePart(ObjectTreeParser *otp, KMime::Content *node, bool drawFrame, bool showLink, bool decryptMessage)
-    : TextMessagePart(otp, node, drawFrame, showLink, decryptMessage)
-    , mIsImage(false)
-    , mNeverDisplayInline(false)
-{
-
-}
-
-AttachmentMessagePart::~AttachmentMessagePart()
-{
-
-}
-
-bool AttachmentMessagePart::neverDisplayInline() const
-{
-    return mNeverDisplayInline;
-}
-
-void AttachmentMessagePart::setNeverDisplayInline(bool displayInline)
-{
-    mNeverDisplayInline = displayInline;
-}
-
-bool AttachmentMessagePart::isImage() const
-{
-    return mIsImage;
-}
-
-void AttachmentMessagePart::setIsImage(bool image)
-{
-    mIsImage = image;
-}
-
-IconType AttachmentMessagePart::asIcon() const
-{
-    const AttachmentStrategy *const as = mOtp->attachmentStrategy();
-    const bool defaultHidden(as && as->defaultDisplay(mNode) == AttachmentStrategy::None);
-    const bool showOnlyOneMimePart(mOtp->showOnlyOneMimePart());
-    auto preferredMode = source()->preferredMode();
-    bool isHtmlPreferred = (preferredMode == Util::Html) || (preferredMode == Util::MultipartHtml);
-
-    QByteArray mediaType("text");
-    QByteArray subType("plain");
-    if (mNode->contentType(false) && !mNode->contentType()->mediaType().isEmpty() &&
-            !mNode->contentType()->subType().isEmpty()) {
-        mediaType = mNode->contentType()->mediaType();
-        subType = mNode->contentType()->subType();
-    }
-    const bool isTextPart = (mediaType == QByteArrayLiteral("text"));
-
-    bool defaultAsIcon = true;
-    if (!neverDisplayInline()) {
-        if (as) {
-            defaultAsIcon = as->defaultDisplay(mNode) == AttachmentStrategy::AsIcon;
-        }
-    }
-    if (isImage() && showOnlyOneMimePart && !neverDisplayInline()) {
-        defaultAsIcon = false;
-    }
-
-    // neither image nor text -> show as icon
-    if (!isImage() && !isTextPart) {
-        defaultAsIcon = true;
-    }
-
-    if (isTextPart) {
-        if (as && as->defaultDisplay(mNode) != AttachmentStrategy::Inline) {
-            return MimeTreeParser::IconExternal;
-        }
-        return MimeTreeParser::NoIcon;
-    } else {
-        if (isImage() && isHtmlPreferred &&
-                mNode->parent() && mNode->parent()->contentType()->subType() == "related") {
-            return MimeTreeParser::IconInline;
-        }
-
-        if (defaultHidden && !showOnlyOneMimePart && mNode->parent()) {
-            return MimeTreeParser::IconInline;
-        }
-
-        if (defaultAsIcon) {
-            return MimeTreeParser::IconExternal;
-        } else if (isImage()) {
-            return MimeTreeParser::IconInline;
-        } else {
-            return MimeTreeParser::NoIcon;
-        }
-    }
-}
-
-bool AttachmentMessagePart::isHidden() const
-{
-    const AttachmentStrategy *const as = mOtp->attachmentStrategy();
-    const bool defaultHidden(as && as->defaultDisplay(mNode) == AttachmentStrategy::None);
-    const bool showOnlyOneMimePart(mOtp->showOnlyOneMimePart());
-    auto preferredMode = source()->preferredMode();
-    bool isHtmlPreferred = (preferredMode == Util::Html) || (preferredMode == Util::MultipartHtml);
-
-    QByteArray mediaType("text");
-    QByteArray subType("plain");
-    if (mNode->contentType(false) && !mNode->contentType()->mediaType().isEmpty() &&
-            !mNode->contentType()->subType().isEmpty()) {
-        mediaType = mNode->contentType()->mediaType();
-        subType = mNode->contentType()->subType();
-    }
-    const bool isTextPart = (mediaType == QByteArrayLiteral("text"));
-
-    bool defaultAsIcon = true;
-    if (!neverDisplayInline()) {
-        if (as) {
-            defaultAsIcon = as->defaultDisplay(mNode) == AttachmentStrategy::AsIcon;
-        }
-    }
-    if (isImage() && showOnlyOneMimePart && !neverDisplayInline()) {
-        defaultAsIcon = false;
-    }
-
-    // neither image nor text -> show as icon
-    if (!isImage() && !isTextPart) {
-        defaultAsIcon = true;
-    }
-
-    bool hidden(false);
-    if (isTextPart) {
-        hidden = defaultHidden && !showOnlyOneMimePart;
-    } else {
-        if (isImage() && isHtmlPreferred &&
-                mNode->parent() && mNode->parent()->contentType()->subType() == "related") {
-            hidden = true;
-        } else {
-            hidden = defaultHidden && !showOnlyOneMimePart && mNode->parent();
-            hidden |= defaultAsIcon && (defaultHidden || showOnlyOneMimePart);
-        }
-    }
-    mOtp->nodeHelper()->setNodeDisplayedHidden(mNode, hidden);
-    return hidden;
-}
-
-//-----HtmlMessageBlock----------------------
-
-HtmlMessagePart::HtmlMessagePart(ObjectTreeParser *otp, KMime::Content *node, Interface::ObjectTreeSource *source)
-    : MessagePart(otp, QString())
-    , mNode(node)
-    , mSource(source)
-{
-    if (!mNode) {
-        qCWarning(MIMETREEPARSER_LOG) << "not a valid node";
-        return;
-    }
-
-    const QByteArray partBody(mNode->decodedContent());
-    mBodyHTML = mOtp->codecFor(mNode)->toUnicode(partBody);
-    mCharset = NodeHelper::charset(mNode);
-}
-
-HtmlMessagePart::~HtmlMessagePart()
-{
-}
-
-void HtmlMessagePart::fix() const
-{
-    mOtp->mHtmlContent += mBodyHTML;
-    mOtp->mHtmlContentCharset = mCharset;
-}
-
-QString HtmlMessagePart::text() const
-{
-    return mBodyHTML;
-}
-
-bool HtmlMessagePart::isHtml() const
-{
-    return true;
-}
-
-//-----MimeMessageBlock----------------------
-
-MimeMessagePart::MimeMessagePart(ObjectTreeParser *otp, KMime::Content *node, bool onlyOneMimePart)
-    : MessagePart(otp, QString())
-    , mNode(node)
-    , mOnlyOneMimePart(onlyOneMimePart)
-{
-    if (!mNode) {
-        qCWarning(MIMETREEPARSER_LOG) << "not a valid node";
-        return;
-    }
-
-    parseInternal(mNode, mOnlyOneMimePart);
-}
-
-MimeMessagePart::~MimeMessagePart()
-{
-
-}
-
-QString MimeMessagePart::text() const
-{
-    return renderInternalText();
-}
-
-QString MimeMessagePart::plaintextContent() const
-{
-    return QString();
-}
-
-QString MimeMessagePart::htmlContent() const
-{
-    return QString();
-}
-
-//-----AlternativeMessagePart----------------------
-
-AlternativeMessagePart::AlternativeMessagePart(ObjectTreeParser *otp, KMime::Content *node, Util::HtmlMode preferredMode)
-    : MessagePart(otp, QString())
-    , mNode(node)
-    , mPreferredMode(preferredMode)
-{
-    KMime::Content *dataIcal = findTypeInDirectChilds(mNode, "text/calendar");
-    KMime::Content *dataHtml = findTypeInDirectChilds(mNode, "text/html");
-    KMime::Content *dataText = findTypeInDirectChilds(mNode, "text/plain");
-
-    if (!dataHtml) {
-        // If we didn't find the HTML part as the first child of the multipart/alternative, it might
-        // be that this is a HTML message with images, and text/plain and multipart/related are the
-        // immediate children of this multipart/alternative node.
-        // In this case, the HTML node is a child of multipart/related.
-        dataHtml = findTypeInDirectChilds(mNode, "multipart/related");
-
-        // Still not found? Stupid apple mail actually puts the attachments inside of the
-        // multipart/alternative, which is wrong. Therefore we also have to look for multipart/mixed
-        // here.
-        // Do this only when prefering HTML mail, though, since otherwise the attachments are hidden
-        // when displaying plain text.
-        if (!dataHtml) {
-            dataHtml  = findTypeInDirectChilds(mNode, "multipart/mixed");
-        }
-    }
-
-    if (dataIcal) {
-        mChildNodes[Util::MultipartIcal] = dataIcal;
-    }
-
-    if (dataText) {
-        mChildNodes[Util::MultipartPlain] = dataText;
-    }
-
-    if (dataHtml) {
-        mChildNodes[Util::MultipartHtml] = dataHtml;
-    }
-
-    if (mChildNodes.isEmpty()) {
-        qCWarning(MIMETREEPARSER_LOG) << "no valid nodes";
-        return;
-    }
-
-    QMapIterator<Util::HtmlMode, KMime::Content *> i(mChildNodes);
-    while (i.hasNext()) {
-        i.next();
-        mChildParts[i.key()] = MimeMessagePart::Ptr(new MimeMessagePart(mOtp, i.value(), true));
-    }
-}
-
-AlternativeMessagePart::~AlternativeMessagePart()
-{
-
-}
-
-Util::HtmlMode AlternativeMessagePart::preferredMode() const
-{
-    return mPreferredMode;
-}
-
-QList<Util::HtmlMode> AlternativeMessagePart::availableModes()
-{
-    return mChildParts.keys();
-}
-
-QString AlternativeMessagePart::text() const
-{
-    if (mChildParts.contains(Util::MultipartPlain)) {
-        return mChildParts[Util::MultipartPlain]->text();
-    }
-    return QString();
-}
-
-void AlternativeMessagePart::fix() const
-{
-    if (mChildParts.contains(Util::MultipartPlain)) {
-        mChildParts[Util::MultipartPlain]->fix();
-    }
-
-    const auto mode = preferredMode();
-    if (mode != Util::MultipartPlain && mChildParts.contains(mode)) {
-        mChildParts[mode]->fix();
-    }
-}
-
-void AlternativeMessagePart::copyContentFrom() const
-{
-    if (mChildParts.contains(Util::MultipartPlain)) {
-        mChildParts[Util::MultipartPlain]->copyContentFrom();
-    }
-
-    const auto mode = preferredMode();
-    if (mode != Util::MultipartPlain && mChildParts.contains(mode)) {
-        mChildParts[mode]->copyContentFrom();
-    }
-}
-
-bool AlternativeMessagePart::isHtml() const
-{
-    return mChildParts.contains(Util::MultipartHtml);
-}
-
-QString AlternativeMessagePart::plaintextContent() const
-{
-    return text();
-}
-
-QString AlternativeMessagePart::htmlContent() const
-{
-    if (mChildParts.contains(Util::MultipartHtml)) {
-        return mChildParts[Util::MultipartHtml]->text();
-    } else {
-        return plaintextContent();
-    }
-}
-
-//-----CertMessageBlock----------------------
-
-CertMessagePart::CertMessagePart(ObjectTreeParser *otp, KMime::Content *node, const QGpgME::Protocol *cryptoProto, bool autoImport)
-    : MessagePart(otp, QString())
-    , mNode(node)
-    , mAutoImport(autoImport)
-    , mCryptoProto(cryptoProto)
-{
-    if (!mNode) {
-        qCWarning(MIMETREEPARSER_LOG) << "not a valid node";
-        return;
-    }
-
-    if (!mAutoImport) {
-        return;
-    }
-
-    const QByteArray certData = node->decodedContent();
-
-    QGpgME::ImportJob *import = mCryptoProto->importJob();
-    QGpgMEJobExecutor executor;
-    mImportResult = executor.exec(import, certData);
-}
-
-CertMessagePart::~CertMessagePart()
-{
-
-}
-
-QString CertMessagePart::text() const
-{
-    return QString();
-}
-
-//-----SignedMessageBlock---------------------
-SignedMessagePart::SignedMessagePart(ObjectTreeParser *otp,
-                                     const QString &text,
-                                     const QGpgME::Protocol *cryptoProto,
-                                     const QString &fromAddress,
-                                     KMime::Content *node)
-    : MessagePart(otp, text)
-    , mCryptoProto(cryptoProto)
-    , mFromAddress(fromAddress)
-    , mNode(node)
-{
-    mMetaData.technicalProblem = (mCryptoProto == nullptr);
-    mMetaData.isSigned = true;
-    mMetaData.isGoodSignature = false;
-    mMetaData.keyTrust = GpgME::Signature::Unknown;
-    mMetaData.status = i18n("Wrong Crypto Plug-In.");
-    mMetaData.status_code = GPGME_SIG_STAT_NONE;
-}
-
-SignedMessagePart::~SignedMessagePart()
-{
-
-}
-
-void SignedMessagePart::setIsSigned(bool isSigned)
-{
-    mMetaData.isSigned = isSigned;
-}
-
-bool SignedMessagePart::isSigned() const
-{
-    return mMetaData.isSigned;
-}
-
-bool SignedMessagePart::okVerify(const QByteArray &data, const QByteArray &signature, KMime::Content *textNode)
-{
-    NodeHelper *nodeHelper = mOtp->nodeHelper();
-    Interface::ObjectTreeSource *_source = source();
-
-    mMetaData.isSigned = false;
-    mMetaData.technicalProblem = (mCryptoProto == nullptr);
-    mMetaData.keyTrust = GpgME::Signature::Unknown;
-    mMetaData.status = i18n("Wrong Crypto Plug-In.");
-    mMetaData.status_code = GPGME_SIG_STAT_NONE;
-
-    const QByteArray mementoName = "verification";
-
-    CryptoBodyPartMemento *m = dynamic_cast<CryptoBodyPartMemento *>(nodeHelper->bodyPartMemento(mNode, mementoName));
-    Q_ASSERT(!m || mCryptoProto); //No CryptoPlugin and having a bodyPartMemento -> there is something completely wrong
-
-    if (!m && mCryptoProto) {
-        if (!signature.isEmpty()) {
-            QGpgME::VerifyDetachedJob *job = mCryptoProto->verifyDetachedJob();
-            if (job) {
-                m = new VerifyDetachedBodyPartMemento(job, mCryptoProto->keyListJob(), signature, data);
-            }
-        } else {
-            QGpgME::VerifyOpaqueJob *job = mCryptoProto->verifyOpaqueJob();
-            if (job) {
-                m = new VerifyOpaqueBodyPartMemento(job, mCryptoProto->keyListJob(), data);
-            }
-        }
-        if (m) {
-            if (mOtp->allowAsync()) {
-                QObject::connect(m, &CryptoBodyPartMemento::update,
-                                 nodeHelper, &NodeHelper::update);
-                QObject::connect(m, SIGNAL(update(MimeTreeParser::UpdateMode)),
-                                 _source->sourceObject(), SLOT(update(MimeTreeParser::UpdateMode)));
-
-                if (m->start()) {
-                    mMetaData.inProgress = true;
-                    mOtp->mHasPendingAsyncJobs = true;
-                }
-            } else {
-                m->exec();
-            }
-            nodeHelper->setBodyPartMemento(mNode, mementoName, m);
-        }
-    } else if (m->isRunning()) {
-        mMetaData.inProgress = true;
-        mOtp->mHasPendingAsyncJobs = true;
-    } else {
-        mMetaData.inProgress = false;
-        mOtp->mHasPendingAsyncJobs = false;
-    }
-
-    if (m && !mMetaData.inProgress) {
-        if (!signature.isEmpty()) {
-            mVerifiedText = data;
-        }
-        setVerificationResult(m, textNode);
-    }
-
-    if (!m && !mMetaData.inProgress) {
-        QString errorMsg;
-        QString cryptPlugLibName;
-        QString cryptPlugDisplayName;
-        if (mCryptoProto) {
-            cryptPlugLibName = mCryptoProto->name();
-            cryptPlugDisplayName = mCryptoProto->displayName();
-        }
-
-        if (!mCryptoProto) {
-            if (cryptPlugDisplayName.isEmpty()) {
-                errorMsg = i18n("No appropriate crypto plug-in was found.");
-            } else {
-                errorMsg = i18nc("%1 is either 'OpenPGP' or 'S/MIME'",
-                                 "No %1 plug-in was found.",
-                                 cryptPlugDisplayName);
-            }
-        } else {
-            errorMsg = i18n("Crypto plug-in \"%1\" cannot verify signatures.",
-                            cryptPlugLibName);
-        }
-        mMetaData.errorText = i18n("The message is signed, but the "
-                                   "validity of the signature cannot be "
-                                   "verified.<br />"
-                                   "Reason: %1",
-                                   errorMsg);
-    }
-
-    return mMetaData.isSigned;
-}
-
-static int signatureToStatus(const GpgME::Signature &sig)
-{
-    switch (sig.status().code()) {
-    case GPG_ERR_NO_ERROR:
-        return GPGME_SIG_STAT_GOOD;
-    case GPG_ERR_BAD_SIGNATURE:
-        return GPGME_SIG_STAT_BAD;
-    case GPG_ERR_NO_PUBKEY:
-        return GPGME_SIG_STAT_NOKEY;
-    case GPG_ERR_NO_DATA:
-        return GPGME_SIG_STAT_NOSIG;
-    case GPG_ERR_SIG_EXPIRED:
-        return GPGME_SIG_STAT_GOOD_EXP;
-    case GPG_ERR_KEY_EXPIRED:
-        return GPGME_SIG_STAT_GOOD_EXPKEY;
-    default:
-        return GPGME_SIG_STAT_ERROR;
-    }
-}
-
-QString prettifyDN(const char *uid)
-{
-    return QGpgME::DN(uid).prettyDN();
-}
-
-void SignedMessagePart::sigStatusToMetaData()
-{
-    GpgME::Key key;
-    if (mMetaData.isSigned) {
-        GpgME::Signature signature = mSignatures.front();
-        mMetaData.status_code = signatureToStatus(signature);
-        mMetaData.isGoodSignature = mMetaData.status_code & GPGME_SIG_STAT_GOOD;
-        // save extended signature status flags
-        mMetaData.sigSummary = signature.summary();
-
-        if (mMetaData.isGoodSignature && !key.keyID()) {
-            // Search for the key by its fingerprint so that we can check for
-            // trust etc.
-            QGpgME::KeyListJob *job = mCryptoProto->keyListJob(false);    // local, no sigs
-            if (!job) {
-                qCDebug(MIMETREEPARSER_LOG) << "The Crypto backend does not support listing keys. ";
-            } else {
-                std::vector<GpgME::Key> found_keys;
-                // As we are local it is ok to make this synchronous
-                GpgME::KeyListResult res = job->exec(QStringList(QLatin1String(signature.fingerprint())), false, found_keys);
-                if (res.error()) {
-                    qCDebug(MIMETREEPARSER_LOG) << "Error while searching key for Fingerprint: " << signature.fingerprint();
-                }
-                if (found_keys.size() > 1) {
-                    // Should not Happen
-                    qCDebug(MIMETREEPARSER_LOG) << "Oops: Found more then one Key for Fingerprint: " << signature.fingerprint();
-                }
-                if (found_keys.size() != 1) {
-                    // Should not Happen at this point
-                    qCDebug(MIMETREEPARSER_LOG) << "Oops: Found no Key for Fingerprint: " << signature.fingerprint();
-                } else {
-                    key = found_keys[0];
-                }
-                delete job;
-            }
-        }
-
-        if (key.keyID()) {
-            mMetaData.keyId = key.keyID();
-        }
-        if (mMetaData.keyId.isEmpty()) {
-            mMetaData.keyId = signature.fingerprint();
-        }
-        mMetaData.keyTrust = signature.validity();
-        if (key.numUserIDs() > 0 && key.userID(0).id()) {
-            mMetaData.signer = prettifyDN(key.userID(0).id());
-        }
-        for (uint iMail = 0; iMail < key.numUserIDs(); ++iMail) {
-            // The following if /should/ always result in TRUE but we
-            // won't trust implicitely the plugin that gave us these data.
-            if (key.userID(iMail).email()) {
-                QString email = QString::fromUtf8(key.userID(iMail).email());
-                // ### work around gpgme 0.3.QString text() const Q_DECL_OVERRIDE;x / cryptplug bug where the
-                // ### email addresses are specified as angle-addr, not addr-spec:
-                if (email.startsWith(QLatin1Char('<')) && email.endsWith(QLatin1Char('>'))) {
-                    email = email.mid(1, email.length() - 2);
-                }
-                if (!email.isEmpty()) {
-                    mMetaData.signerMailAddresses.append(email);
-                }
-            }
-        }
-
-        if (signature.creationTime()) {
-            mMetaData.creationTime.setTime_t(signature.creationTime());
-        } else {
-            mMetaData.creationTime = QDateTime();
-        }
-        if (mMetaData.signer.isEmpty()) {
-            if (key.numUserIDs() > 0 && key.userID(0).name()) {
-                mMetaData.signer = prettifyDN(key.userID(0).name());
-            }
-            if (!mMetaData.signerMailAddresses.empty()) {
-                if (mMetaData.signer.isEmpty()) {
-                    mMetaData.signer = mMetaData.signerMailAddresses.front();
-                } else {
-                    mMetaData.signer += QLatin1String(" <") + mMetaData.signerMailAddresses.front() + QLatin1Char('>');
-                }
-            }
-        }
-    }
-}
-
-void SignedMessagePart::startVerification(const QByteArray &text, const QTextCodec *aCodec)
-{
-    startVerificationDetached(text, nullptr, QByteArray());
-
-    if (!mNode && mMetaData.isSigned) {
-        setText(aCodec->toUnicode(mVerifiedText));
-    }
-}
-
-void SignedMessagePart::startVerificationDetached(const QByteArray &text, KMime::Content *textNode, const QByteArray &signature)
-{
-    mMetaData.isEncrypted = false;
-    mMetaData.isDecryptable = false;
-
-    if (textNode) {
-        parseInternal(textNode, false);
-    }
-
-    okVerify(text, signature, textNode);
-
-    if (!mMetaData.isSigned) {
-        mMetaData.creationTime = QDateTime();
-    }
-}
-
-void SignedMessagePart::setVerificationResult(const CryptoBodyPartMemento *m, KMime::Content *textNode)
-{
-    {
-        const auto vm = dynamic_cast<const VerifyDetachedBodyPartMemento *>(m);
-        if (vm) {
-            mSignatures = vm->verifyResult().signatures();
-        }
-    }
-    {
-        const auto vm = dynamic_cast<const VerifyOpaqueBodyPartMemento *>(m);
-        if (vm) {
-            mVerifiedText = vm->plainText();
-            mSignatures = vm->verifyResult().signatures();
-        }
-    }
-    {
-        const auto vm = dynamic_cast<const DecryptVerifyBodyPartMemento *>(m);
-        if (vm) {
-            mVerifiedText = vm->plainText();
-            mSignatures = vm->verifyResult().signatures();
-        }
-    }
-    mMetaData.auditLogError = m->auditLogError();
-    mMetaData.auditLog = m->auditLogAsHtml();
-    mMetaData.isSigned = !mSignatures.empty();
-
-    if (mMetaData.isSigned) {
-        sigStatusToMetaData();
-        if (mNode) {
-            mOtp->nodeHelper()->setSignatureState(mNode, KMMsgFullySigned);
-            if (!textNode) {
-                mOtp->mNodeHelper->setPartMetaData(mNode, mMetaData);
-
-                if (!mVerifiedText.isEmpty()) {
-                    auto tempNode = new KMime::Content();
-                    tempNode->setContent(KMime::CRLFtoLF(mVerifiedText.constData()));
-                    tempNode->parse();
-
-                    if (!tempNode->head().isEmpty()) {
-                        tempNode->contentDescription()->from7BitString("signed data");
-                    }
-                    mOtp->mNodeHelper->attachExtraContent(mNode, tempNode);
-
-                    parseInternal(tempNode, false);
-                }
-            }
-        }
-    }
-}
-
-QString SignedMessagePart::plaintextContent() const
-{
-    if (!mNode) {
-        return MessagePart::text();
-    } else {
-        return QString();
-    }
-}
-
-QString SignedMessagePart::htmlContent() const
-{
-    if (!mNode) {
-        return MessagePart::text();
-    } else {
-        return QString();
-    }
-}
-
-//-----CryptMessageBlock---------------------
-EncryptedMessagePart::EncryptedMessagePart(ObjectTreeParser *otp,
-        const QString &text,
-        const QGpgME::Protocol *cryptoProto,
-        const QString &fromAddress,
-        KMime::Content *node)
-    : MessagePart(otp, text)
-    , mPassphraseError(false)
-    , mNoSecKey(false)
-    , mCryptoProto(cryptoProto)
-    , mFromAddress(fromAddress)
-    , mNode(node)
-    , mDecryptMessage(false)
-{
-    mMetaData.technicalProblem = (mCryptoProto == nullptr);
-    mMetaData.isSigned = false;
-    mMetaData.isGoodSignature = false;
-    mMetaData.isEncrypted = false;
-    mMetaData.isDecryptable = false;
-    mMetaData.keyTrust = GpgME::Signature::Unknown;
-    mMetaData.status = i18n("Wrong Crypto Plug-In.");
-    mMetaData.status_code = GPGME_SIG_STAT_NONE;
-}
-
-EncryptedMessagePart::~EncryptedMessagePart()
-{
-
-}
-
-void EncryptedMessagePart::setDecryptMessage(bool decrypt)
-{
-    mDecryptMessage = decrypt;
-}
-
-bool EncryptedMessagePart::decryptMessage() const
-{
-    return mDecryptMessage;
-}
-
-void EncryptedMessagePart::setIsEncrypted(bool encrypted)
-{
-    mMetaData.isEncrypted = encrypted;
-}
-
-bool EncryptedMessagePart::isEncrypted() const
-{
-    return mMetaData.isEncrypted;
-}
-
-bool EncryptedMessagePart::isDecryptable() const
-{
-    return mMetaData.isDecryptable;
-}
-
-bool EncryptedMessagePart::passphraseError() const
-{
-    return mPassphraseError;
-}
-
-void EncryptedMessagePart::startDecryption(const QByteArray &text, const QTextCodec *aCodec)
-{
-    KMime::Content *content = new KMime::Content;
-    content->setBody(text);
-    content->parse();
-
-    startDecryption(content);
-
-    if (!mMetaData.inProgress && mMetaData.isDecryptable) {
-        if (hasSubParts()) {
-            auto _mp = (subParts()[0]).dynamicCast<SignedMessagePart>();
-            if (_mp) {
-                _mp->setText(aCodec->toUnicode(mDecryptedData));
-            } else {
-                setText(aCodec->toUnicode(mDecryptedData));
-            }
-        } else {
-            setText(aCodec->toUnicode(mDecryptedData));
-        }
-    }
-}
-
-bool EncryptedMessagePart::okDecryptMIME(KMime::Content &data)
-{
-    mPassphraseError = false;
-    mMetaData.inProgress = false;
-    mMetaData.errorText.clear();
-    mMetaData.auditLogError = GpgME::Error();
-    mMetaData.auditLog.clear();
-    bool bDecryptionOk = false;
-    bool cannotDecrypt = false;
-    Interface::ObjectTreeSource *_source = source();
-    NodeHelper *nodeHelper = mOtp->nodeHelper();
-
-    Q_ASSERT(decryptMessage());
-
-    // Check whether the memento contains a result from last time:
-    const DecryptVerifyBodyPartMemento *m
-        = dynamic_cast<DecryptVerifyBodyPartMemento *>(nodeHelper->bodyPartMemento(&data, "decryptverify"));
-
-    Q_ASSERT(!m || mCryptoProto); //No CryptoPlugin and having a bodyPartMemento -> there is something completely wrong
-
-    if (!m && mCryptoProto) {
-        QGpgME::DecryptVerifyJob *job = mCryptoProto->decryptVerifyJob();
-        if (!job) {
-            cannotDecrypt = true;
-        } else {
-            const QByteArray ciphertext = data.decodedContent();
-            DecryptVerifyBodyPartMemento *newM
-                = new DecryptVerifyBodyPartMemento(job, ciphertext);
-            if (mOtp->allowAsync()) {
-                QObject::connect(newM, &CryptoBodyPartMemento::update,
-                                 nodeHelper, &NodeHelper::update);
-                QObject::connect(newM, SIGNAL(update(MimeTreeParser::UpdateMode)), _source->sourceObject(),
-                                 SLOT(update(MimeTreeParser::UpdateMode)));
-                if (newM->start()) {
-                    mMetaData.inProgress = true;
-                    mOtp->mHasPendingAsyncJobs = true;
-                } else {
-                    m = newM;
-                }
-            } else {
-                newM->exec();
-                m = newM;
-            }
-            nodeHelper->setBodyPartMemento(&data, "decryptverify", newM);
-        }
-    } else if (m->isRunning()) {
-        mMetaData.inProgress = true;
-        mOtp->mHasPendingAsyncJobs = true;
-        m = nullptr;
-    }
-
-    if (m) {
-        const QByteArray &plainText = m->plainText();
-        const GpgME::DecryptionResult &decryptResult = m->decryptResult();
-        const GpgME::VerificationResult &verifyResult = m->verifyResult();
-        mMetaData.isSigned = verifyResult.signatures().size() > 0;
-
-        if (verifyResult.signatures().size() > 0) {
-            auto subPart = SignedMessagePart::Ptr(new SignedMessagePart(mOtp, MessagePart::text(), mCryptoProto, mFromAddress, mNode));
-            subPart->setVerificationResult(m, nullptr);
-            appendSubPart(subPart);
-        }
-
-        mDecryptRecipients = decryptResult.recipients();
-        bDecryptionOk = !decryptResult.error();
-//        std::stringstream ss;
-//        ss << decryptResult << '\n' << verifyResult;
-//        qCDebug(MIMETREEPARSER_LOG) << ss.str().c_str();
-
-        if (!bDecryptionOk && mMetaData.isSigned) {
-            //Only a signed part
-            mMetaData.isEncrypted = false;
-            bDecryptionOk = true;
-            mDecryptedData = plainText;
-        } else {
-            mPassphraseError =  decryptResult.error().isCanceled() || decryptResult.error().code() == GPG_ERR_NO_SECKEY;
-            mMetaData.isEncrypted = decryptResult.error().code() != GPG_ERR_NO_DATA;
-            mMetaData.errorText = QString::fromLocal8Bit(decryptResult.error().asString());
-            if (mMetaData.isEncrypted && decryptResult.numRecipients() > 0) {
-                mMetaData.keyId = decryptResult.recipient(0).keyID();
-            }
-
-            if (bDecryptionOk) {
-                mDecryptedData = plainText;
-            } else {
-                mNoSecKey = true;
-                foreach (const GpgME::DecryptionResult::Recipient &recipient, decryptResult.recipients()) {
-                    mNoSecKey &= (recipient.status().code() == GPG_ERR_NO_SECKEY);
-                }
-                if (!mPassphraseError && !mNoSecKey) {          // GpgME do not detect passphrase error correctly
-                    mPassphraseError = true;
-                }
-            }
-        }
-    }
-
-    if (!bDecryptionOk) {
-        QString cryptPlugLibName;
-        if (mCryptoProto) {
-            cryptPlugLibName = mCryptoProto->name();
-        }
-
-        if (!mCryptoProto) {
-            mMetaData.errorText = i18n("No appropriate crypto plug-in was found.");
-        } else if (cannotDecrypt) {
-            mMetaData.errorText = i18n("Crypto plug-in \"%1\" cannot decrypt messages.",
-                                       cryptPlugLibName);
-        } else if (!passphraseError()) {
-            mMetaData.errorText = i18n("Crypto plug-in \"%1\" could not decrypt the data.", cryptPlugLibName)
-                                  + QLatin1String("<br />")
-                                  + i18n("Error: %1", mMetaData.errorText);
-        }
-    }
-    return bDecryptionOk;
-}
-
-void EncryptedMessagePart::startDecryption(KMime::Content *data)
-{
-    if (!mNode && !data) {
-        return;
-    }
-
-    if (!data) {
-        data = mNode;
-    }
-
-    mMetaData.isEncrypted = true;
-
-    bool bOkDecrypt = okDecryptMIME(*data);
-
-    if (mMetaData.inProgress) {
-        return;
-    }
-    mMetaData.isDecryptable = bOkDecrypt;
-
-    if (!mMetaData.isDecryptable) {
-        setText(QString::fromUtf8(mDecryptedData.constData()));
-    }
-
-    if (mMetaData.isEncrypted && !decryptMessage()) {
-        mMetaData.isDecryptable = true;
-    }
-
-    if (mNode && !mMetaData.isSigned) {
-        mOtp->mNodeHelper->setPartMetaData(mNode, mMetaData);
-
-        if (decryptMessage()) {
-            auto tempNode = new KMime::Content();
-            tempNode->setContent(KMime::CRLFtoLF(mDecryptedData.constData()));
-            tempNode->parse();
-
-            if (!tempNode->head().isEmpty()) {
-                tempNode->contentDescription()->from7BitString("encrypted data");
-            }
-            mOtp->mNodeHelper->attachExtraContent(mNode, tempNode);
-
-            parseInternal(tempNode, false);
-        }
-    }
-}
-
-QString EncryptedMessagePart::plaintextContent() const
-{
-    if (!mNode) {
-        return MessagePart::text();
-    } else {
-        return QString();
-    }
-}
-
-QString EncryptedMessagePart::htmlContent() const
-{
-    if (!mNode) {
-        return MessagePart::text();
-    } else {
-        return QString();
-    }
-}
-
-QString EncryptedMessagePart::text() const
-{
-    if (hasSubParts()) {
-        auto _mp = (subParts()[0]).dynamicCast<SignedMessagePart>();
-        if (_mp) {
-            return _mp->text();
-        } else {
-            return MessagePart::text();
-        }
-    } else {
-        return MessagePart::text();
-    }
-}
-
-EncapsulatedRfc822MessagePart::EncapsulatedRfc822MessagePart(ObjectTreeParser *otp, KMime::Content *node, const KMime::Message::Ptr &message)
-    : MessagePart(otp, QString())
-    , mMessage(message)
-    , mNode(node)
-{
-    mMetaData.isEncrypted = false;
-    mMetaData.isSigned = false;
-    mMetaData.isEncapsulatedRfc822Message = true;
-
-    mOtp->nodeHelper()->setNodeDisplayedEmbedded(mNode, true);
-    mOtp->nodeHelper()->setPartMetaData(mNode, mMetaData);
-
-    if (!mMessage) {
-        qCWarning(MIMETREEPARSER_LOG) << "Node is of type message/rfc822 but doesn't have a message!";
-        return;
-    }
-
-    // The link to "Encapsulated message" is clickable, therefore the temp file needs to exists,
-    // since the user can click the link and expect to have normal attachment operations there.
-    mOtp->nodeHelper()->writeNodeToTempFile(message.data());
-
-    parseInternal(message.data(), false);
-}
-
-EncapsulatedRfc822MessagePart::~EncapsulatedRfc822MessagePart()
-{
-
-}
-
-QString EncapsulatedRfc822MessagePart::text() const
-{
-    return renderInternalText();
-}
-
-void EncapsulatedRfc822MessagePart::copyContentFrom() const
-{
-}
-
-void EncapsulatedRfc822MessagePart::fix() const
-{
-}
diff --git a/framework/src/domain/mimetreeparser/otp/messagepart.h b/framework/src/domain/mimetreeparser/otp/messagepart.h
deleted file mode 100644
index 433f3f6b..00000000
--- a/framework/src/domain/mimetreeparser/otp/messagepart.h
+++ /dev/null
@@ -1,422 +0,0 @@
-/*
-   Copyright (c) 2015 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.
-*/
-
-#ifndef __MIMETREEPARSER_MESSAGEPART_H__
-#define __MIMETREEPARSER_MESSAGEPART_H__
-
-#include "bodypartformatter.h"
-#include "util.h"
-
-#include <KMime/Message>
-
-#include <gpgme++/verificationresult.h>
-#include <gpgme++/decryptionresult.h>
-#include <gpgme++/importresult.h>
-
-#include <QString>
-#include <QSharedPointer>
-
-class QTextCodec;
-class PartPrivate;
-
-namespace GpgME
-{
-class ImportResult;
-}
-
-namespace QGpgME
-{
-class Protocol;
-}
-
-namespace KMime
-{
-class Content;
-}
-
-namespace MimeTreeParser
-{
-class ObjectTreeParser;
-class HtmlWriter;
-class HTMLBlock;
-typedef QSharedPointer<HTMLBlock> HTMLBlockPtr;
-class CryptoBodyPartMemento;
-class MultiPartAlternativeBodyPartFormatter;
-namespace Interface
-{
-class ObjectTreeSource;
-}
-
-class MessagePart : public Interface::MessagePart
-{
-    Q_OBJECT
-    Q_PROPERTY(bool attachment READ isAttachment)
-    Q_PROPERTY(bool root READ isRoot)
-    Q_PROPERTY(bool isHtml READ isHtml)
-    Q_PROPERTY(bool isHidden READ isHidden)
-public:
-    typedef QSharedPointer<MessagePart> Ptr;
-    MessagePart(ObjectTreeParser *otp,
-                const QString &text);
-
-    virtual ~MessagePart();
-
-    virtual QString text() const Q_DECL_OVERRIDE;
-    void setText(const QString &text);
-    void setAttachmentFlag(KMime::Content *node);
-    bool isAttachment() const;
-
-    void setIsRoot(bool root);
-    bool isRoot() const;
-
-    virtual bool isHtml() const;
-    virtual bool isHidden() const;
-
-    PartMetaData *partMetaData();
-
-    /* only a function that should be removed if the refactoring is over */
-    virtual void fix() const;
-    virtual void copyContentFrom() const;
-
-    void appendSubPart(const Interface::MessagePart::Ptr &messagePart);
-    const QVector<Interface::MessagePart::Ptr> &subParts() const;
-    bool hasSubParts() const;
-
-    HtmlWriter *htmlWriter() const Q_DECL_OVERRIDE;
-    void setHtmlWriter(HtmlWriter *htmlWriter) const Q_DECL_OVERRIDE;
-
-    Interface::ObjectTreeSource *source() const;
-    KMime::Content *attachmentNode() const;
-
-protected:
-    void parseInternal(KMime::Content *node, bool onlyOneMimePart);
-    QString renderInternalText() const;
-
-    QString mText;
-    ObjectTreeParser *mOtp;
-    PartMetaData mMetaData;
-
-private:
-    QVector<Interface::MessagePart::Ptr> mBlocks;
-
-    KMime::Content *mAttachmentNode;
-    bool mRoot;
-};
-
-class MimeMessagePart : public MessagePart
-{
-    Q_OBJECT
-public:
-    typedef QSharedPointer<MimeMessagePart> Ptr;
-    MimeMessagePart(MimeTreeParser::ObjectTreeParser *otp, KMime::Content *node, bool onlyOneMimePart);
-    virtual ~MimeMessagePart();
-
-    QString text() const Q_DECL_OVERRIDE;
-
-    QString plaintextContent() const Q_DECL_OVERRIDE;
-    QString htmlContent() const Q_DECL_OVERRIDE;
-private:
-    KMime::Content *mNode;
-    bool mOnlyOneMimePart;
-
-    friend class AlternativeMessagePart;
-    friend class ::PartPrivate;
-};
-
-class MessagePartList : public MessagePart
-{
-    Q_OBJECT
-public:
-    typedef QSharedPointer<MessagePartList> Ptr;
-    MessagePartList(MimeTreeParser::ObjectTreeParser *otp);
-    virtual ~MessagePartList();
-
-    QString text() const Q_DECL_OVERRIDE;
-
-    QString plaintextContent() const Q_DECL_OVERRIDE;
-    QString htmlContent() const Q_DECL_OVERRIDE;
-private:
-};
-
-enum IconType {
-    NoIcon = 0,
-    IconExternal,
-    IconInline
-};
-
-class TextMessagePart : public MessagePartList
-{
-    Q_OBJECT
-public:
-    typedef QSharedPointer<TextMessagePart> Ptr;
-    TextMessagePart(MimeTreeParser::ObjectTreeParser *otp, KMime::Content *node, bool drawFrame, bool showLink, bool decryptMessage);
-    virtual ~TextMessagePart();
-
-    KMMsgSignatureState signatureState() const;
-    KMMsgEncryptionState encryptionState() const;
-
-    bool decryptMessage() const;
-
-    bool isHidden() const Q_DECL_OVERRIDE;
-
-    bool showLink() const;
-    bool showTextFrame() const;
-
-protected:
-    KMime::Content *mNode;
-
-private:
-    void parseContent();
-
-    KMMsgSignatureState mSignatureState;
-    KMMsgEncryptionState mEncryptionState;
-    bool mDrawFrame;
-    bool mShowLink;
-    bool mDecryptMessage;
-    bool mIsHidden;
-
-    friend class DefaultRendererPrivate;
-    friend class ObjectTreeParser;
-    friend class ::PartPrivate;
-};
-
-class AttachmentMessagePart : public TextMessagePart
-{
-    Q_OBJECT
-public:
-    typedef QSharedPointer<AttachmentMessagePart> Ptr;
-    AttachmentMessagePart(MimeTreeParser::ObjectTreeParser *otp, KMime::Content *node, bool drawFrame, bool showLink, bool decryptMessage);
-    virtual ~AttachmentMessagePart();
-
-    IconType asIcon() const;
-    bool neverDisplayInline() const;
-    void setNeverDisplayInline(bool displayInline);
-    bool isImage() const;
-    void setIsImage(bool image);
-
-    bool isHidden() const Q_DECL_OVERRIDE;
-
-private:
-    bool mIsImage;
-    bool mNeverDisplayInline;
-};
-
-class HtmlMessagePart : public MessagePart
-{
-    Q_OBJECT
-public:
-    typedef QSharedPointer<HtmlMessagePart> Ptr;
-    HtmlMessagePart(MimeTreeParser::ObjectTreeParser *otp, KMime::Content *node, MimeTreeParser::Interface::ObjectTreeSource *source);
-    virtual ~HtmlMessagePart();
-
-    QString text() const Q_DECL_OVERRIDE;
-
-    void fix() const Q_DECL_OVERRIDE;
-    bool isHtml() const Q_DECL_OVERRIDE;
-
-private:
-    KMime::Content *mNode;
-    Interface::ObjectTreeSource *mSource;
-    QString mBodyHTML;
-    QByteArray mCharset;
-
-    friend class DefaultRendererPrivate;
-    friend class ::PartPrivate;
-};
-
-class AlternativeMessagePart : public MessagePart
-{
-    Q_OBJECT
-public:
-    typedef QSharedPointer<AlternativeMessagePart> Ptr;
-    AlternativeMessagePart(MimeTreeParser::ObjectTreeParser *otp, KMime::Content *node, Util::HtmlMode preferredMode);
-    virtual ~AlternativeMessagePart();
-
-    QString text() const Q_DECL_OVERRIDE;
-
-    Util::HtmlMode preferredMode() const;
-
-    bool isHtml() const Q_DECL_OVERRIDE;
-
-    QString plaintextContent() const Q_DECL_OVERRIDE;
-    QString htmlContent() const Q_DECL_OVERRIDE;
-
-    QList<Util::HtmlMode> availableModes();
-
-    void fix() const Q_DECL_OVERRIDE;
-    void copyContentFrom() const Q_DECL_OVERRIDE;
-private:
-    KMime::Content *mNode;
-
-    Util::HtmlMode mPreferredMode;
-
-    QMap<Util::HtmlMode, KMime::Content *> mChildNodes;
-    QMap<Util::HtmlMode, MimeMessagePart::Ptr> mChildParts;
-
-    friend class DefaultRendererPrivate;
-    friend class ObjectTreeParser;
-    friend class MultiPartAlternativeBodyPartFormatter;
-    friend class ::PartPrivate;
-};
-
-class CertMessagePart : public MessagePart
-{
-    Q_OBJECT
-public:
-    typedef QSharedPointer<CertMessagePart> Ptr;
-    CertMessagePart(MimeTreeParser::ObjectTreeParser *otp, KMime::Content *node, const QGpgME::Protocol *cryptoProto, bool autoImport);
-    virtual ~CertMessagePart();
-
-    QString text() const Q_DECL_OVERRIDE;
-
-private:
-    KMime::Content *mNode;
-    bool mAutoImport;
-    GpgME::ImportResult mImportResult;
-    const QGpgME::Protocol *mCryptoProto;
-    friend class DefaultRendererPrivate;
-};
-
-class EncapsulatedRfc822MessagePart : public MessagePart
-{
-    Q_OBJECT
-public:
-    typedef QSharedPointer<EncapsulatedRfc822MessagePart> Ptr;
-    EncapsulatedRfc822MessagePart(MimeTreeParser::ObjectTreeParser *otp, KMime::Content *node, const KMime::Message::Ptr &message);
-    virtual ~EncapsulatedRfc822MessagePart();
-
-    QString text() const Q_DECL_OVERRIDE;
-
-    void copyContentFrom() const Q_DECL_OVERRIDE;
-    void fix() const Q_DECL_OVERRIDE;
-private:
-    const KMime::Message::Ptr mMessage;
-    KMime::Content *mNode;
-
-    friend class DefaultRendererPrivate;
-};
-
-class EncryptedMessagePart : public MessagePart
-{
-    Q_OBJECT
-    Q_PROPERTY(bool decryptMessage READ decryptMessage WRITE setDecryptMessage)
-    Q_PROPERTY(bool isEncrypted READ isEncrypted)
-    Q_PROPERTY(bool passphraseError READ passphraseError)
-public:
-    typedef QSharedPointer<EncryptedMessagePart> Ptr;
-    EncryptedMessagePart(ObjectTreeParser *otp,
-                         const QString &text,
-                         const QGpgME::Protocol *cryptoProto,
-                         const QString &fromAddress,
-                         KMime::Content *node);
-
-    virtual ~EncryptedMessagePart();
-
-    QString text() const Q_DECL_OVERRIDE;
-
-    void setDecryptMessage(bool decrypt);
-    bool decryptMessage() const;
-
-    void setIsEncrypted(bool encrypted);
-    bool isEncrypted() const;
-
-    bool isDecryptable() const;
-
-    bool passphraseError() const;
-
-    void startDecryption(const QByteArray &text, const QTextCodec *aCodec);
-    void startDecryption(KMime::Content *data = nullptr);
-
-    QByteArray mDecryptedData;
-
-    QString plaintextContent() const Q_DECL_OVERRIDE;
-    QString htmlContent() const Q_DECL_OVERRIDE;
-
-private:
-    /** Handles the dectyptioon of a given content
-     * returns true if the decryption was successfull
-     * if used in async mode, check if mMetaData.inProgress is true, it inicates a running decryption process.
-     */
-    bool okDecryptMIME(KMime::Content &data);
-
-protected:
-    bool mPassphraseError;
-    bool mNoSecKey;
-    const QGpgME::Protocol *mCryptoProto;
-    QString mFromAddress;
-    KMime::Content *mNode;
-    bool mDecryptMessage;
-    QByteArray mVerifiedText;
-    std::vector<GpgME::DecryptionResult::Recipient> mDecryptRecipients;
-
-    friend class DefaultRendererPrivate;
-    friend class ::PartPrivate;
-};
-
-class SignedMessagePart : public MessagePart
-{
-    Q_OBJECT
-    Q_PROPERTY(bool isSigned READ isSigned)
-public:
-    typedef QSharedPointer<SignedMessagePart> Ptr;
-    SignedMessagePart(ObjectTreeParser *otp,
-                      const QString &text,
-                      const QGpgME::Protocol *cryptoProto,
-                      const QString &fromAddress,
-                      KMime::Content *node);
-
-    virtual ~SignedMessagePart();
-
-    void setIsSigned(bool isSigned);
-    bool isSigned() const;
-
-    void startVerification(const QByteArray &text, const QTextCodec *aCodec);
-    void startVerificationDetached(const QByteArray &text, KMime::Content *textNode, const QByteArray &signature);
-
-    QByteArray mDecryptedData;
-    std::vector<GpgME::Signature> mSignatures;
-
-    QString plaintextContent() const Q_DECL_OVERRIDE;
-    QString htmlContent() const Q_DECL_OVERRIDE;
-
-private:
-    /** Handles the verification of data
-     * If signature is empty it is handled as inline signature otherwise as detached signature mode.
-     * Returns true if the verfication was successfull and the block is signed.
-     * If used in async mode, check if mMetaData.inProgress is true, it inicates a running verification process.
-     */
-    bool okVerify(const QByteArray &data, const QByteArray &signature, KMime::Content *textNode);
-
-    void sigStatusToMetaData();
-
-    void setVerificationResult(const CryptoBodyPartMemento *m, KMime::Content *textNode);
-protected:
-    const QGpgME::Protocol *mCryptoProto;
-    QString mFromAddress;
-    KMime::Content *mNode;
-    QByteArray mVerifiedText;
-
-    friend EncryptedMessagePart;
-    friend class DefaultRendererPrivate;
-    friend class ::PartPrivate;
-};
-
-}
-
-#endif //__MIMETREEPARSER_MESSAGEPART_H__
diff --git a/framework/src/domain/mimetreeparser/otp/messagepartrenderer.cpp b/framework/src/domain/mimetreeparser/otp/messagepartrenderer.cpp
deleted file mode 100644
index 7f622268..00000000
--- a/framework/src/domain/mimetreeparser/otp/messagepartrenderer.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-  Copyright (C) 2016 Sandro Knauß <sknauss@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.
-
-  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 "messagepartrenderer.h"
-
-MimeTreeParser::Interface::MessagePartRenderer::~MessagePartRenderer()
-{
-}
diff --git a/framework/src/domain/mimetreeparser/otp/messagepartrenderer.h b/framework/src/domain/mimetreeparser/otp/messagepartrenderer.h
deleted file mode 100644
index a90c17e6..00000000
--- a/framework/src/domain/mimetreeparser/otp/messagepartrenderer.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
-  Copyright (C) 2016 Sandro Knauß <sknauss@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.
-
-  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.
-*/
-
-#ifndef __MIMETREEPARSER_MESSAGEPARTRENDERER_IF_H__
-#define __MIMETREEPARSER_MESSAGEPARTRENDERER_IF_H__
-
-#include <QSharedPointer>
-
-namespace MimeTreeParser
-{
-namespace Interface
-{
-/**
-* Interface for rendering messageparts to html.
-* @author Andras Mantia <sknauss@kde.org>
-*/
-class MessagePartRenderer
-{
-public:
-    typedef QSharedPointer<MessagePartRenderer> Ptr;
-
-    virtual ~MessagePartRenderer();
-
-    virtual QString html() const = 0;
-};
-}
-}
-#endif
diff --git a/framework/src/domain/mimetreeparser/otp/mimetreeparser_debug.cpp b/framework/src/domain/mimetreeparser/otp/mimetreeparser_debug.cpp
deleted file mode 100644
index f8ac36cd..00000000
--- a/framework/src/domain/mimetreeparser/otp/mimetreeparser_debug.cpp
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "mimetreeparser_debug.h"
-
-Q_LOGGING_CATEGORY(MIMETREEPARSER_LOG, "mimetreeparser")
diff --git a/framework/src/domain/mimetreeparser/otp/mimetreeparser_debug.h b/framework/src/domain/mimetreeparser/otp/mimetreeparser_debug.h
deleted file mode 100644
index ddfa6315..00000000
--- a/framework/src/domain/mimetreeparser/otp/mimetreeparser_debug.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#pragma once
-
-#include <QLoggingCategory>
-Q_DECLARE_LOGGING_CATEGORY(MIMETREEPARSER_LOG)
diff --git a/framework/src/domain/mimetreeparser/otp/multipartalternative.cpp b/framework/src/domain/mimetreeparser/otp/multipartalternative.cpp
deleted file mode 100644
index 42c70e28..00000000
--- a/framework/src/domain/mimetreeparser/otp/multipartalternative.cpp
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
-   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 "multipartalternative.h"
-
-#include "utils.h"
-
-#include "objecttreeparser.h"
-#include "messagepart.h"
-
-#include <KMime/Content>
-
-#include "mimetreeparser_debug.h"
-
-using namespace MimeTreeParser;
-
-const MultiPartAlternativeBodyPartFormatter *MultiPartAlternativeBodyPartFormatter::self;
-
-const Interface::BodyPartFormatter *MultiPartAlternativeBodyPartFormatter::create()
-{
-    if (!self) {
-        self = new MultiPartAlternativeBodyPartFormatter();
-    }
-    return self;
-}
-Interface::BodyPartFormatter::Result MultiPartAlternativeBodyPartFormatter::format(Interface::BodyPart *part, HtmlWriter *writer) const
-{
-    Q_UNUSED(writer)
-    const auto p = process(*part);
-    const auto mp = static_cast<MessagePart *>(p.data());
-    if (mp) {
-        mp->html(false);
-        return Ok;
-    }
-    return Failed;
-}
-
-Interface::MessagePart::Ptr MultiPartAlternativeBodyPartFormatter::process(Interface::BodyPart &part) const
-{
-    KMime::Content *node = part.content();
-    if (node->contents().isEmpty()) {
-        return MessagePart::Ptr();
-    }
-
-    auto preferredMode = part.source()->preferredMode();
-    AlternativeMessagePart::Ptr mp(new AlternativeMessagePart(part.objectTreeParser(), node, preferredMode));
-    if (mp->mChildNodes.isEmpty()) {
-        MimeMessagePart::Ptr _mp(new MimeMessagePart(part.objectTreeParser(), node->contents().at(0), false));
-        return _mp;
-    }
-
-    KMime::Content *dataIcal = mp->mChildNodes.contains(Util::MultipartIcal) ? mp->mChildNodes[Util::MultipartIcal] : nullptr;
-    KMime::Content *dataHtml = mp->mChildNodes.contains(Util::MultipartHtml) ? mp->mChildNodes[Util::MultipartHtml] : nullptr;
-    KMime::Content *dataPlain = mp->mChildNodes.contains(Util::MultipartPlain) ? mp->mChildNodes[Util::MultipartPlain] : nullptr;
-
-    // Make sure that in default ical is prefered over html and plain text
-    if (dataIcal && ((preferredMode != Util::MultipartHtml && preferredMode != Util::MultipartPlain))) {
-        if (dataHtml) {
-            part.nodeHelper()->setNodeProcessed(dataHtml, false);
-        }
-        if (dataPlain) {
-            part.nodeHelper()->setNodeProcessed(dataPlain, false);
-        }
-        preferredMode = Util::MultipartIcal;
-    } else if ((dataHtml && (preferredMode == Util::MultipartHtml || preferredMode == Util::Html)) ||
-               (dataHtml && dataPlain && dataPlain->body().isEmpty())) {
-        if (dataPlain) {
-            part.nodeHelper()->setNodeProcessed(dataPlain, false);
-        }
-        preferredMode = Util::MultipartHtml;
-    } else if (!(preferredMode == Util::MultipartHtml) && dataPlain) {
-        part.nodeHelper()->setNodeProcessed(dataHtml, false);
-        preferredMode = Util::MultipartPlain;
-    }
-    part.source()->setHtmlMode(preferredMode, mp->availableModes());
-    mp->mPreferredMode = preferredMode;
-    return mp;
-}
diff --git a/framework/src/domain/mimetreeparser/otp/multipartalternative.h b/framework/src/domain/mimetreeparser/otp/multipartalternative.h
deleted file mode 100644
index 78e5ef38..00000000
--- a/framework/src/domain/mimetreeparser/otp/multipartalternative.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
-   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.
-*/
-
-#ifndef __MIMETREEPARSER_BODYFORAMATTER_MULTIPARTALTERNATIVE_H__
-#define __MIMETREEPARSER_BODYFORAMATTER_MULTIPARTALTERNATIVE_H__
-
-#include "bodypartformatter.h"
-#include "bodypart.h"
-
-namespace MimeTreeParser
-{
-
-class MultiPartAlternativeBodyPartFormatter : public Interface::BodyPartFormatter
-{
-    static const MultiPartAlternativeBodyPartFormatter *self;
-public:
-    Interface::MessagePart::Ptr process(Interface::BodyPart &part) const Q_DECL_OVERRIDE;
-    Interface::BodyPartFormatter::Result format(Interface::BodyPart *, HtmlWriter *) const Q_DECL_OVERRIDE;
-    using Interface::BodyPartFormatter::format;
-    static const Interface::BodyPartFormatter *create();
-};
-
-}
-
-#endif
diff --git a/framework/src/domain/mimetreeparser/otp/multipartencrypted.cpp b/framework/src/domain/mimetreeparser/otp/multipartencrypted.cpp
deleted file mode 100644
index 7a049318..00000000
--- a/framework/src/domain/mimetreeparser/otp/multipartencrypted.cpp
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
-   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 "multipartencrypted.h"
-
-#include "utils.h"
-
-#include "objecttreeparser.h"
-#include "messagepart.h"
-
-#include <KMime/Content>
-
-#include <QGpgME/Protocol>
-
-#include "mimetreeparser_debug.h"
-
-using namespace MimeTreeParser;
-
-const MultiPartEncryptedBodyPartFormatter *MultiPartEncryptedBodyPartFormatter::self;
-
-const Interface::BodyPartFormatter *MultiPartEncryptedBodyPartFormatter::create()
-{
-    if (!self) {
-        self = new MultiPartEncryptedBodyPartFormatter();
-    }
-    return self;
-}
-Interface::BodyPartFormatter::Result MultiPartEncryptedBodyPartFormatter::format(Interface::BodyPart *part, HtmlWriter *writer) const
-{
-    Q_UNUSED(writer)
-    const auto p = process(*part);
-    const auto mp = static_cast<MessagePart *>(p.data());
-    if (mp) {
-        mp->html(false);
-        return Ok;
-    }
-    return Failed;
-}
-
-Interface::MessagePart::Ptr MultiPartEncryptedBodyPartFormatter::process(Interface::BodyPart &part) const
-{
-    KMime::Content *node = part.content();
-
-    if (node->contents().isEmpty()) {
-        Q_ASSERT(false);
-        return MessagePart::Ptr();
-    }
-
-    const QGpgME::Protocol *useThisCryptProto = nullptr;
-
-    /*
-    ATTENTION: This code is to be replaced by the new 'auto-detect' feature. --------------------------------------
-    */
-    KMime::Content *data = findTypeInDirectChilds(node, "application/octet-stream");
-    if (data) {
-        useThisCryptProto = QGpgME::openpgp();
-    }
-    if (!data) {
-        data = findTypeInDirectChilds(node, "application/pkcs7-mime");
-        if (data) {
-            useThisCryptProto = QGpgME::smime();
-        }
-    }
-    /*
-    ---------------------------------------------------------------------------------------------------------------
-    */
-
-    if (!data) {
-        return MessagePart::Ptr(new MimeMessagePart(part.objectTreeParser(), node->contents().at(0), false));
-    }
-
-    part.nodeHelper()->setEncryptionState(node, KMMsgFullyEncrypted);
-
-    EncryptedMessagePart::Ptr mp(new EncryptedMessagePart(part.objectTreeParser(),
-                                 data->decodedText(), useThisCryptProto,
-                                 part.nodeHelper()->fromAsString(data), node));
-    mp->setIsEncrypted(true);
-    mp->setDecryptMessage(part.source()->decryptMessage());
-    PartMetaData *messagePart(mp->partMetaData());
-    if (!part.source()->decryptMessage()) {
-        part.nodeHelper()->setNodeProcessed(data, false);  // Set the data node to done to prevent it from being processed
-    } else if (KMime::Content *newNode = part.nodeHelper()->decryptedNodeForContent(data)) {
-        // if we already have a decrypted node for part.objectTreeParser() encrypted node, don't do the decryption again
-        return MessagePart::Ptr(new MimeMessagePart(part.objectTreeParser(), newNode, true));
-    } else {
-        mp->startDecryption(data);
-
-        qCDebug(MIMETREEPARSER_LOG) << "decrypted, signed?:" << messagePart->isSigned;
-
-        if (!messagePart->inProgress) {
-            part.nodeHelper()->setNodeProcessed(data, false);   // Set the data node to done to prevent it from being processed
-        }
-    }
-    return mp;
-}
diff --git a/framework/src/domain/mimetreeparser/otp/multipartencrypted.h b/framework/src/domain/mimetreeparser/otp/multipartencrypted.h
deleted file mode 100644
index 0d2e01a8..00000000
--- a/framework/src/domain/mimetreeparser/otp/multipartencrypted.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
-   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.
-*/
-
-#ifndef __MIMETREEPARSER_BODYFORAMATTER_MULTIPARTENCRYPTED_H__
-#define __MIMETREEPARSER_BODYFORAMATTER_MULTIPARTENCRYPTED_H__
-
-#include "bodypartformatter.h"
-#include "bodypart.h"
-
-namespace MimeTreeParser
-{
-
-class MultiPartEncryptedBodyPartFormatter : public Interface::BodyPartFormatter
-{
-    static const MultiPartEncryptedBodyPartFormatter *self;
-public:
-    Interface::MessagePart::Ptr process(Interface::BodyPart &part) const Q_DECL_OVERRIDE;
-    Interface::BodyPartFormatter::Result format(Interface::BodyPart *, HtmlWriter *) const Q_DECL_OVERRIDE;
-    using Interface::BodyPartFormatter::format;
-    static const Interface::BodyPartFormatter *create();
-};
-
-}
-
-#endif
diff --git a/framework/src/domain/mimetreeparser/otp/multipartmixed.cpp b/framework/src/domain/mimetreeparser/otp/multipartmixed.cpp
deleted file mode 100644
index 43056e51..00000000
--- a/framework/src/domain/mimetreeparser/otp/multipartmixed.cpp
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
-   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 "multipartmixed.h"
-
-#include "objecttreeparser.h"
-#include "messagepart.h"
-
-#include <KMime/Content>
-
-#include "mimetreeparser_debug.h"
-
-using namespace MimeTreeParser;
-
-const MultiPartMixedBodyPartFormatter *MultiPartMixedBodyPartFormatter::self;
-
-const Interface::BodyPartFormatter *MultiPartMixedBodyPartFormatter::create()
-{
-    if (!self) {
-        self = new MultiPartMixedBodyPartFormatter();
-    }
-    return self;
-}
-Interface::BodyPartFormatter::Result MultiPartMixedBodyPartFormatter::format(Interface::BodyPart *part, HtmlWriter *writer) const
-{
-    Q_UNUSED(writer)
-    const auto p = process(*part);
-    const auto mp = static_cast<MessagePart *>(p.data());
-    if (mp) {
-        mp->html(false);
-        return Ok;
-    }
-    return Failed;
-}
-
-Interface::MessagePart::Ptr MultiPartMixedBodyPartFormatter::process(Interface::BodyPart &part) const
-{
-    if (part.content()->contents().isEmpty()) {
-        return MessagePart::Ptr();
-    }
-
-    // normal treatment of the parts in the mp/mixed container
-    MimeMessagePart::Ptr mp(new MimeMessagePart(part.objectTreeParser(), part.content()->contents().at(0), false));
-    return mp;
-}
diff --git a/framework/src/domain/mimetreeparser/otp/multipartmixed.h b/framework/src/domain/mimetreeparser/otp/multipartmixed.h
deleted file mode 100644
index 0029501b..00000000
--- a/framework/src/domain/mimetreeparser/otp/multipartmixed.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
-   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.
-*/
-
-#ifndef __MIMETREEPARSER_BODYFORAMATTER_MULTIPARTMIXED_H__
-#define __MIMETREEPARSER_BODYFORAMATTER_MULTIPARTMIXED_H__
-
-#include "bodypartformatter.h"
-#include "bodypart.h"
-
-namespace MimeTreeParser
-{
-
-class MultiPartMixedBodyPartFormatter : public Interface::BodyPartFormatter
-{
-    static const MultiPartMixedBodyPartFormatter *self;
-public:
-    Interface::MessagePart::Ptr process(Interface::BodyPart &part) const Q_DECL_OVERRIDE;
-    Interface::BodyPartFormatter::Result format(Interface::BodyPart *, HtmlWriter *) const Q_DECL_OVERRIDE;
-    using Interface::BodyPartFormatter::format;
-    static const Interface::BodyPartFormatter *create();
-};
-
-}
-
-#endif
diff --git a/framework/src/domain/mimetreeparser/otp/multipartsigned.cpp b/framework/src/domain/mimetreeparser/otp/multipartsigned.cpp
deleted file mode 100644
index cb0def6c..00000000
--- a/framework/src/domain/mimetreeparser/otp/multipartsigned.cpp
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
-   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 "multipartsigned.h"
-
-#include "objecttreeparser.h"
-#include "messagepart.h"
-
-#include <KMime/Content>
-
-#include <QGpgME/Protocol>
-
-#include "mimetreeparser_debug.h"
-
-#include <QTextCodec>
-
-using namespace MimeTreeParser;
-
-const MultiPartSignedBodyPartFormatter *MultiPartSignedBodyPartFormatter::self;
-
-const Interface::BodyPartFormatter *MultiPartSignedBodyPartFormatter::create()
-{
-    if (!self) {
-        self = new MultiPartSignedBodyPartFormatter();
-    }
-    return self;
-}
-Interface::BodyPartFormatter::Result MultiPartSignedBodyPartFormatter::format(Interface::BodyPart *part, HtmlWriter *writer) const
-{
-    Q_UNUSED(writer)
-    const auto p = process(*part);
-    const auto mp = static_cast<MessagePart *>(p.data());
-    if (mp) {
-        mp->html(false);
-        return Ok;
-    }
-    return Failed;
-}
-
-Interface::MessagePart::Ptr MultiPartSignedBodyPartFormatter::process(Interface::BodyPart &part) const
-{
-    KMime::Content *node = part.content();
-    if (node->contents().size() != 2) {
-        qCDebug(MIMETREEPARSER_LOG) << "mulitpart/signed must have exactly two child parts!" << endl
-                                    << "processing as multipart/mixed";
-        if (!node->contents().isEmpty()) {
-            return MessagePart::Ptr(new MimeMessagePart(part.objectTreeParser(), node->contents().at(0), false));
-        } else {
-            return MessagePart::Ptr();
-        }
-    }
-
-    KMime::Content *signedData =  node->contents().at(0);
-    KMime::Content *signature = node->contents().at(1);
-    Q_ASSERT(signedData);
-    Q_ASSERT(signature);
-
-    QString protocolContentType = node->contentType()->parameter(QStringLiteral("protocol")).toLower();
-    const QString signatureContentType = QLatin1String(signature->contentType()->mimeType().toLower());
-    if (protocolContentType.isEmpty()) {
-        qCWarning(MIMETREEPARSER_LOG) << "Message doesn't set the protocol for the multipart/signed content-type, "
-                                      "using content-type of the signature:" << signatureContentType;
-        protocolContentType = signatureContentType;
-    }
-
-    const QGpgME::Protocol *protocol = nullptr;
-    if (protocolContentType == QLatin1String("application/pkcs7-signature") ||
-            protocolContentType == QLatin1String("application/x-pkcs7-signature")) {
-        protocol = QGpgME::smime();
-    } else if (protocolContentType == QLatin1String("application/pgp-signature") ||
-               protocolContentType == QLatin1String("application/x-pgp-signature")) {
-        protocol = QGpgME::openpgp();
-    }
-
-    if (!protocol) {
-        return MessagePart::Ptr(new MimeMessagePart(part.objectTreeParser(), signedData, false));
-    }
-
-    part.nodeHelper()->setNodeProcessed(signature, true);
-
-    part.nodeHelper()->setSignatureState(node, KMMsgFullySigned);
-
-    const QByteArray cleartext = KMime::LFtoCRLF(signedData->encodedContent());
-    const QTextCodec *aCodec(part.objectTreeParser()->codecFor(signedData));
-
-    SignedMessagePart::Ptr mp(new SignedMessagePart(part.objectTreeParser(),
-                              aCodec->toUnicode(cleartext), protocol,
-                              part.nodeHelper()->fromAsString(node), signature));
-    PartMetaData *messagePart(mp->partMetaData());
-
-    if (protocol) {
-        mp->startVerificationDetached(cleartext, signedData, signature->decodedContent());
-    } else {
-        messagePart->auditLogError = GpgME::Error(GPG_ERR_NOT_IMPLEMENTED);
-    }
-
-    return mp;
-}
diff --git a/framework/src/domain/mimetreeparser/otp/multipartsigned.h b/framework/src/domain/mimetreeparser/otp/multipartsigned.h
deleted file mode 100644
index 4b8921ad..00000000
--- a/framework/src/domain/mimetreeparser/otp/multipartsigned.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
-   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.
-*/
-
-#ifndef __MIMETREEPARSER_BODYFORAMATTER_MULTIPARTSIGNED_H__
-#define __MIMETREEPARSER_BODYFORAMATTER_MULTIPARTSIGNED_H__
-
-#include "bodypartformatter.h"
-#include "bodypart.h"
-
-namespace MimeTreeParser
-{
-
-class MultiPartSignedBodyPartFormatter : public Interface::BodyPartFormatter
-{
-    static const MultiPartSignedBodyPartFormatter *self;
-public:
-    Interface::MessagePart::Ptr process(Interface::BodyPart &part) const Q_DECL_OVERRIDE;
-    Interface::BodyPartFormatter::Result format(Interface::BodyPart *, HtmlWriter *) const Q_DECL_OVERRIDE;
-    using Interface::BodyPartFormatter::format;
-    static const Interface::BodyPartFormatter *create();
-};
-
-}
-
-#endif
diff --git a/framework/src/domain/mimetreeparser/otp/nodehelper.cpp b/framework/src/domain/mimetreeparser/otp/nodehelper.cpp
deleted file mode 100644
index 8e224f1b..00000000
--- a/framework/src/domain/mimetreeparser/otp/nodehelper.cpp
+++ /dev/null
@@ -1,1069 +0,0 @@
-/*
-  Copyright (C) 2009 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.net
-  Copyright (c) 2009 Andras Mantia <andras@kdab.net>
-
-  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.
-
-  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 "nodehelper.h"
-#include "mimetreeparser_debug.h"
-#include "partmetadata.h"
-#include "bodypart.h"
-#include "attachmenttemporaryfilesdirs.h"
-
-#include <KMime/Content>
-#include <KMime/Message>
-#include <KMime/Headers>
-
-#include <QTemporaryFile>
-#include <KLocalizedString>
-#include <kcharsets.h>
-
-#include <QUrl>
-#include <QDir>
-#include <QTextCodec>
-
-#include <string>
-#include <sstream>
-#include <algorithm>
-#include <KCharsets>
-#include <QMimeDatabase>
-#include <QMimeType>
-#include <QFileDevice>
-
-namespace MimeTreeParser
-{
-
-QStringList replySubjPrefixes(QStringList() << QStringLiteral("Re\\s*:") << QStringLiteral("Re\\[\\d+\\]:") << QStringLiteral("Re\\d+:"));
-QStringList forwardSubjPrefixes(QStringList() << QStringLiteral("Fwd:") << QStringLiteral("FW:"));
-
-NodeHelper::NodeHelper() :
-    mAttachmentFilesDir(new AttachmentTemporaryFilesDirs())
-{
-    //TODO(Andras) add methods to modify these prefixes
-
-    mLocalCodec = QTextCodec::codecForLocale();
-
-    // In the case of Japan. Japanese locale name is "eucjp" but
-    // The Japanese mail systems normally used "iso-2022-jp" of locale name.
-    // We want to change locale name from eucjp to iso-2022-jp at KMail only.
-
-    // (Introduction to i18n, 6.6 Limit of Locale technology):
-    // EUC-JP is the de-facto standard for UNIX systems, ISO 2022-JP
-    // is the standard for Internet, and Shift-JIS is the encoding
-    // for Windows and Macintosh.
-    if (mLocalCodec) {
-        const QByteArray codecNameLower = mLocalCodec->name().toLower();
-        if (codecNameLower == "eucjp"
-#if defined Q_OS_WIN || defined Q_OS_MACX
-                || codecNameLower == "shift-jis" // OK?
-#endif
-           ) {
-            mLocalCodec = QTextCodec::codecForName("jis7");
-            // QTextCodec *cdc = QTextCodec::codecForName("jis7");
-            // QTextCodec::setCodecForLocale(cdc);
-            // KLocale::global()->setEncoding(cdc->mibEnum());
-        }
-    }
-}
-
-NodeHelper::~NodeHelper()
-{
-    if (mAttachmentFilesDir) {
-        mAttachmentFilesDir->forceCleanTempFiles();
-        delete mAttachmentFilesDir;
-        mAttachmentFilesDir = nullptr;
-    }
-    clear();
-}
-
-void NodeHelper::setNodeProcessed(KMime::Content *node, bool recurse)
-{
-    if (!node) {
-        return;
-    }
-    mProcessedNodes.append(node);
-    qCDebug(MIMETREEPARSER_LOG) << "Node processed: " << node->index().toString() << node->contentType()->as7BitString();
-    //<< " decodedContent" << node->decodedContent();
-    if (recurse) {
-        const auto contents = node->contents();
-        for (KMime::Content *c : contents) {
-            setNodeProcessed(c, true);
-        }
-    }
-}
-
-void NodeHelper::setNodeUnprocessed(KMime::Content *node, bool recurse)
-{
-    if (!node) {
-        return;
-    }
-    mProcessedNodes.removeAll(node);
-
-    //avoid double addition of extra nodes, eg. encrypted attachments
-    const QMap<KMime::Content *, QList<KMime::Content *> >::iterator it = mExtraContents.find(node);
-    if (it != mExtraContents.end()) {
-        Q_FOREACH (KMime::Content *c, it.value()) {
-            KMime::Content *p = c->parent();
-            if (p) {
-                p->removeContent(c);
-            }
-        }
-        qDeleteAll(it.value());
-        qCDebug(MIMETREEPARSER_LOG) << "mExtraContents deleted for" << it.key();
-        mExtraContents.erase(it);
-    }
-
-    qCDebug(MIMETREEPARSER_LOG) << "Node UNprocessed: " << node;
-    if (recurse) {
-        const auto contents = node->contents();
-        for (KMime::Content *c : contents) {
-            setNodeUnprocessed(c, true);
-        }
-    }
-}
-
-bool NodeHelper::nodeProcessed(KMime::Content *node) const
-{
-    if (!node) {
-        return true;
-    }
-    return mProcessedNodes.contains(node);
-}
-
-static void clearBodyPartMemento(QMap<QByteArray, Interface::BodyPartMemento *> &bodyPartMementoMap)
-{
-    for (QMap<QByteArray, Interface::BodyPartMemento *>::iterator
-            it = bodyPartMementoMap.begin(), end = bodyPartMementoMap.end();
-            it != end; ++it) {
-        Interface::BodyPartMemento *memento = it.value();
-        memento->detach();
-        delete memento;
-    }
-    bodyPartMementoMap.clear();
-}
-
-void NodeHelper::clear()
-{
-    mProcessedNodes.clear();
-    mEncryptionState.clear();
-    mSignatureState.clear();
-    mOverrideCodecs.clear();
-    std::for_each(mBodyPartMementoMap.begin(), mBodyPartMementoMap.end(),
-                  &clearBodyPartMemento);
-    mBodyPartMementoMap.clear();
-    QMap<KMime::Content *, QList<KMime::Content *> >::ConstIterator end(mExtraContents.constEnd());
-
-    for (QMap<KMime::Content *, QList<KMime::Content *> >::ConstIterator it = mExtraContents.constBegin(); it != end; ++it) {
-        Q_FOREACH (KMime::Content *c, it.value()) {
-            KMime::Content *p = c->parent();
-            if (p) {
-                p->removeContent(c);
-            }
-        }
-        qDeleteAll(it.value());
-        qCDebug(MIMETREEPARSER_LOG) << "mExtraContents deleted for" << it.key();
-    }
-    mExtraContents.clear();
-    mDisplayEmbeddedNodes.clear();
-    mDisplayHiddenNodes.clear();
-}
-
-void NodeHelper::setEncryptionState(const KMime::Content *node, const KMMsgEncryptionState state)
-{
-    mEncryptionState[node] = state;
-}
-
-KMMsgEncryptionState NodeHelper::encryptionState(const KMime::Content *node) const
-{
-    return mEncryptionState.value(node, KMMsgNotEncrypted);
-}
-
-void NodeHelper::setSignatureState(const KMime::Content *node, const KMMsgSignatureState state)
-{
-    mSignatureState[node] = state;
-}
-
-KMMsgSignatureState NodeHelper::signatureState(const KMime::Content *node) const
-{
-    return mSignatureState.value(node, KMMsgNotSigned);
-}
-
-PartMetaData NodeHelper::partMetaData(KMime::Content *node)
-{
-    return mPartMetaDatas.value(node, PartMetaData());
-}
-
-void NodeHelper::setPartMetaData(KMime::Content *node, const PartMetaData &metaData)
-{
-    mPartMetaDatas.insert(node, metaData);
-}
-
-QString NodeHelper::writeNodeToTempFile(KMime::Content *node)
-{
-    // If the message part is already written to a file, no point in doing it again.
-    // This function is called twice actually, once from the rendering of the attachment
-    // in the body and once for the header.
-    QUrl existingFileName = tempFileUrlFromNode(node);
-    if (!existingFileName.isEmpty()) {
-        return existingFileName.toLocalFile();
-    }
-
-    QString fname = createTempDir(persistentIndex(node));
-    if (fname.isEmpty()) {
-        return QString();
-    }
-
-    QString fileName = NodeHelper::fileName(node);
-    // strip off a leading path
-    int slashPos = fileName.lastIndexOf(QLatin1Char('/'));
-    if (-1 != slashPos) {
-        fileName = fileName.mid(slashPos + 1);
-    }
-    if (fileName.isEmpty()) {
-        fileName = QStringLiteral("unnamed");
-    }
-    fname += QLatin1Char('/') + fileName;
-
-    qCDebug(MIMETREEPARSER_LOG) << "Create temp file: " << fname;
-    QByteArray data = node->decodedContent();
-    if (node->contentType()->isText() && !data.isEmpty()) {
-        // convert CRLF to LF before writing text attachments to disk
-        data = KMime::CRLFtoLF(data);
-    }
-    QFile f(fname);
-    if (!f.open(QIODevice::ReadWrite)) {
-        qCWarning(MIMETREEPARSER_LOG) << "Failed to write note to file:" << f.errorString();
-        return QString();
-    }
-    f.write(data);
-    mAttachmentFilesDir->addTempFile(fname);
-    // make file read-only so that nobody gets the impression that he might
-    // edit attached files (cf. bug #52813)
-    f.setPermissions(QFileDevice::ReadUser);
-    f.close();
-
-    return fname;
-}
-
-QUrl NodeHelper::tempFileUrlFromNode(const KMime::Content *node)
-{
-    if (!node) {
-        return QUrl();
-    }
-
-    const QString index = persistentIndex(node);
-
-    foreach (const QString &path, mAttachmentFilesDir->temporaryFiles()) {
-        const int right = path.lastIndexOf(QLatin1Char('/'));
-        int left = path.lastIndexOf(QLatin1String(".index."), right);
-        if (left != -1) {
-            left += 7;
-        }
-
-        QStringRef storedIndex(&path, left, right - left);
-        if (left != -1 && storedIndex == index) {
-            return QUrl::fromLocalFile(path);
-        }
-    }
-    return QUrl();
-}
-
-QString NodeHelper::createTempDir(const QString &param)
-{
-    QTemporaryFile *tempFile = new QTemporaryFile(QDir::tempPath() + QLatin1String("/messageviewer_XXXXXX") + QLatin1String(".index.") + param);
-    tempFile->open();
-    const QString fname = tempFile->fileName();
-    delete tempFile;
-
-    QFile fFile(fname);
-    if (!(fFile.permissions() & QFileDevice::WriteUser)) {
-        // Not there or not writable
-        if (!QDir().mkpath(fname) ||
-                !fFile.setPermissions(QFileDevice::WriteUser | QFileDevice::ReadUser | QFileDevice::ExeUser)) {
-            return QString(); //failed create
-        }
-    }
-
-    Q_ASSERT(!fname.isNull());
-
-    mAttachmentFilesDir->addTempDir(fname);
-    return fname;
-}
-
-void NodeHelper::forceCleanTempFiles()
-{
-    mAttachmentFilesDir->forceCleanTempFiles();
-    delete mAttachmentFilesDir;
-    mAttachmentFilesDir = nullptr;
-}
-
-void NodeHelper::removeTempFiles()
-{
-    //Don't delete it it will delete in class
-    mAttachmentFilesDir->removeTempFiles();
-    mAttachmentFilesDir = new AttachmentTemporaryFilesDirs();
-}
-
-void NodeHelper::addTempFile(const QString &file)
-{
-    mAttachmentFilesDir->addTempFile(file);
-}
-
-bool NodeHelper::isInEncapsulatedMessage(KMime::Content *node)
-{
-    const KMime::Content *const topLevel = node->topLevel();
-    const KMime::Content *cur = node;
-    while (cur && cur != topLevel) {
-        const bool parentIsMessage = cur->parent() && cur->parent()->contentType(false) &&
-                                     cur->parent()->contentType()->mimeType().toLower() == "message/rfc822";
-        if (parentIsMessage && cur->parent() != topLevel) {
-            return true;
-        }
-        cur = cur->parent();
-    }
-    return false;
-}
-
-QByteArray NodeHelper::charset(KMime::Content *node)
-{
-    if (node->contentType(false)) {
-        return node->contentType(false)->charset();
-    } else {
-        return node->defaultCharset();
-    }
-}
-
-KMMsgEncryptionState NodeHelper::overallEncryptionState(KMime::Content *node) const
-{
-    KMMsgEncryptionState myState = KMMsgEncryptionStateUnknown;
-    if (!node) {
-        return myState;
-    }
-
-    KMime::Content *parent = node->parent();
-    auto contents = parent ?  parent->contents() : KMime::Content::List();
-    if (contents.isEmpty()) {
-        contents.append(node);
-    }
-    int i = contents.indexOf(const_cast<KMime::Content *>(node));
-    for (; i < contents.size(); ++i) {
-        auto next = contents.at(i);
-        KMMsgEncryptionState otherState = encryptionState(next);
-
-        // NOTE: children are tested ONLY when parent is not encrypted
-        if (otherState == KMMsgNotEncrypted && !next->contents().isEmpty()) {
-            otherState = overallEncryptionState(next->contents().at(0));
-        }
-
-        if (otherState == KMMsgNotEncrypted && !extraContents(next).isEmpty()) {
-            otherState = overallEncryptionState(extraContents(next).at(0));
-        }
-
-        if (next == node) {
-            myState = otherState;
-        }
-
-        switch (otherState) {
-        case KMMsgEncryptionStateUnknown:
-            break;
-        case KMMsgNotEncrypted:
-            if (myState == KMMsgFullyEncrypted) {
-                myState = KMMsgPartiallyEncrypted;
-            } else if (myState != KMMsgPartiallyEncrypted) {
-                myState = KMMsgNotEncrypted;
-            }
-            break;
-        case KMMsgPartiallyEncrypted:
-            myState = KMMsgPartiallyEncrypted;
-            break;
-        case KMMsgFullyEncrypted:
-            if (myState != KMMsgFullyEncrypted) {
-                myState = KMMsgPartiallyEncrypted;
-            }
-            break;
-        case KMMsgEncryptionProblematic:
-            break;
-        }
-    }
-
-    qCDebug(MIMETREEPARSER_LOG) << "\n\n  KMMsgEncryptionState:" << myState;
-
-    return myState;
-}
-
-KMMsgSignatureState NodeHelper::overallSignatureState(KMime::Content *node) const
-{
-    KMMsgSignatureState myState = KMMsgSignatureStateUnknown;
-    if (!node) {
-        return myState;
-    }
-
-    KMime::Content *parent = node->parent();
-    auto contents = parent ? parent->contents() : KMime::Content::List();
-    if (contents.isEmpty()) {
-        contents.append(node);
-    }
-    int i = contents.indexOf(const_cast<KMime::Content *>(node));
-    for (; i < contents.size(); ++i) {
-        auto next = contents.at(i);
-        KMMsgSignatureState otherState = signatureState(next);
-
-        // NOTE: children are tested ONLY when parent is not encrypted
-        if (otherState == KMMsgNotSigned && !next->contents().isEmpty()) {
-            otherState = overallSignatureState(next->contents().at(0));
-        }
-
-        if (otherState == KMMsgNotSigned && !extraContents(next).isEmpty()) {
-            otherState = overallSignatureState(extraContents(next).at(0));
-        }
-
-        if (next == node) {
-            myState = otherState;
-        }
-
-        switch (otherState) {
-        case KMMsgSignatureStateUnknown:
-            break;
-        case KMMsgNotSigned:
-            if (myState == KMMsgFullySigned) {
-                myState = KMMsgPartiallySigned;
-            } else if (myState != KMMsgPartiallySigned) {
-                myState = KMMsgNotSigned;
-            }
-            break;
-        case KMMsgPartiallySigned:
-            myState = KMMsgPartiallySigned;
-            break;
-        case KMMsgFullySigned:
-            if (myState != KMMsgFullySigned) {
-                myState = KMMsgPartiallySigned;
-            }
-            break;
-        case KMMsgSignatureProblematic:
-            break;
-        }
-    }
-
-    qCDebug(MIMETREEPARSER_LOG) << "\n\n  KMMsgSignatureState:" << myState;
-
-    return myState;
-}
-
-void NodeHelper::magicSetType(KMime::Content *node, bool aAutoDecode)
-{
-    const QByteArray body = (aAutoDecode) ? node->decodedContent() : node->body();
-    QMimeDatabase db;
-    QMimeType mime = db.mimeTypeForData(body);
-
-    QString mimetype = mime.name();
-    node->contentType()->setMimeType(mimetype.toLatin1());
-}
-
-// static
-QString NodeHelper::replacePrefixes(const QString &str,
-                                    const QStringList &prefixRegExps,
-                                    bool replace,
-                                    const QString &newPrefix)
-{
-    bool recognized = false;
-    // construct a big regexp that
-    // 1. is anchored to the beginning of str (sans whitespace)
-    // 2. matches at least one of the part regexps in prefixRegExps
-    QString bigRegExp = QStringLiteral("^(?:\\s+|(?:%1))+\\s*")
-                        .arg(prefixRegExps.join(QStringLiteral(")|(?:")));
-    QRegExp rx(bigRegExp, Qt::CaseInsensitive);
-    if (!rx.isValid()) {
-        qCWarning(MIMETREEPARSER_LOG) << "bigRegExp = \""
-                                      << bigRegExp << "\"\n"
-                                      << "prefix regexp is invalid!";
-        // try good ole Re/Fwd:
-        recognized = str.startsWith(newPrefix);
-    } else { // valid rx
-        QString tmp = str;
-        if (rx.indexIn(tmp) == 0) {
-            recognized = true;
-            if (replace) {
-                return tmp.replace(0, rx.matchedLength(), newPrefix + QLatin1Char(' '));
-            }
-        }
-    }
-    if (!recognized) {
-        return newPrefix + QLatin1Char(' ') + str;
-    } else {
-        return str;
-    }
-}
-
-QString NodeHelper::cleanSubject(KMime::Message *message)
-{
-    return cleanSubject(message, replySubjPrefixes + forwardSubjPrefixes,
-                        true, QString()).trimmed();
-}
-
-QString NodeHelper::cleanSubject(KMime::Message *message,
-                                 const QStringList &prefixRegExps,
-                                 bool replace,
-                                 const QString &newPrefix)
-{
-    QString cleanStr;
-    if (message) {
-        cleanStr =
-            NodeHelper::replacePrefixes(
-                message->subject()->asUnicodeString(), prefixRegExps, replace, newPrefix);
-    }
-    return cleanStr;
-}
-
-void NodeHelper::setOverrideCodec(KMime::Content *node, const QTextCodec *codec)
-{
-    if (!node) {
-        return;
-    }
-
-    mOverrideCodecs[node] = codec;
-}
-
-const QTextCodec *NodeHelper::codec(KMime::Content *node)
-{
-    if (! node) {
-        return mLocalCodec;
-    }
-
-    const QTextCodec *c = mOverrideCodecs.value(node, nullptr);
-    if (!c) {
-        // no override-codec set for this message, try the CT charset parameter:
-        QByteArray charset = node->contentType()->charset();
-
-        // utf-8 is a superset of us-ascii, so we don't loose anything, if we it insead
-        // utf-8 is nowadays that widely, that it is a good guess to use it to fix issus with broken clients.
-        if (charset.toLower() == "us-ascii") {
-            charset = "utf-8";
-        }
-        c = codecForName(charset);
-    }
-    if (!c) {
-        // no charset means us-ascii (RFC 2045), so using local encoding should
-        // be okay
-        c = mLocalCodec;
-    }
-    return c;
-}
-
-const QTextCodec *NodeHelper::codecForName(const QByteArray &_str)
-{
-    if (_str.isEmpty()) {
-        return nullptr;
-    }
-    QByteArray codec = _str.toLower();
-    return KCharsets::charsets()->codecForName(QLatin1String(codec));
-}
-
-QString NodeHelper::fileName(const KMime::Content *node)
-{
-    QString name = const_cast<KMime::Content *>(node)->contentDisposition()->filename();
-    if (name.isEmpty()) {
-        name = const_cast<KMime::Content *>(node)->contentType()->name();
-    }
-
-    name = name.trimmed();
-    return name;
-}
-
-//FIXME(Andras) review it (by Marc?) to see if I got it right. This is supposed to be the partNode::internalBodyPartMemento replacement
-Interface::BodyPartMemento *NodeHelper::bodyPartMemento(KMime::Content *node,
-        const QByteArray &which) const
-{
-    const QMap< QString, QMap<QByteArray, Interface::BodyPartMemento *> >::const_iterator nit
-        = mBodyPartMementoMap.find(persistentIndex(node));
-    if (nit == mBodyPartMementoMap.end()) {
-        return nullptr;
-    }
-    const QMap<QByteArray, Interface::BodyPartMemento *>::const_iterator it =
-        nit->find(which.toLower());
-    return it != nit->end() ? it.value() : nullptr;
-}
-
-//FIXME(Andras) review it (by Marc?) to see if I got it right. This is supposed to be the partNode::internalSetBodyPartMemento replacement
-void NodeHelper::setBodyPartMemento(KMime::Content *node, const QByteArray &which,
-                                    Interface::BodyPartMemento *memento)
-{
-    QMap<QByteArray, Interface::BodyPartMemento *> &mementos
-        = mBodyPartMementoMap[persistentIndex(node)];
-
-    const QByteArray whichLower = which.toLower();
-    const QMap<QByteArray, Interface::BodyPartMemento *>::iterator it =
-        mementos.lowerBound(whichLower);
-
-    if (it != mementos.end() && it.key() == whichLower) {
-        delete it.value();
-        if (memento) {
-            it.value() = memento;
-        } else {
-            mementos.erase(it);
-        }
-    } else {
-        mementos.insert(whichLower, memento);
-    }
-}
-
-bool NodeHelper::isNodeDisplayedEmbedded(KMime::Content *node) const
-{
-    qCDebug(MIMETREEPARSER_LOG) << "IS NODE: " << mDisplayEmbeddedNodes.contains(node);
-    return mDisplayEmbeddedNodes.contains(node);
-}
-
-void NodeHelper::setNodeDisplayedEmbedded(KMime::Content *node, bool displayedEmbedded)
-{
-    qCDebug(MIMETREEPARSER_LOG) << "SET NODE: " << node << displayedEmbedded;
-    if (displayedEmbedded) {
-        mDisplayEmbeddedNodes.insert(node);
-    } else {
-        mDisplayEmbeddedNodes.remove(node);
-    }
-}
-
-bool NodeHelper::isNodeDisplayedHidden(KMime::Content *node) const
-{
-    return mDisplayHiddenNodes.contains(node);
-}
-
-void NodeHelper::setNodeDisplayedHidden(KMime::Content *node, bool displayedHidden)
-{
-    if (displayedHidden) {
-        mDisplayHiddenNodes.insert(node);
-    } else {
-        mDisplayEmbeddedNodes.remove(node);
-    }
-}
-
-/*!
-  Creates a persistent index string that bridges the gap between the
-  permanent nodes and the temporary ones.
-
-  Used internally for robust indexing.
-*/
-QString NodeHelper::persistentIndex(const KMime::Content *node) const
-{
-    if (!node) {
-        return QString();
-    }
-
-    QString indexStr = node->index().toString();
-    if (indexStr.isEmpty()) {
-        QMapIterator<KMime::Message::Content *, QList<KMime::Content *> > it(mExtraContents);
-        while (it.hasNext()) {
-            it.next();
-            const auto &extraNodes = it.value();
-            for (int i = 0; i < extraNodes.size(); i++) {
-                if (extraNodes[i] == node) {
-                    indexStr = QString::fromLatin1("e%1").arg(i);
-                    const QString parentIndex = persistentIndex(it.key());
-                    if (!parentIndex.isEmpty()) {
-                        indexStr = QString::fromLatin1("%1:%2").arg(parentIndex, indexStr);
-                    }
-                    return indexStr;
-                }
-            }
-        }
-    } else {
-        const KMime::Content *const topLevel = node->topLevel();
-        //if the node is an extra node, prepend the index of the extra node to the url
-        QMapIterator<KMime::Message::Content *, QList<KMime::Content *> > it(mExtraContents);
-        while (it.hasNext()) {
-            it.next();
-            const QList<KMime::Content *> &extraNodes = extraContents(it.key());
-            for (int i = 0; i < extraNodes.size(); ++i) {
-                KMime::Content *const extraNode = extraNodes[i];
-                if (topLevel == extraNode) {
-                    indexStr.prepend(QStringLiteral("e%1:").arg(i));
-                    const QString parentIndex = persistentIndex(it.key());
-                    if (!parentIndex.isEmpty()) {
-                        indexStr = QStringLiteral("%1:%2").arg(parentIndex, indexStr);
-                    }
-                    return indexStr;
-                }
-            }
-        }
-    }
-
-    return indexStr;
-}
-
-KMime::Content *NodeHelper::contentFromIndex(KMime::Content *node, const QString &persistentIndex) const
-{
-    KMime::Content *c = node->topLevel();
-    if (c) {
-        const QStringList pathParts = persistentIndex.split(QLatin1Char(':'), QString::SkipEmptyParts);
-        const int pathPartsSize(pathParts.size());
-        for (int i = 0; i < pathPartsSize; ++i) {
-            const QString &path = pathParts[i];
-            if (path.startsWith(QLatin1Char('e'))) {
-                const QList<KMime::Content *> &extraParts = mExtraContents.value(c);
-                const int idx = path.midRef(1, -1).toInt();
-                c = (idx < extraParts.size()) ? extraParts[idx] : nullptr;
-            } else {
-                c = c->content(KMime::ContentIndex(path));
-            }
-            if (!c) {
-                break;
-            }
-        }
-    }
-    return c;
-}
-
-QString NodeHelper::asHREF(const KMime::Content *node, const QString &place) const
-{
-    return QStringLiteral("attachment:%1?place=%2").arg(persistentIndex(node), place);
-}
-
-KMime::Content *NodeHelper::fromHREF(const KMime::Message::Ptr &mMessage, const QUrl &url) const
-{
-    if (url.isEmpty()) {
-        return mMessage.data();
-    }
-
-    if (!url.isLocalFile()) {
-        return contentFromIndex(mMessage.data(), url.adjusted(QUrl::StripTrailingSlash).path());
-    } else {
-        const QString path = url.toLocalFile();
-        // extract from /<path>/qttestn28554.index.2.3:0:2/unnamed -> "2.3:0:2"
-        // start of the index is something that is not a number followed by a dot: \D.
-        // index is only made of numbers,"." and ":": ([0-9.:]+)
-        // index is the last part of the folder name: /
-        const QRegExp rIndex(QStringLiteral("\\D\\.([e0-9.:]+)/"));
-
-        //search the occurence at most at the end
-        if (rIndex.lastIndexIn(path) != -1) {
-            return  contentFromIndex(mMessage.data(), rIndex.cap(1));
-        }
-        return mMessage.data();
-    }
-}
-
-QString NodeHelper::fixEncoding(const QString &encoding)
-{
-    QString returnEncoding = encoding;
-    // According to http://www.iana.org/assignments/character-sets, uppercase is
-    // preferred in MIME headers
-    const QString returnEncodingToUpper = returnEncoding.toUpper();
-    if (returnEncodingToUpper.contains(QStringLiteral("ISO "))) {
-        returnEncoding = returnEncodingToUpper;
-        returnEncoding.replace(QLatin1String("ISO "), QStringLiteral("ISO-"));
-    }
-    return returnEncoding;
-}
-
-//-----------------------------------------------------------------------------
-QString NodeHelper::encodingForName(const QString &descriptiveName)
-{
-    QString encoding = KCharsets::charsets()->encodingForName(descriptiveName);
-    return NodeHelper::fixEncoding(encoding);
-}
-
-QStringList NodeHelper::supportedEncodings(bool usAscii)
-{
-    QStringList encodingNames = KCharsets::charsets()->availableEncodingNames();
-    QStringList encodings;
-    QMap<QString, bool> mimeNames;
-    QStringList::ConstIterator constEnd(encodingNames.constEnd());
-    for (QStringList::ConstIterator it = encodingNames.constBegin();
-            it != constEnd; ++it) {
-        QTextCodec *codec = KCharsets::charsets()->codecForName(*it);
-        QString mimeName = (codec) ? QString::fromLatin1(codec->name()).toLower() : (*it);
-        if (!mimeNames.contains(mimeName)) {
-            encodings.append(KCharsets::charsets()->descriptionForEncoding(*it));
-            mimeNames.insert(mimeName, true);
-        }
-    }
-    encodings.sort();
-    if (usAscii) {
-        encodings.prepend(KCharsets::charsets()->descriptionForEncoding(QStringLiteral("us-ascii")));
-    }
-    return encodings;
-}
-
-QString NodeHelper::fromAsString(KMime::Content *node) const
-{
-    if (auto topLevel = dynamic_cast<KMime::Message *>(node->topLevel())) {
-        return topLevel->from()->asUnicodeString();
-    } else {
-        auto realNode = std::find_if(mExtraContents.cbegin(), mExtraContents.cend(),
-        [node](const QList<KMime::Content *> &nodes) {
-            return nodes.contains(node);
-        });
-        if (realNode != mExtraContents.cend()) {
-            return fromAsString(realNode.key());
-        }
-    }
-
-    return QString();
-}
-
-void NodeHelper::attachExtraContent(KMime::Content *topLevelNode, KMime::Content *content)
-{
-    qCDebug(MIMETREEPARSER_LOG) << "mExtraContents added for" << topLevelNode << " extra content: " << content;
-    mExtraContents[topLevelNode].append(content);
-}
-
-QList< KMime::Content * > NodeHelper::extraContents(KMime::Content *topLevelnode) const
-{
-    return mExtraContents.value(topLevelnode);
-}
-
-void NodeHelper::mergeExtraNodes(KMime::Content *node)
-{
-    if (!node) {
-        return;
-    }
-
-    const QList<KMime::Content * > extraNodes = extraContents(node);
-    for (KMime::Content *extra : extraNodes) {
-        if (node->bodyIsMessage()) {
-            qCWarning(MIMETREEPARSER_LOG) << "Asked to attach extra content to a kmime::message, this does not make sense. Attaching to:" << node <<
-                                          node->encodedContent() << "\n====== with =======\n" <<  extra << extra->encodedContent();
-            continue;
-        }
-        KMime::Content *c = new KMime::Content(node);
-        c->setContent(extra->encodedContent());
-        c->parse();
-        node->addContent(c);
-    }
-
-    Q_FOREACH (KMime::Content *child, node->contents()) {
-        mergeExtraNodes(child);
-    }
-}
-
-void NodeHelper::cleanFromExtraNodes(KMime::Content *node)
-{
-    if (!node) {
-        return;
-    }
-    const QList<KMime::Content * > extraNodes = extraContents(node);
-    for (KMime::Content *extra : extraNodes) {
-        QByteArray s = extra->encodedContent();
-        const auto children = node->contents();
-        for (KMime::Content *c : children) {
-            if (c->encodedContent() == s) {
-                node->removeContent(c);
-            }
-        }
-    }
-    Q_FOREACH (KMime::Content *child, node->contents()) {
-        cleanFromExtraNodes(child);
-    }
-}
-
-KMime::Message *NodeHelper::messageWithExtraContent(KMime::Content *topLevelNode)
-{
-    /*The merge is done in several steps:
-      1) merge the extra nodes into topLevelNode
-      2) copy the modified (merged) node tree into a new node tree
-      3) restore the original node tree in topLevelNode by removing the extra nodes from it
-
-      The reason is that extra nodes are assigned by pointer value to the nodes in the original tree.
-    */
-    if (!topLevelNode) {
-        return nullptr;
-    }
-
-    mergeExtraNodes(topLevelNode);
-
-    KMime::Message *m = new KMime::Message;
-    m->setContent(topLevelNode->encodedContent());
-    m->parse();
-
-    cleanFromExtraNodes(topLevelNode);
-//   qCDebug(MIMETREEPARSER_LOG) << "MESSAGE WITH EXTRA: " << m->encodedContent();
-//   qCDebug(MIMETREEPARSER_LOG) << "MESSAGE WITHOUT EXTRA: " << topLevelNode->encodedContent();
-
-    return m;
-}
-
-KMime::Content *NodeHelper::decryptedNodeForContent(KMime::Content *content) const
-{
-    const QList<KMime::Content *> xc = extraContents(content);
-    if (!xc.empty()) {
-        if (xc.size() == 1) {
-            return xc.front();
-        } else {
-            qCWarning(MIMETREEPARSER_LOG) << "WTF, encrypted node has multiple extra contents?";
-        }
-    }
-    return nullptr;
-}
-
-bool NodeHelper::unencryptedMessage_helper(KMime::Content *node, QByteArray &resultingData, bool addHeaders,
-        int recursionLevel)
-{
-    bool returnValue = false;
-    if (node) {
-        KMime::Content *curNode = node;
-        KMime::Content *decryptedNode = nullptr;
-        const QByteArray type = node->contentType(false) ? QByteArray(node->contentType()->mediaType()).toLower() : "text";
-        const QByteArray subType = node->contentType(false) ? node->contentType()->subType().toLower() : "plain";
-        const bool isMultipart = node->contentType(false) && node->contentType()->isMultipart();
-        bool isSignature = false;
-
-        qCDebug(MIMETREEPARSER_LOG) << "(" << recursionLevel << ") Looking at" << type << "/" << subType;
-
-        if (isMultipart) {
-            if (subType == "signed") {
-                isSignature = true;
-            } else if (subType == "encrypted") {
-                decryptedNode = decryptedNodeForContent(curNode);
-            }
-        } else if (type == "application") {
-            if (subType == "octet-stream") {
-                decryptedNode = decryptedNodeForContent(curNode);
-            } else if (subType == "pkcs7-signature") {
-                isSignature = true;
-            } else if (subType == "pkcs7-mime") {
-                // note: subtype pkcs7-mime can also be signed
-                //       and we do NOT want to remove the signature!
-                if (encryptionState(curNode) != KMMsgNotEncrypted) {
-                    decryptedNode = decryptedNodeForContent(curNode);
-                }
-            }
-        }
-
-        if (decryptedNode) {
-            qCDebug(MIMETREEPARSER_LOG) << "Current node has an associated decrypted node, adding a modified header "
-                                        "and then processing the children.";
-
-            Q_ASSERT(addHeaders);
-            KMime::Content headers;
-            headers.setHead(curNode->head());
-            headers.parse();
-            if (decryptedNode->contentType(false)) {
-                headers.contentType()->from7BitString(decryptedNode->contentType()->as7BitString(false));
-            } else {
-                headers.removeHeader<KMime::Headers::ContentType>();
-            }
-            if (decryptedNode->contentTransferEncoding(false)) {
-                headers.contentTransferEncoding()->from7BitString(decryptedNode->contentTransferEncoding()->as7BitString(false));
-            } else {
-                headers.removeHeader<KMime::Headers::ContentTransferEncoding>();
-            }
-            if (decryptedNode->contentDisposition(false)) {
-                headers.contentDisposition()->from7BitString(decryptedNode->contentDisposition()->as7BitString(false));
-            } else {
-                headers.removeHeader<KMime::Headers::ContentDisposition>();
-            }
-            if (decryptedNode->contentDescription(false)) {
-                headers.contentDescription()->from7BitString(decryptedNode->contentDescription()->as7BitString(false));
-            } else {
-                headers.removeHeader<KMime::Headers::ContentDescription>();
-            }
-            headers.assemble();
-
-            resultingData += headers.head() + '\n';
-            unencryptedMessage_helper(decryptedNode, resultingData, false, recursionLevel + 1);
-
-            returnValue = true;
-        }
-
-        else if (isSignature) {
-            qCDebug(MIMETREEPARSER_LOG) << "Current node is a signature, adding it as-is.";
-            // We can't change the nodes under the signature, as that would invalidate it. Add the signature
-            // and its child as-is
-            if (addHeaders) {
-                resultingData += curNode->head() + '\n';
-            }
-            resultingData += curNode->encodedBody();
-            returnValue = false;
-        }
-
-        else if (isMultipart) {
-            qCDebug(MIMETREEPARSER_LOG) << "Current node is a multipart node, adding its header and then processing all children.";
-            // Normal multipart node, add the header and all of its children
-            bool somethingChanged = false;
-            if (addHeaders) {
-                resultingData += curNode->head() + '\n';
-            }
-            const QByteArray boundary = curNode->contentType()->boundary();
-            foreach (KMime::Content *child, curNode->contents()) {
-                resultingData += "\n--" + boundary + '\n';
-                const bool changed = unencryptedMessage_helper(child, resultingData, true, recursionLevel + 1);
-                if (changed) {
-                    somethingChanged = true;
-                }
-            }
-            resultingData += "\n--" + boundary + "--\n\n";
-            returnValue = somethingChanged;
-        }
-
-        else if (curNode->bodyIsMessage()) {
-            qCDebug(MIMETREEPARSER_LOG) << "Current node is a message, adding the header and then processing the child.";
-            if (addHeaders) {
-                resultingData += curNode->head() + '\n';
-            }
-
-            returnValue = unencryptedMessage_helper(curNode->bodyAsMessage().data(), resultingData, true, recursionLevel + 1);
-        }
-
-        else {
-            qCDebug(MIMETREEPARSER_LOG) << "Current node is an ordinary leaf node, adding it as-is.";
-            if (addHeaders) {
-                resultingData += curNode->head() + '\n';
-            }
-            resultingData += curNode->body();
-            returnValue = false;
-        }
-    }
-
-    qCDebug(MIMETREEPARSER_LOG) << "(" << recursionLevel << ") done.";
-    return returnValue;
-}
-
-KMime::Message::Ptr NodeHelper::unencryptedMessage(const KMime::Message::Ptr &originalMessage)
-{
-    QByteArray resultingData;
-    const bool messageChanged = unencryptedMessage_helper(originalMessage.data(), resultingData, true);
-    if (messageChanged) {
-#if 0
-        qCDebug(MIMETREEPARSER_LOG) << "Resulting data is:" << resultingData;
-        QFile bla("stripped.mbox");
-        bla.open(QIODevice::WriteOnly);
-        bla.write(resultingData);
-        bla.close();
-#endif
-        KMime::Message::Ptr newMessage(new KMime::Message);
-        newMessage->setContent(resultingData);
-        newMessage->parse();
-        return newMessage;
-    } else {
-        return KMime::Message::Ptr();
-    }
-}
-
-QVector<KMime::Content *> NodeHelper::attachmentsOfExtraContents() const
-{
-    QVector<KMime::Content *> result;
-    for (auto it = mExtraContents.begin(); it != mExtraContents.end(); ++it) {
-        foreach (auto content, it.value()) {
-            if (KMime::isAttachment(content)) {
-                result.push_back(content);
-            } else {
-                result += content->attachments();
-            }
-        }
-    }
-    return result;
-}
-
-}
diff --git a/framework/src/domain/mimetreeparser/otp/nodehelper.h b/framework/src/domain/mimetreeparser/otp/nodehelper.h
deleted file mode 100644
index 70253f21..00000000
--- a/framework/src/domain/mimetreeparser/otp/nodehelper.h
+++ /dev/null
@@ -1,290 +0,0 @@
-/*
-  Copyright (C) 2009 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.net
-  Copyright (c) 2009 Andras Mantia <andras@kdab.net>
-
-  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.
-
-  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.
-*/
-
-#ifndef __MIMETREEPARSER_NODEHELPER_H__
-#define __MIMETREEPARSER_NODEHELPER_H__
-
-#include "partmetadata.h"
-#include "enums.h"
-
-#include <KMime/Message>
-
-#include <QList>
-#include <QMap>
-#include <QSet>
-
-class QUrl;
-class QTextCodec;
-
-namespace MimeTreeParser
-{
-class AttachmentTemporaryFilesDirs;
-namespace Interface
-{
-class BodyPartMemento;
-}
-}
-
-namespace MimeTreeParser
-{
-
-/**
- * @author Andras Mantia <andras@kdab.net>
- */
-class NodeHelper: public QObject
-{
-    Q_OBJECT
-public:
-    NodeHelper();
-
-    ~NodeHelper();
-
-    void setNodeProcessed(KMime::Content *node, bool recurse);
-    void setNodeUnprocessed(KMime::Content *node, bool recurse);
-    bool nodeProcessed(KMime::Content *node) const;
-    void clear();
-    void forceCleanTempFiles();
-
-    void setEncryptionState(const KMime::Content *node, const KMMsgEncryptionState state);
-    KMMsgEncryptionState encryptionState(const KMime::Content *node) const;
-
-    void setSignatureState(const KMime::Content *node, const KMMsgSignatureState state);
-    KMMsgSignatureState signatureState(const KMime::Content *node) const;
-
-    KMMsgSignatureState overallSignatureState(KMime::Content *node) const;
-    KMMsgEncryptionState overallEncryptionState(KMime::Content *node) const;
-
-    void setPartMetaData(KMime::Content *node, const PartMetaData &metaData);
-    PartMetaData partMetaData(KMime::Content *node);
-
-    /**
-     *  Set the 'Content-Type' by mime-magic from the contents of the body.
-     *  If autoDecode is true the decoded body will be used for mime type
-     *  determination (this does not change the body itself).
-     */
-    void magicSetType(KMime::Content *node, bool autoDecode = true);
-
-    /**
-     *  Return this mails subject, with all "forward" and "reply"
-     *  prefixes removed
-     */
-    static QString cleanSubject(KMime::Message *message);
-
-    /** Attach an extra node to an existing node */
-    void attachExtraContent(KMime::Content *topLevelNode, KMime::Content *content);
-
-    /** Get the extra nodes attached to the @param topLevelNode and all sub-nodes of @param topLevelNode */
-    QList<KMime::Content *> extraContents(KMime::Content *topLevelNode) const;
-
-    /** Return a modified message (node tree) starting from @param topLevelNode that has the original nodes and the extra nodes.
-        The caller has the responsibility to delete the new message.
-     */
-    KMime::Message *messageWithExtraContent(KMime::Content *topLevelNode);
-
-    /** Get a QTextCodec suitable for this message part */
-    const QTextCodec *codec(KMime::Content *node);
-
-    /** Set the charset the user selected for the message to display */
-    void setOverrideCodec(KMime::Content *node, const QTextCodec *codec);
-
-    Interface::BodyPartMemento *bodyPartMemento(KMime::Content *node, const QByteArray &which) const;
-
-    void setBodyPartMemento(KMime::Content *node, const QByteArray &which,
-                            Interface::BodyPartMemento *memento);
-
-    // A flag to remember if the node was embedded. This is useful for attachment nodes, the reader
-    // needs to know if they were displayed inline or not.
-    bool isNodeDisplayedEmbedded(KMime::Content *node) const;
-    void setNodeDisplayedEmbedded(KMime::Content *node, bool displayedEmbedded);
-
-    // Same as above, but this time determines if the node was hidden or not
-    bool isNodeDisplayedHidden(KMime::Content *node) const;
-    void setNodeDisplayedHidden(KMime::Content *node, bool displayedHidden);
-
-    /**
-     * Writes the given message part to a temporary file and returns the
-     * name of this file or QString() if writing failed.
-     */
-    QString writeNodeToTempFile(KMime::Content *node);
-
-    /**
-     * Returns the temporary file path and name where this node was saved, or an empty url
-     * if it wasn't saved yet with writeNodeToTempFile()
-     */
-    QUrl tempFileUrlFromNode(const KMime::Content *node);
-
-    /**
-     * Creates a temporary dir for saving attachments, etc.
-     * Will be automatically deleted when another message is viewed.
-     * @param param Optional part of the directory name.
-     */
-    QString createTempDir(const QString &param = QString());
-
-    /**
-     * Cleanup the attachment temp files
-     */
-    void removeTempFiles();
-
-    /**
-     * Add a file to the list of managed temporary files
-     */
-    void addTempFile(const QString &file);
-
-    // Get a href in the form attachment:<nodeId>?place=<place>, used by ObjectTreeParser and
-    // UrlHandlerManager.
-    QString asHREF(const KMime::Content *node, const QString &place) const;
-    KMime::Content *fromHREF(const KMime::Message::Ptr &mMessage, const QUrl &href) const;
-
-    /**
-     * @return true if this node is a child or an encapsulated message
-     */
-    static bool isInEncapsulatedMessage(KMime::Content *node);
-
-    /**
-     * Returns the charset for the given node. If no charset is specified
-     * for the node, the defaultCharset() is returned.
-     */
-    static QByteArray charset(KMime::Content *node);
-
-    /**
-     * Check for prefixes @p prefixRegExps in @p str. If none
-     * is found, @p newPrefix + ' ' is prepended to @p str and the
-     * resulting string is returned. If @p replace is true, any
-     * sequence of whitespace-delimited prefixes at the beginning of
-     * @p str is replaced by @p newPrefix.
-     */
-    static QString replacePrefixes(const QString &str,
-                                   const QStringList &prefixRegExps,
-                                   bool replace,
-                                   const QString &newPrefix);
-
-    /**
-     * Return a QTextCodec for the specified charset.
-     * This function is a bit more tolerant, than QTextCodec::codecForName
-     */
-    static const QTextCodec *codecForName(const QByteArray &_str);
-
-    /**
-     * Returns a usable filename for a node, that can be the filename from the
-     * content disposition header, or if that one is empty, the name from the
-     * content type header.
-     */
-    static QString fileName(const KMime::Content *node);
-
-    /**
-     * Fixes an encoding received by a KDE function and returns the proper,
-     * MIME-compilant encoding name instead.
-     * @see encodingForName
-     */
-    static QString fixEncoding(const QString &encoding);   //TODO(Andras) move to a utility class?
-
-    /**
-     * Drop-in replacement for KCharsets::encodingForName(). The problem with
-     * the KCharsets function is that it returns "human-readable" encoding names
-     * like "ISO 8859-15" instead of valid encoding names like "ISO-8859-15".
-     * This function fixes this by replacing whitespace with a hyphen.
-     */
-    static QString encodingForName(const QString &descriptiveName);   //TODO(Andras) move to a utility class?
-
-    /**
-     * Return a list of the supported encodings
-     * @param usAscii if true, US-Ascii encoding will be prepended to the list.
-     */
-    static QStringList supportedEncodings(bool usAscii);   //TODO(Andras) move to a utility class?
-
-    QString fromAsString(KMime::Content *node) const;
-
-    KMime::Content *decryptedNodeForContent(KMime::Content *content) const;
-
-    /**
-     * This function returns the unencrypted message that is based on @p originalMessage.
-     * All encrypted MIME parts are removed and replaced by their decrypted plain-text versions.
-     * Encrypted parts that are within signed parts are not replaced, since that would invalidate
-     * the signature.
-     *
-     * This only works if the message was run through ObjectTreeParser::parseObjectTree() with the
-     * currrent NodeHelper before, because parseObjectTree() actually decrypts the message and stores
-     * the decrypted nodes by calling attachExtraContent().
-     *
-     * @return the unencrypted message or an invalid pointer if the original message didn't contain
-     *         a part that needed to be modified.
-     */
-    KMime::Message::Ptr unencryptedMessage(const KMime::Message::Ptr &originalMessage);
-
-    /**
-     * Returns a list of attachments of attached extra content nodes.
-     * This is mainly useful is order to get attachments of encrypted messages.
-     * Note that this does not include attachments from the primary node tree.
-     * @see KMime::Content::attachments().
-     */
-    QVector<KMime::Content *> attachmentsOfExtraContents() const;
-
-Q_SIGNALS:
-    void update(MimeTreeParser::UpdateMode);
-
-private:
-    Q_DISABLE_COPY(NodeHelper)
-    bool unencryptedMessage_helper(KMime::Content *node, QByteArray &resultingData, bool addHeaders,
-                                   int recursionLevel = 1);
-
-    /** Check for prefixes @p prefixRegExps in #subject(). If none
-        is found, @p newPrefix + ' ' is prepended to the subject and the
-        resulting string is returned. If @p replace is true, any
-        sequence of whitespace-delimited prefixes at the beginning of
-        #subject() is replaced by @p newPrefix
-    **/
-    static QString cleanSubject(KMime::Message *message, const QStringList &prefixRegExps,
-                                bool replace, const QString &newPrefix);
-
-    void mergeExtraNodes(KMime::Content *node);
-    void cleanFromExtraNodes(KMime::Content *node);
-
-    /** Creates a persistent index string that bridges the gap between the
-        permanent nodes and the temporary ones.
-
-        Used internally for robust indexing.
-    **/
-    QString persistentIndex(const KMime::Content *node) const;
-
-    /** Translates the persistentIndex into a node back
-
-        node: any node of the actually message to what the persistentIndex is interpreded
-    **/
-    KMime::Content *contentFromIndex(KMime::Content *node, const QString &persistentIndex) const;
-
-private:
-    QList<KMime::Content *> mProcessedNodes;
-    QList<KMime::Content *> mNodesUnderProcess;
-    QMap<const KMime::Content *, KMMsgEncryptionState> mEncryptionState;
-    QMap<const KMime::Content *, KMMsgSignatureState> mSignatureState;
-    QSet<KMime::Content *> mDisplayEmbeddedNodes;
-    QSet<KMime::Content *> mDisplayHiddenNodes;
-    QTextCodec *mLocalCodec;
-    QMap<KMime::Content *, const QTextCodec *> mOverrideCodecs;
-    QMap<QString, QMap<QByteArray, Interface::BodyPartMemento *> > mBodyPartMementoMap;
-    QMap<KMime::Content *, PartMetaData> mPartMetaDatas;
-    QMap<KMime::Message::Content *, QList<KMime::Content *> > mExtraContents;
-    AttachmentTemporaryFilesDirs *mAttachmentFilesDir;
-
-    friend class NodeHelperTest;
-};
-
-}
-
-#endif
diff --git a/framework/src/domain/mimetreeparser/otp/objecttreeparser.cpp b/framework/src/domain/mimetreeparser/otp/objecttreeparser.cpp
deleted file mode 100644
index b0d514b6..00000000
--- a/framework/src/domain/mimetreeparser/otp/objecttreeparser.cpp
+++ /dev/null
@@ -1,495 +0,0 @@
-/*
-    objecttreeparser.cpp
-
-    This file is part of KMail, the KDE mail client.
-    Copyright (c) 2003      Marc Mutz <mutz@kde.org>
-    Copyright (C) 2002-2004 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.net
-    Copyright (c) 2009 Andras Mantia <andras@kdab.net>
-    Copyright (c) 2015 Sandro Knauß <sknauss@kde.org>
-
-    KMail 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.
-
-    KMail 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.
-*/
-
-// MessageViewer includes
-
-#include "objecttreeparser.h"
-
-#include "attachmentstrategy.h"
-#include "bodypartformatterbasefactory.h"
-#include "nodehelper.h"
-#include "messagepart.h"
-#include "partnodebodypart.h"
-
-#include "mimetreeparser_debug.h"
-
-#include "utils.h"
-#include "bodypartformatter.h"
-#include "htmlwriter.h"
-#include "messagepartrenderer.h"
-#include "util.h"
-
-#include <KMime/Headers>
-#include <KMime/Message>
-
-// KDE includes
-
-// Qt includes
-#include <QByteArray>
-#include <QTextCodec>
-#include <QUrl>
-
-using namespace MimeTreeParser;
-
-ObjectTreeParser::ObjectTreeParser(const ObjectTreeParser *topLevelParser,
-                                   bool showOnlyOneMimePart,
-                                   const AttachmentStrategy *strategy)
-    : mSource(topLevelParser->mSource),
-      mNodeHelper(topLevelParser->mNodeHelper),
-      mHtmlWriter(topLevelParser->mHtmlWriter),
-      mTopLevelContent(topLevelParser->mTopLevelContent),
-      mShowOnlyOneMimePart(showOnlyOneMimePart),
-      mHasPendingAsyncJobs(false),
-      mAllowAsync(topLevelParser->mAllowAsync),
-      mAttachmentStrategy(strategy)
-{
-    init();
-}
-
-ObjectTreeParser::ObjectTreeParser(Interface::ObjectTreeSource *source,
-                                   MimeTreeParser::NodeHelper *nodeHelper,
-                                   bool showOnlyOneMimePart,
-                                   const AttachmentStrategy *strategy)
-    : mSource(source),
-      mNodeHelper(nodeHelper),
-      mHtmlWriter(nullptr),
-      mTopLevelContent(nullptr),
-      mShowOnlyOneMimePart(showOnlyOneMimePart),
-      mHasPendingAsyncJobs(false),
-      mAllowAsync(false),
-      mAttachmentStrategy(strategy)
-{
-    init();
-}
-
-void ObjectTreeParser::init()
-{
-    Q_ASSERT(mSource);
-    if (!attachmentStrategy()) {
-        mAttachmentStrategy = mSource->attachmentStrategy();
-    }
-
-    if (!mNodeHelper) {
-        mNodeHelper = new NodeHelper();
-        mDeleteNodeHelper = true;
-    } else {
-        mDeleteNodeHelper = false;
-    }
-}
-
-ObjectTreeParser::ObjectTreeParser(const ObjectTreeParser &other)
-    : mSource(other.mSource),
-      mNodeHelper(other.nodeHelper()),   //TODO(Andras) hm, review what happens if mDeleteNodeHelper was true in the source
-      mHtmlWriter(other.mHtmlWriter),
-      mTopLevelContent(other.mTopLevelContent),
-      mShowOnlyOneMimePart(other.showOnlyOneMimePart()),
-      mHasPendingAsyncJobs(other.hasPendingAsyncJobs()),
-      mAllowAsync(other.allowAsync()),
-      mAttachmentStrategy(other.attachmentStrategy()),
-      mDeleteNodeHelper(false)
-{
-
-}
-
-ObjectTreeParser::~ObjectTreeParser()
-{
-    if (mDeleteNodeHelper) {
-        delete mNodeHelper;
-        mNodeHelper = nullptr;
-    }
-}
-
-void ObjectTreeParser::setAllowAsync(bool allow)
-{
-    Q_ASSERT(!mHasPendingAsyncJobs);
-    mAllowAsync = allow;
-}
-
-bool ObjectTreeParser::allowAsync() const
-{
-    return mAllowAsync;
-}
-
-bool ObjectTreeParser::hasPendingAsyncJobs() const
-{
-    return mHasPendingAsyncJobs;
-}
-
-QString ObjectTreeParser::plainTextContent() const
-{
-    return mPlainTextContent;
-}
-
-QString ObjectTreeParser::htmlContent() const
-{
-    return mHtmlContent;
-}
-
-void ObjectTreeParser::copyContentFrom(const ObjectTreeParser *other)
-{
-    mPlainTextContent += other->plainTextContent();
-    mHtmlContent += other->htmlContent();
-    if (!other->plainTextContentCharset().isEmpty()) {
-        mPlainTextContentCharset = other->plainTextContentCharset();
-    }
-    if (!other->htmlContentCharset().isEmpty()) {
-        mHtmlContentCharset = other->htmlContentCharset();
-    }
-}
-
-//-----------------------------------------------------------------------------
-
-void ObjectTreeParser::parseObjectTree(KMime::Content *node)
-{
-    mTopLevelContent = node;
-    mParsedPart = parseObjectTreeInternal(node, showOnlyOneMimePart());
-
-    if (mParsedPart) {
-        mParsedPart->fix();
-        mParsedPart->copyContentFrom();
-        if (auto mp = toplevelTextNode(mParsedPart)) {
-            if (auto _mp = mp.dynamicCast<TextMessagePart>()) {
-                extractNodeInfos(_mp->mNode, true);
-            } else if (auto _mp = mp.dynamicCast<AlternativeMessagePart>()) {
-                if (_mp->mChildNodes.contains(Util::MultipartPlain)) {
-                    extractNodeInfos(_mp->mChildNodes[Util::MultipartPlain], true);
-                }
-            }
-            setPlainTextContent(mp->text());
-        }
-
-        if (htmlWriter()) {
-            const auto renderer = mSource->messagePartTheme(mParsedPart);
-            if (renderer) {
-                mHtmlWriter->queue(renderer->html());
-            }
-        }
-    }
-}
-
-MessagePartPtr ObjectTreeParser::parsedPart() const
-{
-    return mParsedPart;
-}
-
-bool ObjectTreeParser::processType(KMime::Content *node, ProcessResult &processResult, const QByteArray &mediaType, const QByteArray &subType, Interface::MessagePartPtr &mpRet, bool onlyOneMimePart)
-{
-    bool bRendered = false;
-    const auto sub = mSource->bodyPartFormatterFactory()->subtypeRegistry(mediaType.constData());
-    auto range =  sub.equal_range(subType.constData());
-    for (auto it = range.first; it != range.second; ++it) {
-        const auto formatter = (*it).second;
-        if (!formatter) {
-            continue;
-        }
-        PartNodeBodyPart part(this, &processResult, mTopLevelContent, node, mNodeHelper);
-        // Set the default display strategy for this body part relying on the
-        // identity of Interface::BodyPart::Display and AttachmentStrategy::Display
-        part.setDefaultDisplay((Interface::BodyPart::Display) attachmentStrategy()->defaultDisplay(node));
-
-        mNodeHelper->setNodeDisplayedEmbedded(node, true);
-
-        const Interface::MessagePart::Ptr result = formatter->process(part);
-        if (!result) {
-            continue;
-        }
-
-        if (const auto mp = result.dynamicCast<MessagePart>()) {
-            mp->setAttachmentFlag(node);
-            mpRet = result;
-            bRendered = true;
-            break;
-        } else if (dynamic_cast<MimeTreeParser::Interface::MessagePart *>(result.data())) {
-            QObject *asyncResultObserver = allowAsync() ? mSource->sourceObject() : nullptr;
-            const auto r = formatter->format(&part, result->htmlWriter(), asyncResultObserver);
-            if (r == Interface::BodyPartFormatter::AsIcon) {
-                processResult.setNeverDisplayInline(true);
-                formatter->adaptProcessResult(processResult);
-                mNodeHelper->setNodeDisplayedEmbedded(node, false);
-                const Interface::MessagePart::Ptr mp = defaultHandling(node, processResult, onlyOneMimePart);
-                if (mp) {
-                    if (auto _mp = mp.dynamicCast<MessagePart>()) {
-                        _mp->setAttachmentFlag(node);
-                    }
-                    mpRet = mp;
-                }
-                bRendered = true;
-                break;
-            } else if (r == Interface::BodyPartFormatter::Ok) {
-                processResult.setNeverDisplayInline(true);
-                formatter->adaptProcessResult(processResult);
-                mpRet = result;
-                bRendered = true;
-                break;
-            }
-            continue;
-        } else {
-            continue;
-        }
-    }
-    return bRendered;
-}
-
-MessagePart::Ptr ObjectTreeParser::parseObjectTreeInternal(KMime::Content *node, bool onlyOneMimePart)
-{
-    if (!node) {
-        return MessagePart::Ptr();
-    }
-
-    // reset pending async jobs state (we'll rediscover pending jobs as we go)
-    mHasPendingAsyncJobs = false;
-
-    // reset "processed" flags for...
-    if (onlyOneMimePart) {
-        // ... this node and all descendants
-        mNodeHelper->setNodeUnprocessed(node, false);
-        if (!node->contents().isEmpty()) {
-            mNodeHelper->setNodeUnprocessed(node, true);
-        }
-    } else if (!node->parent()) {
-        // ...this node and all it's siblings and descendants
-        mNodeHelper->setNodeUnprocessed(node, true);
-    }
-
-    const bool isRoot = node->isTopLevel();
-    auto parsedPart = MessagePart::Ptr(new MessagePartList(this));
-    parsedPart->setIsRoot(isRoot);
-    KMime::Content *parent = node->parent();
-    auto contents = parent ? parent->contents() : KMime::Content::List();
-    if (contents.isEmpty()) {
-        contents.append(node);
-    }
-    int i = contents.indexOf(const_cast<KMime::Content *>(node));
-    for (; i < contents.size(); ++i) {
-        node = contents.at(i);
-        if (mNodeHelper->nodeProcessed(node)) {
-            continue;
-        }
-
-        ProcessResult processResult(mNodeHelper);
-
-        QByteArray mediaType("text");
-        QByteArray subType("plain");
-        if (node->contentType(false) && !node->contentType()->mediaType().isEmpty() &&
-                !node->contentType()->subType().isEmpty()) {
-            mediaType = node->contentType()->mediaType();
-            subType = node->contentType()->subType();
-        }
-
-        Interface::MessagePartPtr mp;
-        if (processType(node, processResult, mediaType, subType, mp, onlyOneMimePart)) {
-            if (mp) {
-                parsedPart->appendSubPart(mp);
-            }
-        } else if (processType(node, processResult, mediaType, "*", mp, onlyOneMimePart)) {
-            if (mp) {
-                parsedPart->appendSubPart(mp);
-            }
-        } else {
-            qCWarning(MIMETREEPARSER_LOG) << "THIS SHOULD NO LONGER HAPPEN:" << mediaType << '/' << subType;
-            const auto mp = defaultHandling(node, processResult, onlyOneMimePart);
-            if (mp) {
-                if (auto _mp = mp.dynamicCast<MessagePart>()) {
-                    _mp->setAttachmentFlag(node);
-                }
-                parsedPart->appendSubPart(mp);
-            }
-        }
-        mNodeHelper->setNodeProcessed(node, false);
-
-        // adjust signed/encrypted flags if inline PGP was found
-        processResult.adjustCryptoStatesOfNode(node);
-
-        if (onlyOneMimePart) {
-            break;
-        }
-    }
-
-    return parsedPart;
-}
-
-Interface::MessagePart::Ptr ObjectTreeParser::defaultHandling(KMime::Content *node, ProcessResult &result, bool onlyOneMimePart)
-{
-    Interface::MessagePart::Ptr mp;
-    ProcessResult processResult(mNodeHelper);
-
-    if (node->contentType()->mimeType() == QByteArrayLiteral("application/octet-stream") &&
-            (node->contentType()->name().endsWith(QLatin1String("p7m")) ||
-             node->contentType()->name().endsWith(QLatin1String("p7s")) ||
-             node->contentType()->name().endsWith(QLatin1String("p7c"))
-            ) &&
-            processType(node, processResult, "application", "pkcs7-mime", mp, onlyOneMimePart)) {
-        return mp;
-    }
-
-    const auto _mp = AttachmentMessagePart::Ptr(new AttachmentMessagePart(this, node, false, true, mSource->decryptMessage()));
-    result.setInlineSignatureState(_mp->signatureState());
-    result.setInlineEncryptionState(_mp->encryptionState());
-    _mp->setNeverDisplayInline(result.neverDisplayInline());
-    _mp->setIsImage(result.isImage());
-    mp = _mp;
-
-    // always show images in multipart/related when showing in html, not with an additional icon
-    auto preferredMode = mSource->preferredMode();
-    bool isHtmlPreferred = (preferredMode == Util::Html) || (preferredMode == Util::MultipartHtml);
-    if (result.isImage() && node->parent() &&
-            node->parent()->contentType()->subType() == "related" && isHtmlPreferred && !onlyOneMimePart) {
-        QString fileName = mNodeHelper->writeNodeToTempFile(node);
-        QString href = QUrl::fromLocalFile(fileName).url();
-        QByteArray cid = node->contentID()->identifier();
-        if (htmlWriter()) {
-            htmlWriter()->embedPart(cid, href);
-        }
-        nodeHelper()->setNodeDisplayedEmbedded(node, true);
-        mNodeHelper->setNodeDisplayedHidden(node, true);
-        return mp;
-    }
-
-    // Show it inline if showOnlyOneMimePart(), which means the user clicked the image
-    // in the message structure viewer manually, and therefore wants to see the full image
-    if (result.isImage() && onlyOneMimePart && !result.neverDisplayInline()) {
-        mNodeHelper->setNodeDisplayedEmbedded(node, true);
-    }
-
-    return mp;
-}
-
-KMMsgSignatureState ProcessResult::inlineSignatureState() const
-{
-    return mInlineSignatureState;
-}
-
-void ProcessResult::setInlineSignatureState(KMMsgSignatureState state)
-{
-    mInlineSignatureState = state;
-}
-
-KMMsgEncryptionState ProcessResult::inlineEncryptionState() const
-{
-    return mInlineEncryptionState;
-}
-
-void ProcessResult::setInlineEncryptionState(KMMsgEncryptionState state)
-{
-    mInlineEncryptionState = state;
-}
-
-bool ProcessResult::neverDisplayInline() const
-{
-    return mNeverDisplayInline;
-}
-
-void ProcessResult::setNeverDisplayInline(bool display)
-{
-    mNeverDisplayInline = display;
-}
-
-bool ProcessResult::isImage() const
-{
-    return mIsImage;
-}
-
-void ProcessResult::setIsImage(bool image)
-{
-    mIsImage = image;
-}
-
-void ProcessResult::adjustCryptoStatesOfNode(const KMime::Content *node) const
-{
-    if ((inlineSignatureState()  != KMMsgNotSigned) ||
-            (inlineEncryptionState() != KMMsgNotEncrypted)) {
-        mNodeHelper->setSignatureState(node, inlineSignatureState());
-        mNodeHelper->setEncryptionState(node, inlineEncryptionState());
-    }
-}
-
-void ObjectTreeParser::extractNodeInfos(KMime::Content *curNode, bool isFirstTextPart)
-{
-    if (isFirstTextPart) {
-        mPlainTextContent += curNode->decodedText();
-        mPlainTextContentCharset += NodeHelper::charset(curNode);
-    }
-}
-
-void ObjectTreeParser::setPlainTextContent(const QString &plainTextContent)
-{
-    mPlainTextContent = plainTextContent;
-}
-
-const QTextCodec *ObjectTreeParser::codecFor(KMime::Content *node) const
-{
-    Q_ASSERT(node);
-    if (mSource->overrideCodec()) {
-        return mSource->overrideCodec();
-    }
-    return mNodeHelper->codec(node);
-}
-
-QByteArray ObjectTreeParser::plainTextContentCharset() const
-{
-    return mPlainTextContentCharset;
-}
-
-QByteArray ObjectTreeParser::htmlContentCharset() const
-{
-    return mHtmlContentCharset;
-}
-
-bool ObjectTreeParser::showOnlyOneMimePart() const
-{
-    return mShowOnlyOneMimePart;
-}
-
-void ObjectTreeParser::setShowOnlyOneMimePart(bool show)
-{
-    mShowOnlyOneMimePart = show;
-}
-
-const AttachmentStrategy *ObjectTreeParser::attachmentStrategy() const
-{
-    return mAttachmentStrategy;
-}
-
-HtmlWriter *ObjectTreeParser::htmlWriter() const
-{
-    if (mHtmlWriter) {
-        return mHtmlWriter;
-    }
-    return mSource->htmlWriter();
-}
-
-MimeTreeParser::NodeHelper *ObjectTreeParser::nodeHelper() const
-{
-    return mNodeHelper;
-}
diff --git a/framework/src/domain/mimetreeparser/otp/objecttreeparser.h b/framework/src/domain/mimetreeparser/otp/objecttreeparser.h
deleted file mode 100644
index 3f29a673..00000000
--- a/framework/src/domain/mimetreeparser/otp/objecttreeparser.h
+++ /dev/null
@@ -1,406 +0,0 @@
-/*
-    objecttreeparser.h
-
-    This file is part of KMail, the KDE mail client.
-    Copyright (c) 2003      Marc Mutz <mutz@kde.org>
-    Copyright (C) 2002-2003, 2009 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.net
-    Copyright (c) 2009 Andras Mantia <andras@kdab.net>
-
-    KMail 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.
-
-    KMail 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.
-*/
-
-#ifndef __MIMETREEPARSER_OBJECTTREEPARSER_H__
-#define __MIMETREEPARSER_OBJECTTREEPARSER_H__
-
-#include "nodehelper.h"
-#include "objecttreesource.h"
-
-#include <gpgme++/verificationresult.h>
-
-class QString;
-
-namespace KMime
-{
-class Content;
-}
-
-namespace MimeTreeParser
-{
-
-namespace Interface
-{
-class MessagePart;
-typedef QSharedPointer<MessagePart> MessagePartPtr;
-}
-
-class PartMetaData;
-class ViewerPrivate;
-class HtmlWriter;
-class AttachmentStrategy;
-class NodeHelper;
-class MessagePart;
-class MimeMessagePart;
-
-typedef QSharedPointer<MessagePart> MessagePartPtr;
-typedef QSharedPointer<MimeMessagePart> MimeMessagePartPtr;
-
-class ProcessResult
-{
-public:
-    explicit ProcessResult(NodeHelper *nodeHelper, KMMsgSignatureState  inlineSignatureState  = KMMsgNotSigned,
-                           KMMsgEncryptionState inlineEncryptionState = KMMsgNotEncrypted,
-                           bool neverDisplayInline = false,
-                           bool isImage = false)
-        : mInlineSignatureState(inlineSignatureState),
-          mInlineEncryptionState(inlineEncryptionState),
-          mNeverDisplayInline(neverDisplayInline),
-          mIsImage(isImage),
-          mNodeHelper(nodeHelper) {}
-
-    KMMsgSignatureState inlineSignatureState() const;
-    void setInlineSignatureState(KMMsgSignatureState state);
-
-    KMMsgEncryptionState inlineEncryptionState() const;
-    void setInlineEncryptionState(KMMsgEncryptionState state);
-
-    bool neverDisplayInline() const;
-    void setNeverDisplayInline(bool display);
-
-    bool isImage() const;
-    void setIsImage(bool image);
-
-    void adjustCryptoStatesOfNode(const KMime::Content *node) const;
-
-private:
-    KMMsgSignatureState mInlineSignatureState;
-    KMMsgEncryptionState mInlineEncryptionState;
-    bool mNeverDisplayInline : 1;
-    bool mIsImage : 1;
-    NodeHelper *mNodeHelper;
-};
-
-/**
-\brief Parses messages and generates HTML display code out of them
-
-\par Introduction
-
-First, have a look at the documentation in Mainpage.dox and at the documentation of ViewerPrivate
-to understand the broader picture.
-
-Just a note on the terminology: 'Node' refers to a MIME part here, which in KMime is a
-KMime::Content.
-
-\par Basics
-
-The ObjectTreeParser basically has two modes: Generating the HTML code for the Viewer, or only
-extracting the plainTextContent() for situations where only the message text is needed, for example
-when inline forwarding a message. The mode depends on the Interface::ObjectTreeSource passed to the
-constructor: If Interface::ObjectTreeSource::htmlWriter() is not 0, then the HTML code generation mode is
-used.
-
-Basically, all the ObjectTreeParser does is going through the tree of MIME parts and operating on
-those nodes. Operating here means creating the HTML code for the node or extracting the textual
-content from it. This process is started with parseObjectTree(), where we loop over the subnodes
-of the current root node. For each of those subnodes, we try to find a BodyPartFormatter that can
-handle the type of the node. This can either be an internal function, such as
-processMultiPartAlternativeSubtype() or processTextHtmlSubtype(), or it can be an external plugin.
-More on external plugins later. When no matching formatter is found, defaultHandling() is called
-for that node.
-
-\par Multipart Nodes
-
-Those nodes that are of type multipart have subnodes. If one of those children needs to be
-processed normally, the processMultipartXXX() functions call stdChildHandling() for the node that
-should be handled normally. stdChildHandling() creates its own ObjectTreeParser, which is a clone
-of the current ObjectTreeParser, and processes the node. stdChildHandling() is not called for all
-children of the multipart node, for example processMultiPartAlternativeSubtype() only calls it on
-one of the children, as the other one doesn't need to be displayed. Similary,
-processMultiPartSignedSubtype() doesn't call stdChildHandling() for the signature node, only for the
-signed node.
-
-\par Processed and Unprocessed Nodes
-
-When a BodyPartFormatter has finished processing a node, it is processed. Nodes are set to being
-not processed at the beginning of parseObjectTree(). The processed state of a node is saved in a
-list in NodeHelper, see NodeHelper::setNodeProcessed(), NodeHelper::nodeProcessed() and the other
-related helper functions.
-
-It is the responsibility of the BodyPartFormatter to correctly call setNodeProcessed() and the
-related functions. This is important so that processing the same node twice can be prevented. The
-check that prevents duplicate processing is in parseObjectTree().
-
-An example where duplicate processing would happen if we didn't check for it is in stdChildHandling(),
-which is for example called from processMultiPartAlternativeSubtype(). Let's say the setting is to
-prefer HTML over plain text. In this case, processMultiPartAlternativeSubtype() would call
-stdChildHandling() on the HTML node, which would create a new ObjectTreeParser and call
-parseObjectTree() on it. parseObjectTree() processes the node and all its siblings, and one of the
-siblings is the plain text node, which shouldn't be processed! Therefore
-processMultiPartAlternativeSubtype() sets the plain text node as been processed already.
-
-\par Plain Text Output
-
-Various nodes have plain text that should be displayed. This plain text is usually processed though
-writeBodyString() first. That method checks if the provided text is an inline PGP text and decrypts
-it if necessary. It also pushes the text through quotedHTML(), which does a number of things like
-coloring quoted lines or detecting links and creating real link tags for them.
-
-\par Modifying the Message
-
-The ObjectTreeParser does not only parse its message, in some circumstances it also modifies it
-before displaying. This is for example the case when displaying a decrypted message: The original
-message only contains a binary blob of crypto data, and processMultiPartEncryptedSubtype() decrypts
-that blob. After decryption, the current node is replaced with the decrypted node, which happens
-in insertAndParseNewChildNode().
-
-\par Crypto Operations
-
-For signature and decryption handling, there are functions which help with generating the HTML code
-for the signature header and footer. These are writeDeferredDecryptionBlock(), writeSigstatFooter()
-and writeSigstatHeader(). As the name writeDeferredDecryptionBlock() suggests, a setting can cause
-the message to not be decrypted unless the user clicks a link. Whether the message should be
-decrypted or not can be controlled by Interface::ObjectTreeSource::decryptMessage(). When the user clicks the
-decryption link, the URLHandler for 'kmail:' URLs sets that variable to true and triggers an update
-of the Viewer, which will cause parseObjectTree() to be called again.
-
-\par Async Crypto Operations
-
-The above case describes decryption the message in place. However, decryption and also verifying of
-the signature can take a long time, so synchronous decryption and verifing would cause the Viewer to
-block. Therefore it is possible to run these operations in async mode, see allowAsync().
-In the first run of the async mode, all the ObjectTreeParser does is starting the decrypt or the
-verify job, and informing the user that the operation is in progress with
-writeDecryptionInProgressBlock() or with writeSigstatHeader(). Then, it creates and associates a
-BodyPartMemento with the current node, for example a VerifyDetachedBodyPartMemento. Each node can
-have multiple mementos associated with it, which are differeniated by name.
-
-NodeHelper::setBodyPartMemento() and NodeHelper::bodyPartMemento() provide means to store and
-retrieve these mementos. A memento is basically a thin wrapper around the crypto job, it stores the
-job pointer, the job input data and the job result. Mementos can be used for any async situation,
-not just for crypto jobs, but I'll describe crypto jobs here.
-
-So in the first run of decrypting or verifying a message, the BodyPartFormatter only starts the
-crypto job, creates the BodyPartMemento and writes the HTML code that tells the user that the
-operation is in progress. parseObjectTree() thus finishes without waiting for anything, and the
-message is displayed.
-
-At some point, the crypto jobs then finish, which will cause slotResult() of the BodyPartMemento
-to be called. slotResult() then saves the result to some member variable and calls
-BodyPartMemento::notify(), which in the end will trigger an update of the Viewer. That update
-will, in ViewerPrivate::parseMsg(), create a new ObjectTreeParser and call parseObjectTree() on it.
-This is where the second run begins.
-
-The functions that deal with decrypting of verifying, like processMultiPartSignedSubtype() or
-processMultiPartEncryptedSubtype() will look if they find a BodyPartMemento that is associated with
-the current node. Now it finds that memento, since it was created in the first run. It checks if the
-memento's job has finished, and if so, the result can be written out (either the decrypted data or
-the verified signature).
-
-When dealing with encrypted nodes, new nodes are created with the decrypted data. It is important to
-note that the original MIME tree is never modified, and remains the same as the original one. The method
-createAndParseTempNode is called with the newly decrypted data, and it generates a new temporary node to
-store the decrypted data. When these nodes are created, it is important to keep track of them as otherwise
-some mementos that are added to the newly created temporary nodes will be constantly regenerated. As the
-regeneration triggers a viewer update when complete, it results in an infinite refresh loop. The function
-NodeHelper::linkAsPermanentDecrypted will create a link between the newly created node and the original parent.
-Conversely, the function NodeHelper::attachExtraContent will create a link in the other direction, from the parent
-node to the newly created temporary node.
-
-When generating some mementos for nodes that may be temporary nodes (for example, contact photo mementos), the
-function NodeHelper::setBodyPartMementoForPermanentParent is used. This will save the given body part memento for
-the closest found permanent parent node, rather than the transient node itself. Then when checking for the existence
-of a certain memento in a node, NodeHelper::findPermanentParentBodyPartMemento will check to see if any parent of the
-given temporary node is a permanent (encrypted) node that has been used to generate the asked-for node.
-
-To conclude: For async operations, parseObjectTree() is called twice: The first call starts the
-crypto operation and creates the BodyPartMemento, the second calls sees that the BodyPartMemento is
-there and can use its result for writing out the HTML.
-
-\par PartMetaData and ProcessResult
-
-For crypto operations, the class PartMetaData is used a lot, mainly to pass around info about the
-crypto state of a node. A PartMetaData can also be associated with a node by using
-NodeHelper::setPartMetaData(). The only user of that however is MessageAnalyzer::processPart() of
-the Nepomuk E-Mail Feeder, which also uses the ObjectTreeParser to analyze the message.
-
-You'll notice that a ProcessResult is passed to each formatter. The formatter is supposed to modify
-the ProcessResult to tell the callers something about the state of the nodes that were processed.
-One example for its use is to tell the caller about the crypto state of the node.
-
-\par BodyPartFormatter Plugins
-
-As mentioned way earlier, BodyPartFormatter can either be plugins or be internal. bodypartformatter.cpp
-contains some trickery so that the processXXX() methods of the ObjectTreeParser are called from
-a BodyPartFormatter associated with them, see the CREATE_BODY_PART_FORMATTER macro.
-
-The BodyPartFormatter code is work in progress, it was supposed to be refactored, but that has not
-yet happened at the time of writing. Therefore the code can seem a bit chaotic.
-
-External plugins are loaded with loadPlugins() in bodypartformatterfactory.cpp. External plugins
-can only use the classes in the interfaces/ directory, they include BodyPart, BodyPartMemento,
-BodyPartFormatterPlugin, BodyPartFormatter, BodyPartURLHandler, HtmlWriter and URLHandler. Therefore
-external plugins have powerful capabilities, which are needed for example in the iCal formatter or
-in the vCard formatter.
-
-\par Special HTML tags
-
-As also mentioned in the documentation of ViewerPrivate, the ObjectTreeParser writes out special
-links that are only understood by the viewer, for example 'kmail:' URLs or 'attachment:' URLs.
-Also, some special HTML tags are created, which the Viewer later uses for post-processing. For
-example a div with the id 'attachmentInjectionPoint', or a div with the id 'attachmentDiv', which
-is used to mark an attachment in the body with a yellow border when the user clicks the attachment
-in the header. Finally, parseObjectTree() creates an anchor with the id 'att%1', which is used in
-the Viewer to scroll to the attachment.
-*/
-class ObjectTreeParser
-{
-    /**
-    * @internal
-    * Copies the context of @p other, but not it's rawDecryptedBody, plainTextContent or htmlContent.
-    */
-    ObjectTreeParser(const ObjectTreeParser &other);
-
-public:
-    explicit ObjectTreeParser(Interface::ObjectTreeSource *source,
-                              NodeHelper *nodeHelper = nullptr,
-                              bool showOneMimePart = false,
-                              const AttachmentStrategy *attachmentStrategy = nullptr);
-
-    explicit ObjectTreeParser(const ObjectTreeParser *topLevelParser,
-                              bool showOneMimePart = false,
-                              const AttachmentStrategy *attachmentStrategy = nullptr);
-    virtual ~ObjectTreeParser();
-
-    void setAllowAsync(bool allow);
-    bool allowAsync() const;
-
-    bool hasPendingAsyncJobs() const;
-
-    /**
-    * The text of the message, ie. what would appear in the
-    * composer's text editor if this was edited or replied to.
-    * This is usually the content of the first text/plain MIME part.
-    */
-    QString plainTextContent() const;
-
-    /**
-    * Similar to plainTextContent(), but returns the HTML source of the first text/html MIME part.
-    *
-    * Not to be consfused with the HTML code that the message viewer widget displays, that HTML
-    * is written out by htmlWriter() and a totally different pair of shoes.
-    */
-    QString htmlContent() const;
-
-    /**
-    * The original charset of MIME part the plain text was extracted from.
-    *
-    * If there were more than one text/plain MIME parts in the mail, the this is the charset
-    * of the last MIME part processed.
-    */
-    QByteArray plainTextContentCharset() const;
-    QByteArray htmlContentCharset() const;
-
-    bool showOnlyOneMimePart() const;
-    void setShowOnlyOneMimePart(bool show);
-
-    const AttachmentStrategy *attachmentStrategy() const;
-
-    HtmlWriter *htmlWriter() const;
-
-    NodeHelper *nodeHelper() const;
-
-    /** Parse beginning at a given node and recursively parsing
-      the children of that node and it's next sibling. */
-    void parseObjectTree(KMime::Content *node);
-    MessagePartPtr parsedPart() const;
-
-private:
-    void extractNodeInfos(KMime::Content *curNode, bool isFirstTextPart);
-    void setPlainTextContent(const QString &plainTextContent);
-
-    /**
-    * Does the actual work for parseObjectTree. Unlike parseObjectTree(), this does not change the
-    * top-level content.
-    */
-    MessagePartPtr parseObjectTreeInternal(KMime::Content *node, bool mOnlyOneMimePart);
-    bool processType(KMime::Content *node, MimeTreeParser::ProcessResult &processResult, const QByteArray &mediaType, const QByteArray &subType, Interface::MessagePartPtr &mpRet, bool onlyOneMimePart);
-
-    Interface::MessagePartPtr defaultHandling(KMime::Content *node, MimeTreeParser::ProcessResult &result, bool onlyOneMimePart);
-
-private:
-
-    /** ctor helper */
-    void init();
-
-    const QTextCodec *codecFor(KMime::Content *node) const;
-
-    void copyContentFrom(const ObjectTreeParser *other);
-
-private:
-    Interface::ObjectTreeSource *mSource;
-    NodeHelper *mNodeHelper;
-    HtmlWriter *mHtmlWriter;
-    QByteArray mPlainTextContentCharset;
-    QByteArray mHtmlContentCharset;
-    QString mPlainTextContent;
-    QString mHtmlContent;
-    KMime::Content *mTopLevelContent;
-    MessagePartPtr mParsedPart;
-
-    /// Show only one mime part means that the user has selected some node in the message structure
-    /// viewer that is not the root, which means the user wants to only see the selected node and its
-    /// children. If that is the case, this variable is set to true.
-    /// The code needs to behave differently if this is set. For example, it should not process the
-    /// siblings. Also, consider inline images: Normally, those nodes are completely hidden, as the
-    /// HTML node embedds them. However, when showing only the node of the image, one has to show them,
-    /// as their is no HTML node in which they are displayed. There are many more cases where this
-    /// variable needs to be obeyed.
-    /// This variable is set to false again when processing the children in stdChildHandling(), as
-    /// the children can be completely displayed again.
-    bool mShowOnlyOneMimePart;
-
-    bool mHasPendingAsyncJobs;
-    bool mAllowAsync;
-    const AttachmentStrategy *mAttachmentStrategy;
-    // DataUrl Icons cache
-    QString mCollapseIcon;
-    QString mExpandIcon;
-    bool mDeleteNodeHelper;
-
-    friend class PartNodeBodyPart;
-    friend class MessagePart;
-    friend class EncryptedMessagePart;
-    friend class SignedMessagePart;
-    friend class EncapsulatedRfc822MessagePart;
-    friend class TextMessagePart;
-    friend class HtmlMessagePart;
-    friend class TextPlainBodyPartFormatter;
-    friend class MultiPartSignedBodyPartFormatter;
-    friend class ApplicationPkcs7MimeBodyPartFormatter;
-};
-
-}
-
-#endif // __MIMETREEPARSER_OBJECTTREEPARSER_H__
-
diff --git a/framework/src/domain/mimetreeparser/otp/objecttreesource.cpp b/framework/src/domain/mimetreeparser/otp/objecttreesource.cpp
deleted file mode 100644
index 45f96c58..00000000
--- a/framework/src/domain/mimetreeparser/otp/objecttreesource.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
-  Copyright (C) 2009 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.net
-  Copyright (c) 2009 Andras Mantia <andras@kdab.net>
-
-  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.
-
-  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 "objecttreesource.h"
-#include "bodypartformatter.h"
-#include "messagepart.h"
-
-using namespace MimeTreeParser;
-
-Interface::ObjectTreeSource::~ObjectTreeSource()
-{
-}
diff --git a/framework/src/domain/mimetreeparser/otp/objecttreesource.h b/framework/src/domain/mimetreeparser/otp/objecttreesource.h
deleted file mode 100644
index afada4c4..00000000
--- a/framework/src/domain/mimetreeparser/otp/objecttreesource.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
-  Copyright (C) 2009 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.net
-  Copyright (c) 2009 Andras Mantia <andras@kdab.net>
-
-  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.
-
-  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.
-*/
-
-#ifndef __MIMETREEPARSER_OBJECTTREESOURCE_IF_H__
-#define __MIMETREEPARSER_OBJECTTREESOURCE_IF_H__
-
-#include "util.h"
-
-#include <KMime/Message>
-
-#include <QSharedPointer>
-class QTextCodec;
-
-namespace MimeTreeParser
-{
-class HtmlWriter;
-class AttachmentStrategy;
-class BodyPartFormatterBaseFactory;
-namespace Interface
-{
-class MessagePart;
-typedef QSharedPointer<MessagePart> MessagePartPtr;
-class MessagePartRenderer;
-typedef QSharedPointer<MessagePartRenderer> MessagePartRendererPtr;
-}
-}
-
-namespace MimeTreeParser
-{
-namespace Interface
-{
-
-/**
- * Interface for object tree sources.
- * @author Andras Mantia <amantia@kdab.net>
- */
-class ObjectTreeSource
-{
-
-public:
-    virtual ~ObjectTreeSource();
-
-    /**
-      * Sets the type of mail that is currently displayed. Applications can display this
-      * information to the user, for example KMail displays a HTML status bar.
-      * Note: This is not called when the mode is "Normal".
-      */
-    virtual void setHtmlMode(MimeTreeParser::Util::HtmlMode mode, const QList<MimeTreeParser::Util::HtmlMode> &availableModes) = 0;
-
-    /** Return the mode that is the preferred to display */
-    virtual MimeTreeParser::Util::HtmlMode preferredMode() const = 0;
-
-    /** Return true if an encrypted mail should be decrypted */
-    virtual bool decryptMessage() const = 0;
-
-    /** Return true if external sources should be loaded in a html mail */
-    virtual bool htmlLoadExternal() const = 0;
-
-    /** Return true to include the signature details in the generated html */
-    virtual bool showSignatureDetails() const = 0;
-
-    virtual int levelQuote() const = 0;
-
-    /** The override codec that should be used for the mail */
-    virtual const QTextCodec *overrideCodec() = 0;
-
-    virtual QString createMessageHeader(KMime::Message *message) = 0;
-
-    /** Return the wanted attachment startegy */
-    virtual const AttachmentStrategy *attachmentStrategy() = 0;
-
-    /** Return the html write object */
-    virtual HtmlWriter *htmlWriter() = 0;
-
-    /** The source object behind the interface. */
-    virtual QObject *sourceObject() = 0;
-
-    /** should keys be imported automatically **/
-    virtual bool autoImportKeys() const = 0;
-
-    virtual bool showEmoticons() const = 0;
-
-    virtual bool showExpandQuotesMark() const = 0;
-
-    virtual const BodyPartFormatterBaseFactory *bodyPartFormatterFactory() = 0;
-
-    virtual MessagePartRendererPtr messagePartTheme(MessagePartPtr msgPart) = 0;
-
-    virtual bool isPrinting() const = 0;
-};
-}
-}
-#endif
diff --git a/framework/src/domain/mimetreeparser/otp/partmetadata.h b/framework/src/domain/mimetreeparser/otp/partmetadata.h
deleted file mode 100644
index 41399837..00000000
--- a/framework/src/domain/mimetreeparser/otp/partmetadata.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/*  -*- c++ -*-
-    partmetadata.h
-
-    KMail, the KDE mail client.
-    Copyright (c) 2002-2003 Karl-Heinz Zimmer <khz@kde.org>
-    Copyright (c) 2003      Marc Mutz <mutz@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.0, as published by the Free Software Foundation.
-    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, US
-*/
-
-#ifndef __MIMETREEPARSER_PARTMETADATA_H__
-#define __MIMETREEPARSER_PARTMETADATA_H__
-
-#include <gpgme++/verificationresult.h>
-#include <gpgme++/context.h>
-
-#include <QStringList>
-#include <QDateTime>
-
-namespace MimeTreeParser
-{
-
-class PartMetaData
-{
-public:
-    PartMetaData()
-        : sigSummary(GpgME::Signature::None),
-          isSigned(false),
-          isGoodSignature(false),
-          isEncrypted(false),
-          isDecryptable(false),
-          inProgress(false),
-          technicalProblem(false),
-          isEncapsulatedRfc822Message(false)
-    {
-    }
-    GpgME::Signature::Summary sigSummary;
-    QString signClass;
-    QString signer;
-    QStringList signerMailAddresses;
-    QByteArray keyId;
-    GpgME::Signature::Validity keyTrust;
-    QString status;  // to be used for unknown plug-ins
-    int status_code; // to be used for i18n of OpenPGP and S/MIME CryptPlugs
-    QString errorText;
-    QDateTime creationTime;
-    QString decryptionError;
-    QString auditLog;
-    GpgME::Error auditLogError;
-    bool isSigned : 1;
-    bool isGoodSignature : 1;
-    bool isEncrypted : 1;
-    bool isDecryptable : 1;
-    bool inProgress : 1;
-    bool technicalProblem : 1;
-    bool isEncapsulatedRfc822Message : 1;
-};
-
-}
-
-#endif // __MIMETREEPARSER_PARTMETADATA_H__
-
diff --git a/framework/src/domain/mimetreeparser/otp/partnodebodypart.cpp b/framework/src/domain/mimetreeparser/otp/partnodebodypart.cpp
deleted file mode 100644
index ec509787..00000000
--- a/framework/src/domain/mimetreeparser/otp/partnodebodypart.cpp
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
-    partnodebodypart.cpp
-
-    This file is part of KMail, the KDE mail client.
-    Copyright (c) 2004 Marc Mutz <mutz@kde.org>,
-                       Ingo Kloecker <kloecker@kde.org>
-
-    KMail 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.
-
-    KMail 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 "partnodebodypart.h"
-#include "nodehelper.h"
-#include "objecttreeparser.h"
-#include "mimetreeparser_debug.h"
-#include <KMime/Content>
-
-#include <QTextCodec>
-#include <QUrl>
-
-using namespace MimeTreeParser;
-
-static int serial = 0;
-
-PartNodeBodyPart::PartNodeBodyPart(ObjectTreeParser *otp, ProcessResult *result, KMime::Content *topLevelContent, KMime::Content *content,
-                                   NodeHelper *nodeHelper)
-    : Interface::BodyPart(), mTopLevelContent(topLevelContent), mContent(content),
-      mDefaultDisplay(Interface::BodyPart::None), mNodeHelper(nodeHelper)
-    , mObjectTreeParser(otp)
-    , mProcessResult(result)
-{}
-
-QString PartNodeBodyPart::makeLink(const QString &path) const
-{
-    // FIXME: use a PRNG for the first arg, instead of a serial number
-    return QStringLiteral("x-kmail:/bodypart/%1/%2/%3")
-           .arg(serial++).arg(mContent->index().toString())
-           .arg(QString::fromLatin1(QUrl::toPercentEncoding(path, "/")));
-}
-
-QString PartNodeBodyPart::asText() const
-{
-    if (!mContent->contentType()->isText()) {
-        return QString();
-    }
-    return mContent->decodedText();
-}
-
-QByteArray PartNodeBodyPart::asBinary() const
-{
-    return mContent->decodedContent();
-}
-
-QString PartNodeBodyPart::contentTypeParameter(const char *param) const
-{
-    return mContent->contentType()->parameter(QString::fromLatin1(param));
-}
-
-QString PartNodeBodyPart::contentDescription() const
-{
-    return mContent->contentDescription()->asUnicodeString();
-}
-
-QString PartNodeBodyPart::contentDispositionParameter(const char *param) const
-{
-    return mContent->contentDisposition()->parameter(QString::fromLatin1(param));
-}
-
-bool PartNodeBodyPart::hasCompleteBody() const
-{
-    qCWarning(MIMETREEPARSER_LOG) << "Sorry, not yet implemented.";
-    return true;
-}
-
-Interface::BodyPartMemento *PartNodeBodyPart::memento() const
-{
-    /*TODO(Andras) Volker suggests to use a ContentIndex->Mememnto mapping
-    Also review if the reader's bodyPartMemento should be returned or the NodeHelper's one
-    */
-    return mNodeHelper->bodyPartMemento(mContent, "__plugin__");
-}
-
-void PartNodeBodyPart::setBodyPartMemento(Interface::BodyPartMemento *memento)
-{
-    /*TODO(Andras) Volker suggests to use a ContentIndex->Memento mapping
-    Also review if the reader's bodyPartMemento should be set or the NodeHelper's one */
-    mNodeHelper->setBodyPartMemento(mContent, "__plugin__", memento);
-}
-
-Interface::BodyPart::Display PartNodeBodyPart::defaultDisplay() const
-{
-    return mDefaultDisplay;
-}
-
-void PartNodeBodyPart::setDefaultDisplay(Interface::BodyPart::Display d)
-{
-    mDefaultDisplay = d;
-}
-
-Interface::ObjectTreeSource *PartNodeBodyPart::source() const
-{
-    return mObjectTreeParser->mSource;
-}
diff --git a/framework/src/domain/mimetreeparser/otp/partnodebodypart.h b/framework/src/domain/mimetreeparser/otp/partnodebodypart.h
deleted file mode 100644
index ded0ee2c..00000000
--- a/framework/src/domain/mimetreeparser/otp/partnodebodypart.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
-    partnodebodypart.h
-
-    This file is part of KMail, the KDE mail client.
-    Copyright (c) 2004 Marc Mutz <mutz@kde.org>,
-                       Ingo Kloecker <kloecker@kde.org>
-
-    KMail 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.
-
-    KMail 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.
-*/
-
-#ifndef __MIMETREEPARSER_PARTNODEBODYPART_H__
-#define __MIMETREEPARSER_PARTNODEBODYPART_H__
-
-#include "bodypart.h"
-
-namespace KMime
-{
-class Content;
-}
-
-namespace MimeTreeParser
-{
-class NodeHelper;
-}
-
-namespace MimeTreeParser
-{
-
-/**
-    @short an implementation of the BodyPart interface using KMime::Content's
-*/
-class PartNodeBodyPart : public Interface::BodyPart
-{
-public:
-    explicit PartNodeBodyPart(ObjectTreeParser *otp, ProcessResult *result, KMime::Content *topLevelContent, KMime::Content *content,
-                              NodeHelper *nodeHelper);
-
-    QString makeLink(const QString &path) const Q_DECL_OVERRIDE;
-    QString asText() const Q_DECL_OVERRIDE;
-    QByteArray asBinary() const Q_DECL_OVERRIDE;
-    QString contentTypeParameter(const char *param) const Q_DECL_OVERRIDE;
-    QString contentDescription() const Q_DECL_OVERRIDE;
-    QString contentDispositionParameter(const char *param) const Q_DECL_OVERRIDE;
-    bool hasCompleteBody() const Q_DECL_OVERRIDE;
-
-    Interface::BodyPartMemento *memento() const Q_DECL_OVERRIDE;
-    void setBodyPartMemento(Interface::BodyPartMemento *memento) Q_DECL_OVERRIDE;
-    BodyPart::Display defaultDisplay() const Q_DECL_OVERRIDE;
-    void setDefaultDisplay(BodyPart::Display);
-    KMime::Content *content() const Q_DECL_OVERRIDE
-    {
-        return mContent;
-    }
-    KMime::Content *topLevelContent() const Q_DECL_OVERRIDE
-    {
-        return mTopLevelContent;
-    }
-    NodeHelper *nodeHelper() const Q_DECL_OVERRIDE
-    {
-        return mNodeHelper;
-    }
-
-    ObjectTreeParser *objectTreeParser() const Q_DECL_OVERRIDE
-    {
-        return mObjectTreeParser;
-    }
-
-    ProcessResult *processResult() const Q_DECL_OVERRIDE
-    {
-        return mProcessResult;
-    }
-
-    Interface::ObjectTreeSource *source() const Q_DECL_OVERRIDE;
-private:
-    KMime::Content *mTopLevelContent;
-    KMime::Content *mContent;
-    BodyPart::Display mDefaultDisplay;
-    NodeHelper *mNodeHelper;
-    ObjectTreeParser *mObjectTreeParser;
-    ProcessResult *mProcessResult;
-};
-
-}
-
-#endif // __MIMETREEPARSER_PARTNODEBODYPART_H__
diff --git a/framework/src/domain/mimetreeparser/otp/qgpgmejobexecutor.cpp b/framework/src/domain/mimetreeparser/otp/qgpgmejobexecutor.cpp
deleted file mode 100644
index 1f453342..00000000
--- a/framework/src/domain/mimetreeparser/otp/qgpgmejobexecutor.cpp
+++ /dev/null
@@ -1,158 +0,0 @@
-/*
-    Copyright (c) 2008 Volker Krause <vkrause@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.
-
-    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 "qgpgmejobexecutor.h"
-#include "mimetreeparser_debug.h"
-
-#include <QGpgME/DecryptVerifyJob>
-#include <QGpgME/ImportJob>
-#include <QGpgME/VerifyDetachedJob>
-#include <QGpgME/VerifyOpaqueJob>
-
-#include <QEventLoop>
-
-#include <cassert>
-
-using namespace GpgME;
-using namespace MimeTreeParser;
-
-QGpgMEJobExecutor::QGpgMEJobExecutor(QObject *parent) : QObject(parent)
-{
-    setObjectName(QStringLiteral("KleoJobExecutor"));
-    mEventLoop = new QEventLoop(this);
-}
-
-GpgME::VerificationResult QGpgMEJobExecutor::exec(
-    QGpgME::VerifyDetachedJob *job,
-    const QByteArray &signature,
-    const QByteArray &signedData)
-{
-    qCDebug(MIMETREEPARSER_LOG) << "Starting detached verification job";
-    connect(job, SIGNAL(result(GpgME::VerificationResult)), SLOT(verificationResult(GpgME::VerificationResult)));
-    GpgME::Error err = job->start(signature, signedData);
-    if (err) {
-        return VerificationResult(err);
-    }
-    mEventLoop->exec(QEventLoop::ExcludeUserInputEvents);
-    return mVerificationResult;
-}
-
-GpgME::VerificationResult QGpgMEJobExecutor::exec(
-    QGpgME::VerifyOpaqueJob *job,
-    const QByteArray &signedData,
-    QByteArray &plainText)
-{
-    qCDebug(MIMETREEPARSER_LOG) << "Starting opaque verification job";
-    connect(job, SIGNAL(result(GpgME::VerificationResult,QByteArray)), SLOT(verificationResult(GpgME::VerificationResult,QByteArray)));
-    GpgME::Error err = job->start(signedData);
-    if (err) {
-        plainText.clear();
-        return VerificationResult(err);
-    }
-    mEventLoop->exec(QEventLoop::ExcludeUserInputEvents);
-    plainText = mData;
-    return mVerificationResult;
-}
-
-std::pair< GpgME::DecryptionResult, GpgME::VerificationResult > QGpgMEJobExecutor::exec(
-    QGpgME::DecryptVerifyJob *job,
-    const QByteArray &cipherText,
-    QByteArray &plainText)
-{
-    qCDebug(MIMETREEPARSER_LOG) << "Starting decryption job";
-    connect(job, &QGpgME::DecryptVerifyJob::result, this, &QGpgMEJobExecutor::decryptResult);
-    GpgME::Error err = job->start(cipherText);
-    if (err) {
-        plainText.clear();
-        return std::make_pair(DecryptionResult(err), VerificationResult(err));
-    }
-    mEventLoop->exec(QEventLoop::ExcludeUserInputEvents);
-    plainText = mData;
-    return std::make_pair(mDecryptResult, mVerificationResult);
-}
-
-GpgME::ImportResult QGpgMEJobExecutor::exec(QGpgME::ImportJob *job, const QByteArray &certData)
-{
-    connect(job, SIGNAL(result(GpgME::ImportResult)), SLOT(importResult(GpgME::ImportResult)));
-    GpgME::Error err = job->start(certData);
-    if (err) {
-        return ImportResult(err);
-    }
-    mEventLoop->exec(QEventLoop::ExcludeUserInputEvents);
-    return mImportResult;
-}
-
-Error QGpgMEJobExecutor::auditLogError() const
-{
-    return mAuditLogError;
-}
-
-void QGpgMEJobExecutor::verificationResult(const GpgME::VerificationResult &result)
-{
-    qCDebug(MIMETREEPARSER_LOG) << "Detached verification job finished";
-    QGpgME::Job *job = qobject_cast<QGpgME::Job *>(sender());
-    assert(job);
-    mVerificationResult = result;
-    mAuditLogError = job->auditLogError();
-    mAuditLog = job->auditLogAsHtml();
-    mEventLoop->quit();
-}
-
-void QGpgMEJobExecutor::verificationResult(const GpgME::VerificationResult &result, const QByteArray &plainText)
-{
-    qCDebug(MIMETREEPARSER_LOG) << "Opaque verification job finished";
-    QGpgME::Job *job = qobject_cast<QGpgME::Job *>(sender());
-    assert(job);
-    mVerificationResult = result;
-    mData = plainText;
-    mAuditLogError = job->auditLogError();
-    mAuditLog = job->auditLogAsHtml();
-    mEventLoop->quit();
-}
-
-void QGpgMEJobExecutor::decryptResult(
-    const GpgME::DecryptionResult &decryptionresult,
-    const GpgME::VerificationResult &verificationresult,
-    const QByteArray &plainText)
-{
-    qCDebug(MIMETREEPARSER_LOG) << "Decryption job finished";
-    QGpgME::Job *job = qobject_cast<QGpgME::Job *>(sender());
-    assert(job);
-    mVerificationResult = verificationresult;
-    mDecryptResult = decryptionresult;
-    mData = plainText;
-    mAuditLogError = job->auditLogError();
-    mAuditLog = job->auditLogAsHtml();
-    mEventLoop->quit();
-}
-
-void QGpgMEJobExecutor::importResult(const GpgME::ImportResult &result)
-{
-    QGpgME::Job *job = qobject_cast<QGpgME::Job *>(sender());
-    assert(job);
-    mImportResult = result;
-    mAuditLogError = job->auditLogError();
-    mAuditLog = job->auditLogAsHtml();
-    mEventLoop->quit();
-}
-
-QString QGpgMEJobExecutor::auditLogAsHtml() const
-{
-    return mAuditLog;
-}
-
diff --git a/framework/src/domain/mimetreeparser/otp/qgpgmejobexecutor.h b/framework/src/domain/mimetreeparser/otp/qgpgmejobexecutor.h
deleted file mode 100644
index 8a81b078..00000000
--- a/framework/src/domain/mimetreeparser/otp/qgpgmejobexecutor.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
-    Copyright (c) 2008 Volker Krause <vkrause@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.
-
-    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.
-*/
-
-#ifndef __MIMETREEPARSER_KLEOJOBEXECUTOR_H__
-#define __MIMETREEPARSER_KLEOJOBEXECUTOR_H__
-
-#include <gpgme++/decryptionresult.h>
-#include <gpgme++/importresult.h>
-#include <gpgme++/verificationresult.h>
-
-#include <QObject>
-
-#include <utility>
-
-class QEventLoop;
-
-namespace QGpgME
-{
-class DecryptVerifyJob;
-class ImportJob;
-class VerifyDetachedJob;
-class VerifyOpaqueJob;
-}
-
-namespace MimeTreeParser
-{
-
-/**
-  Helper class for synchronous execution of Kleo crypto jobs.
-*/
-class QGpgMEJobExecutor : public QObject
-{
-    Q_OBJECT
-public:
-    explicit QGpgMEJobExecutor(QObject *parent = nullptr);
-
-    GpgME::VerificationResult exec(QGpgME::VerifyDetachedJob *job,
-                                   const QByteArray &signature,
-                                   const QByteArray &signedData);
-    GpgME::VerificationResult exec(QGpgME::VerifyOpaqueJob *job,
-                                   const QByteArray &signedData,
-                                   QByteArray &plainText);
-    std::pair<GpgME::DecryptionResult, GpgME::VerificationResult> exec(QGpgME::DecryptVerifyJob *job,
-            const QByteArray &cipherText,
-            QByteArray &plainText);
-    GpgME::ImportResult exec(QGpgME::ImportJob *job, const QByteArray &certData);
-
-    GpgME::Error auditLogError() const;
-    QString auditLogAsHtml() const;
-
-private Q_SLOTS:
-    void verificationResult(const GpgME::VerificationResult &result);
-    void verificationResult(const GpgME::VerificationResult &result, const QByteArray &plainText);
-    void decryptResult(const GpgME::DecryptionResult &decryptionresult,
-                       const GpgME::VerificationResult &verificationresult,
-                       const QByteArray &plainText);
-    void importResult(const GpgME::ImportResult &result);
-
-private:
-    QEventLoop *mEventLoop;
-    GpgME::VerificationResult mVerificationResult;
-    GpgME::DecryptionResult mDecryptResult;
-    GpgME::ImportResult mImportResult;
-    QByteArray mData;
-    GpgME::Error mAuditLogError;
-    QString mAuditLog;
-};
-
-}
-
-#endif
diff --git a/framework/src/domain/mimetreeparser/otp/queuehtmlwriter.cpp b/framework/src/domain/mimetreeparser/otp/queuehtmlwriter.cpp
deleted file mode 100644
index ea17bf5c..00000000
--- a/framework/src/domain/mimetreeparser/otp/queuehtmlwriter.cpp
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
-   Copyright (c) 2015 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 "queuehtmlwriter.h"
-
-#include "mimetreeparser_debug.h"
-
-#include<QByteArray>
-#include<QString>
-
-using namespace MimeTreeParser;
-
-QueueHtmlWriter::QueueHtmlWriter(HtmlWriter *base)
-    : HtmlWriter()
-    , mBase(base)
-{
-}
-
-QueueHtmlWriter::~QueueHtmlWriter()
-{
-}
-
-void QueueHtmlWriter::setBase(HtmlWriter *base)
-{
-    mBase = base;
-}
-
-void QueueHtmlWriter::begin(const QString &css)
-{
-    Command cmd;
-    cmd.type = Command::Begin;
-    cmd.s = css;
-    mQueue.append(cmd);
-}
-
-void QueueHtmlWriter::end()
-{
-    Command cmd;
-    cmd.type = Command::End;
-    mQueue.append(cmd);
-}
-
-void QueueHtmlWriter::reset()
-{
-    Command cmd;
-    cmd.type = Command::Reset;
-    mQueue.append(cmd);
-}
-
-void QueueHtmlWriter::write(const QString &str)
-{
-    Command cmd;
-    cmd.type = Command::Write;
-    cmd.s = str;
-    mQueue.append(cmd);
-}
-
-void QueueHtmlWriter::queue(const QString &str)
-{
-    Command cmd;
-    cmd.type = Command::Queue;
-    cmd.s = str;
-    mQueue.append(cmd);
-}
-
-void QueueHtmlWriter::flush()
-{
-    Command cmd;
-    cmd.type = Command::Flush;
-    mQueue.append(cmd);
-}
-
-void QueueHtmlWriter::replay()
-{
-    foreach (const auto &entry, mQueue) {
-        switch (entry.type) {
-        case Command::Begin:
-            mBase->begin(entry.s);
-            break;
-        case Command::End:
-            mBase->end();
-            break;
-        case Command::Reset:
-            mBase->reset();
-            break;
-        case Command::Write:
-            mBase->write(entry.s);
-            break;
-        case Command::Queue:
-            mBase->queue(entry.s);
-            break;
-        case Command::Flush:
-            mBase->flush();
-            break;
-        case Command::EmbedPart:
-            mBase->embedPart(entry.b, entry.s);
-            break;
-        case Command::ExtraHead:
-            mBase->extraHead(entry.s);
-            break;
-        }
-    }
-}
-
-void QueueHtmlWriter::embedPart(const QByteArray &contentId, const QString &url)
-{
-    Command cmd;
-    cmd.type = Command::EmbedPart;
-    cmd.s = url;
-    cmd.b = contentId;
-    mQueue.append(cmd);
-}
-void QueueHtmlWriter::extraHead(const QString &extra)
-{
-    Command cmd;
-    cmd.type = Command::ExtraHead;
-    cmd.s = extra;
-    mQueue.append(cmd);
-}
-
diff --git a/framework/src/domain/mimetreeparser/otp/queuehtmlwriter.h b/framework/src/domain/mimetreeparser/otp/queuehtmlwriter.h
deleted file mode 100644
index 9e7a4659..00000000
--- a/framework/src/domain/mimetreeparser/otp/queuehtmlwriter.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
-   Copyright (c) 2015 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.
-*/
-
-#ifndef __MIMETREEPARSER_QUEUEHTMLWRITER_H__
-#define __MIMETREEPARSER_QUEUEHTMLWRITER_H__
-
-#include "htmlwriter.h"
-
-#include<QVector>
-#include<QVariant>
-
-class QString;
-class QByteArray;
-
-namespace MimeTreeParser
-{
-/**
-\brief Cache HTML output and not write them directy.
-
-This class is needed to make it possible to first process the mime tree and
-afterwards render the HTML.
-
-Please do not use this class - it is only added to make it possible to slowly
-move ObjectTreeParser to a process fist / render later.
-
-*/
-struct Command {
-    enum { Begin, End, Reset, Write, Queue, Flush, EmbedPart, ExtraHead } type;
-    QString s;
-    QByteArray b;
-};
-
-class QueueHtmlWriter : public HtmlWriter
-{
-public:
-    explicit QueueHtmlWriter(MimeTreeParser::HtmlWriter *base);
-    virtual ~QueueHtmlWriter();
-
-    void setBase(HtmlWriter *base);
-
-    void begin(const QString &cssDefs) Q_DECL_OVERRIDE;
-    void end() Q_DECL_OVERRIDE;
-    void reset() Q_DECL_OVERRIDE;
-    void write(const QString &str) Q_DECL_OVERRIDE;
-    void queue(const QString &str) Q_DECL_OVERRIDE;
-    void flush() Q_DECL_OVERRIDE;
-    void embedPart(const QByteArray &contentId, const QString &url) Q_DECL_OVERRIDE;
-    void extraHead(const QString &str) Q_DECL_OVERRIDE;
-
-    void replay();
-
-private:
-    HtmlWriter *mBase;
-    QVector<Command> mQueue;
-};
-
-} // namespace MimeTreeParser
-
-#endif // __MIMETREEPARSER_QUEUEHTMLWRITER_H__
diff --git a/framework/src/domain/mimetreeparser/otp/texthtml.cpp b/framework/src/domain/mimetreeparser/otp/texthtml.cpp
deleted file mode 100644
index 51332cff..00000000
--- a/framework/src/domain/mimetreeparser/otp/texthtml.cpp
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
-   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 "texthtml.h"
-
-#include "attachmentstrategy.h"
-#include "objecttreeparser.h"
-#include "messagepart.h"
-
-#include <KMime/Content>
-
-#include "mimetreeparser_debug.h"
-
-using namespace MimeTreeParser;
-
-const TextHtmlBodyPartFormatter *TextHtmlBodyPartFormatter::self;
-
-const Interface::BodyPartFormatter *TextHtmlBodyPartFormatter::create()
-{
-    if (!self) {
-        self = new TextHtmlBodyPartFormatter();
-    }
-    return self;
-}
-Interface::BodyPartFormatter::Result TextHtmlBodyPartFormatter::format(Interface::BodyPart *part, HtmlWriter *writer) const
-{
-    Q_UNUSED(writer)
-    const auto p = process(*part);
-    const auto mp = static_cast<MessagePart *>(p.data());
-    if (mp) {
-        mp->html(false);
-        return Ok;
-    }
-    return Failed;
-}
-
-Interface::MessagePart::Ptr TextHtmlBodyPartFormatter::process(Interface::BodyPart &part) const
-{
-    KMime::Content *node = part.content();
-    HtmlMessagePart::Ptr mp(new HtmlMessagePart(part.objectTreeParser(), node, part.source()));
-    return mp;
-}
diff --git a/framework/src/domain/mimetreeparser/otp/texthtml.h b/framework/src/domain/mimetreeparser/otp/texthtml.h
deleted file mode 100644
index a03cfe50..00000000
--- a/framework/src/domain/mimetreeparser/otp/texthtml.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
-   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.
-*/
-
-#ifndef __MIMETREEPARSER_BODYFORAMATTER_TEXTHTML_H__
-#define __MIMETREEPARSER_BODYFORAMATTER_TEXTHTML_H__
-
-#include "bodypartformatter.h"
-#include "bodypart.h"
-
-namespace MimeTreeParser
-{
-
-class TextHtmlBodyPartFormatter : public Interface::BodyPartFormatter
-{
-    static const TextHtmlBodyPartFormatter *self;
-public:
-    Interface::MessagePart::Ptr process(Interface::BodyPart &part) const Q_DECL_OVERRIDE;
-    Interface::BodyPartFormatter::Result format(Interface::BodyPart *, HtmlWriter *) const Q_DECL_OVERRIDE;
-    using Interface::BodyPartFormatter::format;
-    static const Interface::BodyPartFormatter *create();
-};
-
-}
-
-#endif
diff --git a/framework/src/domain/mimetreeparser/otp/textplain.cpp b/framework/src/domain/mimetreeparser/otp/textplain.cpp
deleted file mode 100644
index d3437f04..00000000
--- a/framework/src/domain/mimetreeparser/otp/textplain.cpp
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
-   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 "textplain.h"
-
-#include "attachmentstrategy.h"
-#include "objecttreeparser.h"
-#include "messagepart.h"
-
-#include <KMime/Content>
-
-#include "mimetreeparser_debug.h"
-
-using namespace MimeTreeParser;
-
-const TextPlainBodyPartFormatter *TextPlainBodyPartFormatter::self;
-
-const Interface::BodyPartFormatter *TextPlainBodyPartFormatter::create()
-{
-    if (!self) {
-        self = new TextPlainBodyPartFormatter();
-    }
-    return self;
-}
-Interface::BodyPartFormatter::Result TextPlainBodyPartFormatter::format(Interface::BodyPart *part, HtmlWriter *writer) const
-{
-    Q_UNUSED(writer)
-    const auto p = process(*part);
-    const auto mp = static_cast<MessagePart *>(p.data());
-    if (mp) {
-        mp->html(false);
-        return Ok;
-    }
-    return Failed;
-}
-
-Interface::MessagePart::Ptr TextPlainBodyPartFormatter::process(Interface::BodyPart &part) const
-{
-    KMime::Content *node = part.content();
-    const bool isFirstTextPart = (node->topLevel()->textContent() == node);
-
-    QString label = NodeHelper::fileName(node);
-
-    const bool bDrawFrame = !isFirstTextPart
-                            && !part.objectTreeParser()->showOnlyOneMimePart()
-                            && !label.isEmpty();
-    const QString fileName = part.nodeHelper()->writeNodeToTempFile(node);
-
-    TextMessagePart::Ptr mp;
-    if (isFirstTextPart) {
-        mp = TextMessagePart::Ptr(new TextMessagePart(part.objectTreeParser(), node, bDrawFrame, fileName.isEmpty(), part.source()->decryptMessage()));
-    } else {
-        mp = TextMessagePart::Ptr(new AttachmentMessagePart(part.objectTreeParser(), node, bDrawFrame, fileName.isEmpty(), part.source()->decryptMessage()));
-    }
-
-    part.processResult()->setInlineSignatureState(mp->signatureState());
-    part.processResult()->setInlineEncryptionState(mp->encryptionState());
-
-    part.nodeHelper()->setNodeDisplayedEmbedded(node, true);
-
-    return mp;
-}
diff --git a/framework/src/domain/mimetreeparser/otp/textplain.h b/framework/src/domain/mimetreeparser/otp/textplain.h
deleted file mode 100644
index c97a6aec..00000000
--- a/framework/src/domain/mimetreeparser/otp/textplain.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
-   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.
-*/
-
-#ifndef __MIMETREEPARSER_BODYFORAMATTER_TEXTPLAIN_H__
-#define __MIMETREEPARSER_BODYFORAMATTER_TEXTPLAIN_H__
-
-#include "bodypartformatter.h"
-#include "bodypart.h"
-
-namespace MimeTreeParser
-{
-
-class TextPlainBodyPartFormatter : public Interface::BodyPartFormatter
-{
-    static const TextPlainBodyPartFormatter *self;
-public:
-    Interface::MessagePart::Ptr process(Interface::BodyPart &part) const Q_DECL_OVERRIDE;
-    Interface::BodyPartFormatter::Result format(Interface::BodyPart *, HtmlWriter *) const Q_DECL_OVERRIDE;
-    using Interface::BodyPartFormatter::format;
-    static const Interface::BodyPartFormatter *create();
-};
-
-}
-
-#endif
diff --git a/framework/src/domain/mimetreeparser/otp/util.cpp b/framework/src/domain/mimetreeparser/otp/util.cpp
deleted file mode 100644
index 5ca8d828..00000000
--- a/framework/src/domain/mimetreeparser/otp/util.cpp
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
-  Copyright (c) 2016 Sandro Knauß <sknauss@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.
-
-  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 "util.h"
-
-#include "mimetreeparser_debug.h"
-
-#include "nodehelper.h"
-
-#include <KMime/Content>
-
-#include <QMimeDatabase>
-#include <QString>
-
-using namespace MimeTreeParser::Util;
-
-bool MimeTreeParser::Util::isTypeBlacklisted(KMime::Content *node)
-{
-    const QByteArray mediaTypeLower = node->contentType()->mediaType().toLower();
-    bool typeBlacklisted = mediaTypeLower == "multipart";
-    if (!typeBlacklisted) {
-        typeBlacklisted = KMime::isCryptoPart(node);
-    }
-    typeBlacklisted = typeBlacklisted || node == node->topLevel();
-    const bool firstTextChildOfEncapsulatedMsg =
-        mediaTypeLower == "text" &&
-        node->contentType()->subType().toLower() == "plain" &&
-        node->parent() && node->parent()->contentType()->mediaType().toLower() == "message";
-    return  typeBlacklisted || firstTextChildOfEncapsulatedMsg;
-}
-
-QString MimeTreeParser::Util::labelForContent(KMime::Content *node)
-{
-    const QString name = node->contentType()->name();
-    QString label = name.isEmpty() ? NodeHelper::fileName(node) : name;
-    if (label.isEmpty()) {
-        label = node->contentDescription()->asUnicodeString();
-    }
-    return label;
-}
-
-QMimeType MimeTreeParser::Util::mimetype(const QString &name)
-{
-    QMimeDatabase db;
-    // consider the filename if mimetype cannot be found by content-type
-    const auto mimeTypes = db.mimeTypesForFileName(name);
-    for (const auto &mt : mimeTypes) {
-        if (mt.name() != QLatin1String("application/octet-stream")) {
-            return mt;
-        }
-    }
-
-    // consider the attachment's contents if neither the Content-Type header
-    // nor the filename give us a clue
-    return db.mimeTypeForFile(name);
-}
-
-QString MimeTreeParser::Util::iconNameForMimetype(const QString &mimeType,
-        const QString &fallbackFileName1,
-        const QString &fallbackFileName2)
-{
-    QString fileName;
-    QString tMimeType = mimeType;
-
-    // convert non-registered types to registered types
-    if (mimeType == QLatin1String("application/x-vnd.kolab.contact")) {
-        tMimeType = QStringLiteral("text/x-vcard");
-    } else if (mimeType == QLatin1String("application/x-vnd.kolab.event")) {
-        tMimeType = QStringLiteral("application/x-vnd.akonadi.calendar.event");
-    } else if (mimeType == QLatin1String("application/x-vnd.kolab.task")) {
-        tMimeType = QStringLiteral("application/x-vnd.akonadi.calendar.todo");
-    } else if (mimeType == QLatin1String("application/x-vnd.kolab.journal")) {
-        tMimeType = QStringLiteral("application/x-vnd.akonadi.calendar.journal");
-    } else if (mimeType == QLatin1String("application/x-vnd.kolab.note")) {
-        tMimeType = QStringLiteral("application/x-vnd.akonadi.note");
-    } else if (mimeType == QLatin1String("image/jpg")) {
-        tMimeType = QStringLiteral("image/jpeg");
-    }
-    QMimeDatabase mimeDb;
-    auto mime = mimeDb.mimeTypeForName(tMimeType);
-    if (mime.isValid()) {
-        fileName = mime.iconName();
-    } else {
-        fileName = QStringLiteral("unknown");
-        if (!tMimeType.isEmpty()) {
-            qCWarning(MIMETREEPARSER_LOG) << "unknown mimetype" << tMimeType;
-        }
-    }
-    //WorkAround for #199083
-    if (fileName == QLatin1String("text-vcard")) {
-        fileName = QStringLiteral("text-x-vcard");
-    }
-
-    if (fileName.isEmpty()) {
-        fileName = fallbackFileName1;
-        if (fileName.isEmpty()) {
-            fileName = fallbackFileName2;
-        }
-        if (!fileName.isEmpty()) {
-            fileName = mimeDb.mimeTypeForFile(QLatin1String("/tmp/") + fileName).iconName();
-        }
-    }
-
-    return fileName;
-}
-
-QString MimeTreeParser::Util::iconNameForContent(KMime::Content *node)
-{
-    if (!node) {
-        return QString();
-    }
-
-    QByteArray mimeType = node->contentType()->mimeType();
-    if (mimeType.isNull() || mimeType == "application/octet-stream") {
-        const QString mime = mimetype(node->contentDisposition()->filename()).name();
-        mimeType = mime.toLatin1();
-    }
-    mimeType = mimeType.toLower();
-    return iconNameForMimetype(QLatin1String(mimeType), node->contentDisposition()->filename(),
-                               node->contentType()->name());
-}
diff --git a/framework/src/domain/mimetreeparser/otp/util.h b/framework/src/domain/mimetreeparser/otp/util.h
deleted file mode 100644
index 099c647a..00000000
--- a/framework/src/domain/mimetreeparser/otp/util.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
-  Copyright (c) 2016 Sandro Knauß <sknauss@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.
-
-  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.
-*/
-
-#ifndef __MIMETREEPARSER_UTILS_UTIL_H__
-#define __MIMETREEPARSER_UTILS_UTIL_H__
-
-#include <QString>
-
-class QMimeType;
-
-namespace KMime
-{
-class Content;
-}
-
-namespace MimeTreeParser
-{
-
-/**
- * The Util namespace contains a collection of helper functions use in
- * various places.
- */
-namespace Util
-{
-
-/**
-      * Describes the type of the displayed message. This depends on the MIME structure
-      * of the mail and on whether HTML mode is enabled (which is decided by htmlMail())
-      */
-enum HtmlMode {
-    Normal,         ///< A normal plaintext message, non-multipart
-    Html,           ///< A HTML message, non-multipart
-    MultipartPlain, ///< A multipart/alternative message, the plain text part is currently displayed
-    MultipartHtml,  ///< A multipart/altervative message, the HTML part is currently displayed
-    MultipartIcal   ///< A multipart/altervative message, the ICal part is currently displayed
-};
-
-bool isTypeBlacklisted(KMime::Content *node);
-
-QString labelForContent(KMime::Content *node);
-
-QMimeType mimetype(const QString &name);
-
-QString iconNameForMimetype(const QString &mimeType,
-        const QString &fallbackFileName1 = QString(),
-        const QString &fallbackFileName2 = QString());
-
-QString iconNameForContent(KMime::Content *node);
-}
-}
-
-#endif
diff --git a/framework/src/domain/mimetreeparser/otp/utils.cpp b/framework/src/domain/mimetreeparser/otp/utils.cpp
deleted file mode 100644
index 8f718143..00000000
--- a/framework/src/domain/mimetreeparser/otp/utils.cpp
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
-   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 "utils.h"
-
-using namespace MimeTreeParser;
-
-MimeMessagePart::Ptr MimeTreeParser::createAndParseTempNode(Interface::BodyPart &part, KMime::Content *parentNode, const char *content, const char *cntDesc)
-{
-    KMime::Content *newNode = new KMime::Content();
-    newNode->setContent(KMime::CRLFtoLF(content));
-    newNode->parse();
-
-    if (!newNode->head().isEmpty()) {
-        newNode->contentDescription()->from7BitString(cntDesc);
-    }
-    part.nodeHelper()->attachExtraContent(parentNode, newNode);
-
-    return MimeMessagePart::Ptr(new MimeMessagePart(part.objectTreeParser(), newNode, false));
-}
-
-KMime::Content *MimeTreeParser::findTypeInDirectChilds(KMime::Content *content, const QByteArray &mimeType)
-{
-    if (mimeType.isEmpty()) {
-        return content;
-    }
-
-    foreach (auto child, content->contents()) {
-        if ((!child->contentType()->isEmpty())
-                && (mimeType == child->contentType()->mimeType())) {
-            return child;
-        }
-    }
-    return nullptr;
-}
-
-MessagePart::Ptr MimeTreeParser::toplevelTextNode(MessagePart::Ptr messageTree)
-{
-    foreach (const auto &mp, messageTree->subParts()) {
-        auto text = mp.dynamicCast<TextMessagePart>();
-        auto attach = mp.dynamicCast<AttachmentMessagePart>();
-        if (text && !attach) {
-            return text;
-        } else if (const auto alternative = mp.dynamicCast<AlternativeMessagePart>()) {
-            return alternative;
-        } else if (const auto m = mp.dynamicCast<MessagePart>()) {
-            auto ret = toplevelTextNode(m);
-            if (ret) {
-                return ret;
-            }
-        }
-    }
-    return MessagePart::Ptr();
-}
diff --git a/framework/src/domain/mimetreeparser/otp/utils.h b/framework/src/domain/mimetreeparser/otp/utils.h
deleted file mode 100644
index d4aaa43a..00000000
--- a/framework/src/domain/mimetreeparser/otp/utils.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
-   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.
-*/
-
-#ifndef __MIMETREEPARSER_BODYFORAMATTER_UTILS_H__
-#define __MIMETREEPARSER_BODYFORAMATTER_UTILS_H__
-
-#include "bodypart.h"
-#include "messagepart.h"
-
-#include <KMime/Content>
-
-namespace MimeTreeParser
-{
-/**
-  1. Create a new partNode using 'content' data and Content-Description
-     found in 'cntDesc'.
-  2. Parse the 'node' to display the content.
-*/
-MimeMessagePart::Ptr createAndParseTempNode(Interface::BodyPart &part, KMime::Content *parentNode, const char *content, const char *cntDesc);
-
-KMime::Content *findTypeInDirectChilds(KMime::Content *content, const QByteArray &mimeType);
-
-MessagePart::Ptr toplevelTextNode(MessagePart::Ptr messageTree);
-}
-
-#endif
diff --git a/framework/src/domain/mimetreeparser/otp/verifydetachedbodypartmemento.cpp b/framework/src/domain/mimetreeparser/otp/verifydetachedbodypartmemento.cpp
deleted file mode 100644
index 56c1d1a7..00000000
--- a/framework/src/domain/mimetreeparser/otp/verifydetachedbodypartmemento.cpp
+++ /dev/null
@@ -1,177 +0,0 @@
-/*
-  Copyright (c) 2014-2017 Montel Laurent <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 "verifydetachedbodypartmemento.h"
-#include "mimetreeparser_debug.h"
-
-#include <QGpgME/VerifyDetachedJob>
-#include <QGpgME/KeyListJob>
-
-#include <gpgme++/keylistresult.h>
-
-#include <qstringlist.h>
-
-#include <cassert>
-
-using namespace QGpgME;
-using namespace GpgME;
-using namespace MimeTreeParser;
-
-VerifyDetachedBodyPartMemento::VerifyDetachedBodyPartMemento(VerifyDetachedJob *job,
-        KeyListJob *klj,
-        const QByteArray &signature,
-        const QByteArray &plainText)
-    : CryptoBodyPartMemento(),
-      m_signature(signature),
-      m_plainText(plainText),
-      m_job(job),
-      m_keylistjob(klj)
-{
-    assert(m_job);
-}
-
-VerifyDetachedBodyPartMemento::~VerifyDetachedBodyPartMemento()
-{
-    if (m_job) {
-        m_job->slotCancel();
-    }
-    if (m_keylistjob) {
-        m_keylistjob->slotCancel();
-    }
-}
-
-bool VerifyDetachedBodyPartMemento::start()
-{
-    assert(m_job);
-#ifdef DEBUG_SIGNATURE
-    qCDebug(MIMETREEPARSER_LOG) << "tokoe: VerifyDetachedBodyPartMemento started";
-#endif
-    connect(m_job, SIGNAL(result(GpgME::VerificationResult)),
-            this, SLOT(slotResult(GpgME::VerificationResult)));
-    if (const Error err = m_job->start(m_signature, m_plainText)) {
-        m_vr = VerificationResult(err);
-#ifdef DEBUG_SIGNATURE
-        qCDebug(MIMETREEPARSER_LOG) << "tokoe: VerifyDetachedBodyPartMemento stopped with error";
-#endif
-        return false;
-    }
-    setRunning(true);
-    return true;
-}
-
-void VerifyDetachedBodyPartMemento::exec()
-{
-    assert(m_job);
-    setRunning(true);
-#ifdef DEBUG_SIGNATURE
-    qCDebug(MIMETREEPARSER_LOG) << "tokoe: VerifyDetachedBodyPartMemento execed";
-#endif
-    saveResult(m_job->exec(m_signature, m_plainText));
-    m_job->deleteLater(); // exec'ed jobs don't delete themselves
-    m_job = nullptr;
-#ifdef DEBUG_SIGNATURE
-    qCDebug(MIMETREEPARSER_LOG) << "tokoe: VerifyDetachedBodyPartMemento after execed";
-#endif
-    if (canStartKeyListJob()) {
-        std::vector<GpgME::Key> keys;
-        m_keylistjob->exec(keyListPattern(), /*secretOnly=*/false, keys);
-        if (!keys.empty()) {
-            m_key = keys.back();
-        }
-    }
-    if (m_keylistjob) {
-        m_keylistjob->deleteLater();    // exec'ed jobs don't delete themselves
-    }
-    m_keylistjob = nullptr;
-    setRunning(false);
-}
-
-bool VerifyDetachedBodyPartMemento::canStartKeyListJob() const
-{
-    if (!m_keylistjob) {
-        return false;
-    }
-    const char *const fpr = m_vr.signature(0).fingerprint();
-    return fpr && *fpr;
-}
-
-QStringList VerifyDetachedBodyPartMemento::keyListPattern() const
-{
-    assert(canStartKeyListJob());
-    return QStringList(QString::fromLatin1(m_vr.signature(0).fingerprint()));
-}
-
-void VerifyDetachedBodyPartMemento::saveResult(const VerificationResult &vr)
-{
-    assert(m_job);
-#ifdef DEBUG_SIGNATURE
-    qCDebug(MIMETREEPARSER_LOG) << "tokoe: VerifyDetachedBodyPartMemento::saveResult called";
-#endif
-    m_vr = vr;
-    setAuditLog(m_job->auditLogError(), m_job->auditLogAsHtml());
-}
-
-void VerifyDetachedBodyPartMemento::slotResult(const VerificationResult &vr)
-{
-#ifdef DEBUG_SIGNATURE
-    qCDebug(MIMETREEPARSER_LOG) << "tokoe: VerifyDetachedBodyPartMemento::slotResult called";
-#endif
-    saveResult(vr);
-    m_job = nullptr;
-    if (canStartKeyListJob() && startKeyListJob()) {
-#ifdef DEBUG_SIGNATURE
-        qCDebug(MIMETREEPARSER_LOG) << "tokoe: VerifyDetachedBodyPartMemento: canStartKeyListJob && startKeyListJob";
-#endif
-        return;
-    }
-    if (m_keylistjob) {
-        m_keylistjob->deleteLater();
-    }
-    m_keylistjob = nullptr;
-    setRunning(false);
-    notify();
-}
-
-bool VerifyDetachedBodyPartMemento::startKeyListJob()
-{
-    assert(canStartKeyListJob());
-    if (const GpgME::Error err = m_keylistjob->start(keyListPattern())) {
-        return false;
-    }
-    connect(m_keylistjob, SIGNAL(done()), this, SLOT(slotKeyListJobDone()));
-    connect(m_keylistjob, SIGNAL(nextKey(GpgME::Key)),
-            this, SLOT(slotNextKey(GpgME::Key)));
-    return true;
-}
-
-void VerifyDetachedBodyPartMemento::slotNextKey(const GpgME::Key &key)
-{
-#ifdef DEBUG_SIGNATURE
-    qCDebug(MIMETREEPARSER_LOG) << "tokoe: VerifyDetachedBodyPartMemento::slotNextKey called";
-#endif
-    m_key = key;
-}
-
-void VerifyDetachedBodyPartMemento::slotKeyListJobDone()
-{
-#ifdef DEBUG_SIGNATURE
-    qCDebug(MIMETREEPARSER_LOG) << "tokoe: VerifyDetachedBodyPartMemento::slotKeyListJobDone called";
-#endif
-    m_keylistjob = nullptr;
-    setRunning(false);
-    notify();
-}
diff --git a/framework/src/domain/mimetreeparser/otp/verifydetachedbodypartmemento.h b/framework/src/domain/mimetreeparser/otp/verifydetachedbodypartmemento.h
deleted file mode 100644
index f37dfe81..00000000
--- a/framework/src/domain/mimetreeparser/otp/verifydetachedbodypartmemento.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
-  Copyright (c) 2014-2016 Montel Laurent <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
-*/
-
-#ifndef __MIMETREEPARSER_VERIFYDETACHEDBODYPARTMEMENTO_H__
-#define __MIMETREEPARSER_VERIFYDETACHEDBODYPARTMEMENTO_H__
-
-#include "cryptobodypartmemento.h"
-#include <gpgme++/verificationresult.h>
-#include <gpgme++/key.h>
-
-#include <QString>
-#include <QPointer>
-
-#include "bodypart.h"
-
-namespace QGpgME
-{
-class VerifyDetachedJob;
-class KeyListJob;
-}
-
-class QStringList;
-
-namespace MimeTreeParser
-{
-
-class VerifyDetachedBodyPartMemento
-    : public CryptoBodyPartMemento
-{
-    Q_OBJECT
-public:
-    VerifyDetachedBodyPartMemento(QGpgME::VerifyDetachedJob *job,
-                                  QGpgME::KeyListJob *klj,
-                                  const QByteArray &signature,
-                                  const QByteArray &plainText);
-    ~VerifyDetachedBodyPartMemento();
-
-    bool start() Q_DECL_OVERRIDE;
-    void exec() Q_DECL_OVERRIDE;
-
-    const GpgME::VerificationResult &verifyResult() const
-    {
-        return m_vr;
-    }
-    const GpgME::Key &signingKey() const
-    {
-        return m_key;
-    }
-
-private Q_SLOTS:
-    void slotResult(const GpgME::VerificationResult &vr);
-    void slotKeyListJobDone();
-    void slotNextKey(const GpgME::Key &);
-
-private:
-    void saveResult(const GpgME::VerificationResult &);
-    bool canStartKeyListJob() const;
-    QStringList keyListPattern() const;
-    bool startKeyListJob();
-private:
-    // input:
-    const QByteArray m_signature;
-    const QByteArray m_plainText;
-    QPointer<QGpgME::VerifyDetachedJob> m_job;
-    QPointer<QGpgME::KeyListJob> m_keylistjob;
-    // output:
-    GpgME::VerificationResult m_vr;
-    GpgME::Key m_key;
-};
-
-}
-
-#endif // __MIMETREEPARSER_VERIFYDETACHEDBODYPARTMEMENTO_H__
diff --git a/framework/src/domain/mimetreeparser/otp/verifyopaquebodypartmemento.cpp b/framework/src/domain/mimetreeparser/otp/verifyopaquebodypartmemento.cpp
deleted file mode 100644
index 99eb8b8e..00000000
--- a/framework/src/domain/mimetreeparser/otp/verifyopaquebodypartmemento.cpp
+++ /dev/null
@@ -1,179 +0,0 @@
-/*
-  Copyright (c) 2014-2017 Montel Laurent <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 "verifyopaquebodypartmemento.h"
-#include "mimetreeparser_debug.h"
-
-#include <QGpgME/VerifyOpaqueJob>
-#include <QGpgME/KeyListJob>
-
-#include <gpgme++/keylistresult.h>
-
-#include <qstringlist.h>
-
-#include <cassert>
-
-using namespace QGpgME;
-using namespace GpgME;
-using namespace MimeTreeParser;
-
-VerifyOpaqueBodyPartMemento::VerifyOpaqueBodyPartMemento(VerifyOpaqueJob *job,
-        KeyListJob   *klj,
-        const QByteArray &signature)
-    : CryptoBodyPartMemento(),
-      m_signature(signature),
-      m_job(job),
-      m_keylistjob(klj)
-{
-    assert(m_job);
-}
-
-VerifyOpaqueBodyPartMemento::~VerifyOpaqueBodyPartMemento()
-{
-    if (m_job) {
-        m_job->slotCancel();
-    }
-    if (m_keylistjob) {
-        m_keylistjob->slotCancel();
-    }
-}
-
-bool VerifyOpaqueBodyPartMemento::start()
-{
-    assert(m_job);
-#ifdef DEBUG_SIGNATURE
-    qCDebug(MIMETREEPARSER_LOG) << "tokoe: VerifyOpaqueBodyPartMemento started";
-#endif
-    if (const Error err = m_job->start(m_signature)) {
-        m_vr = VerificationResult(err);
-#ifdef DEBUG_SIGNATURE
-        qCDebug(MIMETREEPARSER_LOG) << "tokoe: VerifyOpaqueBodyPartMemento stopped with error";
-#endif
-        return false;
-    }
-    connect(m_job, SIGNAL(result(GpgME::VerificationResult,QByteArray)),
-            this, SLOT(slotResult(GpgME::VerificationResult,QByteArray)));
-    setRunning(true);
-    return true;
-}
-
-void VerifyOpaqueBodyPartMemento::exec()
-{
-    assert(m_job);
-    setRunning(true);
-    QByteArray plainText;
-#ifdef DEBUG_SIGNATURE
-    qCDebug(MIMETREEPARSER_LOG) << "tokoe: VerifyOpaqueBodyPartMemento execed";
-#endif
-    saveResult(m_job->exec(m_signature, plainText), plainText);
-#ifdef DEBUG_SIGNATURE
-    qCDebug(MIMETREEPARSER_LOG) << "tokoe: VerifyOpaqueBodyPartMemento after execed";
-#endif
-    m_job->deleteLater(); // exec'ed jobs don't delete themselves
-    m_job = nullptr;
-    if (canStartKeyListJob()) {
-        std::vector<GpgME::Key> keys;
-        m_keylistjob->exec(keyListPattern(), /*secretOnly=*/false, keys);
-        if (!keys.empty()) {
-            m_key = keys.back();
-        }
-    }
-    if (m_keylistjob) {
-        m_keylistjob->deleteLater();    // exec'ed jobs don't delete themselves
-    }
-    m_keylistjob = nullptr;
-    setRunning(false);
-}
-
-bool VerifyOpaqueBodyPartMemento::canStartKeyListJob() const
-{
-    if (!m_keylistjob) {
-        return false;
-    }
-    const char *const fpr = m_vr.signature(0).fingerprint();
-    return fpr && *fpr;
-}
-
-QStringList VerifyOpaqueBodyPartMemento::keyListPattern() const
-{
-    assert(canStartKeyListJob());
-    return QStringList(QString::fromLatin1(m_vr.signature(0).fingerprint()));
-}
-
-void VerifyOpaqueBodyPartMemento::saveResult(const VerificationResult &vr,
-        const QByteArray &plainText)
-{
-    assert(m_job);
-#ifdef DEBUG_SIGNATURE
-    qCDebug(MIMETREEPARSER_LOG) << "tokoe: VerifyOpaqueBodyPartMemento::saveResult called";
-#endif
-    m_vr = vr;
-    m_plainText = plainText;
-    setAuditLog(m_job->auditLogError(), m_job->auditLogAsHtml());
-}
-
-void VerifyOpaqueBodyPartMemento::slotResult(const VerificationResult &vr,
-        const QByteArray &plainText)
-{
-#ifdef DEBUG_SIGNATURE
-    qCDebug(MIMETREEPARSER_LOG) << "tokoe: VerifyOpaqueBodyPartMemento::slotResult called";
-#endif
-    saveResult(vr, plainText);
-    m_job = nullptr;
-    if (canStartKeyListJob() && startKeyListJob()) {
-#ifdef DEBUG_SIGNATURE
-        qCDebug(MIMETREEPARSER_LOG) << "tokoe: VerifyOpaqueBodyPartMemento: canStartKeyListJob && startKeyListJob";
-#endif
-        return;
-    }
-    if (m_keylistjob) {
-        m_keylistjob->deleteLater();
-    }
-    m_keylistjob = nullptr;
-    setRunning(false);
-    notify();
-}
-
-bool VerifyOpaqueBodyPartMemento::startKeyListJob()
-{
-    assert(canStartKeyListJob());
-    if (const GpgME::Error err = m_keylistjob->start(keyListPattern())) {
-        return false;
-    }
-    connect(m_keylistjob, SIGNAL(done()), this, SLOT(slotKeyListJobDone()));
-    connect(m_keylistjob, SIGNAL(nextKey(GpgME::Key)),
-            this, SLOT(slotNextKey(GpgME::Key)));
-    return true;
-}
-
-void VerifyOpaqueBodyPartMemento::slotNextKey(const GpgME::Key &key)
-{
-#ifdef DEBUG_SIGNATURE
-    qCDebug(MIMETREEPARSER_LOG) << "tokoe: VerifyOpaqueBodyPartMemento::slotNextKey called";
-#endif
-    m_key = key;
-}
-
-void VerifyOpaqueBodyPartMemento::slotKeyListJobDone()
-{
-#ifdef DEBUG_SIGNATURE
-    qCDebug(MIMETREEPARSER_LOG) << "tokoe: VerifyOpaqueBodyPartMemento::slotKeyListJobDone called";
-#endif
-    m_keylistjob = nullptr;
-    setRunning(false);
-    notify();
-}
diff --git a/framework/src/domain/mimetreeparser/otp/verifyopaquebodypartmemento.h b/framework/src/domain/mimetreeparser/otp/verifyopaquebodypartmemento.h
deleted file mode 100644
index 02d30a13..00000000
--- a/framework/src/domain/mimetreeparser/otp/verifyopaquebodypartmemento.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
-  Copyright (c) 2014-2016 Montel Laurent <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
-*/
-
-#ifndef __MIMETREEPARSER_VERIFYOPAQUEBODYPARTMEMENTO_H__
-#define __MIMETREEPARSER_VERIFYOPAQUEBODYPARTMEMENTO_H__
-
-#include "cryptobodypartmemento.h"
-#include <gpgme++/verificationresult.h>
-#include <gpgme++/decryptionresult.h>
-#include <gpgme++/key.h>
-
-#include <QString>
-#include <QPointer>
-
-#include "bodypart.h"
-
-namespace QGpgME
-{
-class VerifyOpaqueJob;
-class KeyListJob;
-}
-
-class QStringList;
-
-namespace MimeTreeParser
-{
-
-class VerifyOpaqueBodyPartMemento
-    : public CryptoBodyPartMemento
-{
-    Q_OBJECT
-public:
-    VerifyOpaqueBodyPartMemento(QGpgME::VerifyOpaqueJob *job,
-                                QGpgME::KeyListJob *klj,
-                                const QByteArray &signature);
-    ~VerifyOpaqueBodyPartMemento();
-
-    bool start() Q_DECL_OVERRIDE;
-    void exec() Q_DECL_OVERRIDE;
-
-    const QByteArray &plainText() const
-    {
-        return m_plainText;
-    }
-    const GpgME::VerificationResult &verifyResult() const
-    {
-        return m_vr;
-    }
-    const GpgME::Key &signingKey() const
-    {
-        return m_key;
-    }
-
-private Q_SLOTS:
-    void slotResult(const GpgME::VerificationResult &vr,
-                    const QByteArray &plainText);
-    void slotKeyListJobDone();
-    void slotNextKey(const GpgME::Key &);
-
-private:
-    void saveResult(const GpgME::VerificationResult &,
-                    const QByteArray &);
-    bool canStartKeyListJob() const;
-    QStringList keyListPattern() const;
-    bool startKeyListJob();
-private:
-    // input:
-    const QByteArray m_signature;
-    QPointer<QGpgME::VerifyOpaqueJob> m_job;
-    QPointer<QGpgME::KeyListJob> m_keylistjob;
-    // output:
-    GpgME::VerificationResult m_vr;
-    QByteArray m_plainText;
-    GpgME::Key m_key;
-};
-
-}
-
-#endif // __MIMETREEPARSER_VERIFYOPAQUEBODYPARTMEMENTO_H__