From e452707fdfbd61be1e5633b516b653b7337e7865 Mon Sep 17 00:00:00 2001
From: Christian Mollekopf <chrigi_1@fastmail.fm>
Date: Mon, 29 May 2017 16:17:04 +0200
Subject: Reduced the messagetreeparser to aproximately what we actually
 require

While in a much more managable state it's still not pretty.
However, further refactoring can now gradually happen as we need to do
further work on it.

Things that should happen eventually:
* Simplify the logic that creates the messageparts (we don't need the  whole formatter plugin complexity)
* Get rid of the nodehelper (let the parts hold the necessary data)
* Get rid of partmetadata (let the part handleit)
---
 .../mimetreeparser/otp/autotests/CMakeLists.txt    |  46 --
 .../otp/autotests/attachmenttest.cpp               |  68 ---
 .../otp/autotests/cryptohelpertest.cpp             | 144 ------
 .../otp/autotests/cryptohelpertest.h               |  42 --
 .../otp/autotests/data/alternative-notext.mbox     |  22 -
 .../autotests/data/alternative-notext.mbox.html    |  17 -
 .../autotests/data/alternative-notext.mbox.tree    |   2 -
 .../otp/autotests/data/alternative.mbox            |  34 --
 .../otp/autotests/data/alternative.mbox.html       |  17 -
 .../otp/autotests/data/alternative.mbox.tree       |   2 -
 .../forward-openpgp-signed-encrypted.mbox.html     |  84 ----
 .../data/details/openpgp-encoded.mbox.html         |  38 --
 .../details/openpgp-encrypted+signed.mbox.html     |  55 ---
 ...tachment-and-non-encrypted-attachment.mbox.html |  80 ----
 .../details/openpgp-encrypted-attachment.mbox.html |  69 ---
 ...gp-encrypted-non-encrypted-attachment.mbox.html |  72 ---
 ...ncrypted-partially-signed-attachments.mbox.html | 102 ----
 .../openpgp-inline-charset-encrypted.mbox.html     |  50 --
 .../data/details/openpgp-inline-signed.mbox.html   |  38 --
 .../openpgp-signed-base64-mailman-footer.mbox.html |  81 ----
 ...npgp-signed-encrypted-two-attachments.mbox.html |  91 ----
 .../details/openpgp-signed-encrypted.mbox.html     |  58 ---
 .../openpgp-signed-mailinglist+old.mbox.html       |  97 ----
 .../details/openpgp-signed-mailinglist.mbox.html   |  68 ---
 .../openpgp-signed-two-attachments.mbox.html       |  74 ---
 ...gned-forward-openpgp-signed-encrypted.mbox.html | 111 -----
 .../data/details/smime-opaque-enc+sign.mbox.html   |  60 ---
 .../data/details/smime-opaque-sign.mbox.html       |  43 --
 .../data/details/smime-signed-encrypted.mbox.html  |  58 ---
 .../data/encapsulated-with-attachment.mbox         |  53 ---
 .../data/encapsulated-with-attachment.mbox.html    |  51 --
 .../data/encapsulated-with-attachment.mbox.tree    |  10 -
 .../data/forward-openpgp-signed-encrypted.mbox     |  69 ---
 .../forward-openpgp-signed-encrypted.mbox.html     |  81 ----
 .../forward-openpgp-signed-encrypted.mbox.tree     |   9 -
 ...tachment-and-non-encrypted-attachment.mbox.html |  61 ---
 .../openpgp-encrypted-attachment.mbox.html         |  58 ---
 ...gp-encrypted-non-encrypted-attachment.mbox.html |  61 ---
 ...ncrypted-partially-signed-attachments.mbox.html |  84 ----
 .../openpgp-encrypted-two-attachments.mbox.html    |  34 --
 .../data/headeronly/openpgp-signed-apple.mbox.html |  50 --
 ...npgp-signed-encrypted-two-attachments.mbox.html |  58 ---
 ...igned-mailinglist+additional-children.mbox.html |  52 ---
 .../openpgp-signed-no-protocol.mbox.html           |  28 --
 .../openpgp-signed-two-attachments.mbox.html       |  41 --
 .../data/headeronly/smime-signed-apple.mbox.html   |  50 --
 .../hidden/encapsulated-with-attachment.mbox.html  |  43 --
 ...tachment-and-non-encrypted-attachment.mbox.html |  61 ---
 .../hidden/openpgp-encrypted-attachment.mbox.html  |  58 ---
 .../data/hidden/openpgp-encrypted-noData.mbox.html |  10 -
 ...gp-encrypted-non-encrypted-attachment.mbox.html |  61 ---
 ...ncrypted-partially-signed-attachments.mbox.html |  84 ----
 .../openpgp-encrypted-two-attachments.mbox.html    |  34 --
 .../data/hidden/openpgp-signed-apple.mbox.html     |  50 --
 ...npgp-signed-encrypted-two-attachments.mbox.html |  58 ---
 ...igned-mailinglist+additional-children.mbox.html |  44 --
 .../hidden/openpgp-signed-no-protocol.mbox.html    |  28 --
 .../openpgp-signed-two-attachments.mbox.html       |  41 --
 .../data/hidden/smime-signed-apple.mbox.html       |  50 --
 .../mimetreeparser/otp/autotests/data/html.mbox    |  31 --
 .../otp/autotests/data/html.mbox.html              |  17 -
 .../otp/autotests/data/html.mbox.tree              |   2 -
 .../otp/autotests/data/htmlonly.mbox               |  21 -
 .../otp/autotests/data/htmlonly.mbox.html          |  12 -
 .../otp/autotests/data/htmlonly.mbox.tree          |   2 -
 .../otp/autotests/data/htmlonlyexternal.mbox       |  21 -
 ...ncrypted-partially-signed-attachments.mbox.html |  92 ----
 .../openpgp-encrypted-two-attachments.mbox.html    |  50 --
 ...npgp-signed-encrypted-two-attachments.mbox.html |  74 ---
 .../openpgp-signed-two-attachments.mbox.html       |  57 ---
 .../inlined/encapsulated-with-attachment.mbox.html |  58 ---
 ...tachment-and-non-encrypted-attachment.mbox.html |  90 ----
 .../inlined/openpgp-encrypted-attachment.mbox.html |  74 ---
 ...gp-encrypted-non-encrypted-attachment.mbox.html |  74 ---
 .../data/inlined/openpgp-signed-apple.mbox.html    |  63 ---
 ...igned-mailinglist+additional-children.mbox.html |  67 ---
 .../data/inlined/smime-signed-apple.mbox.html      |  63 ---
 .../data/inlinepgpencrypted-appendix.mbox          |  33 --
 .../data/inlinepgpencrypted-appendix.mbox.html     |  36 --
 .../data/inlinepgpencrypted-appendix.mbox.tree     |   4 -
 .../autotests/data/inlinepgpencrypted-error.mbox   |  55 ---
 .../data/inlinepgpencrypted-error.mbox.html        |  24 -
 .../data/inlinepgpencrypted-error.mbox.tree        |   3 -
 .../otp/autotests/data/inlinepgpencrypted.mbox     |  29 --
 .../autotests/data/inlinepgpencrypted.mbox.html    |  26 --
 .../data/inlinepgpencrypted.mbox.inProgress.html   |  24 -
 .../autotests/data/inlinepgpencrypted.mbox.tree    |   3 -
 .../otp/autotests/data/mailheader.css              | 512 ---------------------
 .../otp/autotests/data/no-content-type.mbox        |   7 -
 .../otp/autotests/data/no-content-type.mbox.html   |  14 -
 .../otp/autotests/data/no-content-type.mbox.tree   |   3 -
 .../otp/autotests/data/openpgp-encoded.mbox        |  33 --
 .../otp/autotests/data/openpgp-encoded.mbox.html   |  35 --
 .../otp/autotests/data/openpgp-encoded.mbox.tree   |   4 -
 .../autotests/data/openpgp-encrypted+signed.mbox   |  46 --
 .../data/openpgp-encrypted+signed.mbox.html        |  52 ---
 .../data/openpgp-encrypted+signed.mbox.tree        |   5 -
 .../data/openpgp-encrypted-applemail.mbox          |  52 ---
 .../data/openpgp-encrypted-applemail.mbox.html     |  39 --
 .../data/openpgp-encrypted-applemail.mbox.tree     |   7 -
 ...ed-attachment-and-non-encrypted-attachment.mbox | 115 -----
 ...tachment-and-non-encrypted-attachment.mbox.html |  77 ----
 ...tachment-and-non-encrypted-attachment.mbox.tree |  11 -
 .../data/openpgp-encrypted-attachment.mbox         |  57 ---
 .../data/openpgp-encrypted-attachment.mbox.html    |  66 ---
 .../data/openpgp-encrypted-attachment.mbox.tree    |   8 -
 .../data/openpgp-encrypted-enigmail1.6.mbox        |  48 --
 .../data/openpgp-encrypted-enigmail1.6.mbox.html   |  34 --
 .../data/openpgp-encrypted-enigmail1.6.mbox.tree   |   5 -
 .../autotests/data/openpgp-encrypted-noData.mbox   |  17 -
 .../data/openpgp-encrypted-noData.mbox.html        |  19 -
 .../data/openpgp-encrypted-noData.mbox.tree        |   4 -
 ...openpgp-encrypted-non-encrypted-attachment.mbox | 114 -----
 ...gp-encrypted-non-encrypted-attachment.mbox.html |  69 ---
 ...gp-encrypted-non-encrypted-attachment.mbox.tree |   9 -
 ...pgp-encrypted-partially-signed-attachments.mbox |  91 ----
 ...ncrypted-partially-signed-attachments.mbox.html |  99 ----
 ...ncrypted-partially-signed-attachments.mbox.tree |  12 -
 .../data/openpgp-encrypted-two-attachments.mbox    |  42 --
 .../openpgp-encrypted-two-attachments.mbox.html    |  64 ---
 .../openpgp-encrypted-two-attachments.mbox.tree    |   9 -
 .../otp/autotests/data/openpgp-encrypted.mbox      |  36 --
 .../otp/autotests/data/openpgp-encrypted.mbox.html |  31 --
 .../data/openpgp-encrypted.mbox.inProgress.html    |  24 -
 .../otp/autotests/data/openpgp-encrypted.mbox.tree |   4 -
 .../data/openpgp-inline-charset-encrypted.mbox     |  40 --
 .../openpgp-inline-charset-encrypted.mbox.html     |  47 --
 ...p-inline-charset-encrypted.mbox.inProgress.html |  24 -
 .../openpgp-inline-charset-encrypted.mbox.tree     |   4 -
 .../data/openpgp-inline-signed-broken.mbox         |  26 --
 .../otp/autotests/data/openpgp-inline-signed.mbox  |  26 --
 .../autotests/data/openpgp-inline-signed.mbox.html |  35 --
 .../openpgp-inline-signed.mbox.inProgress.html     |  22 -
 .../autotests/data/openpgp-inline-signed.mbox.tree |   3 -
 .../openpgp-inline-wrong-charset-encrypted.mbox    |  34 --
 ...penpgp-inline-wrong-charset-encrypted.mbox.html |  47 --
 ...penpgp-inline-wrong-charset-encrypted.mbox.tree |   4 -
 .../otp/autotests/data/openpgp-signed-apple.mbox   | 129 ------
 .../autotests/data/openpgp-signed-apple.mbox.html  |  58 ---
 .../data/openpgp-signed-apple.mbox.inProgress.html |  49 --
 .../autotests/data/openpgp-signed-apple.mbox.tree  |   3 -
 .../data/openpgp-signed-base64-mailman-footer.mbox | 117 -----
 .../openpgp-signed-base64-mailman-footer.mbox.html |  78 ----
 .../openpgp-signed-base64-mailman-footer.mbox.tree |   7 -
 .../openpgp-signed-encrypted-two-attachments.mbox  |  52 ---
 ...npgp-signed-encrypted-two-attachments.mbox.html |  88 ----
 ...npgp-signed-encrypted-two-attachments.mbox.tree |  10 -
 .../autotests/data/openpgp-signed-encrypted.mbox   |  47 --
 .../data/openpgp-signed-encrypted.mbox.html        |  55 ---
 .../data/openpgp-signed-encrypted.mbox.tree        |   5 -
 ...pgp-signed-mailinglist+additional-children.mbox | 126 -----
 ...igned-mailinglist+additional-children.mbox.html |  60 ---
 ...igned-mailinglist+additional-children.mbox.tree |  10 -
 .../data/openpgp-signed-mailinglist+old.mbox       |  67 ---
 .../data/openpgp-signed-mailinglist+old.mbox.html  |  94 ----
 .../data/openpgp-signed-mailinglist+old.mbox.tree  |  13 -
 .../autotests/data/openpgp-signed-mailinglist.mbox | 121 -----
 .../data/openpgp-signed-mailinglist.mbox.html      |  65 ---
 ...openpgp-signed-mailinglist.mbox.inProgress.html |  56 ---
 .../data/openpgp-signed-mailinglist.mbox.tree      |   7 -
 .../autotests/data/openpgp-signed-no-protocol.mbox |  35 --
 .../data/openpgp-signed-no-protocol.mbox.html      |  36 --
 .../data/openpgp-signed-no-protocol.mbox.tree      |   5 -
 .../data/openpgp-signed-two-attachments.mbox       |  54 ---
 .../data/openpgp-signed-two-attachments.mbox.html  |  71 ---
 .../data/openpgp-signed-two-attachments.mbox.tree  |   9 -
 .../signed-forward-openpgp-signed-encrypted.mbox   |  92 ----
 ...gned-forward-openpgp-signed-encrypted.mbox.html | 105 -----
 ...gned-forward-openpgp-signed-encrypted.mbox.tree |  10 -
 .../otp/autotests/data/smime-cert.mbox             |  24 -
 .../otp/autotests/data/smime-cert.mbox.html        |  10 -
 .../otp/autotests/data/smime-cert.mbox.tree        |   2 -
 .../data/smime-encrypted-octet-stream.mbox         |  23 -
 .../data/smime-encrypted-octet-stream.mbox.html    |  31 --
 .../data/smime-encrypted-octet-stream.mbox.tree    |   4 -
 .../otp/autotests/data/smime-encrypted.mbox        |  22 -
 .../otp/autotests/data/smime-encrypted.mbox.html   |  31 --
 .../data/smime-encrypted.mbox.inProgress.html      |  24 -
 .../otp/autotests/data/smime-encrypted.mbox.tree   |   4 -
 .../otp/autotests/data/smime-opaque-enc+sign.mbox  |  37 --
 .../autotests/data/smime-opaque-enc+sign.mbox.html |  57 ---
 .../autotests/data/smime-opaque-enc+sign.mbox.tree |   5 -
 .../otp/autotests/data/smime-opaque-sign.mbox      |  25 -
 .../otp/autotests/data/smime-opaque-sign.mbox.html |  40 --
 .../data/smime-opaque-sign.mbox.inProgress.html    |  22 -
 .../otp/autotests/data/smime-opaque-sign.mbox.tree |   4 -
 .../smime-opaque-signed-encrypted-attachment.mbox  |  50 --
 .../otp/autotests/data/smime-signed-apple.mbox     | 197 --------
 .../autotests/data/smime-signed-apple.mbox.html    |  58 ---
 .../data/smime-signed-apple.mbox.inProgress.html   |  49 --
 .../autotests/data/smime-signed-apple.mbox.tree    |   3 -
 .../otp/autotests/data/smime-signed-encrypted.mbox |  38 --
 .../data/smime-signed-encrypted.mbox.html          |  55 ---
 .../data/smime-signed-encrypted.mbox.tree          |   5 -
 .../otp/autotests/data/text+html-maillinglist.mbox | 163 -------
 .../data/text+html-maillinglist.mbox.html          |  38 --
 .../data/text+html-maillinglist.mbox.tree          |   5 -
 .../otp/autotests/kdepim_add_gpg_crypto_test.cmake |  61 ---
 .../kdepim_generate_crypto_test_wrapper.cmake      |  45 --
 .../otp/autotests/nodehelpertest.cpp               | 275 -----------
 .../mimetreeparser/otp/autotests/nodehelpertest.h  |  45 --
 .../mime/mimetreeparser/otp/autotests/setupenv.cpp |  34 --
 .../mime/mimetreeparser/otp/autotests/setupenv.h   | 170 -------
 .../mimetreeparser/otp/autotests/testcsshelper.cpp | 106 -----
 .../mimetreeparser/otp/autotests/testcsshelper.h   |  50 --
 .../mime/mimetreeparser/otp/autotests/util.cpp     |  34 --
 .../mime/mimetreeparser/otp/autotests/util.h       |  43 --
 207 files changed, 10109 deletions(-)
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/CMakeLists.txt
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/attachmenttest.cpp
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/cryptohelpertest.cpp
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/cryptohelpertest.h
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/alternative-notext.mbox
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/alternative-notext.mbox.html
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/alternative-notext.mbox.tree
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/alternative.mbox
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/alternative.mbox.html
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/alternative.mbox.tree
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/details/forward-openpgp-signed-encrypted.mbox.html
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/details/openpgp-encoded.mbox.html
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/details/openpgp-encrypted+signed.mbox.html
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/details/openpgp-encrypted-attachment-and-non-encrypted-attachment.mbox.html
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/details/openpgp-encrypted-attachment.mbox.html
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/details/openpgp-encrypted-non-encrypted-attachment.mbox.html
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/details/openpgp-encrypted-partially-signed-attachments.mbox.html
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/details/openpgp-inline-charset-encrypted.mbox.html
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/details/openpgp-inline-signed.mbox.html
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/details/openpgp-signed-base64-mailman-footer.mbox.html
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/details/openpgp-signed-encrypted-two-attachments.mbox.html
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/details/openpgp-signed-encrypted.mbox.html
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/details/openpgp-signed-mailinglist+old.mbox.html
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/details/openpgp-signed-mailinglist.mbox.html
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/details/openpgp-signed-two-attachments.mbox.html
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/details/signed-forward-openpgp-signed-encrypted.mbox.html
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/details/smime-opaque-enc+sign.mbox.html
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/details/smime-opaque-sign.mbox.html
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/details/smime-signed-encrypted.mbox.html
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/encapsulated-with-attachment.mbox
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/encapsulated-with-attachment.mbox.html
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/encapsulated-with-attachment.mbox.tree
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/forward-openpgp-signed-encrypted.mbox
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/forward-openpgp-signed-encrypted.mbox.html
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/forward-openpgp-signed-encrypted.mbox.tree
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/headeronly/openpgp-encrypted-attachment-and-non-encrypted-attachment.mbox.html
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/headeronly/openpgp-encrypted-attachment.mbox.html
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/headeronly/openpgp-encrypted-non-encrypted-attachment.mbox.html
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/headeronly/openpgp-encrypted-partially-signed-attachments.mbox.html
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/headeronly/openpgp-encrypted-two-attachments.mbox.html
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/headeronly/openpgp-signed-apple.mbox.html
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/headeronly/openpgp-signed-encrypted-two-attachments.mbox.html
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/headeronly/openpgp-signed-mailinglist+additional-children.mbox.html
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/headeronly/openpgp-signed-no-protocol.mbox.html
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/headeronly/openpgp-signed-two-attachments.mbox.html
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/headeronly/smime-signed-apple.mbox.html
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/hidden/encapsulated-with-attachment.mbox.html
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/hidden/openpgp-encrypted-attachment-and-non-encrypted-attachment.mbox.html
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/hidden/openpgp-encrypted-attachment.mbox.html
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/hidden/openpgp-encrypted-noData.mbox.html
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/hidden/openpgp-encrypted-non-encrypted-attachment.mbox.html
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/hidden/openpgp-encrypted-partially-signed-attachments.mbox.html
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/hidden/openpgp-encrypted-two-attachments.mbox.html
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/hidden/openpgp-signed-apple.mbox.html
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/hidden/openpgp-signed-encrypted-two-attachments.mbox.html
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/hidden/openpgp-signed-mailinglist+additional-children.mbox.html
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/hidden/openpgp-signed-no-protocol.mbox.html
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/hidden/openpgp-signed-two-attachments.mbox.html
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/hidden/smime-signed-apple.mbox.html
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/html.mbox
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/html.mbox.html
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/html.mbox.tree
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/htmlonly.mbox
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/htmlonly.mbox.html
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/htmlonly.mbox.tree
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/htmlonlyexternal.mbox
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/iconic/openpgp-encrypted-partially-signed-attachments.mbox.html
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/iconic/openpgp-encrypted-two-attachments.mbox.html
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/iconic/openpgp-signed-encrypted-two-attachments.mbox.html
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/iconic/openpgp-signed-two-attachments.mbox.html
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/inlined/encapsulated-with-attachment.mbox.html
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/inlined/openpgp-encrypted-attachment-and-non-encrypted-attachment.mbox.html
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/inlined/openpgp-encrypted-attachment.mbox.html
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/inlined/openpgp-encrypted-non-encrypted-attachment.mbox.html
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/inlined/openpgp-signed-apple.mbox.html
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/inlined/openpgp-signed-mailinglist+additional-children.mbox.html
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/inlined/smime-signed-apple.mbox.html
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/inlinepgpencrypted-appendix.mbox
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/inlinepgpencrypted-appendix.mbox.html
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/inlinepgpencrypted-appendix.mbox.tree
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/inlinepgpencrypted-error.mbox
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/inlinepgpencrypted-error.mbox.html
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/inlinepgpencrypted-error.mbox.tree
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/inlinepgpencrypted.mbox
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/inlinepgpencrypted.mbox.html
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/inlinepgpencrypted.mbox.inProgress.html
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/inlinepgpencrypted.mbox.tree
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/mailheader.css
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/no-content-type.mbox
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/no-content-type.mbox.html
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/no-content-type.mbox.tree
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-encoded.mbox
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-encoded.mbox.html
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-encoded.mbox.tree
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted+signed.mbox
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted+signed.mbox.html
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted+signed.mbox.tree
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted-applemail.mbox
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted-applemail.mbox.html
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted-applemail.mbox.tree
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted-attachment-and-non-encrypted-attachment.mbox
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted-attachment-and-non-encrypted-attachment.mbox.html
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted-attachment-and-non-encrypted-attachment.mbox.tree
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted-attachment.mbox
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted-attachment.mbox.html
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted-attachment.mbox.tree
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted-enigmail1.6.mbox
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted-enigmail1.6.mbox.html
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted-enigmail1.6.mbox.tree
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted-noData.mbox
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted-noData.mbox.html
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted-noData.mbox.tree
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted-non-encrypted-attachment.mbox
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted-non-encrypted-attachment.mbox.html
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted-non-encrypted-attachment.mbox.tree
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted-partially-signed-attachments.mbox
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted-partially-signed-attachments.mbox.html
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted-partially-signed-attachments.mbox.tree
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted-two-attachments.mbox
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted-two-attachments.mbox.html
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted-two-attachments.mbox.tree
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted.mbox
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted.mbox.html
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted.mbox.inProgress.html
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted.mbox.tree
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-inline-charset-encrypted.mbox
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-inline-charset-encrypted.mbox.html
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-inline-charset-encrypted.mbox.inProgress.html
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-inline-charset-encrypted.mbox.tree
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-inline-signed-broken.mbox
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-inline-signed.mbox
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-inline-signed.mbox.html
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-inline-signed.mbox.inProgress.html
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-inline-signed.mbox.tree
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-inline-wrong-charset-encrypted.mbox
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-inline-wrong-charset-encrypted.mbox.html
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-inline-wrong-charset-encrypted.mbox.tree
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-signed-apple.mbox
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-signed-apple.mbox.html
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-signed-apple.mbox.inProgress.html
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-signed-apple.mbox.tree
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-signed-base64-mailman-footer.mbox
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-signed-base64-mailman-footer.mbox.html
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-signed-base64-mailman-footer.mbox.tree
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-signed-encrypted-two-attachments.mbox
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-signed-encrypted-two-attachments.mbox.html
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-signed-encrypted-two-attachments.mbox.tree
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-signed-encrypted.mbox
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-signed-encrypted.mbox.html
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-signed-encrypted.mbox.tree
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-signed-mailinglist+additional-children.mbox
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-signed-mailinglist+additional-children.mbox.html
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-signed-mailinglist+additional-children.mbox.tree
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-signed-mailinglist+old.mbox
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-signed-mailinglist+old.mbox.html
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-signed-mailinglist+old.mbox.tree
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-signed-mailinglist.mbox
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-signed-mailinglist.mbox.html
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-signed-mailinglist.mbox.inProgress.html
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-signed-mailinglist.mbox.tree
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-signed-no-protocol.mbox
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-signed-no-protocol.mbox.html
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-signed-no-protocol.mbox.tree
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-signed-two-attachments.mbox
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-signed-two-attachments.mbox.html
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-signed-two-attachments.mbox.tree
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/signed-forward-openpgp-signed-encrypted.mbox
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/signed-forward-openpgp-signed-encrypted.mbox.html
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/signed-forward-openpgp-signed-encrypted.mbox.tree
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/smime-cert.mbox
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/smime-cert.mbox.html
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/smime-cert.mbox.tree
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/smime-encrypted-octet-stream.mbox
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/smime-encrypted-octet-stream.mbox.html
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/smime-encrypted-octet-stream.mbox.tree
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/smime-encrypted.mbox
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/smime-encrypted.mbox.html
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/smime-encrypted.mbox.inProgress.html
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/smime-encrypted.mbox.tree
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/smime-opaque-enc+sign.mbox
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/smime-opaque-enc+sign.mbox.html
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/smime-opaque-enc+sign.mbox.tree
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/smime-opaque-sign.mbox
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/smime-opaque-sign.mbox.html
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/smime-opaque-sign.mbox.inProgress.html
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/smime-opaque-sign.mbox.tree
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/smime-opaque-signed-encrypted-attachment.mbox
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/smime-signed-apple.mbox
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/smime-signed-apple.mbox.html
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/smime-signed-apple.mbox.inProgress.html
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/smime-signed-apple.mbox.tree
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/smime-signed-encrypted.mbox
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/smime-signed-encrypted.mbox.html
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/smime-signed-encrypted.mbox.tree
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/text+html-maillinglist.mbox
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/text+html-maillinglist.mbox.html
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/data/text+html-maillinglist.mbox.tree
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/kdepim_add_gpg_crypto_test.cmake
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/kdepim_generate_crypto_test_wrapper.cmake
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/nodehelpertest.cpp
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/nodehelpertest.h
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/setupenv.cpp
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/setupenv.h
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/testcsshelper.cpp
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/testcsshelper.h
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/util.cpp
 delete mode 100644 framework/src/domain/mime/mimetreeparser/otp/autotests/util.h

(limited to 'framework/src/domain/mime/mimetreeparser/otp/autotests')

diff --git a/framework/src/domain/mime/mimetreeparser/otp/autotests/CMakeLists.txt b/framework/src/domain/mime/mimetreeparser/otp/autotests/CMakeLists.txt
deleted file mode 100644
index c823db0a..00000000
--- a/framework/src/domain/mime/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(${_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/mime/mimetreeparser/otp/autotests/attachmenttest.cpp b/framework/src/domain/mime/mimetreeparser/otp/autotests/attachmenttest.cpp
deleted file mode 100644
index 44e40a45..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/cryptohelpertest.cpp b/framework/src/domain/mime/mimetreeparser/otp/autotests/cryptohelpertest.cpp
deleted file mode 100644
index 251e657d..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/cryptohelpertest.h b/framework/src/domain/mime/mimetreeparser/otp/autotests/cryptohelpertest.h
deleted file mode 100644
index 71ae086f..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/alternative-notext.mbox b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/alternative-notext.mbox
deleted file mode 100644
index 86026437..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/alternative-notext.mbox.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/alternative-notext.mbox.html
deleted file mode 100644
index 41db4eab..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/alternative-notext.mbox.tree b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/alternative-notext.mbox.tree
deleted file mode 100644
index 0de07281..00000000
--- a/framework/src/domain/mime/mimetreeparser/otp/autotests/data/alternative-notext.mbox.tree
+++ /dev/null
@@ -1,2 +0,0 @@
- * MimeTreeParser::MessagePartList
-  * MimeTreeParser::AlternativeMessagePart
diff --git a/framework/src/domain/mime/mimetreeparser/otp/autotests/data/alternative.mbox b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/alternative.mbox
deleted file mode 100644
index a2c58591..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/alternative.mbox.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/alternative.mbox.html
deleted file mode 100644
index 2fe886f1..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/alternative.mbox.tree b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/alternative.mbox.tree
deleted file mode 100644
index 0de07281..00000000
--- a/framework/src/domain/mime/mimetreeparser/otp/autotests/data/alternative.mbox.tree
+++ /dev/null
@@ -1,2 +0,0 @@
- * MimeTreeParser::MessagePartList
-  * MimeTreeParser::AlternativeMessagePart
diff --git a/framework/src/domain/mime/mimetreeparser/otp/autotests/data/details/forward-openpgp-signed-encrypted.mbox.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/details/forward-openpgp-signed-encrypted.mbox.html
deleted file mode 100644
index 9a81f103..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/details/openpgp-encoded.mbox.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/details/openpgp-encoded.mbox.html
deleted file mode 100644
index 65d5f95e..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/details/openpgp-encrypted+signed.mbox.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/details/openpgp-encrypted+signed.mbox.html
deleted file mode 100644
index 96361c30..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/details/openpgp-encrypted-attachment-and-non-encrypted-attachment.mbox.html b/framework/src/domain/mime/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/mime/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/mime/mimetreeparser/otp/autotests/data/details/openpgp-encrypted-attachment.mbox.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/details/openpgp-encrypted-attachment.mbox.html
deleted file mode 100644
index 61bf5d28..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/details/openpgp-encrypted-non-encrypted-attachment.mbox.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/details/openpgp-encrypted-non-encrypted-attachment.mbox.html
deleted file mode 100644
index 8d8bde0d..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/details/openpgp-encrypted-partially-signed-attachments.mbox.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/details/openpgp-encrypted-partially-signed-attachments.mbox.html
deleted file mode 100644
index 1716b841..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/details/openpgp-inline-charset-encrypted.mbox.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/details/openpgp-inline-charset-encrypted.mbox.html
deleted file mode 100644
index c2fa2fee..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/details/openpgp-inline-signed.mbox.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/details/openpgp-inline-signed.mbox.html
deleted file mode 100644
index 00a9dc5b..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/details/openpgp-signed-base64-mailman-footer.mbox.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/details/openpgp-signed-base64-mailman-footer.mbox.html
deleted file mode 100644
index c10cecd8..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/details/openpgp-signed-encrypted-two-attachments.mbox.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/details/openpgp-signed-encrypted-two-attachments.mbox.html
deleted file mode 100644
index 2c02a22c..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/details/openpgp-signed-encrypted.mbox.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/details/openpgp-signed-encrypted.mbox.html
deleted file mode 100644
index d3a7a0ce..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/details/openpgp-signed-mailinglist+old.mbox.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/details/openpgp-signed-mailinglist+old.mbox.html
deleted file mode 100644
index e7da94db..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/details/openpgp-signed-mailinglist.mbox.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/details/openpgp-signed-mailinglist.mbox.html
deleted file mode 100644
index f5b20b6d..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/details/openpgp-signed-two-attachments.mbox.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/details/openpgp-signed-two-attachments.mbox.html
deleted file mode 100644
index 1432aa44..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/details/signed-forward-openpgp-signed-encrypted.mbox.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/details/signed-forward-openpgp-signed-encrypted.mbox.html
deleted file mode 100644
index b960f318..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/details/smime-opaque-enc+sign.mbox.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/details/smime-opaque-enc+sign.mbox.html
deleted file mode 100644
index d6345a7c..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/details/smime-opaque-sign.mbox.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/details/smime-opaque-sign.mbox.html
deleted file mode 100644
index 248b93ff..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/details/smime-signed-encrypted.mbox.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/details/smime-signed-encrypted.mbox.html
deleted file mode 100644
index 6e811632..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/encapsulated-with-attachment.mbox b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/encapsulated-with-attachment.mbox
deleted file mode 100644
index 885b9d1b..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/encapsulated-with-attachment.mbox.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/encapsulated-with-attachment.mbox.html
deleted file mode 100644
index aa3d1090..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/encapsulated-with-attachment.mbox.tree b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/encapsulated-with-attachment.mbox.tree
deleted file mode 100644
index 050414a2..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/forward-openpgp-signed-encrypted.mbox b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/forward-openpgp-signed-encrypted.mbox
deleted file mode 100644
index 1c166940..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/forward-openpgp-signed-encrypted.mbox.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/forward-openpgp-signed-encrypted.mbox.html
deleted file mode 100644
index 7632ec39..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/forward-openpgp-signed-encrypted.mbox.tree b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/forward-openpgp-signed-encrypted.mbox.tree
deleted file mode 100644
index 324156db..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/headeronly/openpgp-encrypted-attachment-and-non-encrypted-attachment.mbox.html b/framework/src/domain/mime/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/mime/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/mime/mimetreeparser/otp/autotests/data/headeronly/openpgp-encrypted-attachment.mbox.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/headeronly/openpgp-encrypted-attachment.mbox.html
deleted file mode 100644
index d5e4550e..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/headeronly/openpgp-encrypted-non-encrypted-attachment.mbox.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/headeronly/openpgp-encrypted-non-encrypted-attachment.mbox.html
deleted file mode 100644
index 73c4d2d7..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/headeronly/openpgp-encrypted-partially-signed-attachments.mbox.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/headeronly/openpgp-encrypted-partially-signed-attachments.mbox.html
deleted file mode 100644
index ebad7354..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/headeronly/openpgp-encrypted-two-attachments.mbox.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/headeronly/openpgp-encrypted-two-attachments.mbox.html
deleted file mode 100644
index 4cdeaa63..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/headeronly/openpgp-signed-apple.mbox.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/headeronly/openpgp-signed-apple.mbox.html
deleted file mode 100644
index 330b02a1..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/headeronly/openpgp-signed-encrypted-two-attachments.mbox.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/headeronly/openpgp-signed-encrypted-two-attachments.mbox.html
deleted file mode 100644
index 83b7a66c..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/headeronly/openpgp-signed-mailinglist+additional-children.mbox.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/headeronly/openpgp-signed-mailinglist+additional-children.mbox.html
deleted file mode 100644
index 25b1ad04..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/headeronly/openpgp-signed-no-protocol.mbox.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/headeronly/openpgp-signed-no-protocol.mbox.html
deleted file mode 100644
index bdac52b6..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/headeronly/openpgp-signed-two-attachments.mbox.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/headeronly/openpgp-signed-two-attachments.mbox.html
deleted file mode 100644
index 027097f7..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/headeronly/smime-signed-apple.mbox.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/headeronly/smime-signed-apple.mbox.html
deleted file mode 100644
index 9554bb39..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/hidden/encapsulated-with-attachment.mbox.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/hidden/encapsulated-with-attachment.mbox.html
deleted file mode 100644
index 42f5ecd7..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/hidden/openpgp-encrypted-attachment-and-non-encrypted-attachment.mbox.html b/framework/src/domain/mime/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/mime/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/mime/mimetreeparser/otp/autotests/data/hidden/openpgp-encrypted-attachment.mbox.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/hidden/openpgp-encrypted-attachment.mbox.html
deleted file mode 100644
index d5e4550e..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/hidden/openpgp-encrypted-noData.mbox.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/hidden/openpgp-encrypted-noData.mbox.html
deleted file mode 100644
index 166812fe..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/hidden/openpgp-encrypted-non-encrypted-attachment.mbox.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/hidden/openpgp-encrypted-non-encrypted-attachment.mbox.html
deleted file mode 100644
index 73c4d2d7..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/hidden/openpgp-encrypted-partially-signed-attachments.mbox.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/hidden/openpgp-encrypted-partially-signed-attachments.mbox.html
deleted file mode 100644
index ebad7354..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/hidden/openpgp-encrypted-two-attachments.mbox.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/hidden/openpgp-encrypted-two-attachments.mbox.html
deleted file mode 100644
index 4cdeaa63..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/hidden/openpgp-signed-apple.mbox.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/hidden/openpgp-signed-apple.mbox.html
deleted file mode 100644
index 330b02a1..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/hidden/openpgp-signed-encrypted-two-attachments.mbox.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/hidden/openpgp-signed-encrypted-two-attachments.mbox.html
deleted file mode 100644
index 83b7a66c..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/hidden/openpgp-signed-mailinglist+additional-children.mbox.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/hidden/openpgp-signed-mailinglist+additional-children.mbox.html
deleted file mode 100644
index 1f0da385..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/hidden/openpgp-signed-no-protocol.mbox.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/hidden/openpgp-signed-no-protocol.mbox.html
deleted file mode 100644
index bdac52b6..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/hidden/openpgp-signed-two-attachments.mbox.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/hidden/openpgp-signed-two-attachments.mbox.html
deleted file mode 100644
index 027097f7..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/hidden/smime-signed-apple.mbox.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/hidden/smime-signed-apple.mbox.html
deleted file mode 100644
index 9554bb39..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/html.mbox b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/html.mbox
deleted file mode 100644
index eebd4283..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/html.mbox.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/html.mbox.html
deleted file mode 100644
index 2fe886f1..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/html.mbox.tree b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/html.mbox.tree
deleted file mode 100644
index 0de07281..00000000
--- a/framework/src/domain/mime/mimetreeparser/otp/autotests/data/html.mbox.tree
+++ /dev/null
@@ -1,2 +0,0 @@
- * MimeTreeParser::MessagePartList
-  * MimeTreeParser::AlternativeMessagePart
diff --git a/framework/src/domain/mime/mimetreeparser/otp/autotests/data/htmlonly.mbox b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/htmlonly.mbox
deleted file mode 100644
index e45b1c4d..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/htmlonly.mbox.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/htmlonly.mbox.html
deleted file mode 100644
index 1143f2cf..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/htmlonly.mbox.tree b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/htmlonly.mbox.tree
deleted file mode 100644
index a4c3191b..00000000
--- a/framework/src/domain/mime/mimetreeparser/otp/autotests/data/htmlonly.mbox.tree
+++ /dev/null
@@ -1,2 +0,0 @@
- * MimeTreeParser::MessagePartList
-  * MimeTreeParser::HtmlMessagePart
diff --git a/framework/src/domain/mime/mimetreeparser/otp/autotests/data/htmlonlyexternal.mbox b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/htmlonlyexternal.mbox
deleted file mode 100644
index 4eb3e2c3..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/iconic/openpgp-encrypted-partially-signed-attachments.mbox.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/iconic/openpgp-encrypted-partially-signed-attachments.mbox.html
deleted file mode 100644
index b6f734c2..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/iconic/openpgp-encrypted-two-attachments.mbox.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/iconic/openpgp-encrypted-two-attachments.mbox.html
deleted file mode 100644
index 7f0b7abd..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/iconic/openpgp-signed-encrypted-two-attachments.mbox.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/iconic/openpgp-signed-encrypted-two-attachments.mbox.html
deleted file mode 100644
index 8d6b5814..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/iconic/openpgp-signed-two-attachments.mbox.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/iconic/openpgp-signed-two-attachments.mbox.html
deleted file mode 100644
index 73dbc5f4..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/inlined/encapsulated-with-attachment.mbox.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/inlined/encapsulated-with-attachment.mbox.html
deleted file mode 100644
index 26d3dd60..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/inlined/openpgp-encrypted-attachment-and-non-encrypted-attachment.mbox.html b/framework/src/domain/mime/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/mime/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/mime/mimetreeparser/otp/autotests/data/inlined/openpgp-encrypted-attachment.mbox.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/inlined/openpgp-encrypted-attachment.mbox.html
deleted file mode 100644
index 67897491..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/inlined/openpgp-encrypted-non-encrypted-attachment.mbox.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/inlined/openpgp-encrypted-non-encrypted-attachment.mbox.html
deleted file mode 100644
index 6091ee5a..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/inlined/openpgp-signed-apple.mbox.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/inlined/openpgp-signed-apple.mbox.html
deleted file mode 100644
index 092d5e1c..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/inlined/openpgp-signed-mailinglist+additional-children.mbox.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/inlined/openpgp-signed-mailinglist+additional-children.mbox.html
deleted file mode 100644
index cc49cbcc..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/inlined/smime-signed-apple.mbox.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/inlined/smime-signed-apple.mbox.html
deleted file mode 100644
index d3f3eeb3..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/inlinepgpencrypted-appendix.mbox b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/inlinepgpencrypted-appendix.mbox
deleted file mode 100644
index c05a7e69..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/inlinepgpencrypted-appendix.mbox.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/inlinepgpencrypted-appendix.mbox.html
deleted file mode 100644
index 8af2b1c6..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/inlinepgpencrypted-appendix.mbox.tree b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/inlinepgpencrypted-appendix.mbox.tree
deleted file mode 100644
index 018f5c33..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/inlinepgpencrypted-error.mbox b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/inlinepgpencrypted-error.mbox
deleted file mode 100644
index 529b4d3b..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/inlinepgpencrypted-error.mbox.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/inlinepgpencrypted-error.mbox.html
deleted file mode 100644
index a4427e01..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/inlinepgpencrypted-error.mbox.tree b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/inlinepgpencrypted-error.mbox.tree
deleted file mode 100644
index 6680b8bc..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/inlinepgpencrypted.mbox b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/inlinepgpencrypted.mbox
deleted file mode 100644
index b581602c..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/inlinepgpencrypted.mbox.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/inlinepgpencrypted.mbox.html
deleted file mode 100644
index 1f695bdf..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/inlinepgpencrypted.mbox.inProgress.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/inlinepgpencrypted.mbox.inProgress.html
deleted file mode 100644
index e5eb55d0..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/inlinepgpencrypted.mbox.tree b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/inlinepgpencrypted.mbox.tree
deleted file mode 100644
index 6680b8bc..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/mailheader.css b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/mailheader.css
deleted file mode 100644
index 10181957..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/no-content-type.mbox b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/no-content-type.mbox
deleted file mode 100644
index ad050d8c..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/no-content-type.mbox.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/no-content-type.mbox.html
deleted file mode 100644
index 9e3eb752..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/no-content-type.mbox.tree b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/no-content-type.mbox.tree
deleted file mode 100644
index c003ec97..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/openpgp-encoded.mbox b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-encoded.mbox
deleted file mode 100644
index 168c8dc4..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/openpgp-encoded.mbox.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-encoded.mbox.html
deleted file mode 100644
index 585bb4f0..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/openpgp-encoded.mbox.tree b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-encoded.mbox.tree
deleted file mode 100644
index ea8223fd..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted+signed.mbox b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted+signed.mbox
deleted file mode 100644
index fbe5ce7f..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted+signed.mbox.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted+signed.mbox.html
deleted file mode 100644
index 54c58b85..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted+signed.mbox.tree b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted+signed.mbox.tree
deleted file mode 100644
index 7d5bbeb7..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted-applemail.mbox b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted-applemail.mbox
deleted file mode 100644
index f5d083ff..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted-applemail.mbox.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted-applemail.mbox.html
deleted file mode 100644
index ca8d7fbb..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted-applemail.mbox.tree b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted-applemail.mbox.tree
deleted file mode 100644
index 8ef3df2d..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted-attachment-and-non-encrypted-attachment.mbox b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted-attachment-and-non-encrypted-attachment.mbox
deleted file mode 100644
index 2d9726ea..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted-attachment-and-non-encrypted-attachment.mbox.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted-attachment-and-non-encrypted-attachment.mbox.html
deleted file mode 100644
index 092a3440..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted-attachment-and-non-encrypted-attachment.mbox.tree b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted-attachment-and-non-encrypted-attachment.mbox.tree
deleted file mode 100644
index 473f0b10..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted-attachment.mbox b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted-attachment.mbox
deleted file mode 100644
index 4204fb0b..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted-attachment.mbox.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted-attachment.mbox.html
deleted file mode 100644
index 2b266b02..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted-attachment.mbox.tree b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted-attachment.mbox.tree
deleted file mode 100644
index f433fd45..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted-enigmail1.6.mbox b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted-enigmail1.6.mbox
deleted file mode 100644
index 9afd17e3..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted-enigmail1.6.mbox.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted-enigmail1.6.mbox.html
deleted file mode 100644
index 09d904bb..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted-enigmail1.6.mbox.tree b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted-enigmail1.6.mbox.tree
deleted file mode 100644
index 009ba99a..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted-noData.mbox b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted-noData.mbox
deleted file mode 100644
index c4f14226..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted-noData.mbox.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted-noData.mbox.html
deleted file mode 100644
index 52196784..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted-noData.mbox.tree b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted-noData.mbox.tree
deleted file mode 100644
index 79a20c8d..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted-non-encrypted-attachment.mbox b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted-non-encrypted-attachment.mbox
deleted file mode 100644
index 2957bf3c..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted-non-encrypted-attachment.mbox.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted-non-encrypted-attachment.mbox.html
deleted file mode 100644
index e20a9568..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted-non-encrypted-attachment.mbox.tree b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted-non-encrypted-attachment.mbox.tree
deleted file mode 100644
index c2a6ad01..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted-partially-signed-attachments.mbox b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted-partially-signed-attachments.mbox
deleted file mode 100644
index 222b5936..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted-partially-signed-attachments.mbox.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted-partially-signed-attachments.mbox.html
deleted file mode 100644
index c0b9d79e..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted-partially-signed-attachments.mbox.tree b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted-partially-signed-attachments.mbox.tree
deleted file mode 100644
index 5cb83749..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted-two-attachments.mbox b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted-two-attachments.mbox
deleted file mode 100644
index c53e0916..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted-two-attachments.mbox.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted-two-attachments.mbox.html
deleted file mode 100644
index cca4c455..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted-two-attachments.mbox.tree b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted-two-attachments.mbox.tree
deleted file mode 100644
index 71a67b58..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted.mbox b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted.mbox
deleted file mode 100644
index 5102fa78..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted.mbox.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted.mbox.html
deleted file mode 100644
index ba0976cd..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted.mbox.inProgress.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted.mbox.inProgress.html
deleted file mode 100644
index e5eb55d0..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted.mbox.tree b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted.mbox.tree
deleted file mode 100644
index 82f705c2..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/openpgp-inline-charset-encrypted.mbox b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-inline-charset-encrypted.mbox
deleted file mode 100644
index 8bd06910..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/openpgp-inline-charset-encrypted.mbox.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-inline-charset-encrypted.mbox.html
deleted file mode 100644
index 344dc237..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/openpgp-inline-charset-encrypted.mbox.inProgress.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-inline-charset-encrypted.mbox.inProgress.html
deleted file mode 100644
index e5eb55d0..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/openpgp-inline-charset-encrypted.mbox.tree b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-inline-charset-encrypted.mbox.tree
deleted file mode 100644
index ea8223fd..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/openpgp-inline-signed-broken.mbox b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-inline-signed-broken.mbox
deleted file mode 100644
index fc0d2df9..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/openpgp-inline-signed.mbox b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-inline-signed.mbox
deleted file mode 100644
index 6099a51f..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/openpgp-inline-signed.mbox.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-inline-signed.mbox.html
deleted file mode 100644
index d32d0235..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/openpgp-inline-signed.mbox.inProgress.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-inline-signed.mbox.inProgress.html
deleted file mode 100644
index 45a999d3..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/openpgp-inline-signed.mbox.tree b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-inline-signed.mbox.tree
deleted file mode 100644
index 23e99880..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/openpgp-inline-wrong-charset-encrypted.mbox b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-inline-wrong-charset-encrypted.mbox
deleted file mode 100644
index 5ecfc612..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/openpgp-inline-wrong-charset-encrypted.mbox.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-inline-wrong-charset-encrypted.mbox.html
deleted file mode 100644
index 3ed4e0fb..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/openpgp-inline-wrong-charset-encrypted.mbox.tree b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-inline-wrong-charset-encrypted.mbox.tree
deleted file mode 100644
index ea8223fd..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/openpgp-signed-apple.mbox b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-signed-apple.mbox
deleted file mode 100644
index ba85df86..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/openpgp-signed-apple.mbox.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-signed-apple.mbox.html
deleted file mode 100644
index 234eaae4..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/openpgp-signed-apple.mbox.inProgress.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-signed-apple.mbox.inProgress.html
deleted file mode 100644
index b5236fe4..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/openpgp-signed-apple.mbox.tree b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-signed-apple.mbox.tree
deleted file mode 100644
index 3ade4efe..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/openpgp-signed-base64-mailman-footer.mbox b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-signed-base64-mailman-footer.mbox
deleted file mode 100644
index 70bf4ef8..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/openpgp-signed-base64-mailman-footer.mbox.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-signed-base64-mailman-footer.mbox.html
deleted file mode 100644
index 50eddaa6..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/openpgp-signed-base64-mailman-footer.mbox.tree b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-signed-base64-mailman-footer.mbox.tree
deleted file mode 100644
index 2753978c..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/openpgp-signed-encrypted-two-attachments.mbox b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-signed-encrypted-two-attachments.mbox
deleted file mode 100644
index 7939af83..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/openpgp-signed-encrypted-two-attachments.mbox.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-signed-encrypted-two-attachments.mbox.html
deleted file mode 100644
index 53856e74..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/openpgp-signed-encrypted-two-attachments.mbox.tree b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-signed-encrypted-two-attachments.mbox.tree
deleted file mode 100644
index 6705a4d7..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/openpgp-signed-encrypted.mbox b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-signed-encrypted.mbox
deleted file mode 100644
index 6d723d52..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/openpgp-signed-encrypted.mbox.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-signed-encrypted.mbox.html
deleted file mode 100644
index 86a964b8..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/openpgp-signed-encrypted.mbox.tree b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-signed-encrypted.mbox.tree
deleted file mode 100644
index 7d5bbeb7..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/openpgp-signed-mailinglist+additional-children.mbox b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-signed-mailinglist+additional-children.mbox
deleted file mode 100644
index dbca8d45..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/openpgp-signed-mailinglist+additional-children.mbox.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-signed-mailinglist+additional-children.mbox.html
deleted file mode 100644
index a95252e4..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/openpgp-signed-mailinglist+additional-children.mbox.tree b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-signed-mailinglist+additional-children.mbox.tree
deleted file mode 100644
index 906e6274..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/openpgp-signed-mailinglist+old.mbox b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-signed-mailinglist+old.mbox
deleted file mode 100644
index 362dff3e..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/openpgp-signed-mailinglist+old.mbox.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-signed-mailinglist+old.mbox.html
deleted file mode 100644
index 59c6d690..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/openpgp-signed-mailinglist+old.mbox.tree b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-signed-mailinglist+old.mbox.tree
deleted file mode 100644
index c8310bc1..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/openpgp-signed-mailinglist.mbox b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-signed-mailinglist.mbox
deleted file mode 100644
index 8adb9f4c..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/openpgp-signed-mailinglist.mbox.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-signed-mailinglist.mbox.html
deleted file mode 100644
index 7acb6fbf..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/openpgp-signed-mailinglist.mbox.inProgress.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-signed-mailinglist.mbox.inProgress.html
deleted file mode 100644
index 77c6b29b..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/openpgp-signed-mailinglist.mbox.tree b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-signed-mailinglist.mbox.tree
deleted file mode 100644
index 2753978c..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/openpgp-signed-no-protocol.mbox b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-signed-no-protocol.mbox
deleted file mode 100644
index e50879b9..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/openpgp-signed-no-protocol.mbox.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-signed-no-protocol.mbox.html
deleted file mode 100644
index 4a5f337b..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/openpgp-signed-no-protocol.mbox.tree b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-signed-no-protocol.mbox.tree
deleted file mode 100644
index d824a11b..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/openpgp-signed-two-attachments.mbox b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-signed-two-attachments.mbox
deleted file mode 100644
index 462f62a3..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/openpgp-signed-two-attachments.mbox.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-signed-two-attachments.mbox.html
deleted file mode 100644
index 06718641..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/openpgp-signed-two-attachments.mbox.tree b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-signed-two-attachments.mbox.tree
deleted file mode 100644
index 7133f4be..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/signed-forward-openpgp-signed-encrypted.mbox b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/signed-forward-openpgp-signed-encrypted.mbox
deleted file mode 100644
index 9b715161..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/signed-forward-openpgp-signed-encrypted.mbox.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/signed-forward-openpgp-signed-encrypted.mbox.html
deleted file mode 100644
index b91772b7..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/signed-forward-openpgp-signed-encrypted.mbox.tree b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/signed-forward-openpgp-signed-encrypted.mbox.tree
deleted file mode 100644
index 818f894c..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/smime-cert.mbox b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/smime-cert.mbox
deleted file mode 100644
index b3c8a19e..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/smime-cert.mbox.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/smime-cert.mbox.html
deleted file mode 100644
index 1b86390f..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/smime-cert.mbox.tree b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/smime-cert.mbox.tree
deleted file mode 100644
index c34c2eca..00000000
--- a/framework/src/domain/mime/mimetreeparser/otp/autotests/data/smime-cert.mbox.tree
+++ /dev/null
@@ -1,2 +0,0 @@
- * MimeTreeParser::MessagePartList
-  * MimeTreeParser::CertMessagePart
diff --git a/framework/src/domain/mime/mimetreeparser/otp/autotests/data/smime-encrypted-octet-stream.mbox b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/smime-encrypted-octet-stream.mbox
deleted file mode 100644
index 887fe358..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/smime-encrypted-octet-stream.mbox.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/smime-encrypted-octet-stream.mbox.html
deleted file mode 100644
index 6b08c47e..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/smime-encrypted-octet-stream.mbox.tree b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/smime-encrypted-octet-stream.mbox.tree
deleted file mode 100644
index 82f705c2..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/smime-encrypted.mbox b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/smime-encrypted.mbox
deleted file mode 100644
index 6b6d6a0d..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/smime-encrypted.mbox.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/smime-encrypted.mbox.html
deleted file mode 100644
index 6b08c47e..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/smime-encrypted.mbox.inProgress.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/smime-encrypted.mbox.inProgress.html
deleted file mode 100644
index e5eb55d0..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/smime-encrypted.mbox.tree b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/smime-encrypted.mbox.tree
deleted file mode 100644
index 82f705c2..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/smime-opaque-enc+sign.mbox b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/smime-opaque-enc+sign.mbox
deleted file mode 100644
index be75c1e2..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/smime-opaque-enc+sign.mbox.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/smime-opaque-enc+sign.mbox.html
deleted file mode 100644
index 7f60c04f..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/smime-opaque-enc+sign.mbox.tree b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/smime-opaque-enc+sign.mbox.tree
deleted file mode 100644
index 7d5bbeb7..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/smime-opaque-sign.mbox b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/smime-opaque-sign.mbox
deleted file mode 100644
index 6e1739ac..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/smime-opaque-sign.mbox.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/smime-opaque-sign.mbox.html
deleted file mode 100644
index 6088bc72..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/smime-opaque-sign.mbox.inProgress.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/smime-opaque-sign.mbox.inProgress.html
deleted file mode 100644
index 45a999d3..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/smime-opaque-sign.mbox.tree b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/smime-opaque-sign.mbox.tree
deleted file mode 100644
index a469bb76..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/smime-opaque-signed-encrypted-attachment.mbox b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/smime-opaque-signed-encrypted-attachment.mbox
deleted file mode 100644
index 2b1a0761..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/smime-signed-apple.mbox b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/smime-signed-apple.mbox
deleted file mode 100644
index d5cd06f1..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/smime-signed-apple.mbox.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/smime-signed-apple.mbox.html
deleted file mode 100644
index 11652a14..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/smime-signed-apple.mbox.inProgress.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/smime-signed-apple.mbox.inProgress.html
deleted file mode 100644
index 5b57b937..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/smime-signed-apple.mbox.tree b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/smime-signed-apple.mbox.tree
deleted file mode 100644
index 3ade4efe..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/smime-signed-encrypted.mbox b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/smime-signed-encrypted.mbox
deleted file mode 100644
index 49857e15..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/smime-signed-encrypted.mbox.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/smime-signed-encrypted.mbox.html
deleted file mode 100644
index e13d6841..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/smime-signed-encrypted.mbox.tree b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/smime-signed-encrypted.mbox.tree
deleted file mode 100644
index 7d5bbeb7..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/text+html-maillinglist.mbox b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/text+html-maillinglist.mbox
deleted file mode 100644
index f9c6387f..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/text+html-maillinglist.mbox.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/text+html-maillinglist.mbox.html
deleted file mode 100644
index 2b5af631..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/data/text+html-maillinglist.mbox.tree b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/text+html-maillinglist.mbox.tree
deleted file mode 100644
index 3738cb37..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/kdepim_add_gpg_crypto_test.cmake b/framework/src/domain/mime/mimetreeparser/otp/autotests/kdepim_add_gpg_crypto_test.cmake
deleted file mode 100644
index 841cf6ff..00000000
--- a/framework/src/domain/mime/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/mime/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/mime/mimetreeparser/otp/autotests/kdepim_generate_crypto_test_wrapper.cmake b/framework/src/domain/mime/mimetreeparser/otp/autotests/kdepim_generate_crypto_test_wrapper.cmake
deleted file mode 100644
index e1412f37..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/nodehelpertest.cpp b/framework/src/domain/mime/mimetreeparser/otp/autotests/nodehelpertest.cpp
deleted file mode 100644
index d2a5d605..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/nodehelpertest.h b/framework/src/domain/mime/mimetreeparser/otp/autotests/nodehelpertest.h
deleted file mode 100644
index d2ed772a..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/setupenv.cpp b/framework/src/domain/mime/mimetreeparser/otp/autotests/setupenv.cpp
deleted file mode 100644
index be7a8685..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/setupenv.h b/framework/src/domain/mime/mimetreeparser/otp/autotests/setupenv.h
deleted file mode 100644
index 78a450ce..00000000
--- a/framework/src/domain/mime/mimetreeparser/otp/autotests/setupenv.h
+++ /dev/null
@@ -1,170 +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 <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;
-    }
-
-    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/mime/mimetreeparser/otp/autotests/testcsshelper.cpp b/framework/src/domain/mime/mimetreeparser/otp/autotests/testcsshelper.cpp
deleted file mode 100644
index 0e411e8f..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/testcsshelper.h b/framework/src/domain/mime/mimetreeparser/otp/autotests/testcsshelper.h
deleted file mode 100644
index c21935cf..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/util.cpp b/framework/src/domain/mime/mimetreeparser/otp/autotests/util.cpp
deleted file mode 100644
index 5ea415b7..00000000
--- a/framework/src/domain/mime/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/mime/mimetreeparser/otp/autotests/util.h b/framework/src/domain/mime/mimetreeparser/otp/autotests/util.h
deleted file mode 100644
index ac4aa54f..00000000
--- a/framework/src/domain/mime/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);
-- 
cgit v1.2.3