327 files changed, 9 insertions, 9 deletions

diff --git a/framework/src/CMakeLists.txt b/framework/src/CMakeLists.txt
index 37cb9640..69b7a151 100644
--- a/framework/src/CMakeLists.txt
+++ b/framework/src/CMakeLists.txt
@@ -9,20 +9,14 @@ find_package(KF5Package CONFIG REQUIRED)
 
 add_definitions("-Wall -std=c++0x -g")
 
-include_directories(. domain/mimetreeparser)
+include_directories(. domain/mime/mimetreeparser)
 
 set(SRCS
     frameworkplugin.cpp
     settings/settings.cpp
-    domain/attachmentmodel.cpp
     domain/maillistmodel.cpp
     domain/folderlistmodel.cpp
-    domain/objecttreesource.cpp
-    domain/stringhtmlwriter.cpp
     domain/composercontroller.cpp
-    domain/messageparser.cpp
-    domain/messageparser_new.cpp
-    domain/mailtemplates.cpp
     domain/modeltest.cpp
     domain/retriever.cpp
     domain/outboxmodel.cpp
@@ -35,7 +29,13 @@ set(SRCS
     domain/contactcontroller.cpp
     domain/controller.cpp
     domain/peoplemodel.cpp
-    domain/htmlutils.cpp
+    domain/mime/htmlutils.cpp
+    domain/mime/messageparser.cpp
+    domain/mime/messageparser_new.cpp
+    domain/mime/mailtemplates.cpp
+    domain/mime/attachmentmodel.cpp
+    domain/mime/objecttreesource.cpp
+    domain/mime/stringhtmlwriter.cpp
     accounts/accountfactory.cpp
     accounts/accountsmodel.cpp
     fabric.cpp
@@ -47,6 +47,6 @@ qt5_use_modules(frameworkplugin Core Quick Qml WebEngineWidgets Test)
 target_link_libraries(frameworkplugin sink mimetreeparser KF5::Codecs KF5::Package KAsync)
 install(TARGETS frameworkplugin DESTINATION ${FRAMEWORK_INSTALL_DIR})
 
-add_subdirectory(domain/mimetreeparser)
+add_subdirectory(domain/mime/mimetreeparser)
 
 feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
diff --git a/framework/src/domain/attachmentmodel.cpp b/framework/src/domain/mime/attachmentmodel.cpp
index e98c6fc0..e98c6fc0 100644
--- a/framework/src/domain/attachmentmodel.cpp
+++ b/framework/src/domain/mime/attachmentmodel.cpp
diff --git a/framework/src/domain/htmlutils.cpp b/framework/src/domain/mime/htmlutils.cpp
index 156bcc48..156bcc48 100644
--- a/framework/src/domain/htmlutils.cpp
+++ b/framework/src/domain/mime/htmlutils.cpp
diff --git a/framework/src/domain/htmlutils.h b/framework/src/domain/mime/htmlutils.h
index b59da1dc..b59da1dc 100644
--- a/framework/src/domain/htmlutils.h
+++ b/framework/src/domain/mime/htmlutils.h
diff --git a/framework/src/domain/mailtemplates.cpp b/framework/src/domain/mime/mailtemplates.cpp
index 254dbba3..254dbba3 100644
--- a/framework/src/domain/mailtemplates.cpp
+++ b/framework/src/domain/mime/mailtemplates.cpp
diff --git a/framework/src/domain/mailtemplates.h b/framework/src/domain/mime/mailtemplates.h
index db269c96..db269c96 100644
--- a/framework/src/domain/mailtemplates.h
+++ b/framework/src/domain/mime/mailtemplates.h
diff --git a/framework/src/domain/messageparser.cpp b/framework/src/domain/mime/messageparser.cpp
index 76c060f0..76c060f0 100644
--- a/framework/src/domain/messageparser.cpp
+++ b/framework/src/domain/mime/messageparser.cpp
diff --git a/framework/src/domain/messageparser.h b/framework/src/domain/mime/messageparser.h
index de4d8838..de4d8838 100644
--- a/framework/src/domain/messageparser.h
+++ b/framework/src/domain/mime/messageparser.h
diff --git a/framework/src/domain/messageparser_new.cpp b/framework/src/domain/mime/messageparser_new.cpp
index 7e7dbfa6..7e7dbfa6 100644
--- a/framework/src/domain/messageparser_new.cpp
+++ b/framework/src/domain/mime/messageparser_new.cpp
diff --git a/framework/src/domain/mimetreeparser/CMakeLists.txt b/framework/src/domain/mime/mimetreeparser/CMakeLists.txt
index 517fb7e5..517fb7e5 100644
--- a/framework/src/domain/mimetreeparser/CMakeLists.txt
+++ b/framework/src/domain/mime/mimetreeparser/CMakeLists.txt
diff --git a/framework/src/domain/mimetreeparser/interface.cpp b/framework/src/domain/mime/mimetreeparser/interface.cpp
index b8556336..b8556336 100644
--- a/framework/src/domain/mimetreeparser/interface.cpp
+++ b/framework/src/domain/mime/mimetreeparser/interface.cpp
diff --git a/framework/src/domain/mimetreeparser/interface.h b/framework/src/domain/mime/mimetreeparser/interface.h
index 7c3ea28b..7c3ea28b 100644
--- a/framework/src/domain/mimetreeparser/interface.h
+++ b/framework/src/domain/mime/mimetreeparser/interface.h
diff --git a/framework/src/domain/mimetreeparser/interface_p.h b/framework/src/domain/mime/mimetreeparser/interface_p.h
index 8fab221a..8fab221a 100644
--- a/framework/src/domain/mimetreeparser/interface_p.h
+++ b/framework/src/domain/mime/mimetreeparser/interface_p.h
diff --git a/framework/src/domain/mimetreeparser/objecttreesource.cpp b/framework/src/domain/mime/mimetreeparser/objecttreesource.cpp
index 186fdf80..186fdf80 100644
--- a/framework/src/domain/mimetreeparser/objecttreesource.cpp
+++ b/framework/src/domain/mime/mimetreeparser/objecttreesource.cpp
diff --git a/framework/src/domain/mimetreeparser/objecttreesource.h b/framework/src/domain/mime/mimetreeparser/objecttreesource.h
index 2167e06f..2167e06f 100644
--- a/framework/src/domain/mimetreeparser/objecttreesource.h
+++ b/framework/src/domain/mime/mimetreeparser/objecttreesource.h
diff --git a/framework/src/domain/mimetreeparser/otp/CMakeLists.txt b/framework/src/domain/mime/mimetreeparser/otp/CMakeLists.txt
index f480fa21..f480fa21 100644
--- a/framework/src/domain/mimetreeparser/otp/CMakeLists.txt
+++ b/framework/src/domain/mime/mimetreeparser/otp/CMakeLists.txt
diff --git a/framework/src/domain/mimetreeparser/otp/applicationpgpencrypted.cpp b/framework/src/domain/mime/mimetreeparser/otp/applicationpgpencrypted.cpp
index e0f8e30c..e0f8e30c 100644
--- a/framework/src/domain/mimetreeparser/otp/applicationpgpencrypted.cpp
+++ b/framework/src/domain/mime/mimetreeparser/otp/applicationpgpencrypted.cpp
diff --git a/framework/src/domain/mimetreeparser/otp/applicationpgpencrypted.h b/framework/src/domain/mime/mimetreeparser/otp/applicationpgpencrypted.h
index f0f4865c..f0f4865c 100644
--- a/framework/src/domain/mimetreeparser/otp/applicationpgpencrypted.h
+++ b/framework/src/domain/mime/mimetreeparser/otp/applicationpgpencrypted.h
diff --git a/framework/src/domain/mimetreeparser/otp/applicationpkcs7mime.cpp b/framework/src/domain/mime/mimetreeparser/otp/applicationpkcs7mime.cpp
index bcfc0616..bcfc0616 100644
--- a/framework/src/domain/mimetreeparser/otp/applicationpkcs7mime.cpp
+++ b/framework/src/domain/mime/mimetreeparser/otp/applicationpkcs7mime.cpp
diff --git a/framework/src/domain/mimetreeparser/otp/applicationpkcs7mime.h b/framework/src/domain/mime/mimetreeparser/otp/applicationpkcs7mime.h
index a9a33f7c..a9a33f7c 100644
--- a/framework/src/domain/mimetreeparser/otp/applicationpkcs7mime.h
+++ b/framework/src/domain/mime/mimetreeparser/otp/applicationpkcs7mime.h
diff --git a/framework/src/domain/mimetreeparser/otp/attachmentstrategy.cpp b/framework/src/domain/mime/mimetreeparser/otp/attachmentstrategy.cpp
index 5ea21133..5ea21133 100644
--- a/framework/src/domain/mimetreeparser/otp/attachmentstrategy.cpp
+++ b/framework/src/domain/mime/mimetreeparser/otp/attachmentstrategy.cpp
diff --git a/framework/src/domain/mimetreeparser/otp/attachmentstrategy.h b/framework/src/domain/mime/mimetreeparser/otp/attachmentstrategy.h
index a0b5dc81..a0b5dc81 100644
--- a/framework/src/domain/mimetreeparser/otp/attachmentstrategy.h
+++ b/framework/src/domain/mime/mimetreeparser/otp/attachmentstrategy.h
diff --git a/framework/src/domain/mimetreeparser/otp/attachmenttemporaryfilesdirs.cpp b/framework/src/domain/mime/mimetreeparser/otp/attachmenttemporaryfilesdirs.cpp
index 364bc422..364bc422 100644
--- a/framework/src/domain/mimetreeparser/otp/attachmenttemporaryfilesdirs.cpp
+++ b/framework/src/domain/mime/mimetreeparser/otp/attachmenttemporaryfilesdirs.cpp
diff --git a/framework/src/domain/mimetreeparser/otp/attachmenttemporaryfilesdirs.h b/framework/src/domain/mime/mimetreeparser/otp/attachmenttemporaryfilesdirs.h
index bf65fcdb..bf65fcdb 100644
--- a/framework/src/domain/mimetreeparser/otp/attachmenttemporaryfilesdirs.h
+++ b/framework/src/domain/mime/mimetreeparser/otp/attachmenttemporaryfilesdirs.h
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/CMakeLists.txt b/framework/src/domain/mime/mimetreeparser/otp/autotests/CMakeLists.txt
index 789ee795..789ee795 100644
--- a/framework/src/domain/mimetreeparser/otp/autotests/CMakeLists.txt
+++ b/framework/src/domain/mime/mimetreeparser/otp/autotests/CMakeLists.txt
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/attachmenttest.cpp b/framework/src/domain/mime/mimetreeparser/otp/autotests/attachmenttest.cpp
index 44e40a45..44e40a45 100644
--- a/framework/src/domain/mimetreeparser/otp/autotests/attachmenttest.cpp
+++ b/framework/src/domain/mime/mimetreeparser/otp/autotests/attachmenttest.cpp
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/cryptohelpertest.cpp b/framework/src/domain/mime/mimetreeparser/otp/autotests/cryptohelpertest.cpp
index 251e657d..251e657d 100644
--- a/framework/src/domain/mimetreeparser/otp/autotests/cryptohelpertest.cpp
+++ b/framework/src/domain/mime/mimetreeparser/otp/autotests/cryptohelpertest.cpp
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/cryptohelpertest.h b/framework/src/domain/mime/mimetreeparser/otp/autotests/cryptohelpertest.h
index 71ae086f..71ae086f 100644
--- a/framework/src/domain/mimetreeparser/otp/autotests/cryptohelpertest.h
+++ b/framework/src/domain/mime/mimetreeparser/otp/autotests/cryptohelpertest.h
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/alternative-notext.mbox b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/alternative-notext.mbox
index 86026437..86026437 100644
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/alternative-notext.mbox
+++ b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/alternative-notext.mbox
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/alternative-notext.mbox.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/alternative-notext.mbox.html
index 41db4eab..41db4eab 100644
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/alternative-notext.mbox.html
+++ b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/alternative-notext.mbox.html
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/alternative-notext.mbox.tree b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/alternative-notext.mbox.tree
index 0de07281..0de07281 100644
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/alternative-notext.mbox.tree
+++ b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/alternative-notext.mbox.tree
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/alternative.mbox b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/alternative.mbox
index a2c58591..a2c58591 100644
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/alternative.mbox
+++ b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/alternative.mbox
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/alternative.mbox.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/alternative.mbox.html
index 2fe886f1..2fe886f1 100644
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/alternative.mbox.html
+++ b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/alternative.mbox.html
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/alternative.mbox.tree b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/alternative.mbox.tree
index 0de07281..0de07281 100644
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/alternative.mbox.tree
+++ b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/alternative.mbox.tree
diff --git a/framework/src/domain/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
index 9a81f103..9a81f103 100644
--- a/framework/src/domain/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
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/details/openpgp-encoded.mbox.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/details/openpgp-encoded.mbox.html
index 65d5f95e..65d5f95e 100644
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/details/openpgp-encoded.mbox.html
+++ b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/details/openpgp-encoded.mbox.html
diff --git a/framework/src/domain/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
index 96361c30..96361c30 100644
--- a/framework/src/domain/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
diff --git a/framework/src/domain/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
index cc6bf03e..cc6bf03e 100644
--- a/framework/src/domain/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
diff --git a/framework/src/domain/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
index 61bf5d28..61bf5d28 100644
--- a/framework/src/domain/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
diff --git a/framework/src/domain/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
index 8d8bde0d..8d8bde0d 100644
--- a/framework/src/domain/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
diff --git a/framework/src/domain/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
index 1716b841..1716b841 100644
--- a/framework/src/domain/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
diff --git a/framework/src/domain/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
index c2fa2fee..c2fa2fee 100644
--- a/framework/src/domain/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
diff --git a/framework/src/domain/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
index 00a9dc5b..00a9dc5b 100644
--- a/framework/src/domain/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
diff --git a/framework/src/domain/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
index c10cecd8..c10cecd8 100644
--- a/framework/src/domain/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
diff --git a/framework/src/domain/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
index 2c02a22c..2c02a22c 100644
--- a/framework/src/domain/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
diff --git a/framework/src/domain/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
index d3a7a0ce..d3a7a0ce 100644
--- a/framework/src/domain/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
diff --git a/framework/src/domain/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
index e7da94db..e7da94db 100644
--- a/framework/src/domain/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
diff --git a/framework/src/domain/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
index f5b20b6d..f5b20b6d 100644
--- a/framework/src/domain/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
diff --git a/framework/src/domain/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
index 1432aa44..1432aa44 100644
--- a/framework/src/domain/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
diff --git a/framework/src/domain/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
index b960f318..b960f318 100644
--- a/framework/src/domain/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
diff --git a/framework/src/domain/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
index d6345a7c..d6345a7c 100644
--- a/framework/src/domain/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
diff --git a/framework/src/domain/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
index 248b93ff..248b93ff 100644
--- a/framework/src/domain/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
diff --git a/framework/src/domain/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
index 6e811632..6e811632 100644
--- a/framework/src/domain/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
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/encapsulated-with-attachment.mbox b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/encapsulated-with-attachment.mbox
index 885b9d1b..885b9d1b 100644
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/encapsulated-with-attachment.mbox
+++ b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/encapsulated-with-attachment.mbox
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/encapsulated-with-attachment.mbox.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/encapsulated-with-attachment.mbox.html
index aa3d1090..aa3d1090 100644
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/encapsulated-with-attachment.mbox.html
+++ b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/encapsulated-with-attachment.mbox.html
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/encapsulated-with-attachment.mbox.tree b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/encapsulated-with-attachment.mbox.tree
index 050414a2..050414a2 100644
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/encapsulated-with-attachment.mbox.tree
+++ b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/encapsulated-with-attachment.mbox.tree
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/forward-openpgp-signed-encrypted.mbox b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/forward-openpgp-signed-encrypted.mbox
index 1c166940..1c166940 100644
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/forward-openpgp-signed-encrypted.mbox
+++ b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/forward-openpgp-signed-encrypted.mbox
diff --git a/framework/src/domain/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
index 7632ec39..7632ec39 100644
--- a/framework/src/domain/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
diff --git a/framework/src/domain/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
index 324156db..324156db 100644
--- a/framework/src/domain/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
diff --git a/framework/src/domain/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
index 73c4d2d7..73c4d2d7 100644
--- a/framework/src/domain/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
diff --git a/framework/src/domain/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
index d5e4550e..d5e4550e 100644
--- a/framework/src/domain/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
diff --git a/framework/src/domain/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
index 73c4d2d7..73c4d2d7 100644
--- a/framework/src/domain/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
diff --git a/framework/src/domain/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
index ebad7354..ebad7354 100644
--- a/framework/src/domain/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
diff --git a/framework/src/domain/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
index 4cdeaa63..4cdeaa63 100644
--- a/framework/src/domain/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
diff --git a/framework/src/domain/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
index 330b02a1..330b02a1 100644
--- a/framework/src/domain/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
diff --git a/framework/src/domain/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
index 83b7a66c..83b7a66c 100644
--- a/framework/src/domain/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
diff --git a/framework/src/domain/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
index 25b1ad04..25b1ad04 100644
--- a/framework/src/domain/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
diff --git a/framework/src/domain/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
index bdac52b6..bdac52b6 100644
--- a/framework/src/domain/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
diff --git a/framework/src/domain/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
index 027097f7..027097f7 100644
--- a/framework/src/domain/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
diff --git a/framework/src/domain/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
index 9554bb39..9554bb39 100644
--- a/framework/src/domain/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
diff --git a/framework/src/domain/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
index 42f5ecd7..42f5ecd7 100644
--- a/framework/src/domain/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
diff --git a/framework/src/domain/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
index 73c4d2d7..73c4d2d7 100644
--- a/framework/src/domain/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
diff --git a/framework/src/domain/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
index d5e4550e..d5e4550e 100644
--- a/framework/src/domain/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
diff --git a/framework/src/domain/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
index 166812fe..166812fe 100644
--- a/framework/src/domain/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
diff --git a/framework/src/domain/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
index 73c4d2d7..73c4d2d7 100644
--- a/framework/src/domain/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
diff --git a/framework/src/domain/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
index ebad7354..ebad7354 100644
--- a/framework/src/domain/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
diff --git a/framework/src/domain/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
index 4cdeaa63..4cdeaa63 100644
--- a/framework/src/domain/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
diff --git a/framework/src/domain/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
index 330b02a1..330b02a1 100644
--- a/framework/src/domain/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
diff --git a/framework/src/domain/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
index 83b7a66c..83b7a66c 100644
--- a/framework/src/domain/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
diff --git a/framework/src/domain/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
index 1f0da385..1f0da385 100644
--- a/framework/src/domain/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
diff --git a/framework/src/domain/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
index bdac52b6..bdac52b6 100644
--- a/framework/src/domain/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
diff --git a/framework/src/domain/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
index 027097f7..027097f7 100644
--- a/framework/src/domain/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
diff --git a/framework/src/domain/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
index 9554bb39..9554bb39 100644
--- a/framework/src/domain/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
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/html.mbox b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/html.mbox
index eebd4283..eebd4283 100644
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/html.mbox
+++ b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/html.mbox
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/html.mbox.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/html.mbox.html
index 2fe886f1..2fe886f1 100644
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/html.mbox.html
+++ b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/html.mbox.html
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/html.mbox.tree b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/html.mbox.tree
index 0de07281..0de07281 100644
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/html.mbox.tree
+++ b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/html.mbox.tree
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/htmlonly.mbox b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/htmlonly.mbox
index e45b1c4d..e45b1c4d 100644
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/htmlonly.mbox
+++ b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/htmlonly.mbox
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/htmlonly.mbox.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/htmlonly.mbox.html
index 1143f2cf..1143f2cf 100644
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/htmlonly.mbox.html
+++ b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/htmlonly.mbox.html
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/htmlonly.mbox.tree b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/htmlonly.mbox.tree
index a4c3191b..a4c3191b 100644
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/htmlonly.mbox.tree
+++ b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/htmlonly.mbox.tree
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/htmlonlyexternal.mbox b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/htmlonlyexternal.mbox
index 4eb3e2c3..4eb3e2c3 100644
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/htmlonlyexternal.mbox
+++ b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/htmlonlyexternal.mbox
diff --git a/framework/src/domain/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
index b6f734c2..b6f734c2 100644
--- a/framework/src/domain/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
diff --git a/framework/src/domain/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
index 7f0b7abd..7f0b7abd 100644
--- a/framework/src/domain/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
diff --git a/framework/src/domain/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
index 8d6b5814..8d6b5814 100644
--- a/framework/src/domain/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
diff --git a/framework/src/domain/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
index 73dbc5f4..73dbc5f4 100644
--- a/framework/src/domain/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
diff --git a/framework/src/domain/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
index 26d3dd60..26d3dd60 100644
--- a/framework/src/domain/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
diff --git a/framework/src/domain/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
index 49e503f1..49e503f1 100644
--- a/framework/src/domain/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
diff --git a/framework/src/domain/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
index 67897491..67897491 100644
--- a/framework/src/domain/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
diff --git a/framework/src/domain/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
index 6091ee5a..6091ee5a 100644
--- a/framework/src/domain/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
diff --git a/framework/src/domain/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
index 092d5e1c..092d5e1c 100644
--- a/framework/src/domain/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
diff --git a/framework/src/domain/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
index cc49cbcc..cc49cbcc 100644
--- a/framework/src/domain/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
diff --git a/framework/src/domain/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
index d3f3eeb3..d3f3eeb3 100644
--- a/framework/src/domain/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
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/inlinepgpencrypted-appendix.mbox b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/inlinepgpencrypted-appendix.mbox
index c05a7e69..c05a7e69 100644
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/inlinepgpencrypted-appendix.mbox
+++ b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/inlinepgpencrypted-appendix.mbox
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/inlinepgpencrypted-appendix.mbox.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/inlinepgpencrypted-appendix.mbox.html
index 8af2b1c6..8af2b1c6 100644
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/inlinepgpencrypted-appendix.mbox.html
+++ b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/inlinepgpencrypted-appendix.mbox.html
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/inlinepgpencrypted-appendix.mbox.tree b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/inlinepgpencrypted-appendix.mbox.tree
index 018f5c33..018f5c33 100644
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/inlinepgpencrypted-appendix.mbox.tree
+++ b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/inlinepgpencrypted-appendix.mbox.tree
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/inlinepgpencrypted-error.mbox b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/inlinepgpencrypted-error.mbox
index 529b4d3b..529b4d3b 100644
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/inlinepgpencrypted-error.mbox
+++ b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/inlinepgpencrypted-error.mbox
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/inlinepgpencrypted-error.mbox.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/inlinepgpencrypted-error.mbox.html
index a4427e01..a4427e01 100644
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/inlinepgpencrypted-error.mbox.html
+++ b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/inlinepgpencrypted-error.mbox.html
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/inlinepgpencrypted-error.mbox.tree b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/inlinepgpencrypted-error.mbox.tree
index 6680b8bc..6680b8bc 100644
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/inlinepgpencrypted-error.mbox.tree
+++ b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/inlinepgpencrypted-error.mbox.tree
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/inlinepgpencrypted.mbox b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/inlinepgpencrypted.mbox
index b581602c..b581602c 100644
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/inlinepgpencrypted.mbox
+++ b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/inlinepgpencrypted.mbox
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/inlinepgpencrypted.mbox.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/inlinepgpencrypted.mbox.html
index 1f695bdf..1f695bdf 100644
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/inlinepgpencrypted.mbox.html
+++ b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/inlinepgpencrypted.mbox.html
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/inlinepgpencrypted.mbox.inProgress.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/inlinepgpencrypted.mbox.inProgress.html
index e5eb55d0..e5eb55d0 100644
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/inlinepgpencrypted.mbox.inProgress.html
+++ b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/inlinepgpencrypted.mbox.inProgress.html
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/inlinepgpencrypted.mbox.tree b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/inlinepgpencrypted.mbox.tree
index 6680b8bc..6680b8bc 100644
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/inlinepgpencrypted.mbox.tree
+++ b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/inlinepgpencrypted.mbox.tree
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/mailheader.css b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/mailheader.css
index 10181957..10181957 100644
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/mailheader.css
+++ b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/mailheader.css
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/no-content-type.mbox b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/no-content-type.mbox
index ad050d8c..ad050d8c 100644
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/no-content-type.mbox
+++ b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/no-content-type.mbox
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/no-content-type.mbox.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/no-content-type.mbox.html
index 9e3eb752..9e3eb752 100644
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/no-content-type.mbox.html
+++ b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/no-content-type.mbox.html
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/no-content-type.mbox.tree b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/no-content-type.mbox.tree
index c003ec97..c003ec97 100644
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/no-content-type.mbox.tree
+++ b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/no-content-type.mbox.tree
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encoded.mbox b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-encoded.mbox
index 168c8dc4..168c8dc4 100644
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encoded.mbox
+++ b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-encoded.mbox
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encoded.mbox.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-encoded.mbox.html
index 585bb4f0..585bb4f0 100644
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encoded.mbox.html
+++ b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-encoded.mbox.html
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encoded.mbox.tree b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-encoded.mbox.tree
index ea8223fd..ea8223fd 100644
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encoded.mbox.tree
+++ b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-encoded.mbox.tree
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted+signed.mbox b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted+signed.mbox
index fbe5ce7f..fbe5ce7f 100644
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted+signed.mbox
+++ b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted+signed.mbox
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted+signed.mbox.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted+signed.mbox.html
index 54c58b85..54c58b85 100644
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted+signed.mbox.html
+++ b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted+signed.mbox.html
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted+signed.mbox.tree b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted+signed.mbox.tree
index 7d5bbeb7..7d5bbeb7 100644
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted+signed.mbox.tree
+++ b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted+signed.mbox.tree
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted-applemail.mbox b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted-applemail.mbox
index f5d083ff..f5d083ff 100644
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted-applemail.mbox
+++ b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted-applemail.mbox
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted-applemail.mbox.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted-applemail.mbox.html
index ca8d7fbb..ca8d7fbb 100644
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted-applemail.mbox.html
+++ b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted-applemail.mbox.html
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted-applemail.mbox.tree b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted-applemail.mbox.tree
index 8ef3df2d..8ef3df2d 100644
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted-applemail.mbox.tree
+++ b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted-applemail.mbox.tree
diff --git a/framework/src/domain/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
index 2d9726ea..2d9726ea 100644
--- a/framework/src/domain/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
diff --git a/framework/src/domain/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
index 092a3440..092a3440 100644
--- a/framework/src/domain/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
diff --git a/framework/src/domain/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
index 473f0b10..473f0b10 100644
--- a/framework/src/domain/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
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted-attachment.mbox b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted-attachment.mbox
index 4204fb0b..4204fb0b 100644
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted-attachment.mbox
+++ b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted-attachment.mbox
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted-attachment.mbox.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted-attachment.mbox.html
index 2b266b02..2b266b02 100644
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted-attachment.mbox.html
+++ b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted-attachment.mbox.html
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted-attachment.mbox.tree b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted-attachment.mbox.tree
index f433fd45..f433fd45 100644
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted-attachment.mbox.tree
+++ b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted-attachment.mbox.tree
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted-enigmail1.6.mbox b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted-enigmail1.6.mbox
index 9afd17e3..9afd17e3 100644
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted-enigmail1.6.mbox
+++ b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted-enigmail1.6.mbox
diff --git a/framework/src/domain/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
index 09d904bb..09d904bb 100644
--- a/framework/src/domain/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
diff --git a/framework/src/domain/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
index 009ba99a..009ba99a 100644
--- a/framework/src/domain/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
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted-noData.mbox b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted-noData.mbox
index c4f14226..c4f14226 100644
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted-noData.mbox
+++ b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted-noData.mbox
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted-noData.mbox.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted-noData.mbox.html
index 52196784..52196784 100644
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted-noData.mbox.html
+++ b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted-noData.mbox.html
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted-noData.mbox.tree b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted-noData.mbox.tree
index 79a20c8d..79a20c8d 100644
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted-noData.mbox.tree
+++ b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted-noData.mbox.tree
diff --git a/framework/src/domain/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
index 2957bf3c..2957bf3c 100644
--- a/framework/src/domain/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
diff --git a/framework/src/domain/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
index e20a9568..e20a9568 100644
--- a/framework/src/domain/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
diff --git a/framework/src/domain/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
index c2a6ad01..c2a6ad01 100644
--- a/framework/src/domain/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
diff --git a/framework/src/domain/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
index 222b5936..222b5936 100644
--- a/framework/src/domain/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
diff --git a/framework/src/domain/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
index c0b9d79e..c0b9d79e 100644
--- a/framework/src/domain/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
diff --git a/framework/src/domain/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
index 5cb83749..5cb83749 100644
--- a/framework/src/domain/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
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted-two-attachments.mbox b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted-two-attachments.mbox
index c53e0916..c53e0916 100644
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted-two-attachments.mbox
+++ b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted-two-attachments.mbox
diff --git a/framework/src/domain/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
index cca4c455..cca4c455 100644
--- a/framework/src/domain/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
diff --git a/framework/src/domain/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
index 71a67b58..71a67b58 100644
--- a/framework/src/domain/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
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted.mbox b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted.mbox
index 5102fa78..5102fa78 100644
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted.mbox
+++ b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted.mbox
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted.mbox.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted.mbox.html
index ba0976cd..ba0976cd 100644
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted.mbox.html
+++ b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted.mbox.html
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted.mbox.inProgress.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted.mbox.inProgress.html
index e5eb55d0..e5eb55d0 100644
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted.mbox.inProgress.html
+++ b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted.mbox.inProgress.html
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted.mbox.tree b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted.mbox.tree
index 82f705c2..82f705c2 100644
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-encrypted.mbox.tree
+++ b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-encrypted.mbox.tree
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-inline-charset-encrypted.mbox b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-inline-charset-encrypted.mbox
index 8bd06910..8bd06910 100644
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-inline-charset-encrypted.mbox
+++ b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-inline-charset-encrypted.mbox
diff --git a/framework/src/domain/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
index 344dc237..344dc237 100644
--- a/framework/src/domain/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
diff --git a/framework/src/domain/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
index e5eb55d0..e5eb55d0 100644
--- a/framework/src/domain/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
diff --git a/framework/src/domain/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
index ea8223fd..ea8223fd 100644
--- a/framework/src/domain/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
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-inline-signed-broken.mbox b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-inline-signed-broken.mbox
index fc0d2df9..fc0d2df9 100644
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-inline-signed-broken.mbox
+++ b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-inline-signed-broken.mbox
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-inline-signed.mbox b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-inline-signed.mbox
index 6099a51f..6099a51f 100644
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-inline-signed.mbox
+++ b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-inline-signed.mbox
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-inline-signed.mbox.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-inline-signed.mbox.html
index d32d0235..d32d0235 100644
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-inline-signed.mbox.html
+++ b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-inline-signed.mbox.html
diff --git a/framework/src/domain/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
index 45a999d3..45a999d3 100644
--- a/framework/src/domain/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
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-inline-signed.mbox.tree b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-inline-signed.mbox.tree
index 23e99880..23e99880 100644
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-inline-signed.mbox.tree
+++ b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-inline-signed.mbox.tree
diff --git a/framework/src/domain/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
index 5ecfc612..5ecfc612 100644
--- a/framework/src/domain/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
diff --git a/framework/src/domain/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
index 3ed4e0fb..3ed4e0fb 100644
--- a/framework/src/domain/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
diff --git a/framework/src/domain/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
index ea8223fd..ea8223fd 100644
--- a/framework/src/domain/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
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-signed-apple.mbox b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-signed-apple.mbox
index ba85df86..ba85df86 100644
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-signed-apple.mbox
+++ b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-signed-apple.mbox
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-signed-apple.mbox.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-signed-apple.mbox.html
index 234eaae4..234eaae4 100644
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-signed-apple.mbox.html
+++ b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-signed-apple.mbox.html
diff --git a/framework/src/domain/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
index b5236fe4..b5236fe4 100644
--- a/framework/src/domain/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
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-signed-apple.mbox.tree b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-signed-apple.mbox.tree
index 3ade4efe..3ade4efe 100644
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-signed-apple.mbox.tree
+++ b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-signed-apple.mbox.tree
diff --git a/framework/src/domain/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
index 70bf4ef8..70bf4ef8 100644
--- a/framework/src/domain/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
diff --git a/framework/src/domain/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
index 50eddaa6..50eddaa6 100644
--- a/framework/src/domain/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
diff --git a/framework/src/domain/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
index 2753978c..2753978c 100644
--- a/framework/src/domain/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
diff --git a/framework/src/domain/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
index 7939af83..7939af83 100644
--- a/framework/src/domain/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
diff --git a/framework/src/domain/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
index 53856e74..53856e74 100644
--- a/framework/src/domain/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
diff --git a/framework/src/domain/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
index 6705a4d7..6705a4d7 100644
--- a/framework/src/domain/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
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-signed-encrypted.mbox b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-signed-encrypted.mbox
index 6d723d52..6d723d52 100644
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-signed-encrypted.mbox
+++ b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-signed-encrypted.mbox
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-signed-encrypted.mbox.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-signed-encrypted.mbox.html
index 86a964b8..86a964b8 100644
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-signed-encrypted.mbox.html
+++ b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-signed-encrypted.mbox.html
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-signed-encrypted.mbox.tree b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-signed-encrypted.mbox.tree
index 7d5bbeb7..7d5bbeb7 100644
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-signed-encrypted.mbox.tree
+++ b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-signed-encrypted.mbox.tree
diff --git a/framework/src/domain/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
index dbca8d45..dbca8d45 100644
--- a/framework/src/domain/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
diff --git a/framework/src/domain/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
index a95252e4..a95252e4 100644
--- a/framework/src/domain/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
diff --git a/framework/src/domain/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
index 906e6274..906e6274 100644
--- a/framework/src/domain/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
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-signed-mailinglist+old.mbox b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-signed-mailinglist+old.mbox
index 362dff3e..362dff3e 100644
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-signed-mailinglist+old.mbox
+++ b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-signed-mailinglist+old.mbox
diff --git a/framework/src/domain/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
index 59c6d690..59c6d690 100644
--- a/framework/src/domain/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
diff --git a/framework/src/domain/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
index c8310bc1..c8310bc1 100644
--- a/framework/src/domain/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
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-signed-mailinglist.mbox b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-signed-mailinglist.mbox
index 8adb9f4c..8adb9f4c 100644
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-signed-mailinglist.mbox
+++ b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-signed-mailinglist.mbox
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-signed-mailinglist.mbox.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-signed-mailinglist.mbox.html
index 7acb6fbf..7acb6fbf 100644
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-signed-mailinglist.mbox.html
+++ b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-signed-mailinglist.mbox.html
diff --git a/framework/src/domain/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
index 77c6b29b..77c6b29b 100644
--- a/framework/src/domain/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
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-signed-mailinglist.mbox.tree b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-signed-mailinglist.mbox.tree
index 2753978c..2753978c 100644
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-signed-mailinglist.mbox.tree
+++ b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-signed-mailinglist.mbox.tree
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-signed-no-protocol.mbox b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-signed-no-protocol.mbox
index e50879b9..e50879b9 100644
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-signed-no-protocol.mbox
+++ b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-signed-no-protocol.mbox
diff --git a/framework/src/domain/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
index 4a5f337b..4a5f337b 100644
--- a/framework/src/domain/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
diff --git a/framework/src/domain/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
index d824a11b..d824a11b 100644
--- a/framework/src/domain/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
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-signed-two-attachments.mbox b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-signed-two-attachments.mbox
index 462f62a3..462f62a3 100644
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/openpgp-signed-two-attachments.mbox
+++ b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/openpgp-signed-two-attachments.mbox
diff --git a/framework/src/domain/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
index 06718641..06718641 100644
--- a/framework/src/domain/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
diff --git a/framework/src/domain/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
index 7133f4be..7133f4be 100644
--- a/framework/src/domain/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
diff --git a/framework/src/domain/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
index 9b715161..9b715161 100644
--- a/framework/src/domain/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
diff --git a/framework/src/domain/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
index b91772b7..b91772b7 100644
--- a/framework/src/domain/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
diff --git a/framework/src/domain/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
index 818f894c..818f894c 100644
--- a/framework/src/domain/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
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/smime-cert.mbox b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/smime-cert.mbox
index b3c8a19e..b3c8a19e 100644
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/smime-cert.mbox
+++ b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/smime-cert.mbox
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/smime-cert.mbox.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/smime-cert.mbox.html
index 1b86390f..1b86390f 100644
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/smime-cert.mbox.html
+++ b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/smime-cert.mbox.html
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/smime-cert.mbox.tree b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/smime-cert.mbox.tree
index c34c2eca..c34c2eca 100644
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/smime-cert.mbox.tree
+++ b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/smime-cert.mbox.tree
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/smime-encrypted-octet-stream.mbox b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/smime-encrypted-octet-stream.mbox
index 887fe358..887fe358 100644
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/smime-encrypted-octet-stream.mbox
+++ b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/smime-encrypted-octet-stream.mbox
diff --git a/framework/src/domain/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
index 6b08c47e..6b08c47e 100644
--- a/framework/src/domain/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
diff --git a/framework/src/domain/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
index 82f705c2..82f705c2 100644
--- a/framework/src/domain/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
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/smime-encrypted.mbox b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/smime-encrypted.mbox
index 6b6d6a0d..6b6d6a0d 100644
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/smime-encrypted.mbox
+++ b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/smime-encrypted.mbox
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/smime-encrypted.mbox.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/smime-encrypted.mbox.html
index 6b08c47e..6b08c47e 100644
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/smime-encrypted.mbox.html
+++ b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/smime-encrypted.mbox.html
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/smime-encrypted.mbox.inProgress.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/smime-encrypted.mbox.inProgress.html
index e5eb55d0..e5eb55d0 100644
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/smime-encrypted.mbox.inProgress.html
+++ b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/smime-encrypted.mbox.inProgress.html
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/smime-encrypted.mbox.tree b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/smime-encrypted.mbox.tree
index 82f705c2..82f705c2 100644
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/smime-encrypted.mbox.tree
+++ b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/smime-encrypted.mbox.tree
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/smime-opaque-enc+sign.mbox b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/smime-opaque-enc+sign.mbox
index be75c1e2..be75c1e2 100644
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/smime-opaque-enc+sign.mbox
+++ b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/smime-opaque-enc+sign.mbox
diff --git a/framework/src/domain/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
index 7f60c04f..7f60c04f 100644
--- a/framework/src/domain/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
diff --git a/framework/src/domain/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
index 7d5bbeb7..7d5bbeb7 100644
--- a/framework/src/domain/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
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/smime-opaque-sign.mbox b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/smime-opaque-sign.mbox
index 6e1739ac..6e1739ac 100644
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/smime-opaque-sign.mbox
+++ b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/smime-opaque-sign.mbox
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/smime-opaque-sign.mbox.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/smime-opaque-sign.mbox.html
index 6088bc72..6088bc72 100644
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/smime-opaque-sign.mbox.html
+++ b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/smime-opaque-sign.mbox.html
diff --git a/framework/src/domain/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
index 45a999d3..45a999d3 100644
--- a/framework/src/domain/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
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/smime-opaque-sign.mbox.tree b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/smime-opaque-sign.mbox.tree
index a469bb76..a469bb76 100644
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/smime-opaque-sign.mbox.tree
+++ b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/smime-opaque-sign.mbox.tree
diff --git a/framework/src/domain/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
index 2b1a0761..2b1a0761 100644
--- a/framework/src/domain/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
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/smime-signed-apple.mbox b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/smime-signed-apple.mbox
index d5cd06f1..d5cd06f1 100644
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/smime-signed-apple.mbox
+++ b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/smime-signed-apple.mbox
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/smime-signed-apple.mbox.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/smime-signed-apple.mbox.html
index 11652a14..11652a14 100644
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/smime-signed-apple.mbox.html
+++ b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/smime-signed-apple.mbox.html
diff --git a/framework/src/domain/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
index 5b57b937..5b57b937 100644
--- a/framework/src/domain/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
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/smime-signed-apple.mbox.tree b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/smime-signed-apple.mbox.tree
index 3ade4efe..3ade4efe 100644
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/smime-signed-apple.mbox.tree
+++ b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/smime-signed-apple.mbox.tree
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/smime-signed-encrypted.mbox b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/smime-signed-encrypted.mbox
index 49857e15..49857e15 100644
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/smime-signed-encrypted.mbox
+++ b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/smime-signed-encrypted.mbox
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/smime-signed-encrypted.mbox.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/smime-signed-encrypted.mbox.html
index e13d6841..e13d6841 100644
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/smime-signed-encrypted.mbox.html
+++ b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/smime-signed-encrypted.mbox.html
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/smime-signed-encrypted.mbox.tree b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/smime-signed-encrypted.mbox.tree
index 7d5bbeb7..7d5bbeb7 100644
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/smime-signed-encrypted.mbox.tree
+++ b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/smime-signed-encrypted.mbox.tree
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/text+html-maillinglist.mbox b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/text+html-maillinglist.mbox
index f9c6387f..f9c6387f 100644
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/text+html-maillinglist.mbox
+++ b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/text+html-maillinglist.mbox
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/text+html-maillinglist.mbox.html b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/text+html-maillinglist.mbox.html
index 2b5af631..2b5af631 100644
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/text+html-maillinglist.mbox.html
+++ b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/text+html-maillinglist.mbox.html
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/data/text+html-maillinglist.mbox.tree b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/text+html-maillinglist.mbox.tree
index 3738cb37..3738cb37 100644
--- a/framework/src/domain/mimetreeparser/otp/autotests/data/text+html-maillinglist.mbox.tree
+++ b/framework/src/domain/mime/mimetreeparser/otp/autotests/data/text+html-maillinglist.mbox.tree
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/kdepim_add_gpg_crypto_test.cmake b/framework/src/domain/mime/mimetreeparser/otp/autotests/kdepim_add_gpg_crypto_test.cmake
index ea0ab8d2..ea0ab8d2 100644
--- a/framework/src/domain/mimetreeparser/otp/autotests/kdepim_add_gpg_crypto_test.cmake
+++ b/framework/src/domain/mime/mimetreeparser/otp/autotests/kdepim_add_gpg_crypto_test.cmake
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/kdepim_generate_crypto_test_wrapper.cmake b/framework/src/domain/mime/mimetreeparser/otp/autotests/kdepim_generate_crypto_test_wrapper.cmake
index e1412f37..e1412f37 100644
--- a/framework/src/domain/mimetreeparser/otp/autotests/kdepim_generate_crypto_test_wrapper.cmake
+++ b/framework/src/domain/mime/mimetreeparser/otp/autotests/kdepim_generate_crypto_test_wrapper.cmake
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/nodehelpertest.cpp b/framework/src/domain/mime/mimetreeparser/otp/autotests/nodehelpertest.cpp
index d2a5d605..d2a5d605 100644
--- a/framework/src/domain/mimetreeparser/otp/autotests/nodehelpertest.cpp
+++ b/framework/src/domain/mime/mimetreeparser/otp/autotests/nodehelpertest.cpp
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/nodehelpertest.h b/framework/src/domain/mime/mimetreeparser/otp/autotests/nodehelpertest.h
index d2ed772a..d2ed772a 100644
--- a/framework/src/domain/mimetreeparser/otp/autotests/nodehelpertest.h
+++ b/framework/src/domain/mime/mimetreeparser/otp/autotests/nodehelpertest.h
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/setupenv.cpp b/framework/src/domain/mime/mimetreeparser/otp/autotests/setupenv.cpp
index be7a8685..be7a8685 100644
--- a/framework/src/domain/mimetreeparser/otp/autotests/setupenv.cpp
+++ b/framework/src/domain/mime/mimetreeparser/otp/autotests/setupenv.cpp
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/setupenv.h b/framework/src/domain/mime/mimetreeparser/otp/autotests/setupenv.h
index 3582853e..3582853e 100644
--- a/framework/src/domain/mimetreeparser/otp/autotests/setupenv.h
+++ b/framework/src/domain/mime/mimetreeparser/otp/autotests/setupenv.h
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/testcsshelper.cpp b/framework/src/domain/mime/mimetreeparser/otp/autotests/testcsshelper.cpp
index 0e411e8f..0e411e8f 100644
--- a/framework/src/domain/mimetreeparser/otp/autotests/testcsshelper.cpp
+++ b/framework/src/domain/mime/mimetreeparser/otp/autotests/testcsshelper.cpp
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/testcsshelper.h b/framework/src/domain/mime/mimetreeparser/otp/autotests/testcsshelper.h
index c21935cf..c21935cf 100644
--- a/framework/src/domain/mimetreeparser/otp/autotests/testcsshelper.h
+++ b/framework/src/domain/mime/mimetreeparser/otp/autotests/testcsshelper.h
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/util.cpp b/framework/src/domain/mime/mimetreeparser/otp/autotests/util.cpp
index 5ea415b7..5ea415b7 100644
--- a/framework/src/domain/mimetreeparser/otp/autotests/util.cpp
+++ b/framework/src/domain/mime/mimetreeparser/otp/autotests/util.cpp
diff --git a/framework/src/domain/mimetreeparser/otp/autotests/util.h b/framework/src/domain/mime/mimetreeparser/otp/autotests/util.h
index ac4aa54f..ac4aa54f 100644
--- a/framework/src/domain/mimetreeparser/otp/autotests/util.h
+++ b/framework/src/domain/mime/mimetreeparser/otp/autotests/util.h
diff --git a/framework/src/domain/mimetreeparser/otp/bodypart.cpp b/framework/src/domain/mime/mimetreeparser/otp/bodypart.cpp
index 62e92d0c..62e92d0c 100644
--- a/framework/src/domain/mimetreeparser/otp/bodypart.cpp
+++ b/framework/src/domain/mime/mimetreeparser/otp/bodypart.cpp
diff --git a/framework/src/domain/mimetreeparser/otp/bodypart.h b/framework/src/domain/mime/mimetreeparser/otp/bodypart.h
index f50c0360..f50c0360 100644
--- a/framework/src/domain/mimetreeparser/otp/bodypart.h
+++ b/framework/src/domain/mime/mimetreeparser/otp/bodypart.h
diff --git a/framework/src/domain/mimetreeparser/otp/bodypartformatter.cpp b/framework/src/domain/mime/mimetreeparser/otp/bodypartformatter.cpp
index 63d7e92c..63d7e92c 100644
--- a/framework/src/domain/mimetreeparser/otp/bodypartformatter.cpp
+++ b/framework/src/domain/mime/mimetreeparser/otp/bodypartformatter.cpp
diff --git a/framework/src/domain/mimetreeparser/otp/bodypartformatter.h b/framework/src/domain/mime/mimetreeparser/otp/bodypartformatter.h
index 0116c2e4..0116c2e4 100644
--- a/framework/src/domain/mimetreeparser/otp/bodypartformatter.h
+++ b/framework/src/domain/mime/mimetreeparser/otp/bodypartformatter.h
diff --git a/framework/src/domain/mimetreeparser/otp/bodypartformatter_impl.cpp b/framework/src/domain/mime/mimetreeparser/otp/bodypartformatter_impl.cpp
index c8622ba3..c8622ba3 100644
--- a/framework/src/domain/mimetreeparser/otp/bodypartformatter_impl.cpp
+++ b/framework/src/domain/mime/mimetreeparser/otp/bodypartformatter_impl.cpp
diff --git a/framework/src/domain/mimetreeparser/otp/bodypartformatterbasefactory.cpp b/framework/src/domain/mime/mimetreeparser/otp/bodypartformatterbasefactory.cpp
index fb02945b..fb02945b 100644
--- a/framework/src/domain/mimetreeparser/otp/bodypartformatterbasefactory.cpp
+++ b/framework/src/domain/mime/mimetreeparser/otp/bodypartformatterbasefactory.cpp
diff --git a/framework/src/domain/mimetreeparser/otp/bodypartformatterbasefactory.h b/framework/src/domain/mime/mimetreeparser/otp/bodypartformatterbasefactory.h
index 2bba551d..2bba551d 100644
--- a/framework/src/domain/mimetreeparser/otp/bodypartformatterbasefactory.h
+++ b/framework/src/domain/mime/mimetreeparser/otp/bodypartformatterbasefactory.h
diff --git a/framework/src/domain/mimetreeparser/otp/bodypartformatterbasefactory_p.h b/framework/src/domain/mime/mimetreeparser/otp/bodypartformatterbasefactory_p.h
index 1f71f183..1f71f183 100644
--- a/framework/src/domain/mimetreeparser/otp/bodypartformatterbasefactory_p.h
+++ b/framework/src/domain/mime/mimetreeparser/otp/bodypartformatterbasefactory_p.h
diff --git a/framework/src/domain/mimetreeparser/otp/cryptobodypartmemento.cpp b/framework/src/domain/mime/mimetreeparser/otp/cryptobodypartmemento.cpp
index a884ec36..a884ec36 100644
--- a/framework/src/domain/mimetreeparser/otp/cryptobodypartmemento.cpp
+++ b/framework/src/domain/mime/mimetreeparser/otp/cryptobodypartmemento.cpp
diff --git a/framework/src/domain/mimetreeparser/otp/cryptobodypartmemento.h b/framework/src/domain/mime/mimetreeparser/otp/cryptobodypartmemento.h
index 076ed890..076ed890 100644
--- a/framework/src/domain/mimetreeparser/otp/cryptobodypartmemento.h
+++ b/framework/src/domain/mime/mimetreeparser/otp/cryptobodypartmemento.h
diff --git a/framework/src/domain/mimetreeparser/otp/cryptohelper.cpp b/framework/src/domain/mime/mimetreeparser/otp/cryptohelper.cpp
index 8e5df576..8e5df576 100644
--- a/framework/src/domain/mimetreeparser/otp/cryptohelper.cpp
+++ b/framework/src/domain/mime/mimetreeparser/otp/cryptohelper.cpp
diff --git a/framework/src/domain/mimetreeparser/otp/cryptohelper.h b/framework/src/domain/mime/mimetreeparser/otp/cryptohelper.h
index f09771c3..f09771c3 100644
--- a/framework/src/domain/mimetreeparser/otp/cryptohelper.h
+++ b/framework/src/domain/mime/mimetreeparser/otp/cryptohelper.h
diff --git a/framework/src/domain/mimetreeparser/otp/decryptverifybodypartmemento.cpp b/framework/src/domain/mime/mimetreeparser/otp/decryptverifybodypartmemento.cpp
index 9810797a..9810797a 100644
--- a/framework/src/domain/mimetreeparser/otp/decryptverifybodypartmemento.cpp
+++ b/framework/src/domain/mime/mimetreeparser/otp/decryptverifybodypartmemento.cpp
diff --git a/framework/src/domain/mimetreeparser/otp/decryptverifybodypartmemento.h b/framework/src/domain/mime/mimetreeparser/otp/decryptverifybodypartmemento.h
index 4781abe2..4781abe2 100644
--- a/framework/src/domain/mimetreeparser/otp/decryptverifybodypartmemento.h
+++ b/framework/src/domain/mime/mimetreeparser/otp/decryptverifybodypartmemento.h
diff --git a/framework/src/domain/mimetreeparser/otp/enums.h b/framework/src/domain/mime/mimetreeparser/otp/enums.h
index bec5a028..bec5a028 100644
--- a/framework/src/domain/mimetreeparser/otp/enums.h
+++ b/framework/src/domain/mime/mimetreeparser/otp/enums.h
diff --git a/framework/src/domain/mimetreeparser/otp/filehtmlwriter.cpp b/framework/src/domain/mime/mimetreeparser/otp/filehtmlwriter.cpp
index a143f944..a143f944 100644
--- a/framework/src/domain/mimetreeparser/otp/filehtmlwriter.cpp
+++ b/framework/src/domain/mime/mimetreeparser/otp/filehtmlwriter.cpp
diff --git a/framework/src/domain/mimetreeparser/otp/filehtmlwriter.h b/framework/src/domain/mime/mimetreeparser/otp/filehtmlwriter.h
index 5dafb593..5dafb593 100644
--- a/framework/src/domain/mimetreeparser/otp/filehtmlwriter.h
+++ b/framework/src/domain/mime/mimetreeparser/otp/filehtmlwriter.h
diff --git a/framework/src/domain/mimetreeparser/otp/htmlwriter.cpp b/framework/src/domain/mime/mimetreeparser/otp/htmlwriter.cpp
index 3c98d997..3c98d997 100644
--- a/framework/src/domain/mimetreeparser/otp/htmlwriter.cpp
+++ b/framework/src/domain/mime/mimetreeparser/otp/htmlwriter.cpp
diff --git a/framework/src/domain/mimetreeparser/otp/htmlwriter.h b/framework/src/domain/mime/mimetreeparser/otp/htmlwriter.h
index 382c80fb..382c80fb 100644
--- a/framework/src/domain/mimetreeparser/otp/htmlwriter.h
+++ b/framework/src/domain/mime/mimetreeparser/otp/htmlwriter.h
diff --git a/framework/src/domain/mimetreeparser/otp/mailman.cpp b/framework/src/domain/mime/mimetreeparser/otp/mailman.cpp
index e79ef0fa..e79ef0fa 100644
--- a/framework/src/domain/mimetreeparser/otp/mailman.cpp
+++ b/framework/src/domain/mime/mimetreeparser/otp/mailman.cpp
diff --git a/framework/src/domain/mimetreeparser/otp/mailman.h b/framework/src/domain/mime/mimetreeparser/otp/mailman.h
index 742830b2..742830b2 100644
--- a/framework/src/domain/mimetreeparser/otp/mailman.h
+++ b/framework/src/domain/mime/mimetreeparser/otp/mailman.h
diff --git a/framework/src/domain/mimetreeparser/otp/messagepart.cpp b/framework/src/domain/mime/mimetreeparser/otp/messagepart.cpp
index 3228a387..3228a387 100644
--- a/framework/src/domain/mimetreeparser/otp/messagepart.cpp
+++ b/framework/src/domain/mime/mimetreeparser/otp/messagepart.cpp
diff --git a/framework/src/domain/mimetreeparser/otp/messagepart.h b/framework/src/domain/mime/mimetreeparser/otp/messagepart.h
index 433f3f6b..433f3f6b 100644
--- a/framework/src/domain/mimetreeparser/otp/messagepart.h
+++ b/framework/src/domain/mime/mimetreeparser/otp/messagepart.h
diff --git a/framework/src/domain/mimetreeparser/otp/messagepartrenderer.cpp b/framework/src/domain/mime/mimetreeparser/otp/messagepartrenderer.cpp
index 7f622268..7f622268 100644
--- a/framework/src/domain/mimetreeparser/otp/messagepartrenderer.cpp
+++ b/framework/src/domain/mime/mimetreeparser/otp/messagepartrenderer.cpp
diff --git a/framework/src/domain/mimetreeparser/otp/messagepartrenderer.h b/framework/src/domain/mime/mimetreeparser/otp/messagepartrenderer.h
index a90c17e6..a90c17e6 100644
--- a/framework/src/domain/mimetreeparser/otp/messagepartrenderer.h
+++ b/framework/src/domain/mime/mimetreeparser/otp/messagepartrenderer.h
diff --git a/framework/src/domain/mimetreeparser/otp/mimetreeparser_debug.cpp b/framework/src/domain/mime/mimetreeparser/otp/mimetreeparser_debug.cpp
index f8ac36cd..f8ac36cd 100644
--- a/framework/src/domain/mimetreeparser/otp/mimetreeparser_debug.cpp
+++ b/framework/src/domain/mime/mimetreeparser/otp/mimetreeparser_debug.cpp
diff --git a/framework/src/domain/mimetreeparser/otp/mimetreeparser_debug.h b/framework/src/domain/mime/mimetreeparser/otp/mimetreeparser_debug.h
index ddfa6315..ddfa6315 100644
--- a/framework/src/domain/mimetreeparser/otp/mimetreeparser_debug.h
+++ b/framework/src/domain/mime/mimetreeparser/otp/mimetreeparser_debug.h
diff --git a/framework/src/domain/mimetreeparser/otp/multipartalternative.cpp b/framework/src/domain/mime/mimetreeparser/otp/multipartalternative.cpp
index 42c70e28..42c70e28 100644
--- a/framework/src/domain/mimetreeparser/otp/multipartalternative.cpp
+++ b/framework/src/domain/mime/mimetreeparser/otp/multipartalternative.cpp
diff --git a/framework/src/domain/mimetreeparser/otp/multipartalternative.h b/framework/src/domain/mime/mimetreeparser/otp/multipartalternative.h
index 78e5ef38..78e5ef38 100644
--- a/framework/src/domain/mimetreeparser/otp/multipartalternative.h
+++ b/framework/src/domain/mime/mimetreeparser/otp/multipartalternative.h
diff --git a/framework/src/domain/mimetreeparser/otp/multipartencrypted.cpp b/framework/src/domain/mime/mimetreeparser/otp/multipartencrypted.cpp
index 7a049318..7a049318 100644
--- a/framework/src/domain/mimetreeparser/otp/multipartencrypted.cpp
+++ b/framework/src/domain/mime/mimetreeparser/otp/multipartencrypted.cpp
diff --git a/framework/src/domain/mimetreeparser/otp/multipartencrypted.h b/framework/src/domain/mime/mimetreeparser/otp/multipartencrypted.h
index 0d2e01a8..0d2e01a8 100644
--- a/framework/src/domain/mimetreeparser/otp/multipartencrypted.h
+++ b/framework/src/domain/mime/mimetreeparser/otp/multipartencrypted.h
diff --git a/framework/src/domain/mimetreeparser/otp/multipartmixed.cpp b/framework/src/domain/mime/mimetreeparser/otp/multipartmixed.cpp
index 43056e51..43056e51 100644
--- a/framework/src/domain/mimetreeparser/otp/multipartmixed.cpp
+++ b/framework/src/domain/mime/mimetreeparser/otp/multipartmixed.cpp
diff --git a/framework/src/domain/mimetreeparser/otp/multipartmixed.h b/framework/src/domain/mime/mimetreeparser/otp/multipartmixed.h
index 0029501b..0029501b 100644
--- a/framework/src/domain/mimetreeparser/otp/multipartmixed.h
+++ b/framework/src/domain/mime/mimetreeparser/otp/multipartmixed.h
diff --git a/framework/src/domain/mimetreeparser/otp/multipartsigned.cpp b/framework/src/domain/mime/mimetreeparser/otp/multipartsigned.cpp
index cb0def6c..cb0def6c 100644
--- a/framework/src/domain/mimetreeparser/otp/multipartsigned.cpp
+++ b/framework/src/domain/mime/mimetreeparser/otp/multipartsigned.cpp
diff --git a/framework/src/domain/mimetreeparser/otp/multipartsigned.h b/framework/src/domain/mime/mimetreeparser/otp/multipartsigned.h
index 4b8921ad..4b8921ad 100644
--- a/framework/src/domain/mimetreeparser/otp/multipartsigned.h
+++ b/framework/src/domain/mime/mimetreeparser/otp/multipartsigned.h
diff --git a/framework/src/domain/mimetreeparser/otp/nodehelper.cpp b/framework/src/domain/mime/mimetreeparser/otp/nodehelper.cpp
index 8e224f1b..8e224f1b 100644
--- a/framework/src/domain/mimetreeparser/otp/nodehelper.cpp
+++ b/framework/src/domain/mime/mimetreeparser/otp/nodehelper.cpp
diff --git a/framework/src/domain/mimetreeparser/otp/nodehelper.h b/framework/src/domain/mime/mimetreeparser/otp/nodehelper.h
index 70253f21..70253f21 100644
--- a/framework/src/domain/mimetreeparser/otp/nodehelper.h
+++ b/framework/src/domain/mime/mimetreeparser/otp/nodehelper.h
diff --git a/framework/src/domain/mimetreeparser/otp/objecttreeparser.cpp b/framework/src/domain/mime/mimetreeparser/otp/objecttreeparser.cpp
index b0d514b6..b0d514b6 100644
--- a/framework/src/domain/mimetreeparser/otp/objecttreeparser.cpp
+++ b/framework/src/domain/mime/mimetreeparser/otp/objecttreeparser.cpp
diff --git a/framework/src/domain/mimetreeparser/otp/objecttreeparser.h b/framework/src/domain/mime/mimetreeparser/otp/objecttreeparser.h
index 3f29a673..3f29a673 100644
--- a/framework/src/domain/mimetreeparser/otp/objecttreeparser.h
+++ b/framework/src/domain/mime/mimetreeparser/otp/objecttreeparser.h
diff --git a/framework/src/domain/mimetreeparser/otp/objecttreesource.cpp b/framework/src/domain/mime/mimetreeparser/otp/objecttreesource.cpp
index 45f96c58..45f96c58 100644
--- a/framework/src/domain/mimetreeparser/otp/objecttreesource.cpp
+++ b/framework/src/domain/mime/mimetreeparser/otp/objecttreesource.cpp
diff --git a/framework/src/domain/mimetreeparser/otp/objecttreesource.h b/framework/src/domain/mime/mimetreeparser/otp/objecttreesource.h
index afada4c4..afada4c4 100644
--- a/framework/src/domain/mimetreeparser/otp/objecttreesource.h
+++ b/framework/src/domain/mime/mimetreeparser/otp/objecttreesource.h
diff --git a/framework/src/domain/mimetreeparser/otp/partmetadata.h b/framework/src/domain/mime/mimetreeparser/otp/partmetadata.h
index 41399837..41399837 100644
--- a/framework/src/domain/mimetreeparser/otp/partmetadata.h
+++ b/framework/src/domain/mime/mimetreeparser/otp/partmetadata.h
diff --git a/framework/src/domain/mimetreeparser/otp/partnodebodypart.cpp b/framework/src/domain/mime/mimetreeparser/otp/partnodebodypart.cpp
index ec509787..ec509787 100644
--- a/framework/src/domain/mimetreeparser/otp/partnodebodypart.cpp
+++ b/framework/src/domain/mime/mimetreeparser/otp/partnodebodypart.cpp
diff --git a/framework/src/domain/mimetreeparser/otp/partnodebodypart.h b/framework/src/domain/mime/mimetreeparser/otp/partnodebodypart.h
index ded0ee2c..ded0ee2c 100644
--- a/framework/src/domain/mimetreeparser/otp/partnodebodypart.h
+++ b/framework/src/domain/mime/mimetreeparser/otp/partnodebodypart.h
diff --git a/framework/src/domain/mimetreeparser/otp/qgpgmejobexecutor.cpp b/framework/src/domain/mime/mimetreeparser/otp/qgpgmejobexecutor.cpp
index 1f453342..1f453342 100644
--- a/framework/src/domain/mimetreeparser/otp/qgpgmejobexecutor.cpp
+++ b/framework/src/domain/mime/mimetreeparser/otp/qgpgmejobexecutor.cpp
diff --git a/framework/src/domain/mimetreeparser/otp/qgpgmejobexecutor.h b/framework/src/domain/mime/mimetreeparser/otp/qgpgmejobexecutor.h
index 8a81b078..8a81b078 100644
--- a/framework/src/domain/mimetreeparser/otp/qgpgmejobexecutor.h
+++ b/framework/src/domain/mime/mimetreeparser/otp/qgpgmejobexecutor.h
diff --git a/framework/src/domain/mimetreeparser/otp/queuehtmlwriter.cpp b/framework/src/domain/mime/mimetreeparser/otp/queuehtmlwriter.cpp
index ea17bf5c..ea17bf5c 100644
--- a/framework/src/domain/mimetreeparser/otp/queuehtmlwriter.cpp
+++ b/framework/src/domain/mime/mimetreeparser/otp/queuehtmlwriter.cpp
diff --git a/framework/src/domain/mimetreeparser/otp/queuehtmlwriter.h b/framework/src/domain/mime/mimetreeparser/otp/queuehtmlwriter.h
index 9e7a4659..9e7a4659 100644
--- a/framework/src/domain/mimetreeparser/otp/queuehtmlwriter.h
+++ b/framework/src/domain/mime/mimetreeparser/otp/queuehtmlwriter.h
diff --git a/framework/src/domain/mimetreeparser/otp/texthtml.cpp b/framework/src/domain/mime/mimetreeparser/otp/texthtml.cpp
index 51332cff..51332cff 100644
--- a/framework/src/domain/mimetreeparser/otp/texthtml.cpp
+++ b/framework/src/domain/mime/mimetreeparser/otp/texthtml.cpp
diff --git a/framework/src/domain/mimetreeparser/otp/texthtml.h b/framework/src/domain/mime/mimetreeparser/otp/texthtml.h
index a03cfe50..a03cfe50 100644
--- a/framework/src/domain/mimetreeparser/otp/texthtml.h
+++ b/framework/src/domain/mime/mimetreeparser/otp/texthtml.h
diff --git a/framework/src/domain/mimetreeparser/otp/textplain.cpp b/framework/src/domain/mime/mimetreeparser/otp/textplain.cpp
index d3437f04..d3437f04 100644
--- a/framework/src/domain/mimetreeparser/otp/textplain.cpp
+++ b/framework/src/domain/mime/mimetreeparser/otp/textplain.cpp
diff --git a/framework/src/domain/mimetreeparser/otp/textplain.h b/framework/src/domain/mime/mimetreeparser/otp/textplain.h
index c97a6aec..c97a6aec 100644
--- a/framework/src/domain/mimetreeparser/otp/textplain.h
+++ b/framework/src/domain/mime/mimetreeparser/otp/textplain.h
diff --git a/framework/src/domain/mimetreeparser/otp/util.cpp b/framework/src/domain/mime/mimetreeparser/otp/util.cpp
index 5ca8d828..5ca8d828 100644
--- a/framework/src/domain/mimetreeparser/otp/util.cpp
+++ b/framework/src/domain/mime/mimetreeparser/otp/util.cpp
diff --git a/framework/src/domain/mimetreeparser/otp/util.h b/framework/src/domain/mime/mimetreeparser/otp/util.h
index 099c647a..099c647a 100644
--- a/framework/src/domain/mimetreeparser/otp/util.h
+++ b/framework/src/domain/mime/mimetreeparser/otp/util.h
diff --git a/framework/src/domain/mimetreeparser/otp/utils.cpp b/framework/src/domain/mime/mimetreeparser/otp/utils.cpp
index 8f718143..8f718143 100644
--- a/framework/src/domain/mimetreeparser/otp/utils.cpp
+++ b/framework/src/domain/mime/mimetreeparser/otp/utils.cpp
diff --git a/framework/src/domain/mimetreeparser/otp/utils.h b/framework/src/domain/mime/mimetreeparser/otp/utils.h
index d4aaa43a..d4aaa43a 100644
--- a/framework/src/domain/mimetreeparser/otp/utils.h
+++ b/framework/src/domain/mime/mimetreeparser/otp/utils.h
diff --git a/framework/src/domain/mimetreeparser/otp/verifydetachedbodypartmemento.cpp b/framework/src/domain/mime/mimetreeparser/otp/verifydetachedbodypartmemento.cpp
index 56c1d1a7..56c1d1a7 100644
--- a/framework/src/domain/mimetreeparser/otp/verifydetachedbodypartmemento.cpp
+++ b/framework/src/domain/mime/mimetreeparser/otp/verifydetachedbodypartmemento.cpp
diff --git a/framework/src/domain/mimetreeparser/otp/verifydetachedbodypartmemento.h b/framework/src/domain/mime/mimetreeparser/otp/verifydetachedbodypartmemento.h
index f37dfe81..f37dfe81 100644
--- a/framework/src/domain/mimetreeparser/otp/verifydetachedbodypartmemento.h
+++ b/framework/src/domain/mime/mimetreeparser/otp/verifydetachedbodypartmemento.h
diff --git a/framework/src/domain/mimetreeparser/otp/verifyopaquebodypartmemento.cpp b/framework/src/domain/mime/mimetreeparser/otp/verifyopaquebodypartmemento.cpp
index 99eb8b8e..99eb8b8e 100644
--- a/framework/src/domain/mimetreeparser/otp/verifyopaquebodypartmemento.cpp
+++ b/framework/src/domain/mime/mimetreeparser/otp/verifyopaquebodypartmemento.cpp
diff --git a/framework/src/domain/mimetreeparser/otp/verifyopaquebodypartmemento.h b/framework/src/domain/mime/mimetreeparser/otp/verifyopaquebodypartmemento.h
index 02d30a13..02d30a13 100644
--- a/framework/src/domain/mimetreeparser/otp/verifyopaquebodypartmemento.h
+++ b/framework/src/domain/mime/mimetreeparser/otp/verifyopaquebodypartmemento.h
diff --git a/framework/src/domain/mimetreeparser/stringhtmlwriter.cpp b/framework/src/domain/mime/mimetreeparser/stringhtmlwriter.cpp
index 88034492..88034492 100644
--- a/framework/src/domain/mimetreeparser/stringhtmlwriter.cpp
+++ b/framework/src/domain/mime/mimetreeparser/stringhtmlwriter.cpp
diff --git a/framework/src/domain/mimetreeparser/stringhtmlwriter.h b/framework/src/domain/mime/mimetreeparser/stringhtmlwriter.h
index 20f6763e..20f6763e 100644
--- a/framework/src/domain/mimetreeparser/stringhtmlwriter.h
+++ b/framework/src/domain/mime/mimetreeparser/stringhtmlwriter.h
diff --git a/framework/src/domain/mimetreeparser/tests/CMakeLists.txt b/framework/src/domain/mime/mimetreeparser/tests/CMakeLists.txt
index a7f28bb1..a7f28bb1 100644
--- a/framework/src/domain/mimetreeparser/tests/CMakeLists.txt
+++ b/framework/src/domain/mime/mimetreeparser/tests/CMakeLists.txt
diff --git a/framework/src/domain/mimetreeparser/tests/data/alternative.mbox b/framework/src/domain/mime/mimetreeparser/tests/data/alternative.mbox
index 6522c34b..6522c34b 100644
--- a/framework/src/domain/mimetreeparser/tests/data/alternative.mbox
+++ b/framework/src/domain/mime/mimetreeparser/tests/data/alternative.mbox
diff --git a/framework/src/domain/mimetreeparser/tests/data/cid-links.mbox b/framework/src/domain/mime/mimetreeparser/tests/data/cid-links.mbox
index 40ff5282..40ff5282 100644
--- a/framework/src/domain/mimetreeparser/tests/data/cid-links.mbox
+++ b/framework/src/domain/mime/mimetreeparser/tests/data/cid-links.mbox
diff --git a/framework/src/domain/mimetreeparser/tests/data/html.mbox b/framework/src/domain/mime/mimetreeparser/tests/data/html.mbox
index bf5c685d..bf5c685d 100644
--- a/framework/src/domain/mimetreeparser/tests/data/html.mbox
+++ b/framework/src/domain/mime/mimetreeparser/tests/data/html.mbox
diff --git a/framework/src/domain/mimetreeparser/tests/data/openpgp-encrypted-attachment-and-non-encrypted-attachment.mbox b/framework/src/domain/mime/mimetreeparser/tests/data/openpgp-encrypted-attachment-and-non-encrypted-attachment.mbox
index 2d9726ea..2d9726ea 100644
--- a/framework/src/domain/mimetreeparser/tests/data/openpgp-encrypted-attachment-and-non-encrypted-attachment.mbox
+++ b/framework/src/domain/mime/mimetreeparser/tests/data/openpgp-encrypted-attachment-and-non-encrypted-attachment.mbox
diff --git a/framework/src/domain/mimetreeparser/tests/data/openpgp-inline-charset-encrypted.mbox b/framework/src/domain/mime/mimetreeparser/tests/data/openpgp-inline-charset-encrypted.mbox
index 8bd06910..8bd06910 100644
--- a/framework/src/domain/mimetreeparser/tests/data/openpgp-inline-charset-encrypted.mbox
+++ b/framework/src/domain/mime/mimetreeparser/tests/data/openpgp-inline-charset-encrypted.mbox
diff --git a/framework/src/domain/mimetreeparser/tests/data/openpgp-inline-encrypted+nonenc.mbox b/framework/src/domain/mime/mimetreeparser/tests/data/openpgp-inline-encrypted+nonenc.mbox
index b98dc336..b98dc336 100644
--- a/framework/src/domain/mimetreeparser/tests/data/openpgp-inline-encrypted+nonenc.mbox
+++ b/framework/src/domain/mime/mimetreeparser/tests/data/openpgp-inline-encrypted+nonenc.mbox
diff --git a/framework/src/domain/mimetreeparser/tests/data/plaintext.mbox b/framework/src/domain/mime/mimetreeparser/tests/data/plaintext.mbox
index d185b1c1..d185b1c1 100644
--- a/framework/src/domain/mimetreeparser/tests/data/plaintext.mbox
+++ b/framework/src/domain/mime/mimetreeparser/tests/data/plaintext.mbox
diff --git a/framework/src/domain/mimetreeparser/tests/data/smime-encrypted.mbox b/framework/src/domain/mime/mimetreeparser/tests/data/smime-encrypted.mbox
index 6b6d6a0d..6b6d6a0d 100644
--- a/framework/src/domain/mimetreeparser/tests/data/smime-encrypted.mbox
+++ b/framework/src/domain/mime/mimetreeparser/tests/data/smime-encrypted.mbox
diff --git a/framework/src/domain/mimetreeparser/tests/gnupg_home/CMakeLists.txt b/framework/src/domain/mime/mimetreeparser/tests/gnupg_home/CMakeLists.txt
index 9c64a008..9c64a008 100644
--- a/framework/src/domain/mimetreeparser/tests/gnupg_home/CMakeLists.txt
+++ b/framework/src/domain/mime/mimetreeparser/tests/gnupg_home/CMakeLists.txt
diff --git a/framework/src/domain/mimetreeparser/tests/gnupg_home/dirmngr-cache.d/DIR.txt b/framework/src/domain/mime/mimetreeparser/tests/gnupg_home/dirmngr-cache.d/DIR.txt
index 1a45a6b3..1a45a6b3 100644
--- a/framework/src/domain/mimetreeparser/tests/gnupg_home/dirmngr-cache.d/DIR.txt
+++ b/framework/src/domain/mime/mimetreeparser/tests/gnupg_home/dirmngr-cache.d/DIR.txt
diff --git a/framework/src/domain/mimetreeparser/tests/gnupg_home/dirmngr-cache.d/crl-4E31CEB57DDD4A7B9991AB05507B1ED4293FF952.db b/framework/src/domain/mime/mimetreeparser/tests/gnupg_home/dirmngr-cache.d/crl-4E31CEB57DDD4A7B9991AB05507B1ED4293FF952.db
index 0b7e2dd4..0b7e2dd4 100644
--- a/framework/src/domain/mimetreeparser/tests/gnupg_home/dirmngr-cache.d/crl-4E31CEB57DDD4A7B9991AB05507B1ED4293FF952.db
+++ b/framework/src/domain/mime/mimetreeparser/tests/gnupg_home/dirmngr-cache.d/crl-4E31CEB57DDD4A7B9991AB05507B1ED4293FF952.db
diff --git a/framework/src/domain/mimetreeparser/tests/gnupg_home/dirmngr-cache.d/crl-7F2A402CBB016A9146D613568C89D3596A4111AA.db b/framework/src/domain/mime/mimetreeparser/tests/gnupg_home/dirmngr-cache.d/crl-7F2A402CBB016A9146D613568C89D3596A4111AA.db
index 47474a26..47474a26 100644
--- a/framework/src/domain/mimetreeparser/tests/gnupg_home/dirmngr-cache.d/crl-7F2A402CBB016A9146D613568C89D3596A4111AA.db
+++ b/framework/src/domain/mime/mimetreeparser/tests/gnupg_home/dirmngr-cache.d/crl-7F2A402CBB016A9146D613568C89D3596A4111AA.db
diff --git a/framework/src/domain/mimetreeparser/tests/gnupg_home/dirmngr.conf b/framework/src/domain/mime/mimetreeparser/tests/gnupg_home/dirmngr.conf
index a17a0354..a17a0354 100644
--- a/framework/src/domain/mimetreeparser/tests/gnupg_home/dirmngr.conf
+++ b/framework/src/domain/mime/mimetreeparser/tests/gnupg_home/dirmngr.conf
diff --git a/framework/src/domain/mimetreeparser/tests/gnupg_home/gpg-agent.conf.in b/framework/src/domain/mime/mimetreeparser/tests/gnupg_home/gpg-agent.conf.in
index ece69255..ece69255 100644
--- a/framework/src/domain/mimetreeparser/tests/gnupg_home/gpg-agent.conf.in
+++ b/framework/src/domain/mime/mimetreeparser/tests/gnupg_home/gpg-agent.conf.in
diff --git a/framework/src/domain/mimetreeparser/tests/gnupg_home/gpg.conf b/framework/src/domain/mime/mimetreeparser/tests/gnupg_home/gpg.conf
index f1760823..f1760823 100644
--- a/framework/src/domain/mimetreeparser/tests/gnupg_home/gpg.conf
+++ b/framework/src/domain/mime/mimetreeparser/tests/gnupg_home/gpg.conf
diff --git a/framework/src/domain/mimetreeparser/tests/gnupg_home/gpgsm.conf.in b/framework/src/domain/mime/mimetreeparser/tests/gnupg_home/gpgsm.conf.in
index 92b6119d..92b6119d 100644
--- a/framework/src/domain/mimetreeparser/tests/gnupg_home/gpgsm.conf.in
+++ b/framework/src/domain/mime/mimetreeparser/tests/gnupg_home/gpgsm.conf.in
diff --git a/framework/src/domain/mimetreeparser/tests/gnupg_home/pinentry-fake.sh b/framework/src/domain/mime/mimetreeparser/tests/gnupg_home/pinentry-fake.sh
index 7135a942..7135a942 100755
--- a/framework/src/domain/mimetreeparser/tests/gnupg_home/pinentry-fake.sh
+++ b/framework/src/domain/mime/mimetreeparser/tests/gnupg_home/pinentry-fake.sh
diff --git a/framework/src/domain/mimetreeparser/tests/gnupg_home/private-keys-v1.d/1AA8BA52430E51AE249AF0DA97D59F869E4101A8.key b/framework/src/domain/mime/mimetreeparser/tests/gnupg_home/private-keys-v1.d/1AA8BA52430E51AE249AF0DA97D59F869E4101A8.key
index 39ac307b..39ac307b 100644
--- a/framework/src/domain/mimetreeparser/tests/gnupg_home/private-keys-v1.d/1AA8BA52430E51AE249AF0DA97D59F869E4101A8.key
+++ b/framework/src/domain/mime/mimetreeparser/tests/gnupg_home/private-keys-v1.d/1AA8BA52430E51AE249AF0DA97D59F869E4101A8.key
diff --git a/framework/src/domain/mimetreeparser/tests/gnupg_home/pubring.gpg b/framework/src/domain/mime/mimetreeparser/tests/gnupg_home/pubring.gpg
index 2e00fa24..2e00fa24 100644
--- a/framework/src/domain/mimetreeparser/tests/gnupg_home/pubring.gpg
+++ b/framework/src/domain/mime/mimetreeparser/tests/gnupg_home/pubring.gpg
diff --git a/framework/src/domain/mimetreeparser/tests/gnupg_home/pubring.kbx b/framework/src/domain/mime/mimetreeparser/tests/gnupg_home/pubring.kbx
index 0230f313..0230f313 100644
--- a/framework/src/domain/mimetreeparser/tests/gnupg_home/pubring.kbx
+++ b/framework/src/domain/mime/mimetreeparser/tests/gnupg_home/pubring.kbx
diff --git a/framework/src/domain/mimetreeparser/tests/gnupg_home/scdaemon.conf b/framework/src/domain/mime/mimetreeparser/tests/gnupg_home/scdaemon.conf
index a17a0354..a17a0354 100644
--- a/framework/src/domain/mimetreeparser/tests/gnupg_home/scdaemon.conf
+++ b/framework/src/domain/mime/mimetreeparser/tests/gnupg_home/scdaemon.conf
diff --git a/framework/src/domain/mimetreeparser/tests/gnupg_home/secring.gpg b/framework/src/domain/mime/mimetreeparser/tests/gnupg_home/secring.gpg
index cfd3387d..cfd3387d 100644
--- a/framework/src/domain/mimetreeparser/tests/gnupg_home/secring.gpg
+++ b/framework/src/domain/mime/mimetreeparser/tests/gnupg_home/secring.gpg
diff --git a/framework/src/domain/mimetreeparser/tests/gnupg_home/trustdb.gpg b/framework/src/domain/mime/mimetreeparser/tests/gnupg_home/trustdb.gpg
index 70089c15..70089c15 100644
--- a/framework/src/domain/mimetreeparser/tests/gnupg_home/trustdb.gpg
+++ b/framework/src/domain/mime/mimetreeparser/tests/gnupg_home/trustdb.gpg
diff --git a/framework/src/domain/mimetreeparser/tests/gnupg_home/trustlist.txt b/framework/src/domain/mime/mimetreeparser/tests/gnupg_home/trustlist.txt
index bbb0442d..bbb0442d 100644
--- a/framework/src/domain/mimetreeparser/tests/gnupg_home/trustlist.txt
+++ b/framework/src/domain/mime/mimetreeparser/tests/gnupg_home/trustlist.txt
diff --git a/framework/src/domain/mimetreeparser/tests/gpgerrortest.cpp b/framework/src/domain/mime/mimetreeparser/tests/gpgerrortest.cpp
index 4254d972..4254d972 100644
--- a/framework/src/domain/mimetreeparser/tests/gpgerrortest.cpp
+++ b/framework/src/domain/mime/mimetreeparser/tests/gpgerrortest.cpp
diff --git a/framework/src/domain/mimetreeparser/tests/interfacetest.cpp b/framework/src/domain/mime/mimetreeparser/tests/interfacetest.cpp
index 3ae32a4a..3ae32a4a 100644
--- a/framework/src/domain/mimetreeparser/tests/interfacetest.cpp
+++ b/framework/src/domain/mime/mimetreeparser/tests/interfacetest.cpp
diff --git a/framework/src/domain/mimetreeparser/tests/kdepim_add_gpg_crypto_test.cmake b/framework/src/domain/mime/mimetreeparser/tests/kdepim_add_gpg_crypto_test.cmake
index ea0ab8d2..ea0ab8d2 100644
--- a/framework/src/domain/mimetreeparser/tests/kdepim_add_gpg_crypto_test.cmake
+++ b/framework/src/domain/mime/mimetreeparser/tests/kdepim_add_gpg_crypto_test.cmake
diff --git a/framework/src/domain/mimetreeparser/tests/kdepim_generate_crypto_test_wrapper.cmake b/framework/src/domain/mime/mimetreeparser/tests/kdepim_generate_crypto_test_wrapper.cmake
index e1412f37..e1412f37 100644
--- a/framework/src/domain/mimetreeparser/tests/kdepim_generate_crypto_test_wrapper.cmake
+++ b/framework/src/domain/mime/mimetreeparser/tests/kdepim_generate_crypto_test_wrapper.cmake
diff --git a/framework/src/domain/mimetreeparser/thoughts.txt b/framework/src/domain/mime/mimetreeparser/thoughts.txt
index 3340347a..3340347a 100644
--- a/framework/src/domain/mimetreeparser/thoughts.txt
+++ b/framework/src/domain/mime/mimetreeparser/thoughts.txt
diff --git a/framework/src/domain/objecttreesource.cpp b/framework/src/domain/mime/objecttreesource.cpp
index 186fdf80..186fdf80 100644
--- a/framework/src/domain/objecttreesource.cpp
+++ b/framework/src/domain/mime/objecttreesource.cpp
diff --git a/framework/src/domain/objecttreesource.h b/framework/src/domain/mime/objecttreesource.h
index 2167e06f..2167e06f 100644
--- a/framework/src/domain/objecttreesource.h
+++ b/framework/src/domain/mime/objecttreesource.h
diff --git a/framework/src/domain/stringhtmlwriter.cpp b/framework/src/domain/mime/stringhtmlwriter.cpp
index 88034492..88034492 100644
--- a/framework/src/domain/stringhtmlwriter.cpp
+++ b/framework/src/domain/mime/stringhtmlwriter.cpp
diff --git a/framework/src/domain/stringhtmlwriter.h b/framework/src/domain/mime/stringhtmlwriter.h
index 20f6763e..20f6763e 100644
--- a/framework/src/domain/stringhtmlwriter.h
+++ b/framework/src/domain/mime/stringhtmlwriter.h