207 files changed, 2 insertions, 297 deletions
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/CMakeLists.txt b/framework/src/domain/mime/mimetreeparser/autotests/CMakeLists.txt
index 3575a798..9b26d885 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/CMakeLists.txt
+++ b/framework/src/domain/mime/mimetreeparser/autotests/CMakeLists.txt
@@ -4,7 +4,7 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
 set(AUTOMOC ON)
 set(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR})
-add_definitions( -DMAIL_DATA_DIR="${CMAKE_CURRENT_SOURCE_DIR}/data" )
+add_definitions( -DMAIL_DATA_DIR="${CMAKE_CURRENT_SOURCE_DIR}/../../testdata" )
 include(ECMAddTests)
 include(${CMAKE_CURRENT_SOURCE_DIR}/kdepim_add_gpg_crypto_test.cmake)
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/alternative.mbox b/framework/src/domain/mime/mimetreeparser/autotests/data/alternative.mbox
deleted file mode 100644
index a2c58591..00000000
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/alternative.mbox
+++ /dev/null
@@ -1,34 +0,0 @@
-Return-Path: <konqi@example.org>
-Date: Wed, 8 Jun 2016 20:34:44 -0700
-From: Konqi <konqi@example.org>
-To: konqi@kde.org
-Subject: A random subject with alternative contenttype
-MIME-Version: 1.0
-Content-Type: multipart/alternative; 
- boundary="----=_Part_12345678_12345678"
------=_Part_12345678_12345678
-Content-Type: text/plain; charset=utf-8
-Content-Transfer-Encoding: quoted-printable
-If you can see this text it means that your email client couldn't display o=
-ur newsletter properly.
-Please visit this link to view the newsletter on our website: http://www.go=
-g.com/newsletter/
-=2D GOG.com Team
------=_Part_12345678_12345678
-Content-Transfer-Encoding: 7Bit
-Content-Type: text/html; charset="windows-1252"
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<html><head><meta name="qrichtext" content="1" /><style type="text/css">
-p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;">
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; -qt-user-state:0;">Some <span style=" font-weight:600;">HTML</span> text</p></body></html>
------=_Part_12345678_12345678--
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/encapsulated-with-attachment.mbox b/framework/src/domain/mime/mimetreeparser/autotests/data/encapsulated-with-attachment.mbox
deleted file mode 100644
index 885b9d1b..00000000
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/encapsulated-with-attachment.mbox
+++ /dev/null
@@ -1,53 +0,0 @@
-From: Thomas McGuire <dontspamme@gmx.net>
-Subject: Fwd: Test with attachment
-Date: Wed, 5 Aug 2009 10:58:27 +0200
-MIME-Version: 1.0
-Content-Type: Multipart/Mixed;
-  boundary="Boundary-00=_zmUeKB+A8hGfCVZ"
--Boundary-00=_zmUeKB+A8hGfCVZ
-Content-Type: text/plain;
-  charset="iso-8859-15"
-Content-Transfer-Encoding: 7bit
-Content-Disposition: inline
-This is the first encapsulating message.
--Boundary-00=_zmUeKB+A8hGfCVZ
-Content-Type: message/rfc822;
-  name="forwarded message"
-Content-Transfer-Encoding: 7bit
-Content-Description: Thomas McGuire <dontspamme@gmx.net>: Test with attachment
-Content-Disposition: inline
-From: Thomas McGuire <dontspamme@gmx.net>
-Subject: Test with attachment
-Date: Wed, 5 Aug 2009 10:57:58 +0200
-MIME-Version: 1.0
-Content-Type: Multipart/Mixed;
-  boundary="Boundary-00=_WmUeKQpGb0DHyx1"
--Boundary-00=_WmUeKQpGb0DHyx1
-Content-Type: text/plain;
-  charset="us-ascii"
-Content-Transfer-Encoding: 7bit
-Content-Disposition: inline
-This is the second encapsulated message.
--Boundary-00=_WmUeKQpGb0DHyx1
-Content-Type: text/plain;
-  name="attachment.txt"
-Content-Transfer-Encoding: 7bit
-Content-Disposition: attachment;
-  filename="attachment.txt"
-This is an attachment.
--Boundary-00=_WmUeKQpGb0DHyx1--
--Boundary-00=_zmUeKB+A8hGfCVZ--
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/html.mbox b/framework/src/domain/mime/mimetreeparser/autotests/data/html.mbox
deleted file mode 100644
index eebd4283..00000000
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/html.mbox
+++ /dev/null
@@ -1,31 +0,0 @@
-From foo@example.com Thu, 26 May 2011 01:16:54 +0100
-From: Thomas McGuire <foo@example.com>
-Subject: HTML test
-Date: Thu, 26 May 2011 01:16:54 +0100
-Message-ID: <1501334.pROlBb7MZF@herrwackelpudding.localhost>
-X-KMail-Transport: GMX
-X-KMail-Fcc: 28
-X-KMail-Drafts: 7
-X-KMail-Templates: 9
-User-Agent: KMail/4.6 beta5 (Linux/2.6.34.7-0.7-desktop; KDE/4.6.41; x86_64; git-0269848; 2011-04-19)
-MIME-Version: 1.0
-Content-Type: multipart/alternative; boundary="nextPart8606278.tpV19BTJKu"
-Content-Transfer-Encoding: 7Bit
--nextPart8606278.tpV19BTJKu
-Content-Transfer-Encoding: 7Bit
-Content-Type: text/plain; charset="windows-1252"
-Some HTML text
--nextPart8606278.tpV19BTJKu
-Content-Transfer-Encoding: 7Bit
-Content-Type: text/html; charset="windows-1252"
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<html><head><meta name="qrichtext" content="1" /><style type="text/css">
-p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;">
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; -qt-user-state:0;">Some <span style=" font-weight:600;">HTML</span> text</p></body></html>
--nextPart8606278.tpV19BTJKu--
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-encrypted-attachment-and-non-encrypted-attachment.mbox b/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-encrypted-attachment-and-non-encrypted-attachment.mbox
deleted file mode 100644
index 2d9726ea..00000000
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-encrypted-attachment-and-non-encrypted-attachment.mbox
+++ /dev/null
@@ -1,115 +0,0 @@
-From test@kolab.org Fri May 01 15:12:47 2015
-From: testkey <test@kolab.org>
-To: you@you.com
-Subject: enc & non enc attachment
-Date: Fri, 01 May 2015 17:12:47 +0200
-Message-ID: <13897561.XENKdJMSlR@tabin.local>
-X-KMail-Identity: 1197256126
-User-Agent: KMail/4.13.0.1 (Linux/3.19.1-towo.1-siduction-amd64; KDE/4.14.2; x86_64; git-cd33034; 2015-04-11)
-MIME-Version: 1.0
-Content-Type: multipart/mixed; boundary="nextPart1939768.sIoLGH0PD8"
-Content-Transfer-Encoding: 7Bit
-This is a multi-part message in MIME format.
--nextPart1939768.sIoLGH0PD8
-Content-Type: multipart/encrypted; boundary="nextPart2814166.CHKktCGlQ3"; protocol="application/pgp-encrypted"
--nextPart2814166.CHKktCGlQ3
-Content-Type: application/pgp-encrypted
-Content-Disposition: attachment
-Content-Transfer-Encoding: 7Bit
-Version: 1
--nextPart2814166.CHKktCGlQ3
-Content-Type: application/octet-stream
-Content-Disposition: inline; filename="msg.asc"
-Content-Transfer-Encoding: 7Bit
-----BEGIN PGP MESSAGE-----
-Version: GnuPG v2
-hIwDGJlthTT7oq0BA/9cXFQ6mN9Vxnc2B9M10odS3/6z1tsIY9oJdsiOjpfxqapX
-P7nOzR/jNWdFQanXoG1SjAcY2FeZEN0c3SkxEM6R5QVF1vMh/Xsni1clI+peZyVT
-Z4OSU74YCfYLg+cgDnPCF3kyNPVe6Z1pnfWOCZNCG3rpApw6UVLN63ScWC6eQIUB
-DAMMzkNap8zaOwEIANKHn1svvj+hBOIZYf8R+q2Bw7cd4xEChiJ7uQLnD98j0Fh1
-85v7/8JbZx6rEDDenPp1mCciDodb0aCmi0XLuzJz2ANGTVflfq+ZA+v1pwLksWCs
-0YcHLEjOJzjr3KKmvu6wqnun5J2yV69K3OW3qTTGhNvcYZulqQ617pPa48+sFCgh
-nM8TMAD0ElVEwmMtrS3AWoJz52Af+R3YzpAnX8NzV317/JG+b6e2ksl3tR7TWp1q
-2FOqC1sXAxuv+DIz4GgRfaK1+xYr2ckkg+H/3HJqa5LmJ7rGCyv+Epfp9u+OvdBG
-PBvuCtO3tm0crmnttMw57Gy35BKutRf/8MpBj/nS6QFX0t7XOLeL4Me7/a2H20wz
-HZsuRGDXMCh0lL0FYCBAwdbbYvvy0gz/5iaNvoADtaIu+VtbFNrTUN0SwuL+AIFS
-+WIiaSbFt4Ng3t9YmqL6pqB7fjxI10S+PK0s7ABqe4pgbzUWWt1yzBcxfk8l/47Q
-JrlvcE7HuDOhNOHfZIgUP2Dbeu+pVvHIJbmLsNWpl4s+nHhoxc9HrVhYG/MTZtQ3
-kkUWviegO6mwEZjQvgBxjWib7090sCxkO847b8A93mfQNHnuy2ZEEJ+9xyk7nIWs
-4RsiNR8pYc/SMvdocyAvQMH/qSvmn/IFJ+jHhtT8UJlXJ0bHvXTHjHMqBp6fP69z
-Jh1ERadWQdMaTkzQ+asl+kl/x3p6RZP8MEVbZIl/3pcV+xiFCYcFu2TETKMtbW+b
-NYOlrltFxFDvyu3WeNNp0g9k0nFpD/T1OXHRBRcbUDWE4QF6NWTm6NO9wy2UYHCi
-7QTSecBWgMaw7cUdwvnW6chIVoov1pm69BI9D0PoV76zCI7KzpiDsTFxdilKwbQf
-K/PDnv9Adx3ERh0/F8llBHrj2UGsRs4aHSEBDBJIHDCp8+lqtsRcINQBKEU3qIjt
-wf5vizdaVIgQnsD2z8QmBQ7QCCipI0ur6GKl+YWDDOSDLDUs9dK4A6xo/4Q0bsnI
-rH63ti5HslGq6uArfFkewH2MWff/8Li3uGEqzpK5NhP5UpbArelK+QaQQP5SdsmW
-XFwUqDS4QTCKNJXw/5SQMl8UE10l2Xaav3TkiOYTcBcvPNDovYgnMyRff/tTeFa8
-83STkvpGtkULkCntp22fydv5rg6DZ7eJrYfC2oZXdM87hHhUALUO6Y/VtVmNdNYw
-F3Uim4PDuLIKt+mFqRtFqnWm+5X/AslC31qLkjH+Fbb83TY+mC9gbIn7CZGJRCjn
-zzzMX2h15V/VHzNUgx9V/h28T0/z25FxoozZiJxpmhOtqoxMHp+y6nXXfMoIAD1D
-963Pc7u1HS0ny54A7bqc6KKd4W9IF7HkXn3SoBwCyn0IOPoKQTDD8mW3lbBI6+h9
-vP+MAQpfD8s+3VZ9r7OKYCVmUv47ViTRlf428Co6WT7rTHjGM09tqz826fTOXA==
-=6Eu9
-----END PGP MESSAGE-----
--nextPart2814166.CHKktCGlQ3--
--nextPart1939768.sIoLGH0PD8
-Content-Disposition: attachment; filename="image.png"
-Content-Transfer-Encoding: base64
-Content-Type: image/png; name="image.png"
-iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAAlwSFlzAAAb
-rwAAG68BXhqRHAAAAAd0SU1FB9gHFg8aNG8uqeIAAAAGYktHRAD/AP8A/6C9p5MAAAkqSURBVHja
-5VV7cFTVGf/OPefeu3fv3t1NdhMSCHkKASEpyEsaGwalWEWntLV1Wu0fdOxAx9Iq0xntAwac6ehY
-p+rwKLbjjLRFh9JadURKRGgFQTTECCYQE9nNgzzYZDe7m33d1+l3tpOOU61T2tF/+s1s7pzn9/t+
-v993Av/3QT6FO6WdO/d+M55Il8rMOdrT0x3Zt++3+c8EgM/nozseeviJiYmpe1zOQdM8BOOCIku/
-lIj1VrQ/0r9n9+78xwLgeAA3w4fHXV1d5Omnn6aapumlJSVVqalUJJvJZRdcu0RSfZQsaW7mjfPm
-cbF9+/btEIlEaq6Z03whXyhIjDFuGIZEKSP5fMFRVcVNT2Vf0jzsmMxYGtel9rff/vM/M8bjcZpM
-Jp1XX32VNDc3e7ovRP3JyZGVNdXVd1FGGwKBQEM8njiWTKV36IHgEACwibGx62LjU/cBd01Zljoc
-p9DHmLbHsmyK1UuKooJt24IMcLE+y3L45eEYLS8LgWH4YXR0bAPZtGmTVFvfoBZMEzKpFKmqqmqp
-qane4DhOteH3L1FkWZVlGSzLAtd1Oe4773C4LxoZvDWXh82OY2MtwAuFvCvSyDIFXdelYDDIvF4d
-xPzA0AgXFStMcWPxBPGoKvXpPh6JDG5hK1Zcv1H36Xc6tsMs21EMQ69CLSts2wGkDygTyW2CP8gX
-TKLIyvx0OrdDUXyLKXVUkdSne4QKtFAwuWmabjAYkDyqAgG/jziORh1EKaonkkQt2yRZRC5JHEGn
-L7OKyopNqqo2IbWQjqWgLOwFBFKsuGDa4PVyIssMk1sCACCjimXbrbquYKW41zJJOpXkeARyeZNQ
-SUKwHEqCKnBuAybkZeFSmssVSDKdhlBpCRgIcnQsdvKPB19sY4rMNIaH0BhQUVHKvXgpIiQF0wK/
-4QORnOEayoDzOSBMXK4BSgpeTcMECqiqTDKZHDKmct3LCI55Kp0mQgK/3yDYkgIc3kNhfHzCkRk9
-p6nk+yPD3SmWzeZiKNkciUrg2g5BjQWdSBchiEvQjzoWAFkUYPDrCjBFUEJ8AhSIRyl2jcfjEL9h
-AFJODL8B6H7IZrNIt2g3B1mysShdQhmbT58+ExRdx3L5/PNomGU4kJkuA9ILYn+JP4CXOoDUoWO9
-IBhCSBCLTYCK+rqOg8CKvY6JPQhGxjkX1zyAdwrgAhTKWBDmxTUTC7Tcy5dHBiilL7cdaTsNGAwP
-7o32D4Q9HnWTrvsCiqIgdWgqDkJfkKgDU1MZcBGMhbKgj2B0LIle8eNhgiBsoMwFEY7rQDqVwlo5
-esUE/AAR81gUYIUT8UR2//4/rK+pLjs3MhIFEVJN9WwXK2oM+P1BREpQO0hjwkw+BzJWY1oOXB5L
-w9DIOGTQvYS4UFqigR9ZwUqEXFghVop059AjonqcAIZrqCKg31AS3OU66Adf4sabWqKvvHIYpoNh
-y+Vj4xMHVEW93eUuo0izhT4oRbcSIoALbRle4AVVkfBup6g9thwCzRX1VRQmdMeqLVETEIkW2ZNx
-H8oqzqAfXCGJEQ6XBQEgNQ2A7tq1C1a1tvaattOOrVFOqVSLCQhqU6QPx+DTsOU0GavLYUV20Qv4
-rEIymYNQuB48Wkg8QTA0NIQeYKB6NGTgH90jIcJEMikAi1dRRo9NLV583ek33jjpFAGIPw8++IAj
-e9SIRGm5wliraVosnTWLmmemUugBkTiPSS3AtgV8VQA9A8LxdfULYXBoEKv2wMhIn2BHGFR0DZ6d
-glQ6hUDT6A/RWVSSmfx5DjxRV1vzVkdHBzDAWLNmDezc+aQVqqz5dSY52Z63nLn9A33lI9myLXNL
-xv0Fq3gWutMN0BToxcso+AN+cKmOXI5A9P12mKDzYNXcZXDq1F+h+IboFgzb1VAhDULeJpxwC19G
-g/uMgOXVfXW1tbWCYM6mtdi8+YfiM4m/Y1UrHzkergyXz/3czImCnRjuHiW3qxpPqGFPy6SpHJC9
-IR+Sm+2N8i/dcMOMZdGeshcrS/S58+c3zU2Z8oVD50cbVfP8M4pGkymoUxLxsUzOVhtmQ+5432Rg
-oj6QOLFj28/caQk+EjMXraUV1eW+8dH06StQZnlnNbQefGTD92pWfu3I6TOT8oY7brv4hWUt3xiw
-2OrlDVVdRslsd2Fd469Q8sUB3c8uOW49SdHX1rbcePhoz3B7feuqlt5oZtBTv+ioSdXc7q3fHQaM
-fwtg6Vd/dEvn8Qssnzg/0Ns56jRcO6Nw4d1Af+/RH0/cdv+O/fRK7KnmBXPWGsQeDPhK9oWC6hdd
-R3pdUcg88Tx7U7Ej1y1qMjreGwjt/cnaF2YtvCXQe7bzxLkj+/sunT0Ry00OwHRI8DERLqeNmqGV
-JZJVC6Yu7UxMOfLFlV9pWQcYp57/013rb1u9ua29b0Ch4bsl4tKLY5P1sgxNJzsHDj136KzS3NTk
-9mTNusPvXJLrbnjUe/b16FDfsZ/3xC8d4/HoCQ4Anwzg91vWPL7+3pvvDM806sTY4IVyMxfrojO3
-BVubbyJMhnVVM3y+l187/nChIJ2ZpSs9hMD4qC6t6x6+0gkAoRC33/Sb8RdmXj9nzvWraivhP47g
-AyHxKb1mfWkRYHCjMb30nafeeWzerU9963w3L3/02c4f7D0y0NXTx3f3D/JTb7bzxpeODu55+PGT
-yy5F+ZmeD/iSrh5efeJd/hGZP5GBux+6cysY3w7H+16IVy65V6trnn3P9JqVjQ3JuSsdHhWW6hIL
-NuhyUpJgEF/ofSVBeLBuVtVjd3y55SHXhQ8UBht0DR4r98Fs+IRg/zrxlz2/2A7p5yYBY93Gu+4f
-H5xojLwOxfjd/WufOHhQ/IcD7eYVC5YyCjFMfkVV4NpMFvpTachoZeDaNryLnliOczsUCv1XBWD8
-YjF5MWJ9kcT757qenR7vf4bDoqWwHCvUUfPNsQQMWSZAZTlsw7nxYQQTcuDrjgQuPn7z/D7YivNt
-nPPfEDzwqcU75/j6SD/f8uG5vXs5dL7Hjb+d4gp8mnF8nAOabjcac+OBAxyuNiT4HyNwGZYgu0RW
-IDt/Icz4zAC0tXE4183rQ6XwU9uBXgLQ5Teg7GIv1+EqgsF/GY4DtCQALZMp2ITttmqoHzpWr756
-o/0d59+Lh3Y1HHcAAAAASUVORK5CYII=
--nextPart1939768.sIoLGH0PD8--
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-inline-charset-encrypted.mbox b/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-inline-charset-encrypted.mbox
deleted file mode 100644
index 8bd06910..00000000
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-inline-charset-encrypted.mbox
+++ /dev/null
@@ -1,40 +0,0 @@
-From test@example.com Thu, 17 Oct 2013 02:13:03 +0200
-Return-Path: <test@example.com>
-Delivered-To: you@you.com
-Received: from localhost (localhost [127.0.0.1])
-        by test@example.com (Postfix) with ESMTP id B30D8120030
-        for <you@you.com>; Thu, 17 Oct 2013 02:13:05 +0200 (CEST)
-From: test <test@example.com>
-To: you@you.com
-Subject: charset
-Date: Thu, 17 Oct 2013 02:13:03 +0200
-Message-ID: <4081645.yGjUJ4o4Se@example.local>
-User-Agent: KMail/4.12 pre (Linux/3.11-4.towo-siduction-amd64; KDE/4.11.2; x86_64; git-f7f14e3; 2013-10-15)
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7Bit
-Content-Type: text/plain; charset="ISO-8859-15"
-----BEGIN PGP MESSAGE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-hIwDGJlthTT7oq0BBACbaRZudMigMTetPZNRgkfEXv4QQowR1jborw0dcgKKqMQ1
-6o67NkpxvmXKGJTfTVCLBX3nk6FKYo6NwlPCyU7X9X0DDk8hvaBdR9wGfrdm5YWX
-GKOzcqJY1EypiMsspXeZvjzEW7O8I956c3vBb/2pM3xqYEK1kh8+d9bVH+cjf4UB
-DAMMzkNap8zaOwEH/1rPShyYL8meJN+/GGgS8+Nf1BW5pSHdAPCg0dnX4QCLEx7u
-GkBU6N4JGYayaCBofibOLacQPhYZdnR5Xb/Pvrx03GrzyzyDp0WyeI9nGNfkani7
-sCRWbzlMPsEvGEvJVnMLNRSk4xhPIWumL4APkw+Mgi6mf+Br8z0RhfnGwyMA53Mr
-pG9VQKlq3v7/aaN40pMjAsxiytcHS515jXrb3Ko4pWbTlAr/eytOEfkLRJgSOpQT
-BY7lWs+UQJqiG8Yn65vS9LMDNJgX9EOGx77Z4u9wvv4ZieOxzgbHGg5kYCoae7ba
-hxZeNjYKscH+E6epbOxM/wlTdr4UTiiW9dMsH0zSwMUB891gToeXq+LDGEPTKVSX
-tsJm4HS/kISJBwrCI4EUqWZML6xQ427NkZGmF2z/sD3kmL66GjspIKnb4zHmXacp
-84n2KrI9s7p6AnKnQjsxvB/4/lpXPCIY5GH7KjySEJiMsHECzeN1dJSL6keykBsx
-DtmYDA+dhZ6UWbwzx/78+mjNREhyp/UiSAmLzlJh89OH/xelAPvKcIosYwz4cY9N
-wjralTmL+Y0aHKeZJOeqPLaXADcPFiZrCNPCH65Ey5GEtDpjLpEbjVbykPV9+YkK
-7JKW6bwMraOl5zmAoR77PWMo3IoYb9q4GuqDr1V2ZGlb7eMH1gj1nfgfVintKC1X
-3jFfy7aK6LIQDVKEwbi0SxVXTKStuliVUy5oX4woDOxmTEotJf1QlKZpn5oF20UP
-tumYrp0SPoP8Bo4EVRVaLupduI5cYce1q/kFj9Iho/wk56MoG9PxMMfsH7oKg3AA
-CqQ6/kM4oJNdN5xIf1EH5HeaNFkDy1jlLznnhwVAZKPo/9ffpg==
-=bPqu
-----END PGP MESSAGE-----
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/smime-encrypted.mbox b/framework/src/domain/mime/mimetreeparser/autotests/data/smime-encrypted.mbox
deleted file mode 100644
index 6b6d6a0d..00000000
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/smime-encrypted.mbox
+++ /dev/null
@@ -1,22 +0,0 @@
-From test@example.com Sat, 13 Apr 2013 01:54:30 +0200
-From: test <test@example.com>
-To: you@you.com
-Subject: test
-Date: Sat, 13 Apr 2013 01:54:30 +0200
-Message-ID: <1576646.QQxzHWx8dA@tabin>
-X-KMail-Identity: 505942601
-User-Agent: KMail/4.10.2 (Linux/3.9.0-rc4-experimental-amd64; KDE/4.10.60; x86_64; git-fc9b82c; 2013-04-11)
-MIME-Version: 1.0
-Content-Type: application/pkcs7-mime; name="smime.p7m"; smime-type="enveloped-data"
-Content-Transfer-Encoding: base64
-Content-Disposition: attachment; filename="smime.p7m"
-MIAGCSqGSIb3DQEHA6CAMIACAQAxgfwwgfkCAQAwYjBVMQswCQYDVQQGEwJVUzENMAsGA1UECgwE
-S0RBQjEWMBQGA1UEAwwNdW5pdHRlc3QgY2VydDEfMB0GCSqGSIb3DQEJARYQdGVzdEBleGFtcGxl
-LmNvbQIJANNFIDoYY4XJMA0GCSqGSIb3DQEBAQUABIGAJwmmaOeidXUHSQGOf2OBIsPYafVqdORe
-y54pEXbXiAfSVUWgI4a9CsiWwcDX8vlaX9ZLLr+L2VmOfr6Yc5214yxzausZVvnUFjy6LUXotuEX
-tSar4EW7XI9DjaZc1l985naMsTx9JUa5GyQ9J6PGqhosAKpKMGgKkFAHaOwE1/IwgAYJKoZIhvcN
-AQcBMBQGCCqGSIb3DQMHBAieDfmz3WGbN6CABHgEpsLrNn0PAZTDUfNomDypvSCl5bQH+9cKm80m
-upMV2r8RBiXS7OaP4SpCxq18afDTTPatvboHIoEX92taTbq8soiAgEs6raSGtEYZNvFL0IYqm7MA
-o5HCOmjiEcInyPf14lL3HnPk10FaP3hh58qTHUh4LPYtL7UECOZELYnUfUVhAAAAAAAAAAAAAA==
diff --git a/framework/src/domain/mime/mimetreeparser/tests/CMakeLists.txt b/framework/src/domain/mime/mimetreeparser/tests/CMakeLists.txt
index aa88d46e..89d97823 100644
--- a/framework/src/domain/mime/mimetreeparser/tests/CMakeLists.txt
+++ b/framework/src/domain/mime/mimetreeparser/tests/CMakeLists.txt
@@ -1,5 +1,5 @@
 add_subdirectory(gnupg_home)
-add_definitions( -DMAIL_DATA_DIR="${CMAKE_CURRENT_SOURCE_DIR}/data" )
+add_definitions( -DMAIL_DATA_DIR="${CMAKE_CURRENT_SOURCE_DIR}/../../testdata" )
 include(${CMAKE_CURRENT_SOURCE_DIR}/kdepim_add_gpg_crypto_test.cmake)
 include_directories(
    ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/alternative-notext.mbox b/framework/src/domain/mime/testdata/alternative-notext.mbox
index 86026437..86026437 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/alternative-notext.mbox
+++ b/framework/src/domain/mime/testdata/alternative-notext.mbox
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/alternative-notext.mbox.html b/framework/src/domain/mime/testdata/alternative-notext.mbox.html
index 41db4eab..41db4eab 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/alternative-notext.mbox.html
+++ b/framework/src/domain/mime/testdata/alternative-notext.mbox.html
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/alternative-notext.mbox.tree b/framework/src/domain/mime/testdata/alternative-notext.mbox.tree
index 0de07281..0de07281 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/alternative-notext.mbox.tree
+++ b/framework/src/domain/mime/testdata/alternative-notext.mbox.tree
diff --git a/framework/src/domain/mime/mimetreeparser/tests/data/alternative.mbox b/framework/src/domain/mime/testdata/alternative.mbox
index 6522c34b..6522c34b 100644
--- a/framework/src/domain/mime/mimetreeparser/tests/data/alternative.mbox
+++ b/framework/src/domain/mime/testdata/alternative.mbox
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/alternative.mbox.html b/framework/src/domain/mime/testdata/alternative.mbox.html
index 2fe886f1..2fe886f1 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/alternative.mbox.html
+++ b/framework/src/domain/mime/testdata/alternative.mbox.html
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/alternative.mbox.tree b/framework/src/domain/mime/testdata/alternative.mbox.tree
index 0de07281..0de07281 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/alternative.mbox.tree
+++ b/framework/src/domain/mime/testdata/alternative.mbox.tree
diff --git a/framework/src/domain/mime/mimetreeparser/tests/data/attachment.mbox b/framework/src/domain/mime/testdata/attachment.mbox
index 9c3610a7..9c3610a7 100644
--- a/framework/src/domain/mime/mimetreeparser/tests/data/attachment.mbox
+++ b/framework/src/domain/mime/testdata/attachment.mbox
diff --git a/framework/src/domain/mime/mimetreeparser/tests/data/cid-links-forwarded-inline.mbox b/framework/src/domain/mime/testdata/cid-links-forwarded-inline.mbox
index dd8090e6..dd8090e6 100644
--- a/framework/src/domain/mime/mimetreeparser/tests/data/cid-links-forwarded-inline.mbox
+++ b/framework/src/domain/mime/testdata/cid-links-forwarded-inline.mbox
diff --git a/framework/src/domain/mime/mimetreeparser/tests/data/cid-links.mbox b/framework/src/domain/mime/testdata/cid-links.mbox
index 40ff5282..40ff5282 100644
--- a/framework/src/domain/mime/mimetreeparser/tests/data/cid-links.mbox
+++ b/framework/src/domain/mime/testdata/cid-links.mbox
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/details/forward-openpgp-signed-encrypted.mbox.html b/framework/src/domain/mime/testdata/details/forward-openpgp-signed-encrypted.mbox.html
index 9a81f103..9a81f103 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/details/forward-openpgp-signed-encrypted.mbox.html
+++ b/framework/src/domain/mime/testdata/details/forward-openpgp-signed-encrypted.mbox.html
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/details/openpgp-encoded.mbox.html b/framework/src/domain/mime/testdata/details/openpgp-encoded.mbox.html
index 65d5f95e..65d5f95e 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/details/openpgp-encoded.mbox.html
+++ b/framework/src/domain/mime/testdata/details/openpgp-encoded.mbox.html
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/details/openpgp-encrypted+signed.mbox.html b/framework/src/domain/mime/testdata/details/openpgp-encrypted+signed.mbox.html
index 96361c30..96361c30 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/details/openpgp-encrypted+signed.mbox.html
+++ b/framework/src/domain/mime/testdata/details/openpgp-encrypted+signed.mbox.html
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/details/openpgp-encrypted-attachment-and-non-encrypted-attachment.mbox.html b/framework/src/domain/mime/testdata/details/openpgp-encrypted-attachment-and-non-encrypted-attachment.mbox.html
index cc6bf03e..cc6bf03e 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/details/openpgp-encrypted-attachment-and-non-encrypted-attachment.mbox.html
+++ b/framework/src/domain/mime/testdata/details/openpgp-encrypted-attachment-and-non-encrypted-attachment.mbox.html
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/details/openpgp-encrypted-attachment.mbox.html b/framework/src/domain/mime/testdata/details/openpgp-encrypted-attachment.mbox.html
index 61bf5d28..61bf5d28 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/details/openpgp-encrypted-attachment.mbox.html
+++ b/framework/src/domain/mime/testdata/details/openpgp-encrypted-attachment.mbox.html
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/details/openpgp-encrypted-non-encrypted-attachment.mbox.html b/framework/src/domain/mime/testdata/details/openpgp-encrypted-non-encrypted-attachment.mbox.html
index 8d8bde0d..8d8bde0d 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/details/openpgp-encrypted-non-encrypted-attachment.mbox.html
+++ b/framework/src/domain/mime/testdata/details/openpgp-encrypted-non-encrypted-attachment.mbox.html
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/details/openpgp-encrypted-partially-signed-attachments.mbox.html b/framework/src/domain/mime/testdata/details/openpgp-encrypted-partially-signed-attachments.mbox.html
index 1716b841..1716b841 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/details/openpgp-encrypted-partially-signed-attachments.mbox.html
+++ b/framework/src/domain/mime/testdata/details/openpgp-encrypted-partially-signed-attachments.mbox.html
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/details/openpgp-inline-charset-encrypted.mbox.html b/framework/src/domain/mime/testdata/details/openpgp-inline-charset-encrypted.mbox.html
index c2fa2fee..c2fa2fee 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/details/openpgp-inline-charset-encrypted.mbox.html
+++ b/framework/src/domain/mime/testdata/details/openpgp-inline-charset-encrypted.mbox.html
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/details/openpgp-inline-signed.mbox.html b/framework/src/domain/mime/testdata/details/openpgp-inline-signed.mbox.html
index 00a9dc5b..00a9dc5b 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/details/openpgp-inline-signed.mbox.html
+++ b/framework/src/domain/mime/testdata/details/openpgp-inline-signed.mbox.html
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/details/openpgp-signed-base64-mailman-footer.mbox.html b/framework/src/domain/mime/testdata/details/openpgp-signed-base64-mailman-footer.mbox.html
index c10cecd8..c10cecd8 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/details/openpgp-signed-base64-mailman-footer.mbox.html
+++ b/framework/src/domain/mime/testdata/details/openpgp-signed-base64-mailman-footer.mbox.html
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/details/openpgp-signed-encrypted-two-attachments.mbox.html b/framework/src/domain/mime/testdata/details/openpgp-signed-encrypted-two-attachments.mbox.html
index 2c02a22c..2c02a22c 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/details/openpgp-signed-encrypted-two-attachments.mbox.html
+++ b/framework/src/domain/mime/testdata/details/openpgp-signed-encrypted-two-attachments.mbox.html
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/details/openpgp-signed-encrypted.mbox.html b/framework/src/domain/mime/testdata/details/openpgp-signed-encrypted.mbox.html
index d3a7a0ce..d3a7a0ce 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/details/openpgp-signed-encrypted.mbox.html
+++ b/framework/src/domain/mime/testdata/details/openpgp-signed-encrypted.mbox.html
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/details/openpgp-signed-mailinglist+old.mbox.html b/framework/src/domain/mime/testdata/details/openpgp-signed-mailinglist+old.mbox.html
index e7da94db..e7da94db 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/details/openpgp-signed-mailinglist+old.mbox.html
+++ b/framework/src/domain/mime/testdata/details/openpgp-signed-mailinglist+old.mbox.html
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/details/openpgp-signed-mailinglist.mbox.html b/framework/src/domain/mime/testdata/details/openpgp-signed-mailinglist.mbox.html
index f5b20b6d..f5b20b6d 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/details/openpgp-signed-mailinglist.mbox.html
+++ b/framework/src/domain/mime/testdata/details/openpgp-signed-mailinglist.mbox.html
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/details/openpgp-signed-two-attachments.mbox.html b/framework/src/domain/mime/testdata/details/openpgp-signed-two-attachments.mbox.html
index 1432aa44..1432aa44 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/details/openpgp-signed-two-attachments.mbox.html
+++ b/framework/src/domain/mime/testdata/details/openpgp-signed-two-attachments.mbox.html
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/details/signed-forward-openpgp-signed-encrypted.mbox.html b/framework/src/domain/mime/testdata/details/signed-forward-openpgp-signed-encrypted.mbox.html
index b960f318..b960f318 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/details/signed-forward-openpgp-signed-encrypted.mbox.html
+++ b/framework/src/domain/mime/testdata/details/signed-forward-openpgp-signed-encrypted.mbox.html
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/details/smime-opaque-enc+sign.mbox.html b/framework/src/domain/mime/testdata/details/smime-opaque-enc+sign.mbox.html
index d6345a7c..d6345a7c 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/details/smime-opaque-enc+sign.mbox.html
+++ b/framework/src/domain/mime/testdata/details/smime-opaque-enc+sign.mbox.html
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/details/smime-opaque-sign.mbox.html b/framework/src/domain/mime/testdata/details/smime-opaque-sign.mbox.html
index 248b93ff..248b93ff 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/details/smime-opaque-sign.mbox.html
+++ b/framework/src/domain/mime/testdata/details/smime-opaque-sign.mbox.html
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/details/smime-signed-encrypted.mbox.html b/framework/src/domain/mime/testdata/details/smime-signed-encrypted.mbox.html
index 6e811632..6e811632 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/details/smime-signed-encrypted.mbox.html
+++ b/framework/src/domain/mime/testdata/details/smime-signed-encrypted.mbox.html
diff --git a/framework/src/domain/mime/mimetreeparser/tests/data/encapsulated-with-attachment.mbox b/framework/src/domain/mime/testdata/encapsulated-with-attachment.mbox
index 885b9d1b..885b9d1b 100644
--- a/framework/src/domain/mime/mimetreeparser/tests/data/encapsulated-with-attachment.mbox
+++ b/framework/src/domain/mime/testdata/encapsulated-with-attachment.mbox
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/encapsulated-with-attachment.mbox.html b/framework/src/domain/mime/testdata/encapsulated-with-attachment.mbox.html
index aa3d1090..aa3d1090 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/encapsulated-with-attachment.mbox.html
+++ b/framework/src/domain/mime/testdata/encapsulated-with-attachment.mbox.html
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/encapsulated-with-attachment.mbox.tree b/framework/src/domain/mime/testdata/encapsulated-with-attachment.mbox.tree
index 050414a2..050414a2 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/encapsulated-with-attachment.mbox.tree
+++ b/framework/src/domain/mime/testdata/encapsulated-with-attachment.mbox.tree
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/forward-openpgp-signed-encrypted.mbox b/framework/src/domain/mime/testdata/forward-openpgp-signed-encrypted.mbox
index 1c166940..1c166940 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/forward-openpgp-signed-encrypted.mbox
+++ b/framework/src/domain/mime/testdata/forward-openpgp-signed-encrypted.mbox
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/forward-openpgp-signed-encrypted.mbox.html b/framework/src/domain/mime/testdata/forward-openpgp-signed-encrypted.mbox.html
index 7632ec39..7632ec39 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/forward-openpgp-signed-encrypted.mbox.html
+++ b/framework/src/domain/mime/testdata/forward-openpgp-signed-encrypted.mbox.html
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/forward-openpgp-signed-encrypted.mbox.tree b/framework/src/domain/mime/testdata/forward-openpgp-signed-encrypted.mbox.tree
index 324156db..324156db 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/forward-openpgp-signed-encrypted.mbox.tree
+++ b/framework/src/domain/mime/testdata/forward-openpgp-signed-encrypted.mbox.tree
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/hidden/openpgp-encrypted-attachment-and-non-encrypted-attachment.mbox.html b/framework/src/domain/mime/testdata/headeronly/openpgp-encrypted-attachment-and-non-encrypted-attachment.mbox.html
index 73c4d2d7..73c4d2d7 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/hidden/openpgp-encrypted-attachment-and-non-encrypted-attachment.mbox.html
+++ b/framework/src/domain/mime/testdata/headeronly/openpgp-encrypted-attachment-and-non-encrypted-attachment.mbox.html
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/hidden/openpgp-encrypted-attachment.mbox.html b/framework/src/domain/mime/testdata/headeronly/openpgp-encrypted-attachment.mbox.html
index d5e4550e..d5e4550e 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/hidden/openpgp-encrypted-attachment.mbox.html
+++ b/framework/src/domain/mime/testdata/headeronly/openpgp-encrypted-attachment.mbox.html
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/hidden/openpgp-encrypted-non-encrypted-attachment.mbox.html b/framework/src/domain/mime/testdata/headeronly/openpgp-encrypted-non-encrypted-attachment.mbox.html
index 73c4d2d7..73c4d2d7 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/hidden/openpgp-encrypted-non-encrypted-attachment.mbox.html
+++ b/framework/src/domain/mime/testdata/headeronly/openpgp-encrypted-non-encrypted-attachment.mbox.html
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/hidden/openpgp-encrypted-partially-signed-attachments.mbox.html b/framework/src/domain/mime/testdata/headeronly/openpgp-encrypted-partially-signed-attachments.mbox.html
index ebad7354..ebad7354 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/hidden/openpgp-encrypted-partially-signed-attachments.mbox.html
+++ b/framework/src/domain/mime/testdata/headeronly/openpgp-encrypted-partially-signed-attachments.mbox.html
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/hidden/openpgp-encrypted-two-attachments.mbox.html b/framework/src/domain/mime/testdata/headeronly/openpgp-encrypted-two-attachments.mbox.html
index 4cdeaa63..4cdeaa63 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/hidden/openpgp-encrypted-two-attachments.mbox.html
+++ b/framework/src/domain/mime/testdata/headeronly/openpgp-encrypted-two-attachments.mbox.html
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/hidden/openpgp-signed-apple.mbox.html b/framework/src/domain/mime/testdata/headeronly/openpgp-signed-apple.mbox.html
index 330b02a1..330b02a1 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/hidden/openpgp-signed-apple.mbox.html
+++ b/framework/src/domain/mime/testdata/headeronly/openpgp-signed-apple.mbox.html
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/hidden/openpgp-signed-encrypted-two-attachments.mbox.html b/framework/src/domain/mime/testdata/headeronly/openpgp-signed-encrypted-two-attachments.mbox.html
index 83b7a66c..83b7a66c 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/hidden/openpgp-signed-encrypted-two-attachments.mbox.html
+++ b/framework/src/domain/mime/testdata/headeronly/openpgp-signed-encrypted-two-attachments.mbox.html
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/headeronly/openpgp-signed-mailinglist+additional-children.mbox.html b/framework/src/domain/mime/testdata/headeronly/openpgp-signed-mailinglist+additional-children.mbox.html
index 25b1ad04..25b1ad04 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/headeronly/openpgp-signed-mailinglist+additional-children.mbox.html
+++ b/framework/src/domain/mime/testdata/headeronly/openpgp-signed-mailinglist+additional-children.mbox.html
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/hidden/openpgp-signed-no-protocol.mbox.html b/framework/src/domain/mime/testdata/headeronly/openpgp-signed-no-protocol.mbox.html
index bdac52b6..bdac52b6 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/hidden/openpgp-signed-no-protocol.mbox.html
+++ b/framework/src/domain/mime/testdata/headeronly/openpgp-signed-no-protocol.mbox.html
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/hidden/openpgp-signed-two-attachments.mbox.html b/framework/src/domain/mime/testdata/headeronly/openpgp-signed-two-attachments.mbox.html
index 027097f7..027097f7 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/hidden/openpgp-signed-two-attachments.mbox.html
+++ b/framework/src/domain/mime/testdata/headeronly/openpgp-signed-two-attachments.mbox.html
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/hidden/smime-signed-apple.mbox.html b/framework/src/domain/mime/testdata/headeronly/smime-signed-apple.mbox.html
index 9554bb39..9554bb39 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/hidden/smime-signed-apple.mbox.html
+++ b/framework/src/domain/mime/testdata/headeronly/smime-signed-apple.mbox.html
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/hidden/encapsulated-with-attachment.mbox.html b/framework/src/domain/mime/testdata/hidden/encapsulated-with-attachment.mbox.html
index 42f5ecd7..42f5ecd7 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/hidden/encapsulated-with-attachment.mbox.html
+++ b/framework/src/domain/mime/testdata/hidden/encapsulated-with-attachment.mbox.html
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/headeronly/openpgp-encrypted-attachment-and-non-encrypted-attachment.mbox.html b/framework/src/domain/mime/testdata/hidden/openpgp-encrypted-attachment-and-non-encrypted-attachment.mbox.html
index 73c4d2d7..73c4d2d7 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/headeronly/openpgp-encrypted-attachment-and-non-encrypted-attachment.mbox.html
+++ b/framework/src/domain/mime/testdata/hidden/openpgp-encrypted-attachment-and-non-encrypted-attachment.mbox.html
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/headeronly/openpgp-encrypted-attachment.mbox.html b/framework/src/domain/mime/testdata/hidden/openpgp-encrypted-attachment.mbox.html
index d5e4550e..d5e4550e 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/headeronly/openpgp-encrypted-attachment.mbox.html
+++ b/framework/src/domain/mime/testdata/hidden/openpgp-encrypted-attachment.mbox.html
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/hidden/openpgp-encrypted-noData.mbox.html b/framework/src/domain/mime/testdata/hidden/openpgp-encrypted-noData.mbox.html
index 166812fe..166812fe 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/hidden/openpgp-encrypted-noData.mbox.html
+++ b/framework/src/domain/mime/testdata/hidden/openpgp-encrypted-noData.mbox.html
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/headeronly/openpgp-encrypted-non-encrypted-attachment.mbox.html b/framework/src/domain/mime/testdata/hidden/openpgp-encrypted-non-encrypted-attachment.mbox.html
index 73c4d2d7..73c4d2d7 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/headeronly/openpgp-encrypted-non-encrypted-attachment.mbox.html
+++ b/framework/src/domain/mime/testdata/hidden/openpgp-encrypted-non-encrypted-attachment.mbox.html
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/headeronly/openpgp-encrypted-partially-signed-attachments.mbox.html b/framework/src/domain/mime/testdata/hidden/openpgp-encrypted-partially-signed-attachments.mbox.html
index ebad7354..ebad7354 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/headeronly/openpgp-encrypted-partially-signed-attachments.mbox.html
+++ b/framework/src/domain/mime/testdata/hidden/openpgp-encrypted-partially-signed-attachments.mbox.html
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/headeronly/openpgp-encrypted-two-attachments.mbox.html b/framework/src/domain/mime/testdata/hidden/openpgp-encrypted-two-attachments.mbox.html
index 4cdeaa63..4cdeaa63 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/headeronly/openpgp-encrypted-two-attachments.mbox.html
+++ b/framework/src/domain/mime/testdata/hidden/openpgp-encrypted-two-attachments.mbox.html
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/headeronly/openpgp-signed-apple.mbox.html b/framework/src/domain/mime/testdata/hidden/openpgp-signed-apple.mbox.html
index 330b02a1..330b02a1 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/headeronly/openpgp-signed-apple.mbox.html
+++ b/framework/src/domain/mime/testdata/hidden/openpgp-signed-apple.mbox.html
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/headeronly/openpgp-signed-encrypted-two-attachments.mbox.html b/framework/src/domain/mime/testdata/hidden/openpgp-signed-encrypted-two-attachments.mbox.html
index 83b7a66c..83b7a66c 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/headeronly/openpgp-signed-encrypted-two-attachments.mbox.html
+++ b/framework/src/domain/mime/testdata/hidden/openpgp-signed-encrypted-two-attachments.mbox.html
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/hidden/openpgp-signed-mailinglist+additional-children.mbox.html b/framework/src/domain/mime/testdata/hidden/openpgp-signed-mailinglist+additional-children.mbox.html
index 1f0da385..1f0da385 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/hidden/openpgp-signed-mailinglist+additional-children.mbox.html
+++ b/framework/src/domain/mime/testdata/hidden/openpgp-signed-mailinglist+additional-children.mbox.html
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/headeronly/openpgp-signed-no-protocol.mbox.html b/framework/src/domain/mime/testdata/hidden/openpgp-signed-no-protocol.mbox.html
index bdac52b6..bdac52b6 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/headeronly/openpgp-signed-no-protocol.mbox.html
+++ b/framework/src/domain/mime/testdata/hidden/openpgp-signed-no-protocol.mbox.html
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/headeronly/openpgp-signed-two-attachments.mbox.html b/framework/src/domain/mime/testdata/hidden/openpgp-signed-two-attachments.mbox.html
index 027097f7..027097f7 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/headeronly/openpgp-signed-two-attachments.mbox.html
+++ b/framework/src/domain/mime/testdata/hidden/openpgp-signed-two-attachments.mbox.html
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/headeronly/smime-signed-apple.mbox.html b/framework/src/domain/mime/testdata/hidden/smime-signed-apple.mbox.html
index 9554bb39..9554bb39 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/headeronly/smime-signed-apple.mbox.html
+++ b/framework/src/domain/mime/testdata/hidden/smime-signed-apple.mbox.html
diff --git a/framework/src/domain/mime/mimetreeparser/tests/data/html.mbox b/framework/src/domain/mime/testdata/html.mbox
index bf5c685d..bf5c685d 100644
--- a/framework/src/domain/mime/mimetreeparser/tests/data/html.mbox
+++ b/framework/src/domain/mime/testdata/html.mbox
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/html.mbox.html b/framework/src/domain/mime/testdata/html.mbox.html
index 2fe886f1..2fe886f1 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/html.mbox.html
+++ b/framework/src/domain/mime/testdata/html.mbox.html
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/html.mbox.tree b/framework/src/domain/mime/testdata/html.mbox.tree
index 0de07281..0de07281 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/html.mbox.tree
+++ b/framework/src/domain/mime/testdata/html.mbox.tree
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/htmlonly.mbox b/framework/src/domain/mime/testdata/htmlonly.mbox
index e45b1c4d..e45b1c4d 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/htmlonly.mbox
+++ b/framework/src/domain/mime/testdata/htmlonly.mbox
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/htmlonly.mbox.html b/framework/src/domain/mime/testdata/htmlonly.mbox.html
index 1143f2cf..1143f2cf 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/htmlonly.mbox.html
+++ b/framework/src/domain/mime/testdata/htmlonly.mbox.html
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/htmlonly.mbox.tree b/framework/src/domain/mime/testdata/htmlonly.mbox.tree
index a4c3191b..a4c3191b 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/htmlonly.mbox.tree
+++ b/framework/src/domain/mime/testdata/htmlonly.mbox.tree
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/htmlonlyexternal.mbox b/framework/src/domain/mime/testdata/htmlonlyexternal.mbox
index 4eb3e2c3..4eb3e2c3 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/htmlonlyexternal.mbox
+++ b/framework/src/domain/mime/testdata/htmlonlyexternal.mbox
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/iconic/openpgp-encrypted-partially-signed-attachments.mbox.html b/framework/src/domain/mime/testdata/iconic/openpgp-encrypted-partially-signed-attachments.mbox.html
index b6f734c2..b6f734c2 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/iconic/openpgp-encrypted-partially-signed-attachments.mbox.html
+++ b/framework/src/domain/mime/testdata/iconic/openpgp-encrypted-partially-signed-attachments.mbox.html
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/iconic/openpgp-encrypted-two-attachments.mbox.html b/framework/src/domain/mime/testdata/iconic/openpgp-encrypted-two-attachments.mbox.html
index 7f0b7abd..7f0b7abd 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/iconic/openpgp-encrypted-two-attachments.mbox.html
+++ b/framework/src/domain/mime/testdata/iconic/openpgp-encrypted-two-attachments.mbox.html
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/iconic/openpgp-signed-encrypted-two-attachments.mbox.html b/framework/src/domain/mime/testdata/iconic/openpgp-signed-encrypted-two-attachments.mbox.html
index 8d6b5814..8d6b5814 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/iconic/openpgp-signed-encrypted-two-attachments.mbox.html
+++ b/framework/src/domain/mime/testdata/iconic/openpgp-signed-encrypted-two-attachments.mbox.html
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/iconic/openpgp-signed-two-attachments.mbox.html b/framework/src/domain/mime/testdata/iconic/openpgp-signed-two-attachments.mbox.html
index 73dbc5f4..73dbc5f4 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/iconic/openpgp-signed-two-attachments.mbox.html
+++ b/framework/src/domain/mime/testdata/iconic/openpgp-signed-two-attachments.mbox.html
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/inlined/encapsulated-with-attachment.mbox.html b/framework/src/domain/mime/testdata/inlined/encapsulated-with-attachment.mbox.html
index 26d3dd60..26d3dd60 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/inlined/encapsulated-with-attachment.mbox.html
+++ b/framework/src/domain/mime/testdata/inlined/encapsulated-with-attachment.mbox.html
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/inlined/openpgp-encrypted-attachment-and-non-encrypted-attachment.mbox.html b/framework/src/domain/mime/testdata/inlined/openpgp-encrypted-attachment-and-non-encrypted-attachment.mbox.html
index 49e503f1..49e503f1 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/inlined/openpgp-encrypted-attachment-and-non-encrypted-attachment.mbox.html
+++ b/framework/src/domain/mime/testdata/inlined/openpgp-encrypted-attachment-and-non-encrypted-attachment.mbox.html
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/inlined/openpgp-encrypted-attachment.mbox.html b/framework/src/domain/mime/testdata/inlined/openpgp-encrypted-attachment.mbox.html
index 67897491..67897491 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/inlined/openpgp-encrypted-attachment.mbox.html
+++ b/framework/src/domain/mime/testdata/inlined/openpgp-encrypted-attachment.mbox.html
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/inlined/openpgp-encrypted-non-encrypted-attachment.mbox.html b/framework/src/domain/mime/testdata/inlined/openpgp-encrypted-non-encrypted-attachment.mbox.html
index 6091ee5a..6091ee5a 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/inlined/openpgp-encrypted-non-encrypted-attachment.mbox.html
+++ b/framework/src/domain/mime/testdata/inlined/openpgp-encrypted-non-encrypted-attachment.mbox.html
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/inlined/openpgp-signed-apple.mbox.html b/framework/src/domain/mime/testdata/inlined/openpgp-signed-apple.mbox.html
index 092d5e1c..092d5e1c 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/inlined/openpgp-signed-apple.mbox.html
+++ b/framework/src/domain/mime/testdata/inlined/openpgp-signed-apple.mbox.html
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/inlined/openpgp-signed-mailinglist+additional-children.mbox.html b/framework/src/domain/mime/testdata/inlined/openpgp-signed-mailinglist+additional-children.mbox.html
index cc49cbcc..cc49cbcc 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/inlined/openpgp-signed-mailinglist+additional-children.mbox.html
+++ b/framework/src/domain/mime/testdata/inlined/openpgp-signed-mailinglist+additional-children.mbox.html
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/inlined/smime-signed-apple.mbox.html b/framework/src/domain/mime/testdata/inlined/smime-signed-apple.mbox.html
index d3f3eeb3..d3f3eeb3 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/inlined/smime-signed-apple.mbox.html
+++ b/framework/src/domain/mime/testdata/inlined/smime-signed-apple.mbox.html
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/inlinepgpencrypted-appendix.mbox b/framework/src/domain/mime/testdata/inlinepgpencrypted-appendix.mbox
index c05a7e69..c05a7e69 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/inlinepgpencrypted-appendix.mbox
+++ b/framework/src/domain/mime/testdata/inlinepgpencrypted-appendix.mbox
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/inlinepgpencrypted-appendix.mbox.html b/framework/src/domain/mime/testdata/inlinepgpencrypted-appendix.mbox.html
index 8af2b1c6..8af2b1c6 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/inlinepgpencrypted-appendix.mbox.html
+++ b/framework/src/domain/mime/testdata/inlinepgpencrypted-appendix.mbox.html
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/inlinepgpencrypted-appendix.mbox.tree b/framework/src/domain/mime/testdata/inlinepgpencrypted-appendix.mbox.tree
index 018f5c33..018f5c33 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/inlinepgpencrypted-appendix.mbox.tree
+++ b/framework/src/domain/mime/testdata/inlinepgpencrypted-appendix.mbox.tree
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/inlinepgpencrypted-error.mbox b/framework/src/domain/mime/testdata/inlinepgpencrypted-error.mbox
index 529b4d3b..529b4d3b 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/inlinepgpencrypted-error.mbox
+++ b/framework/src/domain/mime/testdata/inlinepgpencrypted-error.mbox
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/inlinepgpencrypted-error.mbox.html b/framework/src/domain/mime/testdata/inlinepgpencrypted-error.mbox.html
index a4427e01..a4427e01 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/inlinepgpencrypted-error.mbox.html
+++ b/framework/src/domain/mime/testdata/inlinepgpencrypted-error.mbox.html
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/inlinepgpencrypted-error.mbox.tree b/framework/src/domain/mime/testdata/inlinepgpencrypted-error.mbox.tree
index 6680b8bc..6680b8bc 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/inlinepgpencrypted-error.mbox.tree
+++ b/framework/src/domain/mime/testdata/inlinepgpencrypted-error.mbox.tree
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/inlinepgpencrypted.mbox b/framework/src/domain/mime/testdata/inlinepgpencrypted.mbox
index b581602c..b581602c 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/inlinepgpencrypted.mbox
+++ b/framework/src/domain/mime/testdata/inlinepgpencrypted.mbox
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/inlinepgpencrypted.mbox.html b/framework/src/domain/mime/testdata/inlinepgpencrypted.mbox.html
index 1f695bdf..1f695bdf 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/inlinepgpencrypted.mbox.html
+++ b/framework/src/domain/mime/testdata/inlinepgpencrypted.mbox.html
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/inlinepgpencrypted.mbox.inProgress.html b/framework/src/domain/mime/testdata/inlinepgpencrypted.mbox.inProgress.html
index e5eb55d0..e5eb55d0 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/inlinepgpencrypted.mbox.inProgress.html
+++ b/framework/src/domain/mime/testdata/inlinepgpencrypted.mbox.inProgress.html
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/inlinepgpencrypted.mbox.tree b/framework/src/domain/mime/testdata/inlinepgpencrypted.mbox.tree
index 6680b8bc..6680b8bc 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/inlinepgpencrypted.mbox.tree
+++ b/framework/src/domain/mime/testdata/inlinepgpencrypted.mbox.tree
diff --git a/framework/src/domain/mime/mimetreeparser/tests/data/inlinepgpgencrypted-error.mbox b/framework/src/domain/mime/testdata/inlinepgpgencrypted-error.mbox
index 529b4d3b..529b4d3b 100644
--- a/framework/src/domain/mime/mimetreeparser/tests/data/inlinepgpgencrypted-error.mbox
+++ b/framework/src/domain/mime/testdata/inlinepgpgencrypted-error.mbox
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/mailheader.css b/framework/src/domain/mime/testdata/mailheader.css
index 10181957..10181957 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/mailheader.css
+++ b/framework/src/domain/mime/testdata/mailheader.css
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/no-content-type.mbox b/framework/src/domain/mime/testdata/no-content-type.mbox
index ad050d8c..ad050d8c 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/no-content-type.mbox
+++ b/framework/src/domain/mime/testdata/no-content-type.mbox
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/no-content-type.mbox.html b/framework/src/domain/mime/testdata/no-content-type.mbox.html
index 9e3eb752..9e3eb752 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/no-content-type.mbox.html
+++ b/framework/src/domain/mime/testdata/no-content-type.mbox.html
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/no-content-type.mbox.tree b/framework/src/domain/mime/testdata/no-content-type.mbox.tree
index c003ec97..c003ec97 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/no-content-type.mbox.tree
+++ b/framework/src/domain/mime/testdata/no-content-type.mbox.tree
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-encoded.mbox b/framework/src/domain/mime/testdata/openpgp-encoded.mbox
index 168c8dc4..168c8dc4 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-encoded.mbox
+++ b/framework/src/domain/mime/testdata/openpgp-encoded.mbox
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-encoded.mbox.html b/framework/src/domain/mime/testdata/openpgp-encoded.mbox.html
index 585bb4f0..585bb4f0 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-encoded.mbox.html
+++ b/framework/src/domain/mime/testdata/openpgp-encoded.mbox.html
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-encoded.mbox.tree b/framework/src/domain/mime/testdata/openpgp-encoded.mbox.tree
index ea8223fd..ea8223fd 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-encoded.mbox.tree
+++ b/framework/src/domain/mime/testdata/openpgp-encoded.mbox.tree
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-encrypted+signed.mbox b/framework/src/domain/mime/testdata/openpgp-encrypted+signed.mbox
index fbe5ce7f..fbe5ce7f 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-encrypted+signed.mbox
+++ b/framework/src/domain/mime/testdata/openpgp-encrypted+signed.mbox
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-encrypted+signed.mbox.html b/framework/src/domain/mime/testdata/openpgp-encrypted+signed.mbox.html
index 54c58b85..54c58b85 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-encrypted+signed.mbox.html
+++ b/framework/src/domain/mime/testdata/openpgp-encrypted+signed.mbox.html
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-encrypted+signed.mbox.tree b/framework/src/domain/mime/testdata/openpgp-encrypted+signed.mbox.tree
index 7d5bbeb7..7d5bbeb7 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-encrypted+signed.mbox.tree
+++ b/framework/src/domain/mime/testdata/openpgp-encrypted+signed.mbox.tree
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-encrypted-applemail.mbox b/framework/src/domain/mime/testdata/openpgp-encrypted-applemail.mbox
index f5d083ff..f5d083ff 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-encrypted-applemail.mbox
+++ b/framework/src/domain/mime/testdata/openpgp-encrypted-applemail.mbox
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-encrypted-applemail.mbox.html b/framework/src/domain/mime/testdata/openpgp-encrypted-applemail.mbox.html
index ca8d7fbb..ca8d7fbb 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-encrypted-applemail.mbox.html
+++ b/framework/src/domain/mime/testdata/openpgp-encrypted-applemail.mbox.html
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-encrypted-applemail.mbox.tree b/framework/src/domain/mime/testdata/openpgp-encrypted-applemail.mbox.tree
index 8ef3df2d..8ef3df2d 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-encrypted-applemail.mbox.tree
+++ b/framework/src/domain/mime/testdata/openpgp-encrypted-applemail.mbox.tree
diff --git a/framework/src/domain/mime/mimetreeparser/tests/data/openpgp-encrypted-attachment-and-non-encrypted-attachment.mbox b/framework/src/domain/mime/testdata/openpgp-encrypted-attachment-and-non-encrypted-attachment.mbox
index 2d9726ea..2d9726ea 100644
--- a/framework/src/domain/mime/mimetreeparser/tests/data/openpgp-encrypted-attachment-and-non-encrypted-attachment.mbox
+++ b/framework/src/domain/mime/testdata/openpgp-encrypted-attachment-and-non-encrypted-attachment.mbox
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-encrypted-attachment-and-non-encrypted-attachment.mbox.html b/framework/src/domain/mime/testdata/openpgp-encrypted-attachment-and-non-encrypted-attachment.mbox.html
index 092a3440..092a3440 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-encrypted-attachment-and-non-encrypted-attachment.mbox.html
+++ b/framework/src/domain/mime/testdata/openpgp-encrypted-attachment-and-non-encrypted-attachment.mbox.html
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-encrypted-attachment-and-non-encrypted-attachment.mbox.tree b/framework/src/domain/mime/testdata/openpgp-encrypted-attachment-and-non-encrypted-attachment.mbox.tree
index 473f0b10..473f0b10 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-encrypted-attachment-and-non-encrypted-attachment.mbox.tree
+++ b/framework/src/domain/mime/testdata/openpgp-encrypted-attachment-and-non-encrypted-attachment.mbox.tree
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-encrypted-attachment.mbox b/framework/src/domain/mime/testdata/openpgp-encrypted-attachment.mbox
index 4204fb0b..4204fb0b 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-encrypted-attachment.mbox
+++ b/framework/src/domain/mime/testdata/openpgp-encrypted-attachment.mbox
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-encrypted-attachment.mbox.html b/framework/src/domain/mime/testdata/openpgp-encrypted-attachment.mbox.html
index 2b266b02..2b266b02 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-encrypted-attachment.mbox.html
+++ b/framework/src/domain/mime/testdata/openpgp-encrypted-attachment.mbox.html
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-encrypted-attachment.mbox.tree b/framework/src/domain/mime/testdata/openpgp-encrypted-attachment.mbox.tree
index f433fd45..f433fd45 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-encrypted-attachment.mbox.tree
+++ b/framework/src/domain/mime/testdata/openpgp-encrypted-attachment.mbox.tree
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-encrypted-enigmail1.6.mbox b/framework/src/domain/mime/testdata/openpgp-encrypted-enigmail1.6.mbox
index 9afd17e3..9afd17e3 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-encrypted-enigmail1.6.mbox
+++ b/framework/src/domain/mime/testdata/openpgp-encrypted-enigmail1.6.mbox
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-encrypted-enigmail1.6.mbox.html b/framework/src/domain/mime/testdata/openpgp-encrypted-enigmail1.6.mbox.html
index 09d904bb..09d904bb 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-encrypted-enigmail1.6.mbox.html
+++ b/framework/src/domain/mime/testdata/openpgp-encrypted-enigmail1.6.mbox.html
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-encrypted-enigmail1.6.mbox.tree b/framework/src/domain/mime/testdata/openpgp-encrypted-enigmail1.6.mbox.tree
index 009ba99a..009ba99a 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-encrypted-enigmail1.6.mbox.tree
+++ b/framework/src/domain/mime/testdata/openpgp-encrypted-enigmail1.6.mbox.tree
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-encrypted-noData.mbox b/framework/src/domain/mime/testdata/openpgp-encrypted-noData.mbox
index c4f14226..c4f14226 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-encrypted-noData.mbox
+++ b/framework/src/domain/mime/testdata/openpgp-encrypted-noData.mbox
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-encrypted-noData.mbox.html b/framework/src/domain/mime/testdata/openpgp-encrypted-noData.mbox.html
index 52196784..52196784 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-encrypted-noData.mbox.html
+++ b/framework/src/domain/mime/testdata/openpgp-encrypted-noData.mbox.html
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-encrypted-noData.mbox.tree b/framework/src/domain/mime/testdata/openpgp-encrypted-noData.mbox.tree
index 79a20c8d..79a20c8d 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-encrypted-noData.mbox.tree
+++ b/framework/src/domain/mime/testdata/openpgp-encrypted-noData.mbox.tree
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-encrypted-non-encrypted-attachment.mbox b/framework/src/domain/mime/testdata/openpgp-encrypted-non-encrypted-attachment.mbox
index 2957bf3c..2957bf3c 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-encrypted-non-encrypted-attachment.mbox
+++ b/framework/src/domain/mime/testdata/openpgp-encrypted-non-encrypted-attachment.mbox
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-encrypted-non-encrypted-attachment.mbox.html b/framework/src/domain/mime/testdata/openpgp-encrypted-non-encrypted-attachment.mbox.html
index e20a9568..e20a9568 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-encrypted-non-encrypted-attachment.mbox.html
+++ b/framework/src/domain/mime/testdata/openpgp-encrypted-non-encrypted-attachment.mbox.html
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-encrypted-non-encrypted-attachment.mbox.tree b/framework/src/domain/mime/testdata/openpgp-encrypted-non-encrypted-attachment.mbox.tree
index c2a6ad01..c2a6ad01 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-encrypted-non-encrypted-attachment.mbox.tree
+++ b/framework/src/domain/mime/testdata/openpgp-encrypted-non-encrypted-attachment.mbox.tree
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-encrypted-partially-signed-attachments.mbox b/framework/src/domain/mime/testdata/openpgp-encrypted-partially-signed-attachments.mbox
index 222b5936..222b5936 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-encrypted-partially-signed-attachments.mbox
+++ b/framework/src/domain/mime/testdata/openpgp-encrypted-partially-signed-attachments.mbox
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-encrypted-partially-signed-attachments.mbox.html b/framework/src/domain/mime/testdata/openpgp-encrypted-partially-signed-attachments.mbox.html
index c0b9d79e..c0b9d79e 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-encrypted-partially-signed-attachments.mbox.html
+++ b/framework/src/domain/mime/testdata/openpgp-encrypted-partially-signed-attachments.mbox.html
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-encrypted-partially-signed-attachments.mbox.tree b/framework/src/domain/mime/testdata/openpgp-encrypted-partially-signed-attachments.mbox.tree
index 5cb83749..5cb83749 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-encrypted-partially-signed-attachments.mbox.tree
+++ b/framework/src/domain/mime/testdata/openpgp-encrypted-partially-signed-attachments.mbox.tree
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-encrypted-two-attachments.mbox b/framework/src/domain/mime/testdata/openpgp-encrypted-two-attachments.mbox
index c53e0916..c53e0916 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-encrypted-two-attachments.mbox
+++ b/framework/src/domain/mime/testdata/openpgp-encrypted-two-attachments.mbox
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-encrypted-two-attachments.mbox.html b/framework/src/domain/mime/testdata/openpgp-encrypted-two-attachments.mbox.html
index cca4c455..cca4c455 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-encrypted-two-attachments.mbox.html
+++ b/framework/src/domain/mime/testdata/openpgp-encrypted-two-attachments.mbox.html
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-encrypted-two-attachments.mbox.tree b/framework/src/domain/mime/testdata/openpgp-encrypted-two-attachments.mbox.tree
index 71a67b58..71a67b58 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-encrypted-two-attachments.mbox.tree
+++ b/framework/src/domain/mime/testdata/openpgp-encrypted-two-attachments.mbox.tree
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-encrypted.mbox b/framework/src/domain/mime/testdata/openpgp-encrypted.mbox
index 5102fa78..5102fa78 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-encrypted.mbox
+++ b/framework/src/domain/mime/testdata/openpgp-encrypted.mbox
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-encrypted.mbox.html b/framework/src/domain/mime/testdata/openpgp-encrypted.mbox.html
index ba0976cd..ba0976cd 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-encrypted.mbox.html
+++ b/framework/src/domain/mime/testdata/openpgp-encrypted.mbox.html
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-encrypted.mbox.inProgress.html b/framework/src/domain/mime/testdata/openpgp-encrypted.mbox.inProgress.html
index e5eb55d0..e5eb55d0 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-encrypted.mbox.inProgress.html
+++ b/framework/src/domain/mime/testdata/openpgp-encrypted.mbox.inProgress.html
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-encrypted.mbox.tree b/framework/src/domain/mime/testdata/openpgp-encrypted.mbox.tree
index 82f705c2..82f705c2 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-encrypted.mbox.tree
+++ b/framework/src/domain/mime/testdata/openpgp-encrypted.mbox.tree
diff --git a/framework/src/domain/mime/mimetreeparser/tests/data/openpgp-inline-charset-encrypted.mbox b/framework/src/domain/mime/testdata/openpgp-inline-charset-encrypted.mbox
index 8bd06910..8bd06910 100644
--- a/framework/src/domain/mime/mimetreeparser/tests/data/openpgp-inline-charset-encrypted.mbox
+++ b/framework/src/domain/mime/testdata/openpgp-inline-charset-encrypted.mbox
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-inline-charset-encrypted.mbox.html b/framework/src/domain/mime/testdata/openpgp-inline-charset-encrypted.mbox.html
index 344dc237..344dc237 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-inline-charset-encrypted.mbox.html
+++ b/framework/src/domain/mime/testdata/openpgp-inline-charset-encrypted.mbox.html
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-inline-charset-encrypted.mbox.inProgress.html b/framework/src/domain/mime/testdata/openpgp-inline-charset-encrypted.mbox.inProgress.html
index e5eb55d0..e5eb55d0 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-inline-charset-encrypted.mbox.inProgress.html
+++ b/framework/src/domain/mime/testdata/openpgp-inline-charset-encrypted.mbox.inProgress.html
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-inline-charset-encrypted.mbox.tree b/framework/src/domain/mime/testdata/openpgp-inline-charset-encrypted.mbox.tree
index ea8223fd..ea8223fd 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-inline-charset-encrypted.mbox.tree
+++ b/framework/src/domain/mime/testdata/openpgp-inline-charset-encrypted.mbox.tree
diff --git a/framework/src/domain/mime/mimetreeparser/tests/data/openpgp-inline-encrypted+nonenc.mbox b/framework/src/domain/mime/testdata/openpgp-inline-encrypted+nonenc.mbox
index b98dc336..b98dc336 100644
--- a/framework/src/domain/mime/mimetreeparser/tests/data/openpgp-inline-encrypted+nonenc.mbox
+++ b/framework/src/domain/mime/testdata/openpgp-inline-encrypted+nonenc.mbox
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-inline-signed-broken.mbox b/framework/src/domain/mime/testdata/openpgp-inline-signed-broken.mbox
index fc0d2df9..fc0d2df9 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-inline-signed-broken.mbox
+++ b/framework/src/domain/mime/testdata/openpgp-inline-signed-broken.mbox
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-inline-signed.mbox b/framework/src/domain/mime/testdata/openpgp-inline-signed.mbox
index 6099a51f..6099a51f 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-inline-signed.mbox
+++ b/framework/src/domain/mime/testdata/openpgp-inline-signed.mbox
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-inline-signed.mbox.html b/framework/src/domain/mime/testdata/openpgp-inline-signed.mbox.html
index d32d0235..d32d0235 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-inline-signed.mbox.html
+++ b/framework/src/domain/mime/testdata/openpgp-inline-signed.mbox.html
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-inline-signed.mbox.inProgress.html b/framework/src/domain/mime/testdata/openpgp-inline-signed.mbox.inProgress.html
index 45a999d3..45a999d3 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-inline-signed.mbox.inProgress.html
+++ b/framework/src/domain/mime/testdata/openpgp-inline-signed.mbox.inProgress.html
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-inline-signed.mbox.tree b/framework/src/domain/mime/testdata/openpgp-inline-signed.mbox.tree
index 23e99880..23e99880 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-inline-signed.mbox.tree
+++ b/framework/src/domain/mime/testdata/openpgp-inline-signed.mbox.tree
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-inline-wrong-charset-encrypted.mbox b/framework/src/domain/mime/testdata/openpgp-inline-wrong-charset-encrypted.mbox
index 5ecfc612..5ecfc612 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-inline-wrong-charset-encrypted.mbox
+++ b/framework/src/domain/mime/testdata/openpgp-inline-wrong-charset-encrypted.mbox
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-inline-wrong-charset-encrypted.mbox.html b/framework/src/domain/mime/testdata/openpgp-inline-wrong-charset-encrypted.mbox.html
index 3ed4e0fb..3ed4e0fb 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-inline-wrong-charset-encrypted.mbox.html
+++ b/framework/src/domain/mime/testdata/openpgp-inline-wrong-charset-encrypted.mbox.html
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-inline-wrong-charset-encrypted.mbox.tree b/framework/src/domain/mime/testdata/openpgp-inline-wrong-charset-encrypted.mbox.tree
index ea8223fd..ea8223fd 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-inline-wrong-charset-encrypted.mbox.tree
+++ b/framework/src/domain/mime/testdata/openpgp-inline-wrong-charset-encrypted.mbox.tree
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-signed-apple.mbox b/framework/src/domain/mime/testdata/openpgp-signed-apple.mbox
index ba85df86..ba85df86 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-signed-apple.mbox
+++ b/framework/src/domain/mime/testdata/openpgp-signed-apple.mbox
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-signed-apple.mbox.html b/framework/src/domain/mime/testdata/openpgp-signed-apple.mbox.html
index 234eaae4..234eaae4 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-signed-apple.mbox.html
+++ b/framework/src/domain/mime/testdata/openpgp-signed-apple.mbox.html
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-signed-apple.mbox.inProgress.html b/framework/src/domain/mime/testdata/openpgp-signed-apple.mbox.inProgress.html
index b5236fe4..b5236fe4 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-signed-apple.mbox.inProgress.html
+++ b/framework/src/domain/mime/testdata/openpgp-signed-apple.mbox.inProgress.html
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-signed-apple.mbox.tree b/framework/src/domain/mime/testdata/openpgp-signed-apple.mbox.tree
index 3ade4efe..3ade4efe 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-signed-apple.mbox.tree
+++ b/framework/src/domain/mime/testdata/openpgp-signed-apple.mbox.tree
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-signed-base64-mailman-footer.mbox b/framework/src/domain/mime/testdata/openpgp-signed-base64-mailman-footer.mbox
index 70bf4ef8..70bf4ef8 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-signed-base64-mailman-footer.mbox
+++ b/framework/src/domain/mime/testdata/openpgp-signed-base64-mailman-footer.mbox
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-signed-base64-mailman-footer.mbox.html b/framework/src/domain/mime/testdata/openpgp-signed-base64-mailman-footer.mbox.html
index 50eddaa6..50eddaa6 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-signed-base64-mailman-footer.mbox.html
+++ b/framework/src/domain/mime/testdata/openpgp-signed-base64-mailman-footer.mbox.html
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-signed-base64-mailman-footer.mbox.tree b/framework/src/domain/mime/testdata/openpgp-signed-base64-mailman-footer.mbox.tree
index 2753978c..2753978c 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-signed-base64-mailman-footer.mbox.tree
+++ b/framework/src/domain/mime/testdata/openpgp-signed-base64-mailman-footer.mbox.tree
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-signed-encrypted-two-attachments.mbox b/framework/src/domain/mime/testdata/openpgp-signed-encrypted-two-attachments.mbox
index 7939af83..7939af83 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-signed-encrypted-two-attachments.mbox
+++ b/framework/src/domain/mime/testdata/openpgp-signed-encrypted-two-attachments.mbox
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-signed-encrypted-two-attachments.mbox.html b/framework/src/domain/mime/testdata/openpgp-signed-encrypted-two-attachments.mbox.html
index 53856e74..53856e74 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-signed-encrypted-two-attachments.mbox.html
+++ b/framework/src/domain/mime/testdata/openpgp-signed-encrypted-two-attachments.mbox.html
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-signed-encrypted-two-attachments.mbox.tree b/framework/src/domain/mime/testdata/openpgp-signed-encrypted-two-attachments.mbox.tree
index 6705a4d7..6705a4d7 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-signed-encrypted-two-attachments.mbox.tree
+++ b/framework/src/domain/mime/testdata/openpgp-signed-encrypted-two-attachments.mbox.tree
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-signed-encrypted.mbox b/framework/src/domain/mime/testdata/openpgp-signed-encrypted.mbox
index 6d723d52..6d723d52 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-signed-encrypted.mbox
+++ b/framework/src/domain/mime/testdata/openpgp-signed-encrypted.mbox
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-signed-encrypted.mbox.html b/framework/src/domain/mime/testdata/openpgp-signed-encrypted.mbox.html
index 86a964b8..86a964b8 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-signed-encrypted.mbox.html
+++ b/framework/src/domain/mime/testdata/openpgp-signed-encrypted.mbox.html
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-signed-encrypted.mbox.tree b/framework/src/domain/mime/testdata/openpgp-signed-encrypted.mbox.tree
index 7d5bbeb7..7d5bbeb7 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-signed-encrypted.mbox.tree
+++ b/framework/src/domain/mime/testdata/openpgp-signed-encrypted.mbox.tree
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-signed-mailinglist+additional-children.mbox b/framework/src/domain/mime/testdata/openpgp-signed-mailinglist+additional-children.mbox
index dbca8d45..dbca8d45 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-signed-mailinglist+additional-children.mbox
+++ b/framework/src/domain/mime/testdata/openpgp-signed-mailinglist+additional-children.mbox
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-signed-mailinglist+additional-children.mbox.html b/framework/src/domain/mime/testdata/openpgp-signed-mailinglist+additional-children.mbox.html
index a95252e4..a95252e4 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-signed-mailinglist+additional-children.mbox.html
+++ b/framework/src/domain/mime/testdata/openpgp-signed-mailinglist+additional-children.mbox.html
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-signed-mailinglist+additional-children.mbox.tree b/framework/src/domain/mime/testdata/openpgp-signed-mailinglist+additional-children.mbox.tree
index 906e6274..906e6274 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-signed-mailinglist+additional-children.mbox.tree
+++ b/framework/src/domain/mime/testdata/openpgp-signed-mailinglist+additional-children.mbox.tree
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-signed-mailinglist+old.mbox b/framework/src/domain/mime/testdata/openpgp-signed-mailinglist+old.mbox
index 362dff3e..362dff3e 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-signed-mailinglist+old.mbox
+++ b/framework/src/domain/mime/testdata/openpgp-signed-mailinglist+old.mbox
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-signed-mailinglist+old.mbox.html b/framework/src/domain/mime/testdata/openpgp-signed-mailinglist+old.mbox.html
index 59c6d690..59c6d690 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-signed-mailinglist+old.mbox.html
+++ b/framework/src/domain/mime/testdata/openpgp-signed-mailinglist+old.mbox.html
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-signed-mailinglist+old.mbox.tree b/framework/src/domain/mime/testdata/openpgp-signed-mailinglist+old.mbox.tree
index c8310bc1..c8310bc1 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-signed-mailinglist+old.mbox.tree
+++ b/framework/src/domain/mime/testdata/openpgp-signed-mailinglist+old.mbox.tree
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-signed-mailinglist.mbox b/framework/src/domain/mime/testdata/openpgp-signed-mailinglist.mbox
index 8adb9f4c..8adb9f4c 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-signed-mailinglist.mbox
+++ b/framework/src/domain/mime/testdata/openpgp-signed-mailinglist.mbox
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-signed-mailinglist.mbox.html b/framework/src/domain/mime/testdata/openpgp-signed-mailinglist.mbox.html
index 7acb6fbf..7acb6fbf 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-signed-mailinglist.mbox.html
+++ b/framework/src/domain/mime/testdata/openpgp-signed-mailinglist.mbox.html
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-signed-mailinglist.mbox.inProgress.html b/framework/src/domain/mime/testdata/openpgp-signed-mailinglist.mbox.inProgress.html
index 77c6b29b..77c6b29b 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-signed-mailinglist.mbox.inProgress.html
+++ b/framework/src/domain/mime/testdata/openpgp-signed-mailinglist.mbox.inProgress.html
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-signed-mailinglist.mbox.tree b/framework/src/domain/mime/testdata/openpgp-signed-mailinglist.mbox.tree
index 2753978c..2753978c 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-signed-mailinglist.mbox.tree
+++ b/framework/src/domain/mime/testdata/openpgp-signed-mailinglist.mbox.tree
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-signed-no-protocol.mbox b/framework/src/domain/mime/testdata/openpgp-signed-no-protocol.mbox
index e50879b9..e50879b9 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-signed-no-protocol.mbox
+++ b/framework/src/domain/mime/testdata/openpgp-signed-no-protocol.mbox
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-signed-no-protocol.mbox.html b/framework/src/domain/mime/testdata/openpgp-signed-no-protocol.mbox.html
index 4a5f337b..4a5f337b 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-signed-no-protocol.mbox.html
+++ b/framework/src/domain/mime/testdata/openpgp-signed-no-protocol.mbox.html
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-signed-no-protocol.mbox.tree b/framework/src/domain/mime/testdata/openpgp-signed-no-protocol.mbox.tree
index d824a11b..d824a11b 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-signed-no-protocol.mbox.tree
+++ b/framework/src/domain/mime/testdata/openpgp-signed-no-protocol.mbox.tree
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-signed-two-attachments.mbox b/framework/src/domain/mime/testdata/openpgp-signed-two-attachments.mbox
index 462f62a3..462f62a3 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-signed-two-attachments.mbox
+++ b/framework/src/domain/mime/testdata/openpgp-signed-two-attachments.mbox
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-signed-two-attachments.mbox.html b/framework/src/domain/mime/testdata/openpgp-signed-two-attachments.mbox.html
index 06718641..06718641 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-signed-two-attachments.mbox.html
+++ b/framework/src/domain/mime/testdata/openpgp-signed-two-attachments.mbox.html
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-signed-two-attachments.mbox.tree b/framework/src/domain/mime/testdata/openpgp-signed-two-attachments.mbox.tree
index 7133f4be..7133f4be 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/openpgp-signed-two-attachments.mbox.tree
+++ b/framework/src/domain/mime/testdata/openpgp-signed-two-attachments.mbox.tree
diff --git a/framework/src/domain/mime/mimetreeparser/tests/data/plaintext.mbox b/framework/src/domain/mime/testdata/plaintext.mbox
index d185b1c1..d185b1c1 100644
--- a/framework/src/domain/mime/mimetreeparser/tests/data/plaintext.mbox
+++ b/framework/src/domain/mime/testdata/plaintext.mbox
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/signed-forward-openpgp-signed-encrypted.mbox b/framework/src/domain/mime/testdata/signed-forward-openpgp-signed-encrypted.mbox
index 9b715161..9b715161 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/signed-forward-openpgp-signed-encrypted.mbox
+++ b/framework/src/domain/mime/testdata/signed-forward-openpgp-signed-encrypted.mbox
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/signed-forward-openpgp-signed-encrypted.mbox.html b/framework/src/domain/mime/testdata/signed-forward-openpgp-signed-encrypted.mbox.html
index b91772b7..b91772b7 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/signed-forward-openpgp-signed-encrypted.mbox.html
+++ b/framework/src/domain/mime/testdata/signed-forward-openpgp-signed-encrypted.mbox.html
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/signed-forward-openpgp-signed-encrypted.mbox.tree b/framework/src/domain/mime/testdata/signed-forward-openpgp-signed-encrypted.mbox.tree
index 818f894c..818f894c 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/signed-forward-openpgp-signed-encrypted.mbox.tree
+++ b/framework/src/domain/mime/testdata/signed-forward-openpgp-signed-encrypted.mbox.tree
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/smime-cert.mbox b/framework/src/domain/mime/testdata/smime-cert.mbox
index b3c8a19e..b3c8a19e 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/smime-cert.mbox
+++ b/framework/src/domain/mime/testdata/smime-cert.mbox
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/smime-cert.mbox.html b/framework/src/domain/mime/testdata/smime-cert.mbox.html
index 1b86390f..1b86390f 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/smime-cert.mbox.html
+++ b/framework/src/domain/mime/testdata/smime-cert.mbox.html
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/smime-cert.mbox.tree b/framework/src/domain/mime/testdata/smime-cert.mbox.tree
index c34c2eca..c34c2eca 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/smime-cert.mbox.tree
+++ b/framework/src/domain/mime/testdata/smime-cert.mbox.tree
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/smime-encrypted-octet-stream.mbox b/framework/src/domain/mime/testdata/smime-encrypted-octet-stream.mbox
index 887fe358..887fe358 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/smime-encrypted-octet-stream.mbox
+++ b/framework/src/domain/mime/testdata/smime-encrypted-octet-stream.mbox
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/smime-encrypted-octet-stream.mbox.html b/framework/src/domain/mime/testdata/smime-encrypted-octet-stream.mbox.html
index 6b08c47e..6b08c47e 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/smime-encrypted-octet-stream.mbox.html
+++ b/framework/src/domain/mime/testdata/smime-encrypted-octet-stream.mbox.html
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/smime-encrypted-octet-stream.mbox.tree b/framework/src/domain/mime/testdata/smime-encrypted-octet-stream.mbox.tree
index 82f705c2..82f705c2 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/smime-encrypted-octet-stream.mbox.tree
+++ b/framework/src/domain/mime/testdata/smime-encrypted-octet-stream.mbox.tree
diff --git a/framework/src/domain/mime/mimetreeparser/tests/data/smime-encrypted.mbox b/framework/src/domain/mime/testdata/smime-encrypted.mbox
index 6b6d6a0d..6b6d6a0d 100644
--- a/framework/src/domain/mime/mimetreeparser/tests/data/smime-encrypted.mbox
+++ b/framework/src/domain/mime/testdata/smime-encrypted.mbox
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/smime-encrypted.mbox.html b/framework/src/domain/mime/testdata/smime-encrypted.mbox.html
index 6b08c47e..6b08c47e 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/smime-encrypted.mbox.html
+++ b/framework/src/domain/mime/testdata/smime-encrypted.mbox.html
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/smime-encrypted.mbox.inProgress.html b/framework/src/domain/mime/testdata/smime-encrypted.mbox.inProgress.html
index e5eb55d0..e5eb55d0 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/smime-encrypted.mbox.inProgress.html
+++ b/framework/src/domain/mime/testdata/smime-encrypted.mbox.inProgress.html
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/smime-encrypted.mbox.tree b/framework/src/domain/mime/testdata/smime-encrypted.mbox.tree
index 82f705c2..82f705c2 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/smime-encrypted.mbox.tree
+++ b/framework/src/domain/mime/testdata/smime-encrypted.mbox.tree
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/smime-opaque-enc+sign.mbox b/framework/src/domain/mime/testdata/smime-opaque-enc+sign.mbox
index be75c1e2..be75c1e2 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/smime-opaque-enc+sign.mbox
+++ b/framework/src/domain/mime/testdata/smime-opaque-enc+sign.mbox
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/smime-opaque-enc+sign.mbox.html b/framework/src/domain/mime/testdata/smime-opaque-enc+sign.mbox.html
index 7f60c04f..7f60c04f 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/smime-opaque-enc+sign.mbox.html
+++ b/framework/src/domain/mime/testdata/smime-opaque-enc+sign.mbox.html
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/smime-opaque-enc+sign.mbox.tree b/framework/src/domain/mime/testdata/smime-opaque-enc+sign.mbox.tree
index 7d5bbeb7..7d5bbeb7 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/smime-opaque-enc+sign.mbox.tree
+++ b/framework/src/domain/mime/testdata/smime-opaque-enc+sign.mbox.tree
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/smime-opaque-sign.mbox b/framework/src/domain/mime/testdata/smime-opaque-sign.mbox
index 6e1739ac..6e1739ac 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/smime-opaque-sign.mbox
+++ b/framework/src/domain/mime/testdata/smime-opaque-sign.mbox
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/smime-opaque-sign.mbox.html b/framework/src/domain/mime/testdata/smime-opaque-sign.mbox.html
index 6088bc72..6088bc72 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/smime-opaque-sign.mbox.html
+++ b/framework/src/domain/mime/testdata/smime-opaque-sign.mbox.html
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/smime-opaque-sign.mbox.inProgress.html b/framework/src/domain/mime/testdata/smime-opaque-sign.mbox.inProgress.html
index 45a999d3..45a999d3 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/smime-opaque-sign.mbox.inProgress.html
+++ b/framework/src/domain/mime/testdata/smime-opaque-sign.mbox.inProgress.html
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/smime-opaque-sign.mbox.tree b/framework/src/domain/mime/testdata/smime-opaque-sign.mbox.tree
index a469bb76..a469bb76 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/smime-opaque-sign.mbox.tree
+++ b/framework/src/domain/mime/testdata/smime-opaque-sign.mbox.tree
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/smime-opaque-signed-encrypted-attachment.mbox b/framework/src/domain/mime/testdata/smime-opaque-signed-encrypted-attachment.mbox
index 2b1a0761..2b1a0761 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/smime-opaque-signed-encrypted-attachment.mbox
+++ b/framework/src/domain/mime/testdata/smime-opaque-signed-encrypted-attachment.mbox
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/smime-signed-apple.mbox b/framework/src/domain/mime/testdata/smime-signed-apple.mbox
index d5cd06f1..d5cd06f1 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/smime-signed-apple.mbox
+++ b/framework/src/domain/mime/testdata/smime-signed-apple.mbox
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/smime-signed-apple.mbox.html b/framework/src/domain/mime/testdata/smime-signed-apple.mbox.html
index 11652a14..11652a14 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/smime-signed-apple.mbox.html
+++ b/framework/src/domain/mime/testdata/smime-signed-apple.mbox.html
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/smime-signed-apple.mbox.inProgress.html b/framework/src/domain/mime/testdata/smime-signed-apple.mbox.inProgress.html
index 5b57b937..5b57b937 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/smime-signed-apple.mbox.inProgress.html
+++ b/framework/src/domain/mime/testdata/smime-signed-apple.mbox.inProgress.html
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/smime-signed-apple.mbox.tree b/framework/src/domain/mime/testdata/smime-signed-apple.mbox.tree
index 3ade4efe..3ade4efe 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/smime-signed-apple.mbox.tree
+++ b/framework/src/domain/mime/testdata/smime-signed-apple.mbox.tree
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/smime-signed-encrypted.mbox b/framework/src/domain/mime/testdata/smime-signed-encrypted.mbox
index 49857e15..49857e15 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/smime-signed-encrypted.mbox
+++ b/framework/src/domain/mime/testdata/smime-signed-encrypted.mbox
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/smime-signed-encrypted.mbox.html b/framework/src/domain/mime/testdata/smime-signed-encrypted.mbox.html
index e13d6841..e13d6841 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/smime-signed-encrypted.mbox.html
+++ b/framework/src/domain/mime/testdata/smime-signed-encrypted.mbox.html
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/smime-signed-encrypted.mbox.tree b/framework/src/domain/mime/testdata/smime-signed-encrypted.mbox.tree
index 7d5bbeb7..7d5bbeb7 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/smime-signed-encrypted.mbox.tree
+++ b/framework/src/domain/mime/testdata/smime-signed-encrypted.mbox.tree
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/text+html-maillinglist.mbox b/framework/src/domain/mime/testdata/text+html-maillinglist.mbox
index f9c6387f..f9c6387f 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/text+html-maillinglist.mbox
+++ b/framework/src/domain/mime/testdata/text+html-maillinglist.mbox
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/text+html-maillinglist.mbox.html b/framework/src/domain/mime/testdata/text+html-maillinglist.mbox.html
index 2b5af631..2b5af631 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/text+html-maillinglist.mbox.html
+++ b/framework/src/domain/mime/testdata/text+html-maillinglist.mbox.html
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/data/text+html-maillinglist.mbox.tree b/framework/src/domain/mime/testdata/text+html-maillinglist.mbox.tree
index 3738cb37..3738cb37 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/data/text+html-maillinglist.mbox.tree
+++ b/framework/src/domain/mime/testdata/text+html-maillinglist.mbox.tree