summaryrefslogtreecommitdiffstats
path: root/comm/mail/test/browser/openpgp/data
diff options
context:
space:
mode:
Diffstat (limited to 'comm/mail/test/browser/openpgp/data')
-rw-r--r--comm/mail/test/browser/openpgp/data/eml/alice-broken-exchange.eml64
-rw-r--r--comm/mail/test/browser/openpgp/data/eml/alice-utf.eml23
-rw-r--r--comm/mail/test/browser/openpgp/data/eml/bob-enc-html-nbsp.eml38
-rw-r--r--comm/mail/test/browser/openpgp/data/eml/bob-enc-inline-nbsp-qp.eml17
-rw-r--r--comm/mail/test/browser/openpgp/data/eml/bob-to-alice-signed-damaged-signature.eml55
-rw-r--r--comm/mail/test/browser/openpgp/data/eml/enc-to-carol@pgp.icu-revoked.eml73
-rw-r--r--comm/mail/test/browser/openpgp/data/eml/encrypted-and-signed-alice-to-bob-nonascii.eml94
-rw-r--r--comm/mail/test/browser/openpgp/data/eml/eve-duplicate.eml122
-rw-r--r--comm/mail/test/browser/openpgp/data/eml/fwd-unsigned-encrypted.eml75
-rw-r--r--comm/mail/test/browser/openpgp/data/eml/outer-pgp-sig-inner-pgp-enc-sig.eml106
-rw-r--r--comm/mail/test/browser/openpgp/data/eml/outer-pgp-sig-inner-pgp-enc-with-mixed.eml92
-rw-r--r--comm/mail/test/browser/openpgp/data/eml/outer-pgp-sig-inner-pgp-enc.eml82
-rw-r--r--comm/mail/test/browser/openpgp/data/eml/outer-pgp-sig-inner-smime-enc-sig.eml113
-rw-r--r--comm/mail/test/browser/openpgp/data/eml/outer-pgp-sig-inner-smime-enc.eml55
-rw-r--r--comm/mail/test/browser/openpgp/data/eml/outer-smime-bad-sig-inner-pgp-enc-sig-with-mixed.eml135
-rw-r--r--comm/mail/test/browser/openpgp/data/eml/outer-smime-bad-sig-inner-pgp-enc-sig.eml125
-rw-r--r--comm/mail/test/browser/openpgp/data/eml/outer-smime-bad-sig-inner-pgp-enc.eml101
-rw-r--r--comm/mail/test/browser/openpgp/data/eml/outer-smime-bad-sig-inner-smime-enc-sig.eml132
-rw-r--r--comm/mail/test/browser/openpgp/data/eml/outer-smime-bad-sig-inner-smime-enc.eml74
-rw-r--r--comm/mail/test/browser/openpgp/data/eml/partial-encrypt-for-alice-html.eml31
-rw-r--r--comm/mail/test/browser/openpgp/data/eml/partial-encrypt-for-alice-plaintext.eml19
-rw-r--r--comm/mail/test/browser/openpgp/data/eml/partial-encrypt-for-carol-html.eml41
-rw-r--r--comm/mail/test/browser/openpgp/data/eml/partial-encrypt-for-carol-plaintext.eml29
-rw-r--r--comm/mail/test/browser/openpgp/data/eml/partial-signed-from-bob-html.eml41
-rw-r--r--comm/mail/test/browser/openpgp/data/eml/partial-signed-from-bob-plaintext.eml29
-rw-r--r--comm/mail/test/browser/openpgp/data/eml/partial-signed-from-carol-html.eml44
-rw-r--r--comm/mail/test/browser/openpgp/data/eml/partial-signed-from-carol-plaintext.eml32
-rw-r--r--comm/mail/test/browser/openpgp/data/eml/signed-by-0x3099ff1238852b9f-encrypted-to-0xf231550c4f47e38e-with-key.eml187
-rw-r--r--comm/mail/test/browser/openpgp/data/eml/signed-by-0x3099ff1238852b9f-encrypted-to-0xf231550c4f47e38e.eml78
-rw-r--r--comm/mail/test/browser/openpgp/data/eml/signed-by-0x3099ff1238852b9f-to-0xf231550c4f47e38e-unencrypted-with-key.eml197
-rw-r--r--comm/mail/test/browser/openpgp/data/eml/signed-by-0x3099ff1238852b9f-to-0xf231550c4f47e38e-unencrypted.eml57
-rw-r--r--comm/mail/test/browser/openpgp/data/eml/signed-by-0xfbfcc82a015e7330-encrypted-to-0xf231550c4f47e38e-multi-from.eml74
-rw-r--r--comm/mail/test/browser/openpgp/data/eml/signed-by-0xfbfcc82a015e7330-encrypted-to-0xf231550c4f47e38e-with-key.eml160
-rw-r--r--comm/mail/test/browser/openpgp/data/eml/signed-by-0xfbfcc82a015e7330-encrypted-to-0xf231550c4f47e38e.eml73
-rw-r--r--comm/mail/test/browser/openpgp/data/eml/signed-by-0xfbfcc82a015e7330-to-0xf231550c4f47e38e-unencrypted-with-key.eml167
-rw-r--r--comm/mail/test/browser/openpgp/data/eml/signed-by-0xfbfcc82a015e7330-to-0xf231550c4f47e38e-unencrypted.eml54
-rw-r--r--comm/mail/test/browser/openpgp/data/eml/signed-encrypted-autocrypt-gossip.eml174
-rw-r--r--comm/mail/test/browser/openpgp/data/eml/signed-inline-indented.eml23
-rw-r--r--comm/mail/test/browser/openpgp/data/eml/signed-mismatch-email-date.eml54
-rw-r--r--comm/mail/test/browser/openpgp/data/eml/signed-with-mailman-footer.eml75
-rw-r--r--comm/mail/test/browser/openpgp/data/eml/unrelated-and-fake-keys-attached.eml176
-rw-r--r--comm/mail/test/browser/openpgp/data/eml/unsigned-encrypted-to-0xf231550c4f47e38e-from-0x3099ff1238852b9f-with-key.eml163
-rw-r--r--comm/mail/test/browser/openpgp/data/eml/unsigned-encrypted-to-0xf231550c4f47e38e-from-0x3099ff1238852b9f.eml54
-rw-r--r--comm/mail/test/browser/openpgp/data/eml/unsigned-encrypted-to-0xf231550c4f47e38e-from-0xfbfcc82a015e7330-with-key.eml139
-rw-r--r--comm/mail/test/browser/openpgp/data/eml/unsigned-encrypted-to-0xf231550c4f47e38e-from-0xfbfcc82a015e7330.eml52
-rw-r--r--comm/mail/test/browser/openpgp/data/eml/unsigned-unencrypted-0x3099ff1238852b9f-autocrypt.eml55
-rw-r--r--comm/mail/test/browser/openpgp/data/eml/unsigned-unencrypted-from-bob-to-alice.eml17
-rw-r--r--comm/mail/test/browser/openpgp/data/eml/unsigned-unencrypted-key-0x1f10171bfb881b1c-attached.eml69
-rw-r--r--comm/mail/test/browser/openpgp/data/keys/alice@openpgp.example-0xf231550c4f47e38e-pub.asc15
-rw-r--r--comm/mail/test/browser/openpgp/data/keys/alice@openpgp.example-0xf231550c4f47e38e-rev.asc9
-rw-r--r--comm/mail/test/browser/openpgp/data/keys/alice@openpgp.example-0xf231550c4f47e38e-secret-with-pp.asc17
-rw-r--r--comm/mail/test/browser/openpgp/data/keys/alice@openpgp.example-0xf231550c4f47e38e-secret.asc17
-rw-r--r--comm/mail/test/browser/openpgp/data/keys/bob@openpgp.example-0xfbfcc82a015e7330-pub.asc43
-rw-r--r--comm/mail/test/browser/openpgp/data/keys/bob@openpgp.example-0xfbfcc82a015e7330-rev.asc16
-rw-r--r--comm/mail/test/browser/openpgp/data/keys/bob@openpgp.example-0xfbfcc82a015e7330-secret-with-pp.asc83
-rw-r--r--comm/mail/test/browser/openpgp/data/keys/bob@openpgp.example-0xfbfcc82a015e7330-secret.asc83
-rw-r--r--comm/mail/test/browser/openpgp/data/keys/carol@example.com-0x3099ff1238852b9f-pub.asc51
-rw-r--r--comm/mail/test/browser/openpgp/data/keys/carol@example.com-0x3099ff1238852b9f-secret.asc107
-rw-r--r--comm/mail/test/browser/openpgp/data/keys/carol@pgp.icu-0xEF2FD01608AFD744-revoked-secret.asc90
-rw-r--r--comm/mail/test/browser/openpgp/data/keys/eddie@openpgp.example-0x15e9357d2c2395c0-pub.asc13
-rw-r--r--comm/mail/test/browser/openpgp/data/keys/eddie@openpgp.example-0x15e9357d2c2395c0-secret.asc15
-rw-r--r--comm/mail/test/browser/openpgp/data/keys/encryption-subkey-bad.pgpbin0 -> 749 bytes
-rw-r--r--comm/mail/test/browser/openpgp/data/keys/heisenberg-signed-by-pinkman.asc37
-rw-r--r--comm/mail/test/browser/openpgp/data/keys/invalid-pubkey-nosigs.pgpbin0 -> 285 bytes
-rw-r--r--comm/mail/test/browser/openpgp/data/keys/key-binary.gpgbin0 -> 414 bytes
-rw-r--r--comm/mail/test/browser/openpgp/data/keys/key-with-utf8-comment.asc15
-rw-r--r--comm/mail/test/browser/openpgp/data/keys/kylie-0x1AABD9FAD1E411DD-secret-subkeys.asc23
-rw-r--r--comm/mail/test/browser/openpgp/data/keys/ofelia-public.asc68
-rw-r--r--comm/mail/test/browser/openpgp/data/keys/ofelia-secret-subkeys.asc108
-rw-r--r--comm/mail/test/browser/openpgp/data/keys/ofelia-secret.asc129
-rw-r--r--comm/mail/test/browser/openpgp/data/keys/secret-for-preferred-sign-subkey-is-missing--a-without-second-sub--sec.asc129
-rw-r--r--comm/mail/test/browser/openpgp/data/keys/secret-for-preferred-sign-subkey-is-missing--b-with-second-sub--pub.asc95
-rw-r--r--comm/mail/test/browser/openpgp/data/keys/two-enc-subkeys-one-deleted.sec.asc35
-rw-r--r--comm/mail/test/browser/openpgp/data/keys/two-enc-subkeys-still-both.pub.asc31
-rw-r--r--comm/mail/test/browser/openpgp/data/keys/untweaked-secret.asc15
-rw-r--r--comm/mail/test/browser/openpgp/data/smime/Bob.p12bin0 -> 3666 bytes
-rw-r--r--comm/mail/test/browser/openpgp/data/smime/alice.env.eml25
77 files changed, 5209 insertions, 0 deletions
diff --git a/comm/mail/test/browser/openpgp/data/eml/alice-broken-exchange.eml b/comm/mail/test/browser/openpgp/data/eml/alice-broken-exchange.eml
new file mode 100644
index 0000000000..52c38a2668
--- /dev/null
+++ b/comm/mail/test/browser/openpgp/data/eml/alice-broken-exchange.eml
@@ -0,0 +1,64 @@
+From: "Alice Lovelace" <alice@openpgp.example>
+To: "Alice Lovelace" <alice@openpgp.example>
+Subject: broken exchange test message
+Date: Wed, 28 Oct 2020 01:23:45 +0000
+Content-Type: multipart/mixed;
+ boundary="_003_38fbdabc0a957344544c1642f2e764cd1234567890_"
+MIME-Version: 1.0
+
+--_003_38fbdabc0a957344544c1642f2e764cd1234567890_
+Content-Type: text/plain; charset="us-ascii"
+Content-Transfer-Encoding: quoted-printable
+
+
+--_003_38fbdabc0a957344544c1642f2e764cd1234567890_
+Content-Type: application/pgp-encrypted; name="PGPMIME version identification"
+Content-Description: PGP/MIME version identification
+Content-Disposition: attachment; filename="PGPMIME version identification";
+ size=12; creation-date="Wed, 28 Oct 2020 01:23:45 GMT";
+ modification-date="Wed, 28 Oct 2020 01:23:45 GMT"
+Content-ID: <ECC4CBEC65D5CD42A8BF99DC0A800A0F@namprd00.prod.outlook.com>
+Content-Transfer-Encoding: base64
+
+VmVyc2lvbjogMQ0K
+
+--_003_38fbdabc0a957344544c1642f2e764cd1234567890_
+Content-Type: application/octet-stream; name="encrypted.asc"
+Content-Description: OpenPGP encrypted message.asc
+Content-Disposition: attachment; filename="encrypted.asc";
+ creation-date="Wed, 20 May 2020 19:11:08 GMT";
+ modification-date="Wed, 20 May 2020 19:11:08 GMT"
+Content-ID: <3A449618AD0B6A43AE8979E0E971B0FF@namprd00.prod.outlook.com>
+Content-Transfer-Encoding: base64
+
+LS0tLS1CRUdJTiBQR1AgTUVTU0FHRS0tLS0tCgpoRjREUjJiMnVkWHlIcllTQVFk
+QS9ZM0VaZlp4SVM1WlRPcmx3NkVnTkFMKzhENnV2cGVpTWdSRUxzSDFQemd3Ck1N
+d3ZxMnFUT01DaGJUd0RQSGY0WDVETGpZbXowWnN5TWlJY3BzNXo4ZU5XQ0Jyd01k
+ODBtWGlKem8vM0ZCaGkKMHVrQmVaSkFTOUlvTE5DbnRZNUpqWWljbTZZSnBHSGVH
+azA3VUN5dENYUTFEZmF5OWk1cHc5Nk54UTZicE5PSgpFamttRmlEYk1JaExnM25C
+TjVRN2ZzZ01WbFBxMTNTbmJaMmVVZXdRVHVESG10dlByUzFHRmFROExBclFRNVdU
+CjJyampkUmZ1Q040MmNXeUszSHNUNVNMZDRkOTVjZm1CeTIrRnkwQ09tZU5obmRq
+aGxPQWlEL2dOUWE4TVAzYW4KWlQ0OVlmbDdYdHp2Yjh0V0dSL1IzSDFBMU9wYnEz
+d3BrQm1hNlpXMzBvcG9rRlNkYkRqK3pTNlhmNWVmTkVLWApJZFpVQTg1U1hYRjAw
+RWFSZU9tdFQ1WTJLZWMyS1dlUXYybmlVMGRNN0FMNjFGQmw3VXVvaUJDc1IwaGRa
+OCtTClR1UElQa0daWnlSdk1nU3ZTMjduV0lNSUZvdThzeVlTdTg0MElzeHRWSThk
+SEFqM0RvbUNXa20rMnJXaDZ3cWkKM29xZDhOK1QvdGZ3ZFdoMUJnNVpRTm40SFF6
+WXhuYVlqZk1mNFVYMS9RbjFVUmtISnErMXkwYm1reDI4c1RXTwpXVS9mZndQZjBB
+WGVyNG9LNEdtMDNtanFQbkd2UFFYa2xSb2NDQ0prMG9sdmZ6M0dQRDZSNGNiNkc4
+SlFvTyt5CmNMRmhMdytCZFdqd0ZCWU1POTl5TFhJM3lEbDFGdWd5R2JvU3dNNFRT
+aHA3T1ZwYUlXSE1oa2VhVFJIQlVQUnMKNXNqUzR5QVI0OVppTDNMU1lHR2FJbmQr
+QUlzR2I0NTB0enZENWJPT1dUM2JBK0pRWXZ4dzRxa240WnI0OVdCYgptZE9nWmhD
+eUxET3BsVUo1VFJtY0ZkdFdrRFI2MUsyN1VPeno4RVcxcExYazZjQ1RFcU5ZanlT
+bDJCeE53R283ClpGV3IwTW1qbVJydnQvSmNvcm56cjl3WW9HdXJ3bERnc2cxNmpW
+aFZpY09qTUg2ellqcXN0amJRejREeDJqU2wKbGdabjdPUXY5dTR1SGZ0SXNaQk50
+RnFjUlJaSFZHVWpXMjNQK0xUWGNkQzhDSWFaZzMvNUN2blZyTU9jcGd0MwpWdmdB
+TDloeUJRNHV6UWVacVlpRCtHRmhDQmp6QUxtMGNRSzJQZnE3N1AwTjJBS1k2NUNP
+SWVnbjFubXJvNTF4CldIS09jKy9FdURmNU5VY0lieW5sQ0NycUJXenAzZWt4bE5D
+eFZNTkdJeThObEhyS1oxb0RQSlNMZi9vc0Jyb2EKTExCd0V1bllqRlY1czE1NVkv
+TFUybnQzUUY5NzBxTGdHMEVTWm1mV2ZTcEZzaEhuSVZBMXdXV3lMM3o3Ukd2YwpJ
+ZVFnYk9LSklDWlNSTDVlNDBpSHBMcEpERWlyUGpTeEQrYUpuazd1VVZGUDk4aTJu
+Z3FNVjNadUtlM0paV0VpCnc3ZDJvbmEwditscWVUUUp5OHcydUIvaGNpTFBOR0tN
+QUpBeEpSeUFFUDRTaWpXWmNDQjMKPUR2RkwKLS0tLS1FTkQgUEdQIE1FU1NBR0Ut
+LS0tLQo=
+
+--_003_38fbdabc0a957344544c1642f2e764cd1234567890_--
diff --git a/comm/mail/test/browser/openpgp/data/eml/alice-utf.eml b/comm/mail/test/browser/openpgp/data/eml/alice-utf.eml
new file mode 100644
index 0000000000..a468526614
--- /dev/null
+++ b/comm/mail/test/browser/openpgp/data/eml/alice-utf.eml
@@ -0,0 +1,23 @@
+From: "Alice Lovelace" <alice@openpgp.example>
+To: "Alice Lovelace" <alice@openpgp.example>
+Subject: partially encrypted test message
+Date: Thu, 30 Nov 2020 14:40:34 +0100
+Content-Type: text/plain; charset=UTF-8
+MIME-Version: 1.0
+
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+1.00 Month, Services
+Home::1 £10.00
+Home::1 £35.00
+Home::1 £10.00
+Home::1 £0.00
+Domain: £1.20
+-----BEGIN PGP SIGNATURE-----
+
+iIwEARYIADQWIQTrhbtfozp14V6UTmPyMVUMT0fjjgUCX8T2UhYcYWxpY2VAb3Bl
+bnBncC5leGFtcGxlAAoJEPIxVQxPR+OOIFQA/jiCOQN1362aOgywAM/Rm7HGEIN2
+UgxLkUGnoNZEBXOoAQD6EYFBkP5AOHqQZ5a2AEwufxbC4mrJ2UVeyarD8KHKAw==
+=Pxz5
+-----END PGP SIGNATURE-----
diff --git a/comm/mail/test/browser/openpgp/data/eml/bob-enc-html-nbsp.eml b/comm/mail/test/browser/openpgp/data/eml/bob-enc-html-nbsp.eml
new file mode 100644
index 0000000000..7cde190f5f
--- /dev/null
+++ b/comm/mail/test/browser/openpgp/data/eml/bob-enc-html-nbsp.eml
@@ -0,0 +1,38 @@
+From: "Bob" <bob@openpgp.example>
+To: "Alice Lovelace" <alice@openpgp.example>
+Subject: Encrypted for Alice, html with nbsp separator line, not blank
+Date: Fri, 4 Dec 2020 00:35:52 +0000
+Content-Type: multipart/mixed;
+ boundary="_004_33f9d332df5c463d984f9ef386761a91VSMBX02_"
+MIME-Version: 1.0
+
+--_004_33f9d332df5c463d984f9ef386761a91VSMBX02_
+Content-Type: text/html; charset="us-ascii"
+Content-Transfer-Encoding: quoted-printable
+
+<html>
+<head>
+<style><!-- .EmailQuote { margin-left: 1pt; padding-left: 4pt; border-left:=
+ #800000 2px solid; } --></style>
+</head>
+<body>
+<font face=3D"Arial" size=3D"2"><span style=3D"font-size:10pt;">
+<div>-----BEGIN PGP MESSAGE-----</div><br>
+<div>&nbsp;</div><br>
+<div>hE4DR2b2udXyHrYSAQdAINgYcnZM2bAYVKuB30JR5bPNGYtFFj5EEZuHzU7B1TAg</=
+div><br>
+<div>Q0qb&#43;biPpakzFZH5xXDLJVrZFo4H76bR0ds7UROgqjDSVAFVyLyVzbXQGBf8krPa</=
+div><br>
+<div>WuIrCJRc&#43;/GBk0CHwc3cV47F8kdbeH/7uHsTbanaz3yn5gtVXBhoR5iOanSaHfCE</=
+div><br>
+<div>vmaIc6oiurKdS9PuTnqbD91uW8PKdw=3D=3D</=
+div><br>
+<div>=3DVp7p</div><br>
+<div>-----END PGP MESSAGE-----</div><br>
+<div>&nbsp;</div>
+<div>&nbsp;</div>
+</span></font>
+</body>
+</html>
+
+--_004_33f9d332df5c463d984f9ef386761a91VSMBX02_--
diff --git a/comm/mail/test/browser/openpgp/data/eml/bob-enc-inline-nbsp-qp.eml b/comm/mail/test/browser/openpgp/data/eml/bob-enc-inline-nbsp-qp.eml
new file mode 100644
index 0000000000..da39c6e1a1
--- /dev/null
+++ b/comm/mail/test/browser/openpgp/data/eml/bob-enc-inline-nbsp-qp.eml
@@ -0,0 +1,17 @@
+From: "Bob" <bob@openpgp.example>
+To: "Alice Lovelace" <alice@openpgp.example>
+Subject: Encrypted for Alice, inline with nbsp in separator line
+Date: Thu, 30 Oct 2020 02:34:57 +0000
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: quoted-printable
+Content-Language: en-US
+
+-----BEGIN PGP MESSAGE-----
+=C2=A0
+hE4DR2b2udXyHrYSAQdAINgYcnZM2bAYVKuB30JR5bPNGYtFFj5EEZuHzU7B1TAg
+Q0qb+biPpakzFZH5xXDLJVrZFo4H76bR0ds7UROgqjDSVAFVyLyVzbXQGBf8krPa
+WuIrCJRc+/GBk0CHwc3cV47F8kdbeH/7uHsTbanaz3yn5gtVXBhoR5iOanSaHfCE
+vmaIc6oiurKdS9PuTnqbD91uW8PKdw=3D=3D
+=3DVp7p
+-----END PGP MESSAGE-----
diff --git a/comm/mail/test/browser/openpgp/data/eml/bob-to-alice-signed-damaged-signature.eml b/comm/mail/test/browser/openpgp/data/eml/bob-to-alice-signed-damaged-signature.eml
new file mode 100644
index 0000000000..8cafc92e0a
--- /dev/null
+++ b/comm/mail/test/browser/openpgp/data/eml/bob-to-alice-signed-damaged-signature.eml
@@ -0,0 +1,55 @@
+X-Mozilla-Status: 0001
+X-Mozilla-Status2: 00800000
+X-Mozilla-Keys:
+To: alice@openpgp.example
+From: Bob Babbage <bob@openpgp.example>
+Subject: Signed Message Damaged Signature
+Message-ID: <848aa9eb-7cd0-8673-9a07-af43d04c0ee8@openpgp.example>
+Date: Mon, 2 Nov 2020 17:35:44 -0400
+User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:84.0) Gecko/20100101
+ Thunderbird/84.0a1
+MIME-Version: 1.0
+Content-Type: multipart/signed; micalg=pgp-sha256;
+ protocol="application/pgp-signature";
+ boundary="50nOnYT10Ofoj91bgJF5Ao17vVWnb3oq6"
+
+This is an OpenPGP/MIME signed message (RFC 4880 and 3156)
+--50nOnYT10Ofoj91bgJF5Ao17vVWnb3oq6
+Content-Type: multipart/mixed; boundary="N2qZSO8OxbEQYeawxVekJvYNUvD0dwxtb";
+ protected-headers="v1"
+From: Bob Babbage <bob@openpgp.example>
+To: alice@openpgp.example
+Message-ID: <848aa9eb-7cd0-8673-9a07-af43d04c0ee8@openpgp.example>
+Subject: Signed Message
+
+--N2qZSO8OxbEQYeawxVekJvYNUvD0dwxtb
+Content-Type: text/plain; charset=UTF-8; format=flowed
+Content-Transfer-Encoding: quoted-printable
+Content-Language: en-US
+
+Sundays are nothing without callaloo.
+
+
+
+--N2qZSO8OxbEQYeawxVekJvYNUvD0dwxtb--
+
+--50nOnYT10Ofoj91bgJF5Ao17vVWnb3oq6
+Content-Type: application/pgp-signature; name="OpenPGP_signature.asc"
+Content-Description: OpenPGP digital signature
+Content-Disposition: attachment; filename="OpenPGP_signature"
+
+-----BEGIN PGP SIGNATURE-----
+
+wsD5BAABCAAjFiEE0aZuGiOxgsmYD3iM+/zIKgFeczAFAl+ge7AFAwAAAAAACgkQ+/zIKgFeczAw
+dwv/ZTuLMSj073z92I2WStlFzmrCc1ux3FQ107mTFR4+l2zTlE2nxWKEp1clmn+MqZwTLCQquOlX
+YEeYCyXa2z/bSFxm7++mhB2uf5/ahnGs8ZMN5SD+xWoV3WXqOgDiPjz2BNWBrd9VN5Azr8akSEwG
+EJK+i9wMRXTvCtrc6MnuXBVTt5rN35s/HpznpVgtU8+zRQ7MSd6BTD0PkIqrhgl7qV2XTtmlGEM4
+JwHa56QrIg82ebudv/tIm4NlLCj6bvLKBiJ2Q+TvZaPwVuCAYpurFlzJJfKLiNzBi/G+90XNG276
+69C6cm5VlSQe6/gqfB9bHpfkzItRdLYW8rHYTuN6YuctTvPr5hoTmLUYq1YIL9MJHhUmxNnfgq/E
+XLYE0d0fzfopUHzPkmbMdJ3DU14HD4JcyS2623iwRooecxzydSZUPm497t6a/kbBae2p1nk2QZ7I
+muRSPlbVHSi3HClk3aqiDkyTXAkvWbX8UqbY7/fBL24YJzf2k/8yuzzAo+Gl
+=PLaI
+-----END PGP SIGNATURE-----
+
+--50nOnYT10Ofoj91bgJF5Ao17vVWnb3oq6--
+
diff --git a/comm/mail/test/browser/openpgp/data/eml/enc-to-carol@pgp.icu-revoked.eml b/comm/mail/test/browser/openpgp/data/eml/enc-to-carol@pgp.icu-revoked.eml
new file mode 100644
index 0000000000..3f05f75d1d
--- /dev/null
+++ b/comm/mail/test/browser/openpgp/data/eml/enc-to-carol@pgp.icu-revoked.eml
@@ -0,0 +1,73 @@
+Message-ID: <31ae4f7b-7e56-3813-3348-70cbc0709b82@pgp.icu>
+Date: Thu, 15 Jun 2023 20:46:43 +0200
+MIME-Version: 1.0
+From: Jessie J <jessie@pgp.icu>
+To: carol@pgp.icu
+Content-Language: en-US
+Subject: ...
+Content-Type: multipart/encrypted;
+ protocol="application/pgp-encrypted";
+ boundary="------------n4vy4UcZCgGrvyso1j5oTOFL"
+
+This is an OpenPGP/MIME encrypted message (RFC 4880 and 3156)
+--------------n4vy4UcZCgGrvyso1j5oTOFL
+Content-Type: application/pgp-encrypted
+Content-Description: PGP/MIME version identification
+
+Version: 1
+
+--------------n4vy4UcZCgGrvyso1j5oTOFL
+Content-Type: application/octet-stream; name="encrypted.asc"
+Content-Description: OpenPGP encrypted message
+Content-Disposition: inline; filename="encrypted.asc"
+
+-----BEGIN PGP MESSAGE-----
+
+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
+=Hwus
+-----END PGP MESSAGE-----
+
+--------------n4vy4UcZCgGrvyso1j5oTOFL--
diff --git a/comm/mail/test/browser/openpgp/data/eml/encrypted-and-signed-alice-to-bob-nonascii.eml b/comm/mail/test/browser/openpgp/data/eml/encrypted-and-signed-alice-to-bob-nonascii.eml
new file mode 100644
index 0000000000..52ab4c9b27
--- /dev/null
+++ b/comm/mail/test/browser/openpgp/data/eml/encrypted-and-signed-alice-to-bob-nonascii.eml
@@ -0,0 +1,94 @@
+From - Thu, 06 Apr 2023 05:20:15 GMT
+X-Mozilla-Status: 0800
+X-Mozilla-Status2: 00000000
+Message-ID: <20805252-5f4c-ec09-76c7-f775cca2414c@openpgp.example>
+Date: Thu, 6 Apr 2023 15:20:15 +1000
+MIME-Version: 1.0
+User-Agent: Thunderbird Daily
+Content-Language: en-US
+To: bob@openpgp.example
+From: Alice <alice@openpgp.example>
+Autocrypt: addr=alice@openpgp.example; keydata=
+ xjMEXEcE6RYJKwYBBAHaRw8BAQdArjWwk3FAqyiFbFBKT4TzXcVBqPTB3gmzlC/Ub7O1u13N
+ JkFsaWNlIExvdmVsYWNlIDxhbGljZUBvcGVucGdwLmV4YW1wbGU+wpAEExYIADgCGwMFCwkI
+ BwIGFQoJCAsCBBYCAwECHgECF4AWIQTrhbtfozp14V6UTmPyMVUMT0fjjgUCXaWfOgAKCRDy
+ MVUMT0fjjukrAPoDnHBSogOmsHOsd9qGsiZpgRnOdypvbm+QtXZqth9rvwD9HcDC0tC+PHAs
+ O7OTh1S1TC9RiJsvawAfCPaQZoed8gLOOARcRwTpEgorBgEEAZdVAQUBAQdAQv8GIa2rSTzg
+ qbXCpDDYMiKRVitCsy203x3sE9+eviIDAQgHwngEGBYIACAWIQTrhbtfozp14V6UTmPyMVUM
+ T0fjjgUCXEcE6QIbDAAKCRDyMVUMT0fjjlnQAQDFHUs6TIcxrNTtEZFjUFm1M0PJ1Dng/cDW
+ 4xN80fsn0QEA22Kr7VkCjeAEC08VSTeV+QFsmz55/lntWkwYWhmvOgE=
+Subject: ...
+Content-Type: multipart/encrypted;
+ protocol="application/pgp-encrypted";
+ boundary="------------zN0m7YjOAg029Y0ZI4XrGe77"
+
+This is an OpenPGP/MIME encrypted message (RFC 4880 and 3156)
+--------------zN0m7YjOAg029Y0ZI4XrGe77
+Content-Type: application/pgp-encrypted
+Content-Description: PGP/MIME version identification
+
+Version: 1
+
+--------------zN0m7YjOAg029Y0ZI4XrGe77
+Content-Type: application/octet-stream; name="encrypted.asc"
+Content-Description: OpenPGP encrypted message
+Content-Disposition: inline; filename="encrypted.asc"
+
+-----BEGIN PGP MESSAGE-----
+
+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
+=PWTp
+-----END PGP MESSAGE-----
+
+--------------zN0m7YjOAg029Y0ZI4XrGe77--
+
diff --git a/comm/mail/test/browser/openpgp/data/eml/eve-duplicate.eml b/comm/mail/test/browser/openpgp/data/eml/eve-duplicate.eml
new file mode 100644
index 0000000000..2a582937a5
--- /dev/null
+++ b/comm/mail/test/browser/openpgp/data/eml/eve-duplicate.eml
@@ -0,0 +1,122 @@
+Content-Type: multipart/mixed; boundary="------------CELMaEqsZnUdIj6gwK6SX0gy"
+Message-ID: <cf596e2e-5ad8-28d2-e230-f9a377101ae1@pgp.icu>
+Date: Wed, 9 Mar 2022 15:24:01 +0100
+MIME-Version: 1.0
+User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:99.0) Gecko/20100101
+ Thunderbird/99.0a1
+Content-Language: en-US
+To: Bob <bob@pgp.icu>
+Cc: Eve <eve@pgp.icu>
+From: Alice <alice@pgp.icu>
+Subject: duplicate keys for Eve
+
+This is a multi-part message in MIME format.
+--------------CELMaEqsZnUdIj6gwK6SX0gy
+Content-Type: text/plain; charset=UTF-8; format=flowed
+Content-Transfer-Encoding: 7bit
+
+
+--------------CELMaEqsZnUdIj6gwK6SX0gy
+Content-Type: text/plain; charset=UTF-8; name="eve1.asc"
+Content-Disposition: attachment; filename="eve1.asc"
+Content-Transfer-Encoding: base64
+
+LS0tLS1CRUdJTiBQR1AgUFVCTElDIEtFWSBCTE9DSy0tLS0tCgptUUdOQkdJb3Vwd0JEQUQw
+ME9DTTE3RnV5ekRaRittdWphMEhZMDJ0Tm16L0QveE0xSHNTM2tCQ3VvVzVzOUxqClZGdjJ4
+eU1JMElTUHcvenFyT3oxaU9veGtKdU4zUVFhT2FhbHd1aHRRTmowWVViT1dTWjNQMStydEhj
+MSs0TkQKZWkvTTQwZWNSZTZUcGJOaFh0dkhHTFU2akVWd3JjTXdkci8wRVp2WGYxZTNNMksr
+dG93Y2FXV2hZTUExUStXQQpuOU9lVmJqaHYvaFd3N21NNFRzQzZPaVFIL29UNW5JU3gvOW1k
+YnBGUEZoNTFlem5vVHdwaysrWlpybGt1Q2dsCnpBRUZLSGxqbFFTWWZyTGpIdlh3djRwaTBV
+bHR6OERNUWc5bTlZQTZ3NWRCS0pyZElHZkNpTEVFMjRLbndlb24KcHJCb09UTmhCK084bFRU
+d3BtSXlsdlBBZlcrNGtTU3RWTHZsY1VmSUhVQ1VNMTl2M2RxUFVVQ20rR3BiaVFXNQo2SHNq
+Q3FIRXkzRGFqQWtVOHJZdUY1WEVZVExlSWxVaWdCZUh1SU1vL3FQZ29kWHh2azJUZHo1b0ZK
+cHFwc0VSClBjRUlXSTlpWW14TVI0YzZTd2pvUlVHK0xQL1M3Kzk0bVNPdkVVdDlQVTFwUHpi
+TVU4blpRbUZrczRiazVPUTIKY2kxNkxGd3ZDZXN0Q3pVQUVRRUFBYlFYUlhabElERWdQR1Yy
+WlVCbGVHRnRjR3hsTG1OdmJUNkpBZFFFRXdFSwpBRDRXSVFTdmd4czJ1QUp5RFp4NGRLRmhh
+RFBKOEVha09nVUNZaWk2bkFJYkF3VUpBOEpuQUFVTENRZ0hBZ1lWCkNna0lDd0lFRmdJREFR
+SWVBUUlYZ0FBS0NSQmhhRFBKOEVha090b0tEQURnaWFqZ0xXZU9JYTduSmJYRkh6LzgKWlNS
+LzNLMlA3MlJKWDFiWnliMzIyRExidzRUejJtQnlVZlNyVXNSRGNFSjloanY4ZXZmRXpEU2pS
+MVk1MitsegpEWjlTNXVyNDdmVGlWTVM5emErYjh4K3EzazB4UnNleG5xS3RtUVNBbWJTS2Rq
+dHNKK1RHMXRGLytoUkthbGo1CkhPeW9VMjQ3WVlhL1pHWnc2MjZ3THhvMlljYmNUYVhzMjg2
+V0Vrc2xtbWN2TURQclNiem53WmRRU2dtQ1lsazAKc0NUOEcyS1Z4QkF3MDZ5aEJiTm84eDMr
+d0Vvam9uMGRwUU0wMHJiK1pxV2FrK1ZpTUpPQk54Q0c0cnhKMytXQwpFQjF3T3RvQmZZMVla
+ZXN4Mkh3azNxdzdBYkdQbHQ0a0VKVms1WGV4Y0hqaGxtWkd5bUs3S1JxS2pJUzV2byttCmNz
+WERWbHFOeHJyeDhpR2NRSWg1N2JkMGpqeTBzODZWUVJnRDZST3k4M2hZQ1Z1SGpCU2JkcG03
+V3d1U092bVQKMDdzV3U3NHVJSURTMjFPTGo2TjZadVlnNjlWRUdvaE9hUnI3NWxDTkE2OFpr
+MmM5MHJnUUdpZHl3d25mZEZqdQovenNwdStQOCtmKzJFQ1dVWHFyR09TMmk5azJDMGY1RE4v
+R1lLNU9nUll1NUFZMEVZaWk2bkFFTUFOcGxwRzVkCnFFckxiV0VzbHZWV25Ta3ZaampWbXBa
+Wi9la203TEpDNUdsM1hQUEh6VE1CejNId0dtV1VzWnJqQUdsZnRzamoKaVpMcjhGQ0dkdDJG
+SVVCdm5qMGV4YnJGOUthRDRVY3dtbTNVQ2x3cEMvRFg2SEF3d2lGU0N3dHZadTdnZXlzVgpD
+RDFkbHRGWHUybnNBZEJSeVFzYWtVUnJKZndRRzFqS0NLUjhRT2JwR05zSitTcVFuWURibG5v
+Z1MyeC8waGtEClB0eTd6M2p3QWY3eC94dWhtcEwrS1R2eSs3Y3dGR0RXRVBSM1FOVjA5T3Bp
+NC9hYm9XTG1oQlpqNWJSMnNtbGcKY3pGZ1JhYWZGZlZYQ3FDM2t3R3owYmliaWVaK3ZaeDZP
+YnBQOTRlZHpmc2dJb0gwSjQ5WmplNXBCQU1KekNuNQo1dTJGbWJVTUR2bHB1d0x0OHVubWdy
+bjN2NEc2TmZsTlcrY20xQzRrWC82ZnlLSGx2bExIMDVxS2lTZHFPcTJ0CmMxSFFFUVB2cWg3
+UXpqQlZwZFdyUnB3UmhrVU5iSk5GeFAxRDE3ajBha09WUWpXUmNnVmNHZUd2bFd3YTl0YkIK
+TFpPWXpzaXppaVlXMCt0LzlXU3pvYzhkZ1BveVVHcE0xMDYyNHhIdHc0cmkrS2ZxUWdxK3NM
+MFp1d0FSQVFBQgppUUc4QkJnQkNnQW1GaUVFcjRNYk5yZ0NjZzJjZUhTaFlXZ3p5ZkJHcERv
+RkFtSW91cHdDR3d3RkNRUENad0FBCkNna1FZV2d6eWZCR3BEcTg3UXdBejc3Y1JUVGZoTHJF
+QWIrVEpuUnUzb0Z3eE5YbzJhR3RCRldsWTZWd20xMWgKRmFhamxod1liNlZUWHVFZVRjeGRI
+ZDBQSjJEaHlnYXpRekdOaWdFSE1ONWtjQnNRMkJWZGlKRkFXWmNMMkpBTgpEaEdQYXBkd0kv
+MTFodG8wZ2s1aGZrYmE2OWFBVjdXOGg3WG1ISi93UVhtcWNkaDhlclkrejczWWRoS0kveHdE
+Ck1HcFZINFAxbEp6bUJtQ0ZaYkhQTTd4Qkc5RU5rV2kzRUlXaGUyVzBNOFlMMjBEZUdzTEtw
+cU1PMEpUVnBaWksKWWhFdlk3N0htYkJTTjJUVU1tNGxUcXA3cWpMd1FNUExQWkpmOWlBWUhV
+bXp4MTRsL21xMG05a1dOWXpBb25nSQpJb3ZlUkREWmZ6dktXRDVsd0xpNURIbTJxV3Fic0VF
+SWc4bktrVU5qQXpxblZLRHh4UTBpaG5UMzhGZWhRSWsvCmdjK1A0WGlMcHBPdEJMR1ZmeW1y
+VXRUTGtheXFLVlAzajI0OWEzQmh3VUptQTZ4SE9vRWJtdVA4Wk4xb1BLejUKUHlWWWZUTGZh
+NmNCZXRLNUFKSTdqY2RIQjR3MHZUMzZZWkE2NStRWjBsazBaR2dvMnc5djVQZjNkYzhXTTVX
+LwprRzZNVVhQczdibXhLbm1BTytXRwo9c3J0SAotLS0tLUVORCBQR1AgUFVCTElDIEtFWSBC
+TE9DSy0tLS0tCg==
+--------------CELMaEqsZnUdIj6gwK6SX0gy
+Content-Type: text/plain; charset=UTF-8; name="eve2.asc"
+Content-Disposition: attachment; filename="eve2.asc"
+Content-Transfer-Encoding: base64
+
+LS0tLS1CRUdJTiBQR1AgUFVCTElDIEtFWSBCTE9DSy0tLS0tCgptUUdOQkdJb3VxZ0JEQURE
+b3JVY3JlSzR6QVNXQ1o2TmRVMFU3N3NNemhpNmRNRDJ0WU40SHg3SmxDbzhQY3h0CjMzV1Yv
+NmRlZS9HRFU1d1BLdEpsOVZYNHR4TUhacEpxaE9QbEtMekdXWjZTUG5yYXJaUjluMnVjckVH
+a25SVE8KaE9qemZxZWo0ZGNHMXVxOHhuM2kzRlBja1JrVVRHUE1tQndoc08yRzZWbU1MbkF1
+Wmlpb2VESGgrc3VFaVRJRwovRWR4WThkOTZqQTlDeWYxcldybDVGd2twT01rS0xvVjRQYkhS
+bEpzMkM0U3owR0FKWHE3aHUyN1h5eFB4bkd3ClVHajE5bUhZWmNLbnFYTDNEczJQTDEyT3Y1
+VlZ6Y2p2andWVHpvT0tXMnJWeWlTNFdzN2JBaGQxUVZ6K3FIRjgKMkt3VWhOZGsrNVhhb0dy
+S2xtb1dRRXJTSnhTcWhYM0ZsaWUxcnZpSVNmU0thRFQ4TmdIYnFFdjBobm9rQWIvdgo5bHF0
+eURYdTREcGpSUnYvaFMxeHJJTnVFdWExT3VhRGFmbmhuWkRQNVZCZ0Z5Z3Eycko4ZFN4bmVL
+Z0xJSkpFCnZqMTdiS3drb0VZUGp4RVlZUzFOOFBsTUIvTnZoL1k3ajVkcmErKzE5a3VRWDdq
+cjF5bWc0cS8yQW9BdEVHTTgKdy9UMkk1K0ZLZmxoYVg4QUVRRUFBYlFYUlhabElESWdQR1Yy
+WlVCbGVHRnRjR3hsTG1OdmJUNkpBZFFFRXdFSwpBRDRXSVFTKzZYVlJUc09vbWx4K1pORGZv
+ZUhzZlRLNkt3VUNZaWk2cUFJYkF3VUpBOEpuQUFVTENRZ0hBZ1lWCkNna0lDd0lFRmdJREFR
+SWVBUUlYZ0FBS0NSRGZvZUhzZlRLNkszeFlDLzl2WkFyc3RQUGE2VzNuUElPT2k4aHMKc09l
+cUVPbHhwdXc1TXU0bW85Z3VSNGdGUTd5VTRGeGdHT0YxcmhyY1ZiVE1ZZmJBd3ppZ28vbE5j
+R045cmdZZAoxK3N0dHdiMmRmUXk4aHNKR2tQV010SXVBcDYxVXNOVVpYM04rTXJjeHlqNzBG
+SEpXQlJOYWFDWHRQZkpiUHpCCktnaGxnVFRObWtOQkprS1FLa0lYWVdoQVZsUklUU0tqUWhK
+c3cra2xDZlU3bWdBWGJLeHN4L1MyUk5SWmJ2V2gKa21nQ0xtS3A5ZkZ6Z28wNDI5UThtSDJr
+NkhEWGlFTitrUUtYQnRhWXhVZStZbWJsT2YraXZWMVJmSXZwOXg2YQpsQzNmY1E4bzdpSTZq
+MXQyMnQ5WGU2TkZoV0FlL0YxS2RTc3JZRmZtNFlzeXZjS1NseXo1R2htdW5Ub1JhUkhTCkpO
+ZUIvN0F0QU1xSzBaUWdvVjZmeXZwVEtyT2ppL2E4dDFzdFhFdHh4cG5UZmNuTE44ZE5GWFVp
+T3RuQU8waUEKcVpyYVdXZ09xMjJ4dGxPUXY5RTIrS3Y1K3EraFJUV3pxSDYwTjZhWGtIRjI4
+TFFqZVlReTMvWnA4ZTh4MmsvLwpYU251SkszL3Y4WVhxdzZ2UUdYNkthOHk3REFlT2JPUU1G
+QW1EenNJVUhhNUFZMEVZaWk2cUFFTUFMTWFzcVJ0CnY5eEIrRWl5ME1BMnJpZGV5aGErQmpO
+STJDemMrOEZJajZNTzJJcWRtcXBPaXJZRWNjdUFtekZWSjlzZEJDcFcKMjJCQkk2TkFZMG5p
+NnFxRTd5djU0ME02OU5xbXE5SkthSzZjb2t3N0RjK21wTDNWUXpxbmdwalFUZzlqK2tZNgo4
+UXpJcno2dDdzYWorTmxkYzh3WE4yS0doYkgyaXQwaVVSRjAzOEpEU2V6TFZ6SEZnbTRYb0tu
+RjVhajFNYlUzCjdXblpiaVNZaWNwWU1OR2F3S1krMjVkWmxtaVRNcnljYTNmOCsrNTh5Z0Ni
+RERyb1pCUmswVGMrMGZWRzZzcGEKTTJGdERaZTR4SjJEVDl2YkRMVkMxN3ZaQ28xemsxdHYv
+UkNmS3dyZjJucytKeTVPczk5a0ZROGhZUll6Zk5OTApTVWRBbXNpMGh3T0h0YkFHRFdWYUhC
+eEQ0V0pRWHBSSEs0NmoyczdSQ0dFajk1OS9HTXNmcm9RQ2FLSm1mZmFoCjUrRGNVRG8yVitI
+a0Rodlo5VHFrTGE0b1VYWnlSVlpqUVVlTFhWalhCRVBDazEzbnlYdFg3WHZEb016QVlwNTkK
+ZTc0UmpxZmhhcGFtQjJMai9TbEpobjNCcDFvY0NsdUkrZFcvcmFUdGp1c3R0UjFtcm5td2N0
+Qk16d0FSQVFBQgppUUc4QkJnQkNnQW1GaUVFdnVsMVVVN0RxSnBjZm1UUTM2SGg3SDB5dWlz
+RkFtSW91cWdDR3d3RkNRUENad0FBCkNna1EzNkhoN0gweXVpdmtMQXdBbXVzZWE4OE1sZmFY
+Y3JZQTNDN3JzR3EvSnluSmtnekdkeTg0SUsvZGo1L24KMWxSZUhsUll5WnhuUm5Od2JLUHdu
+M0IyZjJXRDNhRTBxOCtnT0lsMVdPY0xRWDRiZTkzWDdTNTUwL29UZDlnSwo5Y25tb3k1cXFk
+dFhZWkp6MWdXZGw5Ym5IZjlQcmJHdjMxNXZSOWxmbnFQQ0ordE01b3I2elFZMTQ3S1dzWG5T
+CklqMXNOci82bnZrV0lwV3FneEhxWVlEa1l6RHlLN3gvSm1CNEhja2I4R2dWaFlNZHFid2E5
+akd2WDUzM2tHNlQKU2RRTkQzaFRnTjJnSTJMRnRrVytYelNHTE9VMXQxK21RU1E5UEkxL1gv
+dHg4NWxuUlorL1Y0Yk04N3NFTklTZgppLzhpazJYY1hZN01tK1MzSnhObktIWVBmMzBkeVlM
+MXc2R1FrZVVnWnc0aFRPMlRWWFcvQmozNmxqK0F1d1h2CkZSRFNPdnFSZ055WXpDLzBSRW55
+ZFpHM1YrOHluTmozRFU1dTlZMFNUTXlWMS84eG1rWnBhcmZZYWluUmZwTzAKZFNtWkxqRzYr
+dFQvSVhtOS93cmdFejA3SHJMQWZlT3RMMmM3U1lpTkdMZ3pQV05OcDgxbzQ2aWZEYXZqWW5C
+RAorWXZ3ZDQ0R0tpTUFQNkd5dzl5dQo9Z3BkNwotLS0tLUVORCBQR1AgUFVCTElDIEtFWSBC
+TE9DSy0tLS0tCg==
+
+--------------CELMaEqsZnUdIj6gwK6SX0gy--
diff --git a/comm/mail/test/browser/openpgp/data/eml/fwd-unsigned-encrypted.eml b/comm/mail/test/browser/openpgp/data/eml/fwd-unsigned-encrypted.eml
new file mode 100644
index 0000000000..d5f37bdee8
--- /dev/null
+++ b/comm/mail/test/browser/openpgp/data/eml/fwd-unsigned-encrypted.eml
@@ -0,0 +1,75 @@
+Content-Type: multipart/mixed; boundary="------------LkTnU6PdkUwoxLbEONGg5YWI"
+Message-ID: <51b2b268-52a6-c8a6-3a9e-6222653b9338@openpgp.example>
+Date: Wed, 15 Oct 2020 14:46:19 -0400
+MIME-Version: 1.0
+References: <41b2b268-52a6-c8a6-3a9e-6222653b9338@openpgp.example>
+Subject: encrypted message forwarded as attachment
+To: alice@openpgp.example
+From: alice@openpgp.example
+In-Reply-To: <41b2b268-52a6-c8a6-3a9e-6222653b9338@openpgp.example>
+X-Forwarded-Message-Id: <41b2b268-52a6-c8a6-3a9e-6222653b9338@openpgp.example>
+
+This is a multi-part message in MIME format.
+--------------LkTnU6PdkUwoxLbEONGg5YWI
+Content-Type: text/plain; charset=UTF-8; format=flowed
+Content-Transfer-Encoding: 7bit
+
+wrapper message with plain text
+
+
+--------------LkTnU6PdkUwoxLbEONGg5YWI
+Content-Type: message/rfc822; name="attached-message.eml"
+Content-Disposition: attachment; filename="attached-message.eml"
+Content-Transfer-Encoding: 7bit
+
+To: alice@openpgp.example
+From: Bob Babbage <bob@openpgp.example>
+Message-ID: <41b2b268-52a6-c8a6-3a9e-6222653b9338@openpgp.example>
+Date: Wed, 14 Oct 2020 14:46:19 -0400
+User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:83.0) Gecko/20100101
+ Thunderbird/83.0a1
+MIME-Version: 1.0
+Subject: ...
+Content-Type: multipart/encrypted;
+ protocol="application/pgp-encrypted";
+ boundary="2W16lTBQJ4ZzVzryxZDTtDj0yHOSWfd6l"
+
+This is an OpenPGP/MIME encrypted message (RFC 4880 and 3156)
+--2W16lTBQJ4ZzVzryxZDTtDj0yHOSWfd6l
+Content-Type: application/pgp-encrypted
+Content-Description: PGP/MIME version identification
+
+Version: 1
+
+--2W16lTBQJ4ZzVzryxZDTtDj0yHOSWfd6l
+Content-Type: application/octet-stream; name="encrypted.asc"
+Content-Description: OpenPGP encrypted message
+Content-Disposition: inline; filename="encrypted.asc"
+
+-----BEGIN PGP MESSAGE-----
+
+wcDMA3wvqk35PDeyAQwAx/6/zGSIvT4IyNpRmcM00iVQhUfdfxUTL/o1hV+MdB7rKZIr+qWJEgiJ
+F7IyNPJW0ps2W4myyCkDQtIy1682ahq6D6kHCNmDFxMSpElrG5Xup4Ibf1es3g9n/OytGXx8699m
+RymR4EA5yAiLEiGYO37N+nwnWhP5BNpk8jgzDSNTD9qbOrXb7Tx32rvOwFCrBHqZsx6LbaD5BWp9
+WdeSqNjJ6c35dhBxy7MlIZWOK27y5TQArsgyoq//3645cQX3jYV0jJbJeWHuPMoMxYfdRHi8oEIm
+P3HnqjtSLUtOTwAcc7Vmp5k9/+PG0IZGLtoR0QLNqrJO607mWrCgYowXZofqt3Bs+Nrtf6cuetWd
+pBcGkfdYldCWgG55dER67jP7rKyx6QjFPgPBPbYPFl/H0lqLBH4YrwyVTQDFDcmXe11k1s9JdrlJ
+JXEqITi4gFFF9E4mj7voC97Fhy2GLPdKH+343gCgTVU5stz8+NyNX7wC2QSogtxEIcBd6FQbTj/j
+wV4DR2b2udXyHrYSAQdAJwk2G0weJUqgb4P+/9f76USsiwNpQO9m0k0FxS5OPGowdVTr0bB/bHyV
+fo2DKIkfmgYKnmoiL99VsigzSMIVh1+visa0mDW2a2oVfJBnHS/D0sF5AfHIvERSb7+yLgpMQPkk
+4cizr+7wiQ6BNbTN6FwG/yhrFbBXp+r//y3ZcTGh6G6IDlAbkAwj4VhTTnxdvBHJCpfnAj2G3AZR
+arZ3nC1IC9RLccV66K0oUOdvehgOMBF37Y+BLHXSL6RMc9PZIvtwH4gVMzATUeOQ1SYENGf5LSYq
+5zXs0sfRCXmC74FwM+PF9h4mBm0zOvEbyL6uqxTEMYDwAACkl8QzsHqhUe8VEhZTu2c1BcGhES4b
+9ajkctWgzG/bA4a8kTwyXDaREZoywIHro0iR5+gzbf3aUm+akWGlCRHCOmaF4ZcYpvFfH65tKgwv
+pRzYheCdjK367qiAOwPXh16vBYB1YOZtm7tSot/jBZ60qaIi5BP9FHXAFoR4Y+VWfx8lZYuE1ZNE
+k/VMN47PJPXgK+f8aMXDbalXuuq+sFl1XezGW3osppOkcL7reOZ/0heH1Say3wLLADnb3NyYaBg6
+ihl8FrVMdvzCFt59ytXn+H33BbrrYb2PfiEABPjzEPoeFItpQxltY5E0SGRYSOCKnpN2G7M1yoKf
+eG7/fXa0EUf1KLLzz+Pj88i4Ht6MQkkb19rwYHgxrxPKhmbV8zJfID5ne2PaE28XPa69wzRIyM2+
+DD5IF7iYLF4KcPURqrF7wYuAtTmOQTSWVv6mlHCxjz/ECeCXJhA+24W0m4/O55h0C3dG4looraOD
+JJMITsjObyRasT5sgS1y7axqlJY8NmJrEdZMn735+kjR1HPPinZiat4=
+=s0kk
+-----END PGP MESSAGE-----
+
+--2W16lTBQJ4ZzVzryxZDTtDj0yHOSWfd6l--
+
+--------------LkTnU6PdkUwoxLbEONGg5YWI--
diff --git a/comm/mail/test/browser/openpgp/data/eml/outer-pgp-sig-inner-pgp-enc-sig.eml b/comm/mail/test/browser/openpgp/data/eml/outer-pgp-sig-inner-pgp-enc-sig.eml
new file mode 100644
index 0000000000..6e6f5bc75b
--- /dev/null
+++ b/comm/mail/test/browser/openpgp/data/eml/outer-pgp-sig-inner-pgp-enc-sig.eml
@@ -0,0 +1,106 @@
+X-Info: File is based on signed-by-0x3099ff1238852b9f-encrypted-to-0xf231550c4f47e38e.eml
+To: alice@openpgp.example
+From: Carol <carol@example.com>
+Message-ID: <1241106f-5ef5-ae8a-36ed-02d6f8f84d62@example.com>
+Date: Wed, 14 Oct 2020 14:29:03 -0400
+User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:83.0) Gecko/20100101
+ Thunderbird/83.0a1
+MIME-Version: 1.0
+Subject: ...
+Content-Type: multipart/signed; micalg=pgp-sha256;
+ protocol="application/pgp-signature";
+ boundary="------------rvEyIV4on03ewe0w3mDNOC3U"
+
+This is an OpenPGP/MIME signed message (RFC 4880 and 3156)
+--------------rvEyIV4on03ewe0w3mDNOC3U
+Content-Type: multipart/encrypted;
+ protocol="application/pgp-encrypted";
+ boundary="PAOkQ1PqAvtLhLyHxuarNAvN1z6Qj8TMm"
+
+This is an OpenPGP/MIME encrypted message (RFC 4880 and 3156)
+--PAOkQ1PqAvtLhLyHxuarNAvN1z6Qj8TMm
+Content-Type: application/pgp-encrypted
+Content-Description: PGP/MIME version identification
+
+Version: 1
+
+--PAOkQ1PqAvtLhLyHxuarNAvN1z6Qj8TMm
+Content-Type: application/octet-stream; name="encrypted.asc"
+Content-Description: OpenPGP encrypted message
+Content-Disposition: inline; filename="encrypted.asc"
+
+-----BEGIN PGP MESSAGE-----
+
+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
+=d8b2
+-----END PGP MESSAGE-----
+
+--PAOkQ1PqAvtLhLyHxuarNAvN1z6Qj8TMm--
+
+--------------rvEyIV4on03ewe0w3mDNOC3U
+Content-Type: application/pgp-signature; name="OpenPGP_signature.asc"
+Content-Description: OpenPGP digital signature
+Content-Disposition: attachment; filename="OpenPGP_signature"
+
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCAAdFiEEuPL29L060/gtxEaDMJn/EjiFK58FAmObKoQACgkQMJn/EjiF
+K59Tyw//dahQthlNdE+XZjvpcGjyYzba8zdMCrjNb6bqlkzUKSAFBADwpuaMgukB
+o6z5LkUASuVBHl99bQgULij6KzMz/XoUqv+72xvTkYg2cbHtPK4KEuCQ2u18vMJ5
+ZGrnBa7ziHLsZRm7xc14sWvhjArPwpsqlaeEZxtNumGRdDPCMYAMD4cvYECfxF97
+lPzGEbKJUKRGC/XZRRonp3iz+v3vaVrt7ukNzuM3mSYvPK7ua7feYL0o/ov+u1Td
+1X9Zm8CJuYqpQYgvDtTjbw4QDOsP2GCnKcB2yZcEBVz7GWTe2Zkz3U8w2Qw+/B/g
+CHFN1tAP/CCsut/brkbbK9wHHdiAmTPNGe6DriB6QHiMzdr5WMiZvudnBYUIleaN
+Pat3K9zlHumHyQo7XjdOu8hZerqbyGRvimwQiNX6eOmtEFTECWk0pPMV0aSCul9O
+UTh0Hz2ZTquk3qBcJZaPyhK6ely2JcIxjJDHMfNgqOWzekcDhj96OvUuNQGS21jU
+d2aA9JbzikbmWws21lczkkHRob9zOCMVBJBsdsVuu+WxB854bXD2HJGtywFwsK6B
+9yLNV1FbqqTOvditrFTfXB9VJkhuGxIzZGBlX0biq2NfufCw9qJEwhwkEZZ/HJ/R
+9xtMVMGJFraPXABos7F8+Ixt5Hw3Ms9YAk+wrbJ3GDE/ngcZhYw=
+=rxUj
+-----END PGP SIGNATURE-----
+
+--------------rvEyIV4on03ewe0w3mDNOC3U--
diff --git a/comm/mail/test/browser/openpgp/data/eml/outer-pgp-sig-inner-pgp-enc-with-mixed.eml b/comm/mail/test/browser/openpgp/data/eml/outer-pgp-sig-inner-pgp-enc-with-mixed.eml
new file mode 100644
index 0000000000..3432e3de57
--- /dev/null
+++ b/comm/mail/test/browser/openpgp/data/eml/outer-pgp-sig-inner-pgp-enc-with-mixed.eml
@@ -0,0 +1,92 @@
+X-Info: File is based on unsigned-encrypted-to-0xf231550c4f47e38e-from-0x3099ff1238852b9f.eml
+To: alice@openpgp.example
+From: Carol <carol@example.com>
+Message-ID: <de515a63-a4fe-022e-4a3c-96f07536dbf8@example.com>
+Date: Wed, 14 Oct 2020 14:57:39 -0400
+User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:83.0) Gecko/20100101
+ Thunderbird/83.0a1
+MIME-Version: 1.0
+Subject: ...
+Content-Type: multipart/signed; micalg=pgp-sha256;
+ protocol="application/pgp-signature";
+ boundary="------------rvEyIV4on03ewe0w3mDNOC3U"
+
+This is an OpenPGP/MIME signed message (RFC 4880 and 3156)
+--------------rvEyIV4on03ewe0w3mDNOC3U
+Content-Type: multipart/mixed; boundary="MIXEDBOUNDARY"
+
+--MIXEDBOUNDARY
+Content-type: text/plain
+
+Additional text
+
+--MIXEDBOUNDARY
+Content-Type: multipart/encrypted;
+ protocol="application/pgp-encrypted";
+ boundary="INcRzoKbgw6NbXSE5JAUq7uEbtRvQ6Hp7"
+
+This is an OpenPGP/MIME encrypted message (RFC 4880 and 3156)
+--INcRzoKbgw6NbXSE5JAUq7uEbtRvQ6Hp7
+Content-Type: application/pgp-encrypted
+Content-Description: PGP/MIME version identification
+
+Version: 1
+
+--INcRzoKbgw6NbXSE5JAUq7uEbtRvQ6Hp7
+Content-Type: application/octet-stream; name="encrypted.asc"
+Content-Description: OpenPGP encrypted message
+Content-Disposition: inline; filename="encrypted.asc"
+
+-----BEGIN PGP MESSAGE-----
+
+wcFMA7L9So5P9bk9AQ//WTEFHnI2KYZJbgTfk8CaREcQpE/beaO1ysXdzCqpdRGWtU2UlbqmPxbu
+PmGDWg5f43qUEgO9mG2zsEvnGKlEoJmBFYaXXGhz/6+OoFY7VI+9DDtAWD5Oi8jzzKnUbyjPQO2a
+16PbLeOs/ydjt5eRNVaUVtnyTXMhp4JMLET1ISQF1FxjJJ00XRnaYzRRt/U6MHzIFLnZGBZYr+tY
+K1z+5vtsU6P0ZfWV/Hh8tFR6oqJ0Tiwji+zKwgUupKwC2QQIFy3j4GGrqJTejXiFfo5U/P4i5h4O
+X5qcnKzCX2spi7CTIJdx+uXKYAW2e9zsQIEQyIFoe8mZLgZcR0OLoH7ledfAeMBmVgS8GlM9uitj
+SWkiLa98gnudZbKiL7KXQ/e/TBLKVTPFtoorpGBmfYeJ6/YV42kQXPwK+ABHbxX52T7Tm7d12LRa
+Q27sp/SwnJYoi3hASA4NKViBi8B2gdV/DHzgsSfvHtEpMvN1LgaREolwESQ6U68yg/EDfohGdPdW
+eRiyo/p4jQ3Yo9v6n/boIxEb7xhkymhwQi2sZ9lyzU4HO18xrZ4sSpTjoMYyQV4ebA8nMqwbNpWn
+ACxWYeMtMdE4p6wJmMY232LlNtEAXkJbJbY+BDlKb9y6uMLBGHhXH4v7G9zaA3nDBWHNHAvP1cAg
+kgqURvqhxkgZqPz40cHBXgNHZva51fIethIBB0AykUD/87/8UHaKZX7MYUWr/CNBP+N68qFTgGp7
+UzMgSTAdpz+xzeC7S4BNoVh2IAg40r+ie38dJDxYJbEyvkhkr2wRhZf8A8z0/eGJczjEP/vSwW0B
+TkGuH9zZrlqH03jXZ0RUTGnA6oBq2wpGrBniHNZRJ7+ImS/cJT5D4uuITVDXl51EgTJQENxmSdyo
+YGe/lNoB4MVTxzmPfjWdOC2FqkGoc4jVzSwGaZ+OfLA/GviucholvaNz/LobZJ/AMXBvCbc3jh6y
+YvcZnjtDFFdUJHPCA4M8staEIVCz63UT5fdoXLWdr62H1NOhxWQDlyoZle+a2oM3FVEdyVKLt98b
+mTIP71YGhVXU4oRCujtiopVxQXzVugXXTEioebMw1+QLZLr663Xo1Kr+nlZlDDFBY9+NGLB7lX7g
+QqNkFUfw55jWFYWsj1N4U3/IzHplh/xGF9KH296ZKnzi66w6YRfp5QVKCT+fahOhxKWkKeTOl9Lf
+saUhPs93QMcVFRSW0igZrTh/fPZcplsgakpYchR9QcevkeHdCizk3CY5uULqMY6blUz3NU/aOMWw
+6fuLtwo1svBm1Vg0yh/mMA7HsRsIIB5xmkXEaP6PwM3WKLN4AZrcErQTwdvJ8HPGnIECCePugHOK
+EPB5JRj3aSp997Xwv+3z74bmp5GisjjtK3wFn8zYr0QI0hivRd9vz943rdh9iIMxCSAglawaqa0i
+BhUfhPIQyOfEWu5MBoIofW97oxnHaQ8/A/Bj2uvCIDUDPD2C50BHuVdtjsW9GlOmQ3ZUwj7llbuq
+O3oUeDzqaMdPgFt1QmfowXEkFAQcwRb0EbNboHX1q3F1QCXLklw3Dww/lw==
+=rZjL
+-----END PGP MESSAGE-----
+
+--INcRzoKbgw6NbXSE5JAUq7uEbtRvQ6Hp7--
+
+--MIXEDBOUNDARY--
+
+--------------rvEyIV4on03ewe0w3mDNOC3U
+Content-Type: application/pgp-signature; name="OpenPGP_signature.asc"
+Content-Description: OpenPGP digital signature
+Content-Disposition: attachment; filename="OpenPGP_signature"
+
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCAAdFiEEuPL29L060/gtxEaDMJn/EjiFK58FAmObKrAACgkQMJn/EjiF
+K59pjQ//bAJQpE1at9sRVUinYMxPLsbmwKhjmEms007hXYVNNivywDUi3Mc14l/p
+z7wOPs2iQeP2CSSBoJjzku3f8cjD75MEYnbDVLD48GJJU7vEIQtlXP4CJiK76dsV
+4WnjzLGbZd08pGr02ERgvgR+PdxppLtj8W7SVvVd60V8fwWQFpF87uFCrTGnfTZk
+wWQui6MqTsSXJ/dBeqjvkZ95cSlWjVqunmLNzJsesnf1k9iq68NqUzsRT8IEqFo7
+PttIK11hX3b6b71XGiP5XLz+ZXx+2O6lDo91TRZ7VzP/I2oJkxjwcTTI4Kqk6ypS
+ZkH9+0XZLpcesVIjYnrY0lBLjh+dxe63lw1BY3JmHOsAX6glwqLywTra1EVEdxw2
+0aqO2KJ9yJ4nSZj6kJiRwE/YOUX0gOOdJ64hL8G7ZCPkYA/xS8lfOQiUaMO3baS/
+lmtkymT6nkm3ub+U0VlEkvpmhw3Y6tfRQ/6aFhMDqB+GFLKDRP/UopHPWxPUmkRy
+j36eFqRTjKULmBAGwfQGB5A+By850tlQ9gtDyy7GcNDnsAAeVV5WC0Spqp/Hhm5A
+n/9VfYvyikTzBN07Of1JL2fNgH+/8WcaWnjDP1mlFGVNhZLqkTE/VsjKZN/LKKNM
+Z2VKNuhbe1PryrvR72M7QJ/ymGFkCx0k3vjOCcN+SuApCRBj38E=
+=/SQd
+-----END PGP SIGNATURE-----
+
+--------------rvEyIV4on03ewe0w3mDNOC3U--
diff --git a/comm/mail/test/browser/openpgp/data/eml/outer-pgp-sig-inner-pgp-enc.eml b/comm/mail/test/browser/openpgp/data/eml/outer-pgp-sig-inner-pgp-enc.eml
new file mode 100644
index 0000000000..c17628190a
--- /dev/null
+++ b/comm/mail/test/browser/openpgp/data/eml/outer-pgp-sig-inner-pgp-enc.eml
@@ -0,0 +1,82 @@
+X-Info: File is based on unsigned-encrypted-to-0xf231550c4f47e38e-from-0x3099ff1238852b9f.eml
+To: alice@openpgp.example
+From: Carol <carol@example.com>
+Message-ID: <de515a63-a4fe-022e-4a3c-96f07536dbf8@example.com>
+Date: Wed, 14 Oct 2020 14:57:39 -0400
+User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:83.0) Gecko/20100101
+ Thunderbird/83.0a1
+MIME-Version: 1.0
+Subject: ...
+Content-Type: multipart/signed; micalg=pgp-sha256;
+ protocol="application/pgp-signature";
+ boundary="------------rvEyIV4on03ewe0w3mDNOC3U"
+
+This is an OpenPGP/MIME signed message (RFC 4880 and 3156)
+--------------rvEyIV4on03ewe0w3mDNOC3U
+Content-Type: multipart/encrypted;
+ protocol="application/pgp-encrypted";
+ boundary="INcRzoKbgw6NbXSE5JAUq7uEbtRvQ6Hp7"
+
+This is an OpenPGP/MIME encrypted message (RFC 4880 and 3156)
+--INcRzoKbgw6NbXSE5JAUq7uEbtRvQ6Hp7
+Content-Type: application/pgp-encrypted
+Content-Description: PGP/MIME version identification
+
+Version: 1
+
+--INcRzoKbgw6NbXSE5JAUq7uEbtRvQ6Hp7
+Content-Type: application/octet-stream; name="encrypted.asc"
+Content-Description: OpenPGP encrypted message
+Content-Disposition: inline; filename="encrypted.asc"
+
+-----BEGIN PGP MESSAGE-----
+
+wcFMA7L9So5P9bk9AQ//WTEFHnI2KYZJbgTfk8CaREcQpE/beaO1ysXdzCqpdRGWtU2UlbqmPxbu
+PmGDWg5f43qUEgO9mG2zsEvnGKlEoJmBFYaXXGhz/6+OoFY7VI+9DDtAWD5Oi8jzzKnUbyjPQO2a
+16PbLeOs/ydjt5eRNVaUVtnyTXMhp4JMLET1ISQF1FxjJJ00XRnaYzRRt/U6MHzIFLnZGBZYr+tY
+K1z+5vtsU6P0ZfWV/Hh8tFR6oqJ0Tiwji+zKwgUupKwC2QQIFy3j4GGrqJTejXiFfo5U/P4i5h4O
+X5qcnKzCX2spi7CTIJdx+uXKYAW2e9zsQIEQyIFoe8mZLgZcR0OLoH7ledfAeMBmVgS8GlM9uitj
+SWkiLa98gnudZbKiL7KXQ/e/TBLKVTPFtoorpGBmfYeJ6/YV42kQXPwK+ABHbxX52T7Tm7d12LRa
+Q27sp/SwnJYoi3hASA4NKViBi8B2gdV/DHzgsSfvHtEpMvN1LgaREolwESQ6U68yg/EDfohGdPdW
+eRiyo/p4jQ3Yo9v6n/boIxEb7xhkymhwQi2sZ9lyzU4HO18xrZ4sSpTjoMYyQV4ebA8nMqwbNpWn
+ACxWYeMtMdE4p6wJmMY232LlNtEAXkJbJbY+BDlKb9y6uMLBGHhXH4v7G9zaA3nDBWHNHAvP1cAg
+kgqURvqhxkgZqPz40cHBXgNHZva51fIethIBB0AykUD/87/8UHaKZX7MYUWr/CNBP+N68qFTgGp7
+UzMgSTAdpz+xzeC7S4BNoVh2IAg40r+ie38dJDxYJbEyvkhkr2wRhZf8A8z0/eGJczjEP/vSwW0B
+TkGuH9zZrlqH03jXZ0RUTGnA6oBq2wpGrBniHNZRJ7+ImS/cJT5D4uuITVDXl51EgTJQENxmSdyo
+YGe/lNoB4MVTxzmPfjWdOC2FqkGoc4jVzSwGaZ+OfLA/GviucholvaNz/LobZJ/AMXBvCbc3jh6y
+YvcZnjtDFFdUJHPCA4M8staEIVCz63UT5fdoXLWdr62H1NOhxWQDlyoZle+a2oM3FVEdyVKLt98b
+mTIP71YGhVXU4oRCujtiopVxQXzVugXXTEioebMw1+QLZLr663Xo1Kr+nlZlDDFBY9+NGLB7lX7g
+QqNkFUfw55jWFYWsj1N4U3/IzHplh/xGF9KH296ZKnzi66w6YRfp5QVKCT+fahOhxKWkKeTOl9Lf
+saUhPs93QMcVFRSW0igZrTh/fPZcplsgakpYchR9QcevkeHdCizk3CY5uULqMY6blUz3NU/aOMWw
+6fuLtwo1svBm1Vg0yh/mMA7HsRsIIB5xmkXEaP6PwM3WKLN4AZrcErQTwdvJ8HPGnIECCePugHOK
+EPB5JRj3aSp997Xwv+3z74bmp5GisjjtK3wFn8zYr0QI0hivRd9vz943rdh9iIMxCSAglawaqa0i
+BhUfhPIQyOfEWu5MBoIofW97oxnHaQ8/A/Bj2uvCIDUDPD2C50BHuVdtjsW9GlOmQ3ZUwj7llbuq
+O3oUeDzqaMdPgFt1QmfowXEkFAQcwRb0EbNboHX1q3F1QCXLklw3Dww/lw==
+=rZjL
+-----END PGP MESSAGE-----
+
+--INcRzoKbgw6NbXSE5JAUq7uEbtRvQ6Hp7--
+
+--------------rvEyIV4on03ewe0w3mDNOC3U
+Content-Type: application/pgp-signature; name="OpenPGP_signature.asc"
+Content-Description: OpenPGP digital signature
+Content-Disposition: attachment; filename="OpenPGP_signature"
+
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCAAdFiEEuPL29L060/gtxEaDMJn/EjiFK58FAmObKrAACgkQMJn/EjiF
+K59pjQ//bAJQpE1at9sRVUinYMxPLsbmwKhjmEms007hXYVNNivywDUi3Mc14l/p
+z7wOPs2iQeP2CSSBoJjzku3f8cjD75MEYnbDVLD48GJJU7vEIQtlXP4CJiK76dsV
+4WnjzLGbZd08pGr02ERgvgR+PdxppLtj8W7SVvVd60V8fwWQFpF87uFCrTGnfTZk
+wWQui6MqTsSXJ/dBeqjvkZ95cSlWjVqunmLNzJsesnf1k9iq68NqUzsRT8IEqFo7
+PttIK11hX3b6b71XGiP5XLz+ZXx+2O6lDo91TRZ7VzP/I2oJkxjwcTTI4Kqk6ypS
+ZkH9+0XZLpcesVIjYnrY0lBLjh+dxe63lw1BY3JmHOsAX6glwqLywTra1EVEdxw2
+0aqO2KJ9yJ4nSZj6kJiRwE/YOUX0gOOdJ64hL8G7ZCPkYA/xS8lfOQiUaMO3baS/
+lmtkymT6nkm3ub+U0VlEkvpmhw3Y6tfRQ/6aFhMDqB+GFLKDRP/UopHPWxPUmkRy
+j36eFqRTjKULmBAGwfQGB5A+By850tlQ9gtDyy7GcNDnsAAeVV5WC0Spqp/Hhm5A
+n/9VfYvyikTzBN07Of1JL2fNgH+/8WcaWnjDP1mlFGVNhZLqkTE/VsjKZN/LKKNM
+Z2VKNuhbe1PryrvR72M7QJ/ymGFkCx0k3vjOCcN+SuApCRBj38E=
+=/SQd
+-----END PGP SIGNATURE-----
+
+--------------rvEyIV4on03ewe0w3mDNOC3U--
diff --git a/comm/mail/test/browser/openpgp/data/eml/outer-pgp-sig-inner-smime-enc-sig.eml b/comm/mail/test/browser/openpgp/data/eml/outer-pgp-sig-inner-smime-enc-sig.eml
new file mode 100644
index 0000000000..4851385105
--- /dev/null
+++ b/comm/mail/test/browser/openpgp/data/eml/outer-pgp-sig-inner-smime-enc-sig.eml
@@ -0,0 +1,113 @@
+X-Info: Based on alice.env.eml
+MIME-Version: 1.0
+From: Alice@example.com
+To: Bob@example.com
+Subject: clear-signed then enveloped sig.SHA256
+Content-Type: multipart/signed; micalg=pgp-sha256;
+ protocol="application/pgp-signature";
+ boundary="------------rvEyIV4on03ewe0w3mDNOC3U"
+
+This is an OpenPGP/MIME signed message (RFC 4880 and 3156)
+--------------rvEyIV4on03ewe0w3mDNOC3U
+Content-Type: application/pkcs7-mime; name=smime.p7m;
+ smime-type=enveloped-data
+Content-Transfer-Encoding: base64
+Content-Disposition: attachment; filename=smime.p7m
+Content-Description: S/MIME Encrypted Message
+
+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
+eQAAAAAAAAAAAAA=
+
+--------------rvEyIV4on03ewe0w3mDNOC3U
+Content-Type: application/pgp-signature; name="OpenPGP_signature.asc"
+Content-Description: OpenPGP digital signature
+Content-Disposition: attachment; filename="OpenPGP_signature"
+
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCAAdFiEEuPL29L060/gtxEaDMJn/EjiFK58FAmObNfwACgkQMJn/EjiF
+K59/CxAAlQ0dqIpo0k+pUTGmL9mFeO8e6lXjg8GwXe8tXA8oTaQ7J/z81XgE5D5v
+7uaQWkF86nD5m7PMZeHJbioNHeXv/KJKvp9LjQriZPcifRTefXdkFgDzNA3QzBS7
+yub/7ovD3RqeLZtPWZh8im/wzp0nA1dzFqh+bGd0E2kdHVnEwrnrIaHMO25UH65H
+RIQSNNyDw0G+JhDGohMkpuMFnZ5/6HR0T9m/OQwdMhYRbXVJAFd+kWbP2nrdTuG2
+qpOhmzxiGAARI1BmG5v7i1nxmrGPqpl7YQ1CkiDWx82g1qk/TGbi4I9lJJrywAgB
+G2nbTwTloxVo1KHI3YmzqS/vJ2uV2/QRprdVssDYfYIR4WSgCbVLEcy9EvMMiO83
+bm1cIenuVbSYb8wu1vlPCgRpHmp/zx2kzq8Ww6+yjslWPfChBS3BSBpS2S8HYNXU
+2mglUaaQYOhnQakjKXrFQqNarmKIBCSCVHUI6dqVYaN5btdpTkz0ZYMAa78Jg1fz
+g39kaCTL0eoSNuo7yUklw3bMqfj7dr4UrusAyFxtAAVb3pXMC8ltSs6XJa9Bt/kf
+STt2LIV1NnqhO6XmGQK/pusLHEeHa3vyKwIMmV9iM1QifDUv09xFez1o9roOyVep
+wJ0i374E169X8SCesq046Pq5meWIumV4U+ayghFnWFv2TzBOoh0=
+=df2O
+-----END PGP SIGNATURE-----
+
+--------------rvEyIV4on03ewe0w3mDNOC3U--
diff --git a/comm/mail/test/browser/openpgp/data/eml/outer-pgp-sig-inner-smime-enc.eml b/comm/mail/test/browser/openpgp/data/eml/outer-pgp-sig-inner-smime-enc.eml
new file mode 100644
index 0000000000..dd78fc1630
--- /dev/null
+++ b/comm/mail/test/browser/openpgp/data/eml/outer-pgp-sig-inner-smime-enc.eml
@@ -0,0 +1,55 @@
+X-Info: Based on alice.dsig.SHA256.multipart.env.eml
+MIME-Version: 1.0
+From: Alice@example.com
+To: Bob@example.com
+Subject: enveloped
+Content-Type: multipart/signed; micalg=pgp-sha256;
+ protocol="application/pgp-signature";
+ boundary="------------rvEyIV4on03ewe0w3mDNOC3U"
+
+This is an OpenPGP/MIME signed message (RFC 4880 and 3156)
+--------------rvEyIV4on03ewe0w3mDNOC3U
+Content-Type: application/pkcs7-mime; name=smime.p7m;
+ smime-type=enveloped-data
+Content-Transfer-Encoding: base64
+Content-Disposition: attachment; filename=smime.p7m
+Content-Description: S/MIME Encrypted Message
+
+MIAGCSqGSIb3DQEHA6CAMIACAQAxggGFMIIBgQIBADBpMGQxCzAJBgNVBAYTAlVT
+MRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRIw
+EAYDVQQKEwlCT0dVUyBOU1MxFDASBgNVBAMTC05TUyBUZXN0IENBAgEoMA0GCSqG
+SIb3DQEBAQUABIIBAFcGoL24XUZv8ZnBG1ld76tZ/AT9ZXCiNLexfkVSp/1hr9CU
+Ilz/fOQ7nOdNqYWaiLEzXDrgyjVHlLbOEKwXVXLVwy+RQgsTSbFYhFweqa4IinoT
+g8Q4/xkXquoQkk8XHPwavkKenjZljbwab0c4D2CwpfsKV0JeWpCNAOIZRiCrG+Aj
+M4KTkIgXFMuWYDGX6EhfTxqgCEMNnfKwhwYafBI+m/O8yW7MjBoSEIOae6tEk31E
+Jt4UEC4E7x2IXaU8yIZb0X5Knl72KcWP4RqO/Ym29xssTzXhW6ocxLgPPKY7OUMf
+MW6PkJuHkgTGwHK42FhX6xDsBx75MKfNTYQA3CUwgAYJKoZIhvcNAQcBMB0GCWCG
+SAFlAwQBAgQQQnhVDuViXS7I+UouwGJhmqCABIGgJ/I1Q7RWQEsw+9NwBxeDhfJg
+AMNHdjoKxe6UgP10Cag2A+P/37OFQ6avwSQXcFOnoVgr+ewn+AmmeTGBbxcHmmuX
+1lRd8TyZJcf7NqKaE/pqlSReKbBwTthBIxhP44T652CWSlZkINBPvmRHLZiymxG1
+ggTnmOsoUt2IR5R7KVaxJ/zQBFD0Q0Tug7wF/py3YHlqKeL0VFhA1/VfvLO1MgQQ
+dialx9mgeNqWNvJQ7r3j7wAAAAAAAAAAAAA=
+
+--------------rvEyIV4on03ewe0w3mDNOC3U
+Content-Type: application/pgp-signature; name="OpenPGP_signature.asc"
+Content-Description: OpenPGP digital signature
+Content-Disposition: attachment; filename="OpenPGP_signature"
+
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCAAdFiEEuPL29L060/gtxEaDMJn/EjiFK58FAmObNeAACgkQMJn/EjiF
+K58aPQ/+OYoMsHjVrAHhxKZ4HiK9hz+rt5mbI9udUx0krf0/QRug6Lz+zw4SLfjM
+jHRCHCBImTWB9LooIKQvFngM1Y9f2sA8i5xRLWR326ZJgDNkiUMpRokpzNCH7Xf3
+ybdFpKJTFEqMIEfuNiWWKbwla+O2ZwvfE60b2QnSRq/ICbqZfzvGNpbVOHfyuKWn
+gd/fyWqDBFmRx6+PJuuP6GmZH7h4wnkHDF7faem+ZgW4qZbly53s80H5tsQ2Bydi
+BCk00eqbNPJqUNqFgYH91ANfn9qZPD9o3mydCIyPcRnR/3QIQa35ZgM7AWApBdPc
+uOIdNkoVCDSFQZUuuPtrK+Me9dohxzdQ656pI/Z1NIO8hAUOG5tWM857RXGHrIxA
+7LKYd5nm2m95I0xOsL3KqnZkonqH6XTuUucUt1oKO5x8yjJnedlYhazolaCARB9R
+YSALXbJkDEs52M4B0NTQq6i/mD8pO644wKuxqD8es3CaRkKREPphxzcWWCjo19ex
+7e8N0P6cAg6RfNql82OLgBGiQ2UvZSY73kwbNAZ3ZKORleRNE9kjOvGIixxhVoG2
+vszvZbdDo4NtQD4BcXtR6faAnSiOCW5RRNN39NGcQMXVZf1DY2ryo6rD7B2HQThI
+KkbOWzlJ9sYt5g8khTUxNipmnNe9kMyim8VpKdMnOV8TxBHb0r4=
+=b2z0
+-----END PGP SIGNATURE-----
+
+--------------rvEyIV4on03ewe0w3mDNOC3U--
diff --git a/comm/mail/test/browser/openpgp/data/eml/outer-smime-bad-sig-inner-pgp-enc-sig-with-mixed.eml b/comm/mail/test/browser/openpgp/data/eml/outer-smime-bad-sig-inner-pgp-enc-sig-with-mixed.eml
new file mode 100644
index 0000000000..413e48ba22
--- /dev/null
+++ b/comm/mail/test/browser/openpgp/data/eml/outer-smime-bad-sig-inner-pgp-enc-sig-with-mixed.eml
@@ -0,0 +1,135 @@
+X-Info: File is based on signed-by-0x3099ff1238852b9f-encrypted-to-0xf231550c4f47e38e.eml
+To: alice@openpgp.example
+From: Carol <carol@example.com>
+Message-ID: <1241106f-5ef5-ae8a-36ed-02d6f8f84d62@example.com>
+Date: Wed, 14 Oct 2020 14:29:03 -0400
+User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:83.0) Gecko/20100101
+ Thunderbird/83.0a1
+MIME-Version: 1.0
+Subject: ...
+Content-Type: multipart/signed; protocol="application/pkcs7-signature"; micalg=sha-256; boundary="------------ms030903020902020502030404"
+
+This is a cryptographically signed message in MIME format.
+
+--------------ms030903020902020502030404
+Content-Type: multipart/mixed; boundary="MIXEDBOUNDARY"
+
+--MIXEDBOUNDARY
+Content-type: text/plain
+
+Additional text
+
+--MIXEDBOUNDARY
+Content-Type: multipart/encrypted;
+ protocol="application/pgp-encrypted";
+ boundary="PAOkQ1PqAvtLhLyHxuarNAvN1z6Qj8TMm"
+
+This is an OpenPGP/MIME encrypted message (RFC 4880 and 3156)
+--PAOkQ1PqAvtLhLyHxuarNAvN1z6Qj8TMm
+Content-Type: application/pgp-encrypted
+Content-Description: PGP/MIME version identification
+
+Version: 1
+
+--PAOkQ1PqAvtLhLyHxuarNAvN1z6Qj8TMm
+Content-Type: application/octet-stream; name="encrypted.asc"
+Content-Description: OpenPGP encrypted message
+Content-Disposition: inline; filename="encrypted.asc"
+
+-----BEGIN PGP MESSAGE-----
+
+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
+=d8b2
+-----END PGP MESSAGE-----
+
+--PAOkQ1PqAvtLhLyHxuarNAvN1z6Qj8TMm--
+
+--MIXEDBOUNDARY--
+
+--------------ms030903020902020502030404
+Content-Type: application/pkcs7-signature; name=smime.p7s
+Content-Transfer-Encoding: base64
+Content-Disposition: attachment; filename=smime.p7s
+Content-Description: S/MIME Cryptographic Signature
+
+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
+--------------ms030903020902020502030404--
+
diff --git a/comm/mail/test/browser/openpgp/data/eml/outer-smime-bad-sig-inner-pgp-enc-sig.eml b/comm/mail/test/browser/openpgp/data/eml/outer-smime-bad-sig-inner-pgp-enc-sig.eml
new file mode 100644
index 0000000000..aa55af42c0
--- /dev/null
+++ b/comm/mail/test/browser/openpgp/data/eml/outer-smime-bad-sig-inner-pgp-enc-sig.eml
@@ -0,0 +1,125 @@
+X-Info: File is based on signed-by-0x3099ff1238852b9f-encrypted-to-0xf231550c4f47e38e.eml
+To: alice@openpgp.example
+From: Carol <carol@example.com>
+Message-ID: <1241106f-5ef5-ae8a-36ed-02d6f8f84d62@example.com>
+Date: Wed, 14 Oct 2020 14:29:03 -0400
+User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:83.0) Gecko/20100101
+ Thunderbird/83.0a1
+MIME-Version: 1.0
+Subject: ...
+Content-Type: multipart/signed; protocol="application/pkcs7-signature"; micalg=sha-256; boundary="------------ms030903020902020502030404"
+
+This is a cryptographically signed message in MIME format.
+
+--------------ms030903020902020502030404
+Content-Type: multipart/encrypted;
+ protocol="application/pgp-encrypted";
+ boundary="PAOkQ1PqAvtLhLyHxuarNAvN1z6Qj8TMm"
+
+This is an OpenPGP/MIME encrypted message (RFC 4880 and 3156)
+--PAOkQ1PqAvtLhLyHxuarNAvN1z6Qj8TMm
+Content-Type: application/pgp-encrypted
+Content-Description: PGP/MIME version identification
+
+Version: 1
+
+--PAOkQ1PqAvtLhLyHxuarNAvN1z6Qj8TMm
+Content-Type: application/octet-stream; name="encrypted.asc"
+Content-Description: OpenPGP encrypted message
+Content-Disposition: inline; filename="encrypted.asc"
+
+-----BEGIN PGP MESSAGE-----
+
+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
+=d8b2
+-----END PGP MESSAGE-----
+
+--PAOkQ1PqAvtLhLyHxuarNAvN1z6Qj8TMm--
+
+--------------ms030903020902020502030404
+Content-Type: application/pkcs7-signature; name=smime.p7s
+Content-Transfer-Encoding: base64
+Content-Disposition: attachment; filename=smime.p7s
+Content-Description: S/MIME Cryptographic Signature
+
+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
+--------------ms030903020902020502030404--
+
diff --git a/comm/mail/test/browser/openpgp/data/eml/outer-smime-bad-sig-inner-pgp-enc.eml b/comm/mail/test/browser/openpgp/data/eml/outer-smime-bad-sig-inner-pgp-enc.eml
new file mode 100644
index 0000000000..a5d8f8b0c8
--- /dev/null
+++ b/comm/mail/test/browser/openpgp/data/eml/outer-smime-bad-sig-inner-pgp-enc.eml
@@ -0,0 +1,101 @@
+X-Info: File is based on unsigned-encrypted-to-0xf231550c4f47e38e-from-0x3099ff1238852b9f.eml
+To: alice@openpgp.example
+From: Carol <carol@example.com>
+Message-ID: <de515a63-a4fe-022e-4a3c-96f07536dbf8@example.com>
+Date: Wed, 14 Oct 2020 14:57:39 -0400
+User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:83.0) Gecko/20100101
+ Thunderbird/83.0a1
+MIME-Version: 1.0
+Subject: ...
+Content-Type: multipart/signed; protocol="application/pkcs7-signature"; micalg=sha-256; boundary="------------ms030903020902020502030404"
+
+This is a cryptographically signed message in MIME format.
+
+--------------ms030903020902020502030404
+Content-Type: multipart/encrypted;
+ protocol="application/pgp-encrypted";
+ boundary="INcRzoKbgw6NbXSE5JAUq7uEbtRvQ6Hp7"
+
+This is an OpenPGP/MIME encrypted message (RFC 4880 and 3156)
+--INcRzoKbgw6NbXSE5JAUq7uEbtRvQ6Hp7
+Content-Type: application/pgp-encrypted
+Content-Description: PGP/MIME version identification
+
+Version: 1
+
+--INcRzoKbgw6NbXSE5JAUq7uEbtRvQ6Hp7
+Content-Type: application/octet-stream; name="encrypted.asc"
+Content-Description: OpenPGP encrypted message
+Content-Disposition: inline; filename="encrypted.asc"
+
+-----BEGIN PGP MESSAGE-----
+
+wcFMA7L9So5P9bk9AQ//WTEFHnI2KYZJbgTfk8CaREcQpE/beaO1ysXdzCqpdRGWtU2UlbqmPxbu
+PmGDWg5f43qUEgO9mG2zsEvnGKlEoJmBFYaXXGhz/6+OoFY7VI+9DDtAWD5Oi8jzzKnUbyjPQO2a
+16PbLeOs/ydjt5eRNVaUVtnyTXMhp4JMLET1ISQF1FxjJJ00XRnaYzRRt/U6MHzIFLnZGBZYr+tY
+K1z+5vtsU6P0ZfWV/Hh8tFR6oqJ0Tiwji+zKwgUupKwC2QQIFy3j4GGrqJTejXiFfo5U/P4i5h4O
+X5qcnKzCX2spi7CTIJdx+uXKYAW2e9zsQIEQyIFoe8mZLgZcR0OLoH7ledfAeMBmVgS8GlM9uitj
+SWkiLa98gnudZbKiL7KXQ/e/TBLKVTPFtoorpGBmfYeJ6/YV42kQXPwK+ABHbxX52T7Tm7d12LRa
+Q27sp/SwnJYoi3hASA4NKViBi8B2gdV/DHzgsSfvHtEpMvN1LgaREolwESQ6U68yg/EDfohGdPdW
+eRiyo/p4jQ3Yo9v6n/boIxEb7xhkymhwQi2sZ9lyzU4HO18xrZ4sSpTjoMYyQV4ebA8nMqwbNpWn
+ACxWYeMtMdE4p6wJmMY232LlNtEAXkJbJbY+BDlKb9y6uMLBGHhXH4v7G9zaA3nDBWHNHAvP1cAg
+kgqURvqhxkgZqPz40cHBXgNHZva51fIethIBB0AykUD/87/8UHaKZX7MYUWr/CNBP+N68qFTgGp7
+UzMgSTAdpz+xzeC7S4BNoVh2IAg40r+ie38dJDxYJbEyvkhkr2wRhZf8A8z0/eGJczjEP/vSwW0B
+TkGuH9zZrlqH03jXZ0RUTGnA6oBq2wpGrBniHNZRJ7+ImS/cJT5D4uuITVDXl51EgTJQENxmSdyo
+YGe/lNoB4MVTxzmPfjWdOC2FqkGoc4jVzSwGaZ+OfLA/GviucholvaNz/LobZJ/AMXBvCbc3jh6y
+YvcZnjtDFFdUJHPCA4M8staEIVCz63UT5fdoXLWdr62H1NOhxWQDlyoZle+a2oM3FVEdyVKLt98b
+mTIP71YGhVXU4oRCujtiopVxQXzVugXXTEioebMw1+QLZLr663Xo1Kr+nlZlDDFBY9+NGLB7lX7g
+QqNkFUfw55jWFYWsj1N4U3/IzHplh/xGF9KH296ZKnzi66w6YRfp5QVKCT+fahOhxKWkKeTOl9Lf
+saUhPs93QMcVFRSW0igZrTh/fPZcplsgakpYchR9QcevkeHdCizk3CY5uULqMY6blUz3NU/aOMWw
+6fuLtwo1svBm1Vg0yh/mMA7HsRsIIB5xmkXEaP6PwM3WKLN4AZrcErQTwdvJ8HPGnIECCePugHOK
+EPB5JRj3aSp997Xwv+3z74bmp5GisjjtK3wFn8zYr0QI0hivRd9vz943rdh9iIMxCSAglawaqa0i
+BhUfhPIQyOfEWu5MBoIofW97oxnHaQ8/A/Bj2uvCIDUDPD2C50BHuVdtjsW9GlOmQ3ZUwj7llbuq
+O3oUeDzqaMdPgFt1QmfowXEkFAQcwRb0EbNboHX1q3F1QCXLklw3Dww/lw==
+=rZjL
+-----END PGP MESSAGE-----
+
+--INcRzoKbgw6NbXSE5JAUq7uEbtRvQ6Hp7--
+
+--------------ms030903020902020502030404
+Content-Type: application/pkcs7-signature; name=smime.p7s
+Content-Transfer-Encoding: base64
+Content-Disposition: attachment; filename=smime.p7s
+Content-Description: S/MIME Cryptographic Signature
+
+MIAGCSqGSIb3DQEHAqCAMIACAQExDzANBglghkgBZQMEAgEFADCABgkqhkiG9w0B
+BwEAAKCCA2IwggNeMIICRqADAgECAgEeMA0GCSqGSIb3DQEBCwUAMGQxCzAJBgNV
+BAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1Nb3VudGFpbiBW
+aWV3MRIwEAYDVQQKEwlCT0dVUyBOU1MxFDASBgNVBAMTC05TUyBUZXN0IENBMB4X
+DTIyMTIxNTA5MDk1N1oXDTI3MTIxNTA5MDk1N1owgYAxCzAJBgNVBAYTAlVTMRMw
+EQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRIwEAYD
+VQQKEwlCT0dVUyBOU1MxIDAeBgkqhkiG9w0BCQEWEUFsaWNlQGV4YW1wbGUuY29t
+MQ4wDAYDVQQDEwVBbGljZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+ALUryBlKMhddXWPI5hrNm7yrY13tIWVuDxMd+Ytq6tFIS9+5Py3RuGTtBOCx3Tkf
+F4EahfdeA5PC6aXCHNaXnwFLLiA+Eq1EzM/ANr2SHR+iWwuvOZComNYaWigswyWU
+rCGJigGB93bC7i1WczgTwQc0zA3K3PbFai8J7bUAwJ39fUqGE6xeM2+RCtVcdU+d
+tkYBFy1nHz2N9K9XIwTNg4aUqCOONwQvZgcKy+HrUQIBhnAnfODjyyqlGRZunj0E
+zA/0D00LCzUtvdaNA5HV3xWRW6Njt4Sn5WrmAfFsTOf8Xm3l/sgrYaiXd3fmo2c+
+JjBgQ0NV2nzczDbihf6dVYUCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAj84R6KF8
+Ve9ZTAw9LdcYnx6+u6emacM/HUESAETBYF2f0f97EASKzUIgtALh0fFXNbzWfc/a
+TzZYek0ilIBFN2LYhkWi69OSLXvQCrYiVBgkmJwf1IFFK+fqr+ZUihdp/URhTuyk
+fH5wnAkYc/Vq4RJWgouujpZVdhsJlvQS+WmnrGLIKRCMQtFfsJ6e6GCgSmhxED4O
+Ds2TnTL1Tq/pECwIwl7iToB2E95RiFRYZz28twV+OmmSY/DQoxKk9Encn5K5BEId
+27iiouVjDMqh+M4qtIrGQiI2Vdcwvb+AUwyrMC6YTKqdnQXC2EsA8g0Dx2tkIx/a
+Gwlma96Op9gWXjGCAtkwggLVAgEBMGkwZDELMAkGA1UEBhMCVVMxEzARBgNVBAgT
+CkNhbGlmb3JuaWExFjAUBgNVBAcTDU1vdW50YWluIFZpZXcxEjAQBgNVBAoTCUJP
+R1VTIE5TUzEUMBIGA1UEAxMLTlNTIFRlc3QgQ0ECAR4wDQYJYIZIAWUDBAIBBQCg
+ggFBMBgGCSqGSIb3DQEJAzELBgkqhkiG9w0BBwEwLwYJKoZIhvcNAQkEMSIEILJr
+dzzDNYWQV/M1oK41/rfKXs+hx4nk6HPGaJpiwfmGMHgGCSsGAQQBgjcQBDFrMGkw
+ZDELMAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDU1v
+dW50YWluIFZpZXcxEjAQBgNVBAoTCUJPR1VTIE5TUzEUMBIGA1UEAxMLTlNTIFRl
+c3QgQ0ECAR4wegYLKoZIhvcNAQkQAgsxa6BpMGQxCzAJBgNVBAYTAlVTMRMwEQYD
+VQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRIwEAYDVQQK
+EwlCT0dVUyBOU1MxFDASBgNVBAMTC05TUyBUZXN0IENBAgEeMA0GCSqGSIb3DQEB
+AQUABIIBAAxt7bvYNUpTx8FStpcQ9Z2Zrzw9pwZ2tWlPyFXRZpQMuD5mJKqyvXOL
+X9TBCEJEIloIeFTo0x1KE4iUAtfgv7D8E+YPpVt6sRdGjsn3+htnE/FfAySTSANr
+2I+BQaU05fSdvIHHCJ2OvK4O6JcoG1YzhEvuReBGdzg5NkQnFCp6CtV/vULO5Q7k
+NIjeeCEBVjJY37w6V6iSEmulYfA/0mv0ABKCu513xFVZP8qXQCJ32OrzB1vYwUfL
+bcMDcaubQT+5W6JTnX9VBszRe73Ayo8CCA0WBOnDxY02p1ncs8cRFhmX1kAfZ3qe
+n2eTTmS8ztANppAPYuc9sISwaMkgWqAAAAAAAAA=
+--------------ms030903020902020502030404--
+
diff --git a/comm/mail/test/browser/openpgp/data/eml/outer-smime-bad-sig-inner-smime-enc-sig.eml b/comm/mail/test/browser/openpgp/data/eml/outer-smime-bad-sig-inner-smime-enc-sig.eml
new file mode 100644
index 0000000000..5b8924f050
--- /dev/null
+++ b/comm/mail/test/browser/openpgp/data/eml/outer-smime-bad-sig-inner-smime-enc-sig.eml
@@ -0,0 +1,132 @@
+X-Info: Based on alice.env.eml
+MIME-Version: 1.0
+From: Alice@example.com
+To: Bob@example.com
+Subject: clear-signed then enveloped sig.SHA256
+Content-Type: multipart/signed; protocol="application/pkcs7-signature"; micalg=sha-256; boundary="------------ms030903020902020502030404"
+
+This is a cryptographically signed message in MIME format.
+
+--------------ms030903020902020502030404
+Content-Type: application/pkcs7-mime; name=smime.p7m;
+ smime-type=enveloped-data
+Content-Transfer-Encoding: base64
+Content-Disposition: attachment; filename=smime.p7m
+Content-Description: S/MIME Encrypted Message
+
+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
+eQAAAAAAAAAAAAA=
+
+--------------ms030903020902020502030404
+Content-Type: application/pkcs7-signature; name=smime.p7s
+Content-Transfer-Encoding: base64
+Content-Disposition: attachment; filename=smime.p7s
+Content-Description: S/MIME Cryptographic Signature
+
+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
+--------------ms030903020902020502030404--
+
diff --git a/comm/mail/test/browser/openpgp/data/eml/outer-smime-bad-sig-inner-smime-enc.eml b/comm/mail/test/browser/openpgp/data/eml/outer-smime-bad-sig-inner-smime-enc.eml
new file mode 100644
index 0000000000..f698617aea
--- /dev/null
+++ b/comm/mail/test/browser/openpgp/data/eml/outer-smime-bad-sig-inner-smime-enc.eml
@@ -0,0 +1,74 @@
+X-Info: Based on alice.dsig.SHA256.multipart.env.eml
+MIME-Version: 1.0
+From: Alice@example.com
+To: Bob@example.com
+Subject: enveloped
+Content-Type: multipart/signed; protocol="application/pkcs7-signature"; micalg=sha-256; boundary="------------ms030903020902020502030404"
+
+This is a cryptographically signed message in MIME format.
+
+--------------ms030903020902020502030404
+Content-Type: application/pkcs7-mime; name=smime.p7m;
+ smime-type=enveloped-data
+Content-Transfer-Encoding: base64
+Content-Disposition: attachment; filename=smime.p7m
+Content-Description: S/MIME Encrypted Message
+
+MIAGCSqGSIb3DQEHA6CAMIACAQAxggGFMIIBgQIBADBpMGQxCzAJBgNVBAYTAlVT
+MRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRIw
+EAYDVQQKEwlCT0dVUyBOU1MxFDASBgNVBAMTC05TUyBUZXN0IENBAgEoMA0GCSqG
+SIb3DQEBAQUABIIBAFcGoL24XUZv8ZnBG1ld76tZ/AT9ZXCiNLexfkVSp/1hr9CU
+Ilz/fOQ7nOdNqYWaiLEzXDrgyjVHlLbOEKwXVXLVwy+RQgsTSbFYhFweqa4IinoT
+g8Q4/xkXquoQkk8XHPwavkKenjZljbwab0c4D2CwpfsKV0JeWpCNAOIZRiCrG+Aj
+M4KTkIgXFMuWYDGX6EhfTxqgCEMNnfKwhwYafBI+m/O8yW7MjBoSEIOae6tEk31E
+Jt4UEC4E7x2IXaU8yIZb0X5Knl72KcWP4RqO/Ym29xssTzXhW6ocxLgPPKY7OUMf
+MW6PkJuHkgTGwHK42FhX6xDsBx75MKfNTYQA3CUwgAYJKoZIhvcNAQcBMB0GCWCG
+SAFlAwQBAgQQQnhVDuViXS7I+UouwGJhmqCABIGgJ/I1Q7RWQEsw+9NwBxeDhfJg
+AMNHdjoKxe6UgP10Cag2A+P/37OFQ6avwSQXcFOnoVgr+ewn+AmmeTGBbxcHmmuX
+1lRd8TyZJcf7NqKaE/pqlSReKbBwTthBIxhP44T652CWSlZkINBPvmRHLZiymxG1
+ggTnmOsoUt2IR5R7KVaxJ/zQBFD0Q0Tug7wF/py3YHlqKeL0VFhA1/VfvLO1MgQQ
+dialx9mgeNqWNvJQ7r3j7wAAAAAAAAAAAAA=
+
+--------------ms030903020902020502030404
+Content-Type: application/pkcs7-signature; name=smime.p7s
+Content-Transfer-Encoding: base64
+Content-Disposition: attachment; filename=smime.p7s
+Content-Description: S/MIME Cryptographic Signature
+
+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
+--------------ms030903020902020502030404--
+
diff --git a/comm/mail/test/browser/openpgp/data/eml/partial-encrypt-for-alice-html.eml b/comm/mail/test/browser/openpgp/data/eml/partial-encrypt-for-alice-html.eml
new file mode 100644
index 0000000000..43be338d8a
--- /dev/null
+++ b/comm/mail/test/browser/openpgp/data/eml/partial-encrypt-for-alice-html.eml
@@ -0,0 +1,31 @@
+From: "Bob" <bob@openpgp.example>
+To: "Alice Lovelace" <alice@openpgp.example>
+Subject: Inline Encrypted for Alice, with extra text in multipart HTML
+Date: Wed, 14 Apr 2021 01:01:01 +0000
+MIME-Version: 1.0
+Content-Type: multipart/mixed;
+ boundary="32989E6E4C7AEB7775BAD49432989E6E4C7AEB7775BAD494"
+
+--32989E6E4C7AEB7775BAD49432989E6E4C7AEB7775BAD494
+Content-Type: text/html; charset=utf-8
+
+prefix
+
+--32989E6E4C7AEB7775BAD49432989E6E4C7AEB7775BAD494
+Content-Type: text/html; charset=utf-8
+
+-----BEGIN PGP MESSAGE-----
+
+hE4DR2b2udXyHrYSAQdAq+9AhQzI4XpD9WtuB7f3OZHNFvdHza5WND3yLgxX8kwg
+eXs+jZGr3TNUpR+XRxCf9+7Er2JyJk7fvL4suUHpHEzSbQG57r4TxneCcV9pukK3
+wzSqNt2o/q/eVO6WwOs3Lo5+31gs9+z6lrVhVjO2cynPdjlNLCQlwRudsQfpNgrF
+4pO7n0tCrX0qWaKYgdQuJwIt1HS2nLYd+ryb9eLWO/Xhy3quo8YpD0yueSHjexI=
+=rSoz
+-----END PGP MESSAGE-----
+
+--32989E6E4C7AEB7775BAD49432989E6E4C7AEB7775BAD494
+Content-Type: text/html; charset=utf-8
+
+suffix
+
+--32989E6E4C7AEB7775BAD49432989E6E4C7AEB7775BAD494--
diff --git a/comm/mail/test/browser/openpgp/data/eml/partial-encrypt-for-alice-plaintext.eml b/comm/mail/test/browser/openpgp/data/eml/partial-encrypt-for-alice-plaintext.eml
new file mode 100644
index 0000000000..9fe370de30
--- /dev/null
+++ b/comm/mail/test/browser/openpgp/data/eml/partial-encrypt-for-alice-plaintext.eml
@@ -0,0 +1,19 @@
+From: "Bob" <bob@openpgp.example>
+To: "Alice Lovelace" <alice@openpgp.example>
+Subject: Inline Encrypted for Alice, with extra plaintext
+Date: Wed, 14 Apr 2021 01:01:02 +0000
+MIME-Version: 1.0
+Content-Type: text/plain
+
+prefix
+
+-----BEGIN PGP MESSAGE-----
+
+hE4DR2b2udXyHrYSAQdAq+9AhQzI4XpD9WtuB7f3OZHNFvdHza5WND3yLgxX8kwg
+eXs+jZGr3TNUpR+XRxCf9+7Er2JyJk7fvL4suUHpHEzSbQG57r4TxneCcV9pukK3
+wzSqNt2o/q/eVO6WwOs3Lo5+31gs9+z6lrVhVjO2cynPdjlNLCQlwRudsQfpNgrF
+4pO7n0tCrX0qWaKYgdQuJwIt1HS2nLYd+ryb9eLWO/Xhy3quo8YpD0yueSHjexI=
+=rSoz
+-----END PGP MESSAGE-----
+
+suffix
diff --git a/comm/mail/test/browser/openpgp/data/eml/partial-encrypt-for-carol-html.eml b/comm/mail/test/browser/openpgp/data/eml/partial-encrypt-for-carol-html.eml
new file mode 100644
index 0000000000..c05375c6b3
--- /dev/null
+++ b/comm/mail/test/browser/openpgp/data/eml/partial-encrypt-for-carol-html.eml
@@ -0,0 +1,41 @@
+From: "Bob" <bob@openpgp.example>
+To: "Carol" <carol@openpgp.example>
+Subject: Inline Encrypted for Caron, with extra text in multipart HTML
+Date: Wed, 14 Apr 2021 01:01:03 +0000
+MIME-Version: 1.0
+Content-Type: multipart/mixed;
+ boundary="32989E6E4C7AEB7775BAD49432989E6E4C7AEB7775BAD494"
+
+--32989E6E4C7AEB7775BAD49432989E6E4C7AEB7775BAD494
+Content-Type: text/html; charset=utf-8
+
+prefix
+
+--32989E6E4C7AEB7775BAD49432989E6E4C7AEB7775BAD494
+Content-Type: text/html; charset=utf-8
+
+-----BEGIN PGP MESSAGE-----
+
+hQIMA7L9So5P9bk9ARAA01Dr6NF4RrED8YADJx3WOOhIgUd55axpniQBPr66Xp6l
+mOCmPJnpSTA6DJzu28AyilrOedVx4rBfY9Bs4WS6d9joFo+zj+aoo9p8nBt2tu/8
+Ox8DbwWgVoQ4Po72LfZdH9FsPzfi4I2ytp/tjfHqjgl9Aakkm3vj09OM15aEfYxd
+oOO0DFk4vyuWojE6u1Y1bdg20hqPvmciyRFfgZC/51swcwFIDm34R20ASRzrwu1h
+kRUHEiGuz3JXPQnzADmK9OcLso9OxGX80WDe136BJG/wgFKqxCwmv0ykplOTJcm3
+VFWAJzguT27JGvJ+2/93IA2uyz1b7Rr4Ly6s6k9zhAPsDudyI2pOiIVpWWSGwiPW
+kX78JB5jvgjNs3Wh1dHp/TyKqivQz1qbgH2M78sKUdmbCHiD3Ak5b3F8h3JhrU7X
+3zwamZMmove1bkScL4TGXBMMZhwUe6BPg3fq42UHLtXccHlfm+XRWgHbT0su4ezZ
+2n3+5YDYozyfmytxZ7jeL9OSbQTNbNZmA+GTf10RX8ww9wwiffLNe8LGdwNaL96i
+F2lsC1Hfczw16fThBIEx7UF9LmJzzPNN7aOf+fbOLvkQFSPiGZg9tmXGzzRjDboT
+VKhpbV3GNFsCoOcry3Q7xzDgKiWXkdqCTqP9AGJfksQ0mdLQB94tfBYouX+g7PLS
+bQEyf6is0CReegpCSbSUZXURLPo381LrYdpV/PA0L+MDZse3xEKpc69zmE+H4oAT
+t/zF/Bh0ezxbN0AAHyldj82I7CP+Vtat0qSnUGsbd7G5nswwswxHXTA+FfDo+qBl
+U70ypxk/ZqPWcAAEkBo=
+=zsMo
+-----END PGP MESSAGE-----
+
+--32989E6E4C7AEB7775BAD49432989E6E4C7AEB7775BAD494
+Content-Type: text/html; charset=utf-8
+
+suffix
+
+--32989E6E4C7AEB7775BAD49432989E6E4C7AEB7775BAD494--
diff --git a/comm/mail/test/browser/openpgp/data/eml/partial-encrypt-for-carol-plaintext.eml b/comm/mail/test/browser/openpgp/data/eml/partial-encrypt-for-carol-plaintext.eml
new file mode 100644
index 0000000000..d9d6450402
--- /dev/null
+++ b/comm/mail/test/browser/openpgp/data/eml/partial-encrypt-for-carol-plaintext.eml
@@ -0,0 +1,29 @@
+From: "Bob" <bob@openpgp.example>
+To: "Carol" <carol@openpgp.example>
+Subject: Inline Encrypted for Carol, with extra plaintext
+Date: Wed, 14 Apr 2021 01:01:04 +0000
+MIME-Version: 1.0
+Content-Type: text/plain
+
+prefix
+
+-----BEGIN PGP MESSAGE-----
+
+hQIMA7L9So5P9bk9ARAA01Dr6NF4RrED8YADJx3WOOhIgUd55axpniQBPr66Xp6l
+mOCmPJnpSTA6DJzu28AyilrOedVx4rBfY9Bs4WS6d9joFo+zj+aoo9p8nBt2tu/8
+Ox8DbwWgVoQ4Po72LfZdH9FsPzfi4I2ytp/tjfHqjgl9Aakkm3vj09OM15aEfYxd
+oOO0DFk4vyuWojE6u1Y1bdg20hqPvmciyRFfgZC/51swcwFIDm34R20ASRzrwu1h
+kRUHEiGuz3JXPQnzADmK9OcLso9OxGX80WDe136BJG/wgFKqxCwmv0ykplOTJcm3
+VFWAJzguT27JGvJ+2/93IA2uyz1b7Rr4Ly6s6k9zhAPsDudyI2pOiIVpWWSGwiPW
+kX78JB5jvgjNs3Wh1dHp/TyKqivQz1qbgH2M78sKUdmbCHiD3Ak5b3F8h3JhrU7X
+3zwamZMmove1bkScL4TGXBMMZhwUe6BPg3fq42UHLtXccHlfm+XRWgHbT0su4ezZ
+2n3+5YDYozyfmytxZ7jeL9OSbQTNbNZmA+GTf10RX8ww9wwiffLNe8LGdwNaL96i
+F2lsC1Hfczw16fThBIEx7UF9LmJzzPNN7aOf+fbOLvkQFSPiGZg9tmXGzzRjDboT
+VKhpbV3GNFsCoOcry3Q7xzDgKiWXkdqCTqP9AGJfksQ0mdLQB94tfBYouX+g7PLS
+bQEyf6is0CReegpCSbSUZXURLPo381LrYdpV/PA0L+MDZse3xEKpc69zmE+H4oAT
+t/zF/Bh0ezxbN0AAHyldj82I7CP+Vtat0qSnUGsbd7G5nswwswxHXTA+FfDo+qBl
+U70ypxk/ZqPWcAAEkBo=
+=zsMo
+-----END PGP MESSAGE-----
+
+suffix
diff --git a/comm/mail/test/browser/openpgp/data/eml/partial-signed-from-bob-html.eml b/comm/mail/test/browser/openpgp/data/eml/partial-signed-from-bob-html.eml
new file mode 100644
index 0000000000..2ba377e24d
--- /dev/null
+++ b/comm/mail/test/browser/openpgp/data/eml/partial-signed-from-bob-html.eml
@@ -0,0 +1,41 @@
+From: "Bob" <bob@openpgp.example>
+To: "Alice Lovelace" <alice@openpgp.example>
+Subject: Inline Signed by Bob, with extra text in multipart HTML
+Date: Wed, 15 Apr 2021 17:55:59 +0200
+MIME-Version: 1.0
+Content-Type: multipart/mixed;
+ boundary="32989E6E4C7AEB7775BAD49432989E6E4C7AEB7775BAD494"
+
+--32989E6E4C7AEB7775BAD49432989E6E4C7AEB7775BAD494
+Content-Type: text/html; charset=utf-8
+
+prefix
+
+--32989E6E4C7AEB7775BAD49432989E6E4C7AEB7775BAD494
+Content-Type: text/html; charset=utf-8
+
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
+Insert a coin to play your personal lucky melody.
+-----BEGIN PGP SIGNATURE-----
+
+iQHIBAEBCgAyFiEE0aZuGiOxgsmYD3iM+/zIKgFeczAFAmB4Yg8UHGJvYkBvcGVu
+cGdwLmV4YW1wbGUACgkQ+/zIKgFeczC6twv/fYtlE8oNqhP5OzR48/rCEmJQ/U8Z
+NIp2Mvg3fpIMY1m2z4nwufCj4xNHM4okyqXnVouWBSLkRL3oPlkXj+syY1lV3Bv2
+Gbl5JMmpMbdSjKAEg7VaYg9C6ELbb25EhBLok1JYMXn5o+wfmm+UN+EU8IbXck5Q
+roFNueM6wFv6nvM64jQIkqoyJ2OvNYg1lTJXp7EXEnwRRIW9IDd1XInVrx4jou3Q
+Ax4/VbyJQiE37JC6NAJ9hBh/noO36IGAXvBeyN/TVOBySBFC1XoZdhjVoA7eWbZY
+m1Pxtar5P1Pb6Nac2c4b8Z1FHZFd81zYbJZkJYG6oApbOBFsn+Lf1+LkVKAiewos
+A91QVSP9pqiJmWFZ17tCxRM5YPIPRT35nV3TN3snHGsNvvAJ9mc3YOO7aM0aitx7
+1p3IqdFUz3G8qUlMDthV4WDBj7N1LnRyKCRU6W58hoDXLEjYXMBYSP8+UHqS953M
+ILOfsOglDqxjdwrNf2TK9y+zpyXX16yI1eHB
+=1Be6
+-----END PGP SIGNATURE-----
+
+--32989E6E4C7AEB7775BAD49432989E6E4C7AEB7775BAD494
+Content-Type: text/html; charset=utf-8
+
+suffix
+
+--32989E6E4C7AEB7775BAD49432989E6E4C7AEB7775BAD494--
diff --git a/comm/mail/test/browser/openpgp/data/eml/partial-signed-from-bob-plaintext.eml b/comm/mail/test/browser/openpgp/data/eml/partial-signed-from-bob-plaintext.eml
new file mode 100644
index 0000000000..94efb8d3b3
--- /dev/null
+++ b/comm/mail/test/browser/openpgp/data/eml/partial-signed-from-bob-plaintext.eml
@@ -0,0 +1,29 @@
+From: "Bob" <bob@openpgp.example>
+To: "Alice Lovelace" <alice@openpgp.example>
+Subject: Inline Signed by Bob, with extra plaintext
+Date: Wed, 15 Apr 2021 17:55:59 +0200
+MIME-Version: 1.0
+Content-Type: text/plain
+
+prefix
+
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
+Insert a coin to play your personal lucky melody.
+-----BEGIN PGP SIGNATURE-----
+
+iQHIBAEBCgAyFiEE0aZuGiOxgsmYD3iM+/zIKgFeczAFAmB4Yg8UHGJvYkBvcGVu
+cGdwLmV4YW1wbGUACgkQ+/zIKgFeczC6twv/fYtlE8oNqhP5OzR48/rCEmJQ/U8Z
+NIp2Mvg3fpIMY1m2z4nwufCj4xNHM4okyqXnVouWBSLkRL3oPlkXj+syY1lV3Bv2
+Gbl5JMmpMbdSjKAEg7VaYg9C6ELbb25EhBLok1JYMXn5o+wfmm+UN+EU8IbXck5Q
+roFNueM6wFv6nvM64jQIkqoyJ2OvNYg1lTJXp7EXEnwRRIW9IDd1XInVrx4jou3Q
+Ax4/VbyJQiE37JC6NAJ9hBh/noO36IGAXvBeyN/TVOBySBFC1XoZdhjVoA7eWbZY
+m1Pxtar5P1Pb6Nac2c4b8Z1FHZFd81zYbJZkJYG6oApbOBFsn+Lf1+LkVKAiewos
+A91QVSP9pqiJmWFZ17tCxRM5YPIPRT35nV3TN3snHGsNvvAJ9mc3YOO7aM0aitx7
+1p3IqdFUz3G8qUlMDthV4WDBj7N1LnRyKCRU6W58hoDXLEjYXMBYSP8+UHqS953M
+ILOfsOglDqxjdwrNf2TK9y+zpyXX16yI1eHB
+=1Be6
+-----END PGP SIGNATURE-----
+
+suffix
diff --git a/comm/mail/test/browser/openpgp/data/eml/partial-signed-from-carol-html.eml b/comm/mail/test/browser/openpgp/data/eml/partial-signed-from-carol-html.eml
new file mode 100644
index 0000000000..2e1e69038d
--- /dev/null
+++ b/comm/mail/test/browser/openpgp/data/eml/partial-signed-from-carol-html.eml
@@ -0,0 +1,44 @@
+From: "Carol" <carol@openpgp.example>
+To: "Alice Lovelace" <alice@openpgp.example>
+Subject: Inline Signed by Carol, with extra text in multipart HTML
+Date: Wed, 14 Apr 2021 01:01:07 +0000
+MIME-Version: 1.0
+Content-Type: multipart/mixed;
+ boundary="32989E6E4C7AEB7775BAD49432989E6E4C7AEB7775BAD494"
+
+--32989E6E4C7AEB7775BAD49432989E6E4C7AEB7775BAD494
+Content-Type: text/html; charset=utf-8
+
+prefix
+
+--32989E6E4C7AEB7775BAD49432989E6E4C7AEB7775BAD494
+Content-Type: text/html; charset=utf-8
+
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
+Insert a coin to play your personal lucky melody.
+-----BEGIN PGP SIGNATURE-----
+
+iQJGBAEBCgAwFiEEuPL29L060/gtxEaDMJn/EjiFK58FAmB4YicSHGNhcm9sQGV4
+YW1wbGUuY29tAAoJEDCZ/xI4hSuflLwP/1wmmla7bXjzbyIGFnSiC+xMT0vcos+s
+uv4jdcC1cPxpCj51EZEQGLzmKUMJaD1ruK7AnimhA55tb22NetDW0OHA917VeuoI
++cY1Hm8YqJI9LF9KbnzfbTtqeAcFKPjQe7OBFIvru3Z38Ng2JTnRXkM0xolZjpOz
+m14f241+LT62xQwKW3rlG3FLW1yWdVQ5vi8jptbZrhC4J7B2Mzhgt1BX0aV/IK69
+3heQKQIttjslwy2ka8IusfSgPiioSBSULcmlN+FV9kKPNCVAoFvjpGRR9hJfZ92E
+6ESuYdphCH+M8FTSKBrKrX6hvl21SpHS0qExr1Xh3MYJvE+8jX0egjuf32Rf/io8
+LYJ/aiBpkDbikCY8rQUD7+HmHGvCiN8tGakeIbjkS3V0vMA3WsZJPtUt/dmVaVHw
+TPuXUMnhbQpuqXI6K175WnzHFaOXoV67AVhLqM6CZTdhJLUz1NNVvaSJ1P8nxAz+
+wEEh33138gtuWfsT4xfaitbQ2KqmkVLvu1CJ7k1+GiEOxWNiPgSHo5Z/Iimi4VB3
+Bwxk77iZOOinqmlhd680s9UK/AnZxJ1I+5NYKx8yuATWYmYoorDKZLvJxZH5DPz5
+XTu+v79iGvIXcSLyOsvcMDLLnA6tj4pBRB+MgxweiVjHfrdvG7ohDwXgklI39I62
+eO84IXMU+peK
+=Kjsi
+-----END PGP SIGNATURE-----
+
+--32989E6E4C7AEB7775BAD49432989E6E4C7AEB7775BAD494
+Content-Type: text/html; charset=utf-8
+
+suffix
+
+--32989E6E4C7AEB7775BAD49432989E6E4C7AEB7775BAD494--
diff --git a/comm/mail/test/browser/openpgp/data/eml/partial-signed-from-carol-plaintext.eml b/comm/mail/test/browser/openpgp/data/eml/partial-signed-from-carol-plaintext.eml
new file mode 100644
index 0000000000..70aef875e4
--- /dev/null
+++ b/comm/mail/test/browser/openpgp/data/eml/partial-signed-from-carol-plaintext.eml
@@ -0,0 +1,32 @@
+From: "Carol" <carol@openpgp.example>
+To: "Alice Lovelace" <alice@openpgp.example>
+Subject: Inline Signed by Carol, with extra plaintext
+Date: Wed, 14 Apr 2021 01:01:08 +0000
+MIME-Version: 1.0
+Content-Type: text/plain
+
+prefix
+
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
+Insert a coin to play your personal lucky melody.
+-----BEGIN PGP SIGNATURE-----
+
+iQJGBAEBCgAwFiEEuPL29L060/gtxEaDMJn/EjiFK58FAmB4YicSHGNhcm9sQGV4
+YW1wbGUuY29tAAoJEDCZ/xI4hSuflLwP/1wmmla7bXjzbyIGFnSiC+xMT0vcos+s
+uv4jdcC1cPxpCj51EZEQGLzmKUMJaD1ruK7AnimhA55tb22NetDW0OHA917VeuoI
++cY1Hm8YqJI9LF9KbnzfbTtqeAcFKPjQe7OBFIvru3Z38Ng2JTnRXkM0xolZjpOz
+m14f241+LT62xQwKW3rlG3FLW1yWdVQ5vi8jptbZrhC4J7B2Mzhgt1BX0aV/IK69
+3heQKQIttjslwy2ka8IusfSgPiioSBSULcmlN+FV9kKPNCVAoFvjpGRR9hJfZ92E
+6ESuYdphCH+M8FTSKBrKrX6hvl21SpHS0qExr1Xh3MYJvE+8jX0egjuf32Rf/io8
+LYJ/aiBpkDbikCY8rQUD7+HmHGvCiN8tGakeIbjkS3V0vMA3WsZJPtUt/dmVaVHw
+TPuXUMnhbQpuqXI6K175WnzHFaOXoV67AVhLqM6CZTdhJLUz1NNVvaSJ1P8nxAz+
+wEEh33138gtuWfsT4xfaitbQ2KqmkVLvu1CJ7k1+GiEOxWNiPgSHo5Z/Iimi4VB3
+Bwxk77iZOOinqmlhd680s9UK/AnZxJ1I+5NYKx8yuATWYmYoorDKZLvJxZH5DPz5
+XTu+v79iGvIXcSLyOsvcMDLLnA6tj4pBRB+MgxweiVjHfrdvG7ohDwXgklI39I62
+eO84IXMU+peK
+=Kjsi
+-----END PGP SIGNATURE-----
+
+suffix
diff --git a/comm/mail/test/browser/openpgp/data/eml/signed-by-0x3099ff1238852b9f-encrypted-to-0xf231550c4f47e38e-with-key.eml b/comm/mail/test/browser/openpgp/data/eml/signed-by-0x3099ff1238852b9f-encrypted-to-0xf231550c4f47e38e-with-key.eml
new file mode 100644
index 0000000000..4bfd511641
--- /dev/null
+++ b/comm/mail/test/browser/openpgp/data/eml/signed-by-0x3099ff1238852b9f-encrypted-to-0xf231550c4f47e38e-with-key.eml
@@ -0,0 +1,187 @@
+X-Mozilla-Status: 0001
+X-Mozilla-Status2: 00800000
+X-Mozilla-Keys:
+To: alice@openpgp.example
+From: Carol <carol@example.com>
+Autocrypt: addr=carol@example.com; keydata=
+ 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
+ meCtpxz2PoYBJfxGPEzu9xTLV6k9wSVTCgE=
+Message-ID: <8a0f64bf-41b6-f20e-6caa-eae0fb5d32e8@example.com>
+Date: Wed, 14 Oct 2020 14:33:24 -0400
+User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:83.0) Gecko/20100101
+ Thunderbird/83.0a1
+MIME-Version: 1.0
+Subject: ...
+Content-Type: multipart/encrypted;
+ protocol="application/pgp-encrypted";
+ boundary="faEswfPorznMRhd02nPybB0ktMdKqd8R7"
+
+This is an OpenPGP/MIME encrypted message (RFC 4880 and 3156)
+--faEswfPorznMRhd02nPybB0ktMdKqd8R7
+Content-Type: application/pgp-encrypted
+Content-Description: PGP/MIME version identification
+
+Version: 1
+
+--faEswfPorznMRhd02nPybB0ktMdKqd8R7
+Content-Type: application/octet-stream; name="encrypted.asc"
+Content-Description: OpenPGP encrypted message
+Content-Disposition: inline; filename="encrypted.asc"
+
+-----BEGIN PGP MESSAGE-----
+
+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
+z+Dcu+E=
+=MZd0
+-----END PGP MESSAGE-----
+
+--faEswfPorznMRhd02nPybB0ktMdKqd8R7--
diff --git a/comm/mail/test/browser/openpgp/data/eml/signed-by-0x3099ff1238852b9f-encrypted-to-0xf231550c4f47e38e.eml b/comm/mail/test/browser/openpgp/data/eml/signed-by-0x3099ff1238852b9f-encrypted-to-0xf231550c4f47e38e.eml
new file mode 100644
index 0000000000..854d9549a7
--- /dev/null
+++ b/comm/mail/test/browser/openpgp/data/eml/signed-by-0x3099ff1238852b9f-encrypted-to-0xf231550c4f47e38e.eml
@@ -0,0 +1,78 @@
+X-Mozilla-Status: 0001
+X-Mozilla-Status2: 00800000
+X-Mozilla-Keys:
+To: alice@openpgp.example
+From: Carol <carol@example.com>
+Message-ID: <1241106f-5ef5-ae8a-36ed-02d6f8f84d62@example.com>
+Date: Wed, 14 Oct 2020 14:29:03 -0400
+User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:83.0) Gecko/20100101
+ Thunderbird/83.0a1
+MIME-Version: 1.0
+Subject: ...
+Content-Type: multipart/encrypted;
+ protocol="application/pgp-encrypted";
+ boundary="PAOkQ1PqAvtLhLyHxuarNAvN1z6Qj8TMm"
+
+This is an OpenPGP/MIME encrypted message (RFC 4880 and 3156)
+--PAOkQ1PqAvtLhLyHxuarNAvN1z6Qj8TMm
+Content-Type: application/pgp-encrypted
+Content-Description: PGP/MIME version identification
+
+Version: 1
+
+--PAOkQ1PqAvtLhLyHxuarNAvN1z6Qj8TMm
+Content-Type: application/octet-stream; name="encrypted.asc"
+Content-Description: OpenPGP encrypted message
+Content-Disposition: inline; filename="encrypted.asc"
+
+-----BEGIN PGP MESSAGE-----
+
+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
+=d8b2
+-----END PGP MESSAGE-----
+
+--PAOkQ1PqAvtLhLyHxuarNAvN1z6Qj8TMm--
diff --git a/comm/mail/test/browser/openpgp/data/eml/signed-by-0x3099ff1238852b9f-to-0xf231550c4f47e38e-unencrypted-with-key.eml b/comm/mail/test/browser/openpgp/data/eml/signed-by-0x3099ff1238852b9f-to-0xf231550c4f47e38e-unencrypted-with-key.eml
new file mode 100644
index 0000000000..3ff97b6fd1
--- /dev/null
+++ b/comm/mail/test/browser/openpgp/data/eml/signed-by-0x3099ff1238852b9f-to-0xf231550c4f47e38e-unencrypted-with-key.eml
@@ -0,0 +1,197 @@
+X-Mozilla-Status: 0001
+X-Mozilla-Status2: 00800000
+X-Mozilla-Keys:
+To: alice@openpgp.example
+From: Carol <carol@example.com>
+Subject: Signed Unencrypted With Key
+Autocrypt: addr=carol@example.com; keydata=
+ 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
+ meCtpxz2PoYBJfxGPEzu9xTLV6k9wSVTCgE=
+Message-ID: <b4609461-36e8-0371-1b9d-7ce6864ec66d@example.com>
+Date: Wed, 14 Oct 2020 14:38:44 -0400
+User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:83.0) Gecko/20100101
+ Thunderbird/83.0a1
+MIME-Version: 1.0
+Content-Type: multipart/signed; micalg=pgp-sha256;
+ protocol="application/pgp-signature";
+ boundary="vrdqJBVucR4QNMOtZVYVRGIjyNweikpUw"
+
+This is an OpenPGP/MIME signed message (RFC 4880 and 3156)
+--vrdqJBVucR4QNMOtZVYVRGIjyNweikpUw
+Content-Type: multipart/mixed; boundary="hZdstSX9kVVgqQC8ECJGhlR1aVjuEMpuI";
+ protected-headers="v1"
+From: Carol <carol@example.com>
+To: alice@openpgp.example
+Message-ID: <b4609461-36e8-0371-1b9d-7ce6864ec66d@example.com>
+Subject: Signed Unencrypted With Key
+
+--hZdstSX9kVVgqQC8ECJGhlR1aVjuEMpuI
+Content-Type: multipart/mixed;
+ boundary="------------83F8BA9FCE9C945124B915CA"
+Content-Language: en-US
+
+This is a multi-part message in MIME format.
+--------------83F8BA9FCE9C945124B915CA
+Content-Type: text/plain; charset=UTF-8; format=flowed
+Content-Transfer-Encoding: quoted-printable
+
+Sundays are nothing without callaloo.
+
+
+--------------83F8BA9FCE9C945124B915CA
+Content-Type: application/pgp-keys;
+ name="OpenPGP_0x3099FF1238852B9F.asc"
+Content-Transfer-Encoding: quoted-printable
+Content-Disposition: attachment;
+ filename="OpenPGP_0x3099FF1238852B9F.asc"
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+xsFNBF9GZTQBEACjK8Db1095rU74k/RwLhmp9rmFBZR6qyEHANlHSVwqARxa4aJPaNoLbqNPe=
+fuF
+g9ib3J0rKcZfqgnqC4usPVSTdmC4w0MdmHvh+1tUoXcxnrjYNRRbP+lC7zaLRRnEEioimC0Mk=
+h+o
+w1u4F2QFBjwcV9bD7i0T1DRfR5k5kh3kcaYFnGnwMjwjJzLtvu3OZbXYsofCw7890TP4LkqLE=
+QVO
+w1OrxBnRd5QNBVojcQi6rnKOQ7AUBGRKSXI3QVrbP+x1oImXpQSqIyaRFbtx57QafDdkyHBEf=
+ChO
+9X96BtMndyry8XgYtcgmwKKWg8Js4TJgghus6Sng5dA7/87nRf/9//NptXh9mdW3AiHsqb+tB=
+u7N
+JGk6pAPL4fUjXILjcm5ZXdlUeFVLmYmqTiOJcGFbqHEBGcwLKPoba2JsBEpnRj0ZEmo2khT+9=
+tXJ
+K3FUANc4w/QfxTXMwV17yYvocDPEBkoKcbxE8b2sSK/L7Vi+h21XX6fA6B3zKFQ3hetFvOjEG=
+TCk
+hFD9asL8KnwQdJmYo4Bd45AVoMZFxBxpmuo9MxPdiF2AGbKHgrKpqDw2pUfelFwMZIVQ4Ya1w=
+dtL
+e8gEJAMq6YnuuQcq+jjGKubNRywld7xXIsxJCpHtqbCQM9P+gqp1VDBnbsk4xGX0HgILXF2Jf=
+yce
+GMGy1Lku0QA+ywARAQABzRlDYXJvbCA8Y2Fyb2xAZXhhbXBsZS5jb20+wsGJBBMBCAAzFiEEu=
+PL2
+9L060/gtxEaDMJn/EjiFK58FAl9GZTUCGwMFCwkIBwIGFQgJCgsCBRYCAwEAAAoJEDCZ/xI4h=
+Suf
+jB0P/0+yaZknO8dS5o7Gp1ZuJwh6+vgTGWrTxcBtsU1JR4BFobPKtMmw45FKsNIiK+AQ7ExCt=
+qum
+GoTJ6hlclBFMlDQyyCxJG/ZpPdrFUFyg6JUVf05/LWsd4Fwy/hQY1ha8R81QinSHqv9DJk6fK=
+ZG2
+rz7YUE47LFfjugbwUj9y8naTxj823Vm6v36J2wgl/1/PHoZTwi3vQRA70SoIDt4tSjqBzuclt=
+2k/
+zlkJmOpBYtQb+xGwpfnh2gBJdYurLwJO9rQlzYjy/+1qB0CZsE95WlkTrqQw8V5S6ULcnyACb=
+ETd
+F5HF/geHL367p/iWULD907E4DJlQBOWjY6fdsJIBj96NfQiG+cXYTNGqaB/FgW8jyoS9vyg4P=
+DOr
+0nGHLvzPw7xTDUkuoJiWXMJ9kDYTZ+MsWreA885i1JSE32CsqqP3+kI7XQD3d3T3pIPhKOo0/=
+bzb
+LY6yWBXh809Ovi9fMxaZkrlrmA3lFcY+FbzDjZB+UYOXDB6TRu1jvISVMiXnYf4X21xWyl8AW=
+v1q
+ANMSXFKUwBSR88I06QZiJBmm9wHcyVtK/Hb6pgH10LydZvIfRDLrDBc2z31rswjNj9UhNp0Qf=
+GdN
+z/gXdxc8HP7Pf4kHkjIxLrWUNlDpYddX+iz1Z//VY9h2XTmSail5pMyyXdiGm90AGfVhIcaOo=
+eKK
+9UslzsFNBF9GZTUBEADWPef8E4OUoxU+vhwCxy/4nDfxzV4ZMFYkqp8QgpLzTVgTv6xGVHFx/=
+waN
+jwR6G34tD0aYhkDrumv9QsMdiQnMw9pLAoc3bnIkL8LkXnS8fVeiuzkXd4lgvpxFlce7KYuXo=
+s9E
+w7Nm2tOx4ovoygFikjliFTKn+QOVJoTr4pxJL9RdzYQ/pV/DI/fc2cmRWy0uivP+F+LBtYW6Z=
+OMY
+1aXzsJEvun2i5ZxV2jqNDhXpD3m6/Y/28WItKbmT80hvTivxO2DSQ1kqNcwB8Z0XWZJoz6iyY=
+Uu2
+7dKB0L4S/x4UASlC6J2Db8bIL3Tdhuy+N0BN8sS1TDWb7Oi1Ad8huVxfrRSyOYj4fkksvAEgD=
+EDH
+6JEvJBU3CGQtfXCoX6d64db2cGp85GDfNHTREJ0mbRjLAKL1RKrcKOG1790OZU2veF5qiN2eN=
+08O
+LfJURL8+P4+mDWbaOcZasqNrg3YhYcPX3ZZzKfEIvvTOdqMk00JU3zaUZhJvGOR9tJ27NBTrC=
+EIO
+Hz7yzOJltTDjdfNZNLqSYFp08+vR/IjSDv8hl6PRjkomkbfdPdwPczKS0dG9Cf8cU+NZQrEgE=
+0Un
+4tvb7p55j9R5OVgHUACLFTlDIRV4veD5RnM2hUFRtBONymXEDjoPGZXaHhv16MckFpZ1IEAkM=
+IZ3
+Ti/NIZcS7IA9jRgBUQARAQABwsF2BBgBCAAgFiEEuPL29L060/gtxEaDMJn/EjiFK58FAl9GZ=
+TYC
+GwwACgkQMJn/EjiFK5/Q3hAAmzMu7EOeWG0xAHAQ4b/ocCSlZqg/MSf6kJIkzUxdnX9T/ylEm=
+rS8
+cEg5mdJMQMVvCecyDpNK9MgJPV7MTnR6x/4qgdVUTtknd6W7RrQ7Oai150nMH5U9M8GrFtbQj=
+c/f
+Ow17agoT06ZGV4umIK41IIGwQZ2/Z/cElHkQZll9//hYS8/E8xOBlweVxsMZhfcLFrbx2hC2o=
+sRt
+0vMlGnYSnv29ligVG+2PwwnHXB6Tn7eslzoowY78ANCTvA6Rc6zR+RIs/CIiaDNgWCRBJcueZ=
+VpA
++JkyL6KmC+JiiF6Hsm07DDDjgLVJ0s660GNe8sWw4IZ8wpvYq1goqXLu+CMqbCsBrEDwfguCl=
+xGS
+QnLwAUIVxuyKprToLJ6hmuubsVcv9fzf/GoYFnT9hge1YZpptKi/zrQqy2CZuSZEHWpUZcwPE=
+3Ow
+qbHKty3UhZPJU50kmEOd/UQNJYNWxxxx5593X96jLLDOxm5M5jNNRvGZPgn8RbA1e7VC2XFgV=
+2KG
+JHq/gxCpwkWs8+0sYUtcFuu+RQWTKbJpFcxfAIEDKS+fyLRAFdYqUA3yQIA1UYco10l8RYPLY=
+0+I
+XiArqjql8+k8PBT0U4P59lfcKlY2GaJe4aoWLPOdNZAJgLzoxd5zgnz0vI3sn+3vmeCtpxz2P=
+oYB
+JfxGPEzu9xTLV6k9wSVTCgE=3D
+=3Dt/qV
+-----END PGP PUBLIC KEY BLOCK-----
+
+--------------83F8BA9FCE9C945124B915CA--
+
+--hZdstSX9kVVgqQC8ECJGhlR1aVjuEMpuI--
+
+--vrdqJBVucR4QNMOtZVYVRGIjyNweikpUw
+Content-Type: application/pgp-signature; name="OpenPGP_signature.asc"
+Content-Description: OpenPGP digital signature
+Content-Disposition: attachment; filename="OpenPGP_signature"
+
+-----BEGIN PGP SIGNATURE-----
+
+wsF5BAABCAAjFiEEuPL29L060/gtxEaDMJn/EjiFK58FAl+HRbQFAwAAAAAACgkQMJn/EjiFK58u
+hhAAmMd8eBmmgXm/qLv1XrOsVOrV5wV39BgdrP0KNHN1Rd0jJmr5HWS81DbV4Yk3UPiOH0Ncj/Cg
+1EFwio+QLnn4SUMTijClTb9V9MyNPIx3IL9Vuh4VOtJb7Yk3skuTqYTk5uExwlwRxRiU40N7pO3z
+nvu/YKPHJZzndWP+p0PuEql8t+Hy5Qm/ibz/364TreLpL3lAKOS11LDQqV4HnzI4YznSlqA8E8LE
+aYJPNJb/ycWyyNohJcMqbNmPxA+V5razCeLlFJyaXw8kykctKOfvFJ2K8WtOBYfAP2/echKGeVQ9
+v0Z2/XH1Ons5vJvc+IB466CYIMAkwHS+1Yq5O/esAAvt/FVY3YBGQIOowZOy1396lykrXhKkKKoG
+Mcp1jU0Bvhyv95sqRbpRfQixGZjvmPnIcpcX8jJz+/mvKpqcFTWjDrxJX3bbeuw0nGQ9ncJD10sZ
+XB77OUyT9ye0iNxvrj6EJ4LWs96Ofq6V4Szdcn+iUHHMXdkLXoONDoF3CIt13BrIWs3p8h+hxfo3
++9gMPREXS8P9yHOX4rNT2I6hIQMNXXa7U4AV5+hn46fvgRdYLz7YHmIdD6QDhFKRujD9TqdgyYSP
+kaQTxLw0WsVXbh6mBlfyvoMREhHpCszoCFls+eIkFfxQilY5EwQffFqVDR72yTE8+AkQCw8/Es1h
+LBU=
+=dmTh
+-----END PGP SIGNATURE-----
+
+--vrdqJBVucR4QNMOtZVYVRGIjyNweikpUw--
diff --git a/comm/mail/test/browser/openpgp/data/eml/signed-by-0x3099ff1238852b9f-to-0xf231550c4f47e38e-unencrypted.eml b/comm/mail/test/browser/openpgp/data/eml/signed-by-0x3099ff1238852b9f-to-0xf231550c4f47e38e-unencrypted.eml
new file mode 100644
index 0000000000..9d63ba3fde
--- /dev/null
+++ b/comm/mail/test/browser/openpgp/data/eml/signed-by-0x3099ff1238852b9f-to-0xf231550c4f47e38e-unencrypted.eml
@@ -0,0 +1,57 @@
+X-Mozilla-Status: 0001
+X-Mozilla-Status2: 00800000
+X-Mozilla-Keys:
+To: alice@openpgp.example
+From: Carol <carol@example.com>
+Subject: Signed Unencrypted
+Message-ID: <d9c78fbc-8373-4596-d806-20857e15a1af@example.com>
+Date: Wed, 14 Oct 2020 14:36:08 -0400
+User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:83.0) Gecko/20100101
+ Thunderbird/83.0a1
+MIME-Version: 1.0
+Content-Type: multipart/signed; micalg=pgp-sha256;
+ protocol="application/pgp-signature";
+ boundary="hUAWHTUaWZ5wnWnHjj7a4qhWdRkydquhh"
+
+This is an OpenPGP/MIME signed message (RFC 4880 and 3156)
+--hUAWHTUaWZ5wnWnHjj7a4qhWdRkydquhh
+Content-Type: multipart/mixed; boundary="oIVAE9YPgX7lo5koqmIMk4gv1QFBbuMEk";
+ protected-headers="v1"
+From: Carol <carol@example.com>
+To: alice@openpgp.example
+Message-ID: <d9c78fbc-8373-4596-d806-20857e15a1af@example.com>
+Subject: Signed Unencrypted
+
+--oIVAE9YPgX7lo5koqmIMk4gv1QFBbuMEk
+Content-Type: text/plain; charset=UTF-8; format=flowed
+Content-Transfer-Encoding: quoted-printable
+Content-Language: en-US
+
+Sundays are nothing without callaloo.
+
+
+
+--oIVAE9YPgX7lo5koqmIMk4gv1QFBbuMEk--
+
+--hUAWHTUaWZ5wnWnHjj7a4qhWdRkydquhh
+Content-Type: application/pgp-signature; name="OpenPGP_signature.asc"
+Content-Description: OpenPGP digital signature
+Content-Disposition: attachment; filename="OpenPGP_signature"
+
+-----BEGIN PGP SIGNATURE-----
+
+wsF5BAABCAAjFiEEuPL29L060/gtxEaDMJn/EjiFK58FAl+HRRgFAwAAAAAACgkQMJn/EjiFK59T
+xRAAoG7+tqzXKQH2S511jRudl0HaKs+AE7kfyqbqBpWsCzcuxWIvCY3cX9ypIEhLllYWTs15aQq+
+f0GCXIK6PFGukhoQ/m49MmiGh4D7oGYxmPQyn9yZVcijqmzF5f4s7oiSKVl9/4y8H0JCHaWuelkN
+fizcAyXUWdPdefL8pIQkng+EtBM1sZ25HBJYFU6du88u0LuA3A7SNRPcRc+LhrGticIPBsDcRntm
+41bcf9QKo36EnltJjSGv3Rtp/PacyMqsmlR/UDHzVP7yWNvPboPCIB2CHVN9J1URxE2S3hjfrbY0
+fuNTgA3TlJ7crTCztIrqugZT4RxhyP3orDhp5TKYLO8q9bof6C1Zo8VbvGzVrl4eVgP0YRNN19vm
+mPeH7rF7wTPhvht0sLKcFMFTXU458SokWZW94EpTBIGNWjCKlzE8TtQPyhViVpo1RUpJQx/tr6Pb
+9r81aKJ0hnrAcDqL+PMd4UWSAONCpr9YpOEY6hj4ppqI09b0HGnBDMvLwsm+PdZ1cLsRlqzCsYfj
+tsU9QpMBV4lJoAnMkGM7pqucovyHSNcgXU/z+OLH1LmPOfPeG3kCGlbRyaQPOt2ZhQZH2f0C6Dnh
+wvmVUqGG8GWDnfVP4hzKzMQQOyWHa/F+J1nwFlbdEBH640jxPdz80/uACXwkhdn+rssEfCeB7SDP
+Cfc=
+=Q8yQ
+-----END PGP SIGNATURE-----
+
+--hUAWHTUaWZ5wnWnHjj7a4qhWdRkydquhh--
diff --git a/comm/mail/test/browser/openpgp/data/eml/signed-by-0xfbfcc82a015e7330-encrypted-to-0xf231550c4f47e38e-multi-from.eml b/comm/mail/test/browser/openpgp/data/eml/signed-by-0xfbfcc82a015e7330-encrypted-to-0xf231550c4f47e38e-multi-from.eml
new file mode 100644
index 0000000000..fca90cbd80
--- /dev/null
+++ b/comm/mail/test/browser/openpgp/data/eml/signed-by-0xfbfcc82a015e7330-encrypted-to-0xf231550c4f47e38e-multi-from.eml
@@ -0,0 +1,74 @@
+X-Mozilla-Status: 0001
+X-Mozilla-Status2: 00800000
+X-Mozilla-Keys:
+To: alice@openpgp.example
+From: Eve <eve@openpgp.example>
+From: Bob Babbage <bob@openpgp.example>
+Message-ID: <ef4ee59f-bb76-3407-ffa5-9b46eb756ae3@openpgp.example>
+Date: Wed, 14 Oct 2020 13:55:14 -0400
+User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:83.0) Gecko/20100101
+ Thunderbird/83.0a1
+MIME-Version: 1.0
+Subject: ...
+Content-Type: multipart/encrypted;
+ protocol="application/pgp-encrypted";
+ boundary="0SJCM8f3etpwdMBIl6eGvaijNVWPX6KJj"
+
+This is an OpenPGP/MIME encrypted message (RFC 4880 and 3156)
+--0SJCM8f3etpwdMBIl6eGvaijNVWPX6KJj
+Content-Type: application/pgp-encrypted
+Content-Description: PGP/MIME version identification
+
+Version: 1
+
+--0SJCM8f3etpwdMBIl6eGvaijNVWPX6KJj
+Content-Type: application/octet-stream; name="encrypted.asc"
+Content-Description: OpenPGP encrypted message
+Content-Disposition: inline; filename="encrypted.asc"
+
+-----BEGIN PGP MESSAGE-----
+
+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
+KvoyvWLzJj8vqyGdD8NRB24JJAQo
+=ci+H
+-----END PGP MESSAGE-----
+
+--0SJCM8f3etpwdMBIl6eGvaijNVWPX6KJj--
diff --git a/comm/mail/test/browser/openpgp/data/eml/signed-by-0xfbfcc82a015e7330-encrypted-to-0xf231550c4f47e38e-with-key.eml b/comm/mail/test/browser/openpgp/data/eml/signed-by-0xfbfcc82a015e7330-encrypted-to-0xf231550c4f47e38e-with-key.eml
new file mode 100644
index 0000000000..f21173a49f
--- /dev/null
+++ b/comm/mail/test/browser/openpgp/data/eml/signed-by-0xfbfcc82a015e7330-encrypted-to-0xf231550c4f47e38e-with-key.eml
@@ -0,0 +1,160 @@
+X-Mozilla-Status: 0001
+X-Mozilla-Status2: 00800000
+X-Mozilla-Keys:
+To: alice@openpgp.example
+From: Bob Babbage <bob@openpgp.example>
+Autocrypt: addr=bob@openpgp.example; keydata=
+ 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
+ NEJd3XZRzaXZE2aAMQ==
+Message-ID: <753a4ab6-3513-2755-aa8f-ead42493bd01@openpgp.example>
+Date: Wed, 14 Oct 2020 14:14:07 -0400
+User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:83.0) Gecko/20100101
+ Thunderbird/83.0a1
+MIME-Version: 1.0
+Subject: ...
+Content-Type: multipart/encrypted;
+ protocol="application/pgp-encrypted";
+ boundary="4IIKWMFJjYkYUMahG01XE9Ywam1bmgvri"
+
+This is an OpenPGP/MIME encrypted message (RFC 4880 and 3156)
+--4IIKWMFJjYkYUMahG01XE9Ywam1bmgvri
+Content-Type: application/pgp-encrypted
+Content-Description: PGP/MIME version identification
+
+Version: 1
+
+--4IIKWMFJjYkYUMahG01XE9Ywam1bmgvri
+Content-Type: application/octet-stream; name="encrypted.asc"
+Content-Description: OpenPGP encrypted message
+Content-Disposition: inline; filename="encrypted.asc"
+
+-----BEGIN PGP MESSAGE-----
+
+wcDMA3wvqk35PDeyAQv7Bd8ipRQy5MQbgotGZqFzedjlxiD+stG0AMwAhGDZfYWZv+obzjy15a+p
+boFFjedLlyV/kwzuhKLMuCQKKLFToyzF36bXpdoy0kek50Xahy2+cEX/OmCN9mf5+NeZsMisJQ3j
+PfEG7xlMxQUFNlSHVpJm5cM7M+2ycQWfA+MeOUbvetayAUbFLLLGTMGbfMQFhJrIPE4g6dk6Xxgy
+vlTwecjb1qFNSo1tnrHeWJpY0oeiq+6s11ab9bEnbHbxi8NMSEXt3wEbiMNCQ9SSOs4PN3AB4tQb
+Sua64joWPzxIK2pXzc1K5Od0Qw57r5BC2M+w61TqI1ANILmtqAVK8MBh62W05cq6Vyx6eSfLe/8q
+ZvJTZy44D0IsB4dxg0eOnrCK4kLosMOOsCzIC1Irk5Sq6WschSYwyG8sq4F50FCeHHWwXrKWoksI
+8O4Z5TagTrHfuYT2FdUqaTANP7O1GJhWGQ43tN8sUeVWfVed6r9bfsO1b5h/thrKVs0urxXWtxIs
+wV4DR2b2udXyHrYSAQdAA03WmjsJVYngUahv5KffsuuaHLZT+Vngb37qLSz+emcwkYsXXwVVatni
+2TDfMu89GDcWYXy54dR/m997nhjG4mu616nOgvRM4OwmLOATuGho0tHoAT8SgbwKeBMT6wsNuUow
+TfvSvyylSKcuj7hLzlC96oSmpC4/+PqqlWVJ4vZpkIMhMfwgdJz+naFGDDQ1klvl2ptMQXCmbfNm
+9vMNnOb8KRvxxmiJD+CeitdP2sAwDLqpxogTDJPTfOli7cmMF+Nm8IG4T7bdKS5Q77zwBIU9NlkD
+OyEaqsn9jq/vwYnYl0ClTtobGflCqo914XP6TkufiAFnOBK1e3wa0pbTfXob42sGPRnX18fEobwI
+MM9qJ4UF8PHYpVSCO5xRFRCNRCHoUXF5s4zc4W5+gPH4xEA4Htm8lRD88rmOEK29pi217LSKnNdX
+adG2PLr40twUbgRP7PcOT99alhfW2FCY5h/p5kw2+S5dn6jJqdaLrwkEJiOynbQQ3TpiW23yNCvL
+TTnY5qPLjRC+e2gzUMmDWOPtZpBfHL5juWG4JEXrSgDYUd64SB6OA5I01Xj/23CUKElB/Ky9XnyP
+Z9t1AN/PQrQOfIdpr0ESHqpJarkfMbEAat84I4fyb01LJqRYnmsKbhPzeA5lsVKqVMgRwcp71mX3
+V6R0K4jc1AgtSokyUcX249zGbrGNKpyvLdcXEWcCV2mddjJNn50ixZajOh2thRVGX6gP87QaAlhr
+Jh3z3omObLEm5MKEFvSc3/hykOf22cea8FK05qoE6EhNiq8T0sr2mgKz2pT7FAnajkGSdJvA3f8m
+bREoRbzuM3gJ9EjwmhcdfpCAIJuwRMN6HcXyl7r0kd+4G1BZZTMi2ivu5Y/AOtkZ8qk4xoX/vtn9
+pYoRJaonNcbE51LkgAgxkzbDynFEPMp/8iH4eOcAgHzpI0L9nett46DVr6srYHLZFjkagXoLDog0
+hHfQ1Gfd8S2gm7w1lGaxIVxCmhPM8YFbkdFwWcKhi0KTIGsvJyFVOPDHkzxo0P3YP78aE/5rFgK6
+uaYniAVJ24ixuri1ZxG9jhoSjy267WCh/Dhd6dDo24KymoHAQdcXRvPsWYhhJc5zaokRb4qIzOu+
+cG65k6s9NarkRlqTNtMJ27dr+MpyIWGciSA3tGOHzaafF24cgjLHINMhwPWatvxttQmOjNEJg0wS
+hC2jEWFTpO7BV7CJUP27j6AdmHF54ov9aK3rGlgd8vxE01QFikGZM3AgF4YWKBZXoSQ241+F4pfQ
+4criaTrr/zDNGKuwTkIfqM1dP6b1Y/DlNwIMXyh+RRhYRhJoYNNqs+xRTIfztpRyWyPWweDN4UKi
+XJY5awnc5UeSv4z5LmuBwxwfpAylZjfH1Whto0eeelSUc9hm1etbchC1C1EnbQg2jZ++Cs8g3r+P
+TkfRSVMwkf3p//6iyewEUYBHufx/tmmuemk61SG24i0d2/a2jaqYN4OSVNfs7eOvAU3CPKXMwcEM
+4oU6kNQ/WoXJAz6BRbE84Ukd/0/btAYoIuAize6pC5q/w2+CJsqJG0KZxJGRllS5NP0MpB+aUZQ0
+jP7RwR03m0giHd/E1vieBZVwmrUi8i4AUJotIBJaAavRYV+gTLQK+T3s/8xntIB19U4MRz6ZrVRL
+o3VMMnwvkyj+U9j19N19GuqFGf8FeDentVvVD1TNV0dmCB8BpaNqj2uNz7XpE6VI2p9W7bMJpc8G
+ESr0/e1BEDHqfSRjpKtuKQUFK24Ru1w8cIdFrKbj8S3CZVxG318QPcyXlR3pjB2n4DzD3TeIWIYF
+r/CoEercHbLjI1N1aN/IAx8JzPBZpmVirjnOpGGUcTAi8wgV6339Ssym3I5W9fYKsytYBjSGrKTf
+FHa73ig8KOqfVdj/vZNu9RyMnj3l5NrGP5MB+k26d8esnal4kh8IQD/mx5Ydt/0nH2e4dLj1XdB9
+pW8jJ5mCemfOuRaSXjzZRf3wL2vcX7+D+eepSK85iJbnk4iZ7/ba/ws7tuJKoDRmoDnKLbQH/pFc
+8TMyTvO0JZiPrbGQjJEPnGDF0CH+y55GDDr0DhBpcchloI1mypCwXOKOffMMd5lFUKtOTsWyhOEY
+SnThbsca4/du4W1cgJXtNqA+wa6tlZX7io0kvgvza6rXy86NzTWiT5aj/4XNWeM26ms/PEv166Ld
+GZ151dAbL+5Sbzl7or05llf/nTJT3eatz5djOTS9iz3CsyBFAgOZZdQ/lrY5zS6jQpz5n7hXmOjU
+SdxFyqv2NeqQ6gv2lfwyl2w4L8Yab5vce4aeEapYthvOF1xTlhinn4OJPQxke6WM5tL0x6Dp4BXw
+aZL55B4PSixAYbDfFO72jhtfee+JlOXCfWf7vxW3Dx7gs/XzMxcKE9JpJswlVR8X0vfaxcCiHp4W
+dGT1rF10UXElmaykiPPBFG2ehsY3N/W8TxOMwq93mKgunTgJS9wfTKs7TYL4DpCqIrBYjYTNenFy
+m2YAFA25q9f6E/bfhDl6erkSTBLu5IKM2dpnilMmH9S/zxOpdutx6nzEeSAdTfSk0Nak8+0qYn+T
+msfbW0KDtzySCHv4re1ivZiGROd14Ksq8/MNPi17HiErMzz4oHBEZ/+RRINAwZ4MTKNbDNIcyDvJ
+Rcp9QtQrvdnyTvZEoAOxfLtH3XNeBR3bCYMIGu3cliivsZffVB7xaAPuXs6G8zvd4JX1KEE45Lod
+7+CchEXCz446iz5lcee5z0XEaJl209vHiJtE8DvtdVFCBN0jdHm/nXjjEH/O6QrUQelsMdVBLAkt
+Ru4D4rRxr2TX5QmxW1zWtbM0fTXSzXxRTCa4Y1bzCG/v3X/wlebrkNCSgt6f1k+LGqlE6w7E+GfM
+j+FIjC1yLXgx+CMiIo/pP885oDhpIcW6NB4pIbcnBMMJH24z3J0NlAIPgxzaQwgPcO52UOoKrHmQ
+wKSFvjPryy8tWqCjxXJ6nGLRgUq8nryxoiaOBN5Lrs0L0XxEUYADCRJjT7mJuOUj69jOCGmEYINZ
+dBhVO3Medph38/MW/4ixLRgj8VfkJ5fVAJiUcUMwkKvdhJotklnbCWfFjNXH3D/bo6dmm5FapwRa
+pUniSXJNxmGYwWIwu6U3CgDSx6jwaosx6GXG4h/lfXxvLna6eF/gtKzGmiU1YdY3h5izNR7PzgT3
+QU9/3SVPizILon/9bPYVDcvQoKX3vdcbKo4/kJuLQh3j+qoyiNJBnpu7gVM0T1aZ4NU3VLdfxpjH
+3juaF9MayOzpgXAm9C2TR87v1l6kVHuPyYO6DDvjmHedrTVTq0wkKUz8nqetisJ3DpbEdhsfD2TV
+mlDY/4zoZdqgQWbvr45Tu1tZ1Shgik5TuneWe+dDcm/WeL8pBH6nHL0Gb65mc5rzsS7HZGppFquh
+LnOIBz7XCPHn9rCYEq1yXMB0QyhCuzW3Y1nLjoXYO+BsvKSXgejzZqkGeHP3t7PzYPDKL76GPml1
+wc85BUEB3YJj/yZ4tJMGw+HcI+b8RvFdmM+/GzSNkmpVdmtMnpLr7PHJhVo8kKtygJdTERAjAqQZ
+PmXuxwMMz5BByTw4lLGi9jeb4oWCKgFYtmUUcQZOpEU+Hrk8H85Iin1B35YcLv76bxpQN+8Qg7W/
+XivM2VtpG4kQsaWInE1ROVWFpA1gLAggVpXbq00LPAhf//st+aLq5qlRd5C0jpM/ljqO/HLHHqwi
+8w1+Cwk2WWffxRLVzz36zEdbR9Lxg7MPKpWMTz4WkPxVDWkQspwjnp5TkBiroQTAiY3UgUfwMga7
+feJnPwmDubA3P73A5RAMTnm2/SLMB3GkcE7DgWUPBEElZ5D2KVQV6a3IeuOgZXo8uYBPAq0ae/8i
+GY7oUgyFaDNXAV4eaZcyGzrqd+tzKsfiCHcQVhnuqUnFN1yUrHIfkwjCA9y3OLfIk29NeW6PCDpw
+hNo0zKc2WQ+LubhRrcpAoP/zZnruzEp4AYSq6fv+SGGm2Q9BwlW+DnUiV8zWwlZI6klywowdbhQf
+L/3Bff1KGTQ/cip35s2IdgzCisujwji+q/trYP6qOBxD1cBbNCN4/8jTGI7HQPZAMahu273wSrUp
+UPzx49JF3677D1P25Iin1++gpFOXh4wGwxEBnzxaXEVnJEGraBCkWIz+QcN+N2oO6WGX92gysXyv
+OxtmivFQhaN3so6PwIdmuzQMStNUbL36g1zjLCT3DPFybz2E6KXFsFsiOTRGwydU3WiRRkasXc2p
+vyBJKD8Izxh2S6ffxk+Uy0xCUtKxHgaK1xyOFvWE9v/67XQHvhK72NkZEg2jWPHu8LWFK3SWZ6iJ
+fIDkEcOJ1Z5SX2cMdEMHfQurteHkjqWKrmg6nDekHWh7PZiuX5JzDgySigzFB06HPGvBceHT3x5J
+pS4ZeMMDLRK1mDqTzpe87rQOeMoxJIueJsAmTtu/MFn0JScA/RehtghOUM03ukrEWiufqyNGuUrn
+rDRUaAVCW8xKh6pPmKcnKwT2q+VPoYf4L3wX072p1Xylipj7Tfac5k/FMTRW7N7rxUImOlsXEU60
+1g0QXW6qqJpKekVeWNnbvZqPJVQdKV/CGGTR3BmFKC6QNqfRJn+YrMjROX/sXxvtREZ4cV0W8GYf
+qgWuBA/zvhBfDqkGUqfquKpVQVI/OuiR4PuW9RdZNy/k4QITg49+I1vU/PnJp99DudfOgZFDBFrT
+qJLNUaqoewtnE0tANaerC/Bf9jnACMr0ZF6VBT+PKiEmPAxpW+n53quly+QSwkPpH9LjpYbpFRAE
+0yOPmrclmRXVF26FSU6QDpuGbMVJRWaS1oldaL90QeBxpwn3kj0vJBJzt2hdu4AOz8MyT4tnmtnp
+zr3WLMaT5LMSegmT3giEpDC9AZ7nt8BrkEbm+P9DKyXWEtkmQfTw9CUR4iZXrJXy1u8VIoPXNwDw
+QxbClRv6+HpGpoiHoxNpUICNbTf/YtsBt7tAAdIdcae2BxZ8DmftOu4fL8yIeeDwPFW3ZxY0xW97
+miidU4FMR0Q26WLYthAH0sRn0W5IOxPJbWH/JNVv+8emjoDgcjx9zbrPm2KyK+ic3yyvLYRkjZ04
+zNuEBdJWz73BjJiTFwftpquIkYTMvBa9oQE6mbOEQXyEORAGoBi9tq7ocgS34/WmEMZHr3d8sbLB
+e4ulJg4LQXR7pyq7secZUyAkKjiLxRVThVyZd2nnGBg1J6uQCMMF7LwpWO/bvcU1LTJ3GCRSwV68
+tL1U6F13rwp1Fs4OmzdxvggsUqDPWtS9eO18iCqMW3O6d1GLdNW6jFbavduFZFlBNcv00wywT5E3
+EVRBAoJFahmq2mXAosiEZAdoHnG1Xdr5iUXODAiDHQrSEl/5JXWkqdKEiClTUptKSryl93jngHDo
+Yb23A3yDCi6C4scrvlZYeaQWuUDs58wtFWNFCJnveIAUaZli6rqTXXGFwPf1ordb94/uYQS4vcjX
+1FE8CPDRcWFeqNHEIuVe3YFQVyfmBBZAbHQmjvBXUoDPA8pPXRECTmnu9/8kzVrdA7PcCpBxKAdZ
+TenC1qhSPCBKL7NNlsyGnc6E0v/xy5AhE4AUtwF7u+v36Xqqic+kTDhDe7pJ51WT8R29qs8BJv8G
+Mlh9skUb8lFCPZTg5sJt6y+I8x4lTo14HAyuipnUdOolAvfQx3G9OhVszhFpEdrVoXZQW8BaJceE
+auufFdWtH7jW1ocYoxdIC3l5tvuzdfXxyIXZSG976dqUQ4albKqdFoxyf1KsVrtiiF/PdB0gFRcS
+z94nB3b1kbmxMaObJnZmyNer6TqGBDBYG7dJqDVTdGeNVB42E1Ez/KzBdwZf7TXYcCoClmLVXJZs
+xaR8tn8hACyU+6GwVOj3tF2YBMkENKNb5HM7zu/2NZydSi6VV9AVXuJcd/SdJOkCBrTNJ3ly6r6H
+A105pd1yaxespTf5NcCHPTgThfRRhtD4kgpXkWH+YXL2BlpaZgBAuE/2bOM4kQDjuK9gznCiMJur
+kGOPXhrLCqv2v+ypK4TGAerXyFYr/lNU2OIM4inhK3csHvoU+rlU3Usb4U1UicXLrO3TuQAMBQ7x
+BeRuigowlOcLThTetHKfHSNvhXEoj1aPtEacM+WmvS6ttN7E3Vk8tx/UHiX4tDnEJgACoY6+HM6a
+1p+e92jpc76TjfUN18Tj4E9JAX5AsGWO1iCRf1wC3GH3umYj2JZr1eZe+hAAN/rl2LdI2zO+6RmE
+wBWPj16wIeNBx2yG+UoQPYcJapPMO9rpGzvaNaXrI0rLFBKwEu0DF+ISzZHfHQa8ot+Nx2aFEz00
+iezou+9Br9gTRUiPZZb3qMek8H1vPo9cTpJLCCiP1IRQoFr6fN0/QtzsEQ4di2Y2bLAKDTJn86oq
+BgCSH4MJvMV0fydDDLYO2e8z3LzVnl8EO8u8O9LfQOQWsbnfGkraF5bRXPLUjsYjYNkf/rFO01/s
+Njzlx9VJmY9jITEFIn7Mw1tpMU0vuiNtJazLZDWU
+=G2xi
+-----END PGP MESSAGE-----
+
+--4IIKWMFJjYkYUMahG01XE9Ywam1bmgvri--
diff --git a/comm/mail/test/browser/openpgp/data/eml/signed-by-0xfbfcc82a015e7330-encrypted-to-0xf231550c4f47e38e.eml b/comm/mail/test/browser/openpgp/data/eml/signed-by-0xfbfcc82a015e7330-encrypted-to-0xf231550c4f47e38e.eml
new file mode 100644
index 0000000000..643f90c76f
--- /dev/null
+++ b/comm/mail/test/browser/openpgp/data/eml/signed-by-0xfbfcc82a015e7330-encrypted-to-0xf231550c4f47e38e.eml
@@ -0,0 +1,73 @@
+X-Mozilla-Status: 0001
+X-Mozilla-Status2: 00800000
+X-Mozilla-Keys:
+To: alice@openpgp.example
+From: Bob Babbage <bob@openpgp.example>
+Message-ID: <ef4ee59f-bb76-3407-ffa5-9b46eb756ae3@openpgp.example>
+Date: Wed, 14 Oct 2020 13:55:14 -0400
+User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:83.0) Gecko/20100101
+ Thunderbird/83.0a1
+MIME-Version: 1.0
+Subject: ...
+Content-Type: multipart/encrypted;
+ protocol="application/pgp-encrypted";
+ boundary="0SJCM8f3etpwdMBIl6eGvaijNVWPX6KJj"
+
+This is an OpenPGP/MIME encrypted message (RFC 4880 and 3156)
+--0SJCM8f3etpwdMBIl6eGvaijNVWPX6KJj
+Content-Type: application/pgp-encrypted
+Content-Description: PGP/MIME version identification
+
+Version: 1
+
+--0SJCM8f3etpwdMBIl6eGvaijNVWPX6KJj
+Content-Type: application/octet-stream; name="encrypted.asc"
+Content-Description: OpenPGP encrypted message
+Content-Disposition: inline; filename="encrypted.asc"
+
+-----BEGIN PGP MESSAGE-----
+
+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
+KvoyvWLzJj8vqyGdD8NRB24JJAQo
+=ci+H
+-----END PGP MESSAGE-----
+
+--0SJCM8f3etpwdMBIl6eGvaijNVWPX6KJj--
diff --git a/comm/mail/test/browser/openpgp/data/eml/signed-by-0xfbfcc82a015e7330-to-0xf231550c4f47e38e-unencrypted-with-key.eml b/comm/mail/test/browser/openpgp/data/eml/signed-by-0xfbfcc82a015e7330-to-0xf231550c4f47e38e-unencrypted-with-key.eml
new file mode 100644
index 0000000000..bf3efec380
--- /dev/null
+++ b/comm/mail/test/browser/openpgp/data/eml/signed-by-0xfbfcc82a015e7330-to-0xf231550c4f47e38e-unencrypted-with-key.eml
@@ -0,0 +1,167 @@
+X-Mozilla-Status: 0001
+X-Mozilla-Status2: 00800000
+X-Mozilla-Keys:
+To: alice@openpgp.example
+From: Bob Babbage <bob@openpgp.example>
+Subject: Signed Unencrypted With Key
+Autocrypt: addr=bob@openpgp.example; keydata=
+ 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
+ NEJd3XZRzaXZE2aAMQ==
+Message-ID: <62904db5-6147-c67f-502c-c24b396d5688@openpgp.example>
+Date: Wed, 14 Oct 2020 14:23:58 -0400
+User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:83.0) Gecko/20100101
+ Thunderbird/83.0a1
+MIME-Version: 1.0
+Content-Type: multipart/signed; micalg=pgp-sha256;
+ protocol="application/pgp-signature";
+ boundary="SnZKl30WhaDQBele2hNh7m1E1rjNUzy75"
+
+This is an OpenPGP/MIME signed message (RFC 4880 and 3156)
+--SnZKl30WhaDQBele2hNh7m1E1rjNUzy75
+Content-Type: multipart/mixed; boundary="zMuh5ZSCGRiyd3u4jmAM5Q7pZNJ1JNY0i";
+ protected-headers="v1"
+From: Bob Babbage <bob@openpgp.example>
+To: alice@openpgp.example
+Message-ID: <62904db5-6147-c67f-502c-c24b396d5688@openpgp.example>
+Subject: Signed Unencrypted With Key
+
+--zMuh5ZSCGRiyd3u4jmAM5Q7pZNJ1JNY0i
+Content-Type: multipart/mixed;
+ boundary="------------64A7DAE7CD7D84EBF8E46B7E"
+Content-Language: en-US
+
+This is a multi-part message in MIME format.
+--------------64A7DAE7CD7D84EBF8E46B7E
+Content-Type: text/plain; charset=UTF-8; format=flowed
+Content-Transfer-Encoding: quoted-printable
+
+Sundays are nothing without callaloo.
+
+
+--------------64A7DAE7CD7D84EBF8E46B7E
+Content-Type: application/pgp-keys;
+ name="OpenPGP_0xFBFCC82A015E7330.asc"
+Content-Transfer-Encoding: quoted-printable
+Content-Disposition: attachment;
+ filename="OpenPGP_0xFBFCC82A015E7330.asc"
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+xsDNBF2lnPIBDAC5cL9PQoQLTMuhjbYvb4Ncuuo0bfmgPRFywX53jPhoFf4Zg6mv/seOXpgec=
+TdO
+cVttfzC8ycIKrt3aQTiwOG/ctaR4Bk/t6ayNFfdUNxHWk4WCKzdz/56fW2O0F23qIRd8UUJp5=
+IIl
+N4RDdRCtdhVQIAuzvp2oVy/LaS2kxQoKvph/5pQ/5whqsyroEWDJoSV0yOb25B/iwk/pLUFoy=
+hDG
+9bj0kIzDxrEqW+7Ba8nocQlecMF3X5KMN5kp2zraLv9dlBBpWW43XktjcCZgMy20SouraVma8=
+Je/
+ECwUWYUiAZxLIlMv9CurEOtxUw6N3RdOtLmYZS9uEnn5y1UkF88o8Nku890uk6BrewFzJyLAx=
+5wR
+Z4F0qV/yq36UWQ0JB/AUGhHVPdFf6pl6eaxBwT5GXvbBUibtf8YI2og5RsgTWtXfU7ebSGXrl=
+5ZM
+pbA6mbfhd0R8aPxWfmDWiIOhBufhMCvUHh1sApMKVZnvIff9/0Dca3wbvLIwa3T4CyshfT0AE=
+QEA
+Ac0hQm9iIEJhYmJhZ2UgPGJvYkBvcGVucGdwLmV4YW1wbGU+wsEOBBMBCgA4AhsDBQsJCAcCB=
+hUK
+CQgLAgQWAgMBAh4BAheAFiEE0aZuGiOxgsmYD3iM+/zIKgFeczAFAl2lnvoACgkQ+/zIKgFec=
+zBv
+bAv/VNk90a6hG8Od9xTzXxH5YRFUSGfIA1yjPIVOnKqhMwps2U+sWE3urL+MvjyQRlyRV8oY9=
+IOh
+Q5Esm6DOZYrTnE7qVETm1ajIAP2OFChEc55uH88x/anpPOXOJY7S8jbn3naC9qad75BrZ+3g9=
+EBU
+Wiy5p8TykP05WSnSxNRt7vFKLfEB4nGkehpwHXOVF0CRNwYle42bg8lpmdXFDcCZCi+qEbafm=
+TQz
+kAqyzS3nCh3IAqq6Y0kBuaKLm2tSNUOlZbD+OHYQNZ5Jix7cZUzs6Xh4+I55NRWl5smrLq66y=
+OQo
+FPy9jot/Qxikx/wP3MsAzeGaZSEPc0fHp5G16rlGbxQ3vl8/usUV7W+TMEMljgwd5x8POR6HC=
+8Ea
+CDfVnUBCPi/Gv+egLjsIbPJZZEroiE40e6/UoCiQtlpQB5exPJYSd1Q1txCwueih99PHepsDh=
+mUQ
+KiACszNU+RRozAYau2VdHqnRJ7QYdxHDiH49jPK4NTMyb/tJh2TiIwcmsIpGzsDNBF2lnPIBD=
+ADW
+ML9cbGMrp12CtF9b2P6z9TTT74S8iyBOzaSvdGDQY/sUtZXRg21HWamXnn9sSXvIDEINOQ6A9=
+Qxd
+xoqWdCHrOuW3ofneYXoG+zeKc4dC86wa1TR2q9vW+RMXSO4uImA+Uzula/6k1DogDf28qhCxM=
+wG/
+i/m9g1c/0aApuDyKdQ1PXsHHNlgd/Dn6rrd5y2AObaifV7wIhEJnvqgFXDN2RXGjLeCOHV4Q2=
+WTY
+Pg/S4k1nMXVDwZXrvIsA0YwIMgIT86Rafp1qKlgPNbiIlC1g9RY/iFaGN2b4Ir6GDohBQSfZW=
+2+L
+XoPZuVE/wGlQ01rh827KVZW4lXvqsge+wtnWlszcselGATyzqOK9LdHPdZGzROZYI2e8c+paL=
+NDd
+VPL6vdRBUnkCaEkOtl1mr2JpQi5nTU+gTX4IeInC7E+1a9UDF/Y85ybUz8XV8rUnR76UqVC7K=
+idN
+epdHbZjjXCt8/Zo+Tec9JNbYNQB/e9ExmDntmlHEsSEQzFwzj8sxH48AEQEAAcLA9gQYAQoAI=
+BYh
+BNGmbhojsYLJmA94jPv8yCoBXnMwBQJdpZzyAhsMAAoJEPv8yCoBXnMw6f8L/26C34dkjBffT=
+zMj
+5Bdzm8MtF67OYneJ4TQMw7+41IL4rVcSKhIhk/3Ud5knaRtP2ef1+5F66h9/RPQOJ5+tvBwhB=
+AcU
+WSupKnUrdVaZQanYmtSxcVV2PL9+QEiNN3tzluhaWO//rACxJ+K/ZXQlIzwQVTpNhfGzAaMVV=
+9zp
+f3u0k14itcv6alKY8+rLZvO1wIIeRZLmU0tZDD5HtWDvUV7rIFI1WuoLb+KZgbYn3OWjCPHVd=
+Trd
+Z2CqnZbG3SXw6awH9bzRLV9EXkbhIMez0deCVdeo+wFFklh8/5VK2b0vk/+wqMJxfpa1lHvJL=
+obz
+OP9fvrswsr92MA2+k901WeISR7qEzcI0Fdg8AyFAExaEK6VyjP7SXGLwvfisw34OxuZr3qmx1=
+Suf
+u4toH3XrB7QJN8XyqqbsGxUCBqWif9RSK4xjzRTe56iPeiSJJOIciMP9i2ldI+KgLycyeDvGo=
+Bj0
+HCLO3gVaBe4ubVrj5KjhX2PVNEJd3XZRzaXZE2aAMQ=3D=3D
+=3DF9yX
+-----END PGP PUBLIC KEY BLOCK-----
+
+--------------64A7DAE7CD7D84EBF8E46B7E--
+
+--zMuh5ZSCGRiyd3u4jmAM5Q7pZNJ1JNY0i--
+
+--SnZKl30WhaDQBele2hNh7m1E1rjNUzy75
+Content-Type: application/pgp-signature; name="OpenPGP_signature.asc"
+Content-Description: OpenPGP digital signature
+Content-Disposition: attachment; filename="OpenPGP_signature"
+
+-----BEGIN PGP SIGNATURE-----
+
+wsD5BAABCAAjFiEE0aZuGiOxgsmYD3iM+/zIKgFeczAFAl+HQj4FAwAAAAAACgkQ+/zIKgFeczCg
+Cwv/SjU90dImzX5R7jbdaU/VwjUfPJ8XyAfmsVIaE3UXrNxgTQ1bsDIqqHdkPSkU5FCR1k34P/Kz
+kmqXvZPpdd+3aoxuUZPPqUd7e0uVWGBRiR70IyvgLLNP5ixh6Ct/tbc+Tf6lpg0jw1w06GW9rUxm
+VpzVt3tEty70P3kD6dlf4eNpswT7PgqWuQGKNRA0xylEfDXOKRTDG8VIX+AGZI0tlpmm3FtJ3XKG
+tvvj9L2ENz4GGWNHUZBAvjLiRfkEX3uKywELX/F1wVZDZGjOEBMVHEy8m5ZkLP1F+pw4GvOVNgIa
+lUPT0q7U5kw9/P6T1NEE1nxpOcqnfNTJvXt1rOr1vDLSoDk+9JlMUn68jT95XwGEoflq6WEuXSwp
+Iu+S3MwKL4un7dLW7xRjdBkORSQD6QOVpoXlUiGzqpFQm4XQT8Jw7HcyIPWfZdVtwJJKd3+uCvGu
+tWEXqmIdXaDGRd4oHlGBjqSPaZ20PzfrWk7VqLp5locKAO32Zkm+fEBxmN/p
+=AeKW
+-----END PGP SIGNATURE-----
+
+--SnZKl30WhaDQBele2hNh7m1E1rjNUzy75--
diff --git a/comm/mail/test/browser/openpgp/data/eml/signed-by-0xfbfcc82a015e7330-to-0xf231550c4f47e38e-unencrypted.eml b/comm/mail/test/browser/openpgp/data/eml/signed-by-0xfbfcc82a015e7330-to-0xf231550c4f47e38e-unencrypted.eml
new file mode 100644
index 0000000000..a01faf34fc
--- /dev/null
+++ b/comm/mail/test/browser/openpgp/data/eml/signed-by-0xfbfcc82a015e7330-to-0xf231550c4f47e38e-unencrypted.eml
@@ -0,0 +1,54 @@
+X-Mozilla-Status: 0001
+X-Mozilla-Status2: 00800000
+X-Mozilla-Keys:
+To: alice@openpgp.example
+From: Bob Babbage <bob@openpgp.example>
+Subject: Signed Unencrypted
+Message-ID: <de411532-9bd9-a30b-37a5-294171a0e1f5@openpgp.example>
+Date: Wed, 14 Oct 2020 14:21:06 -0400
+User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:83.0) Gecko/20100101
+ Thunderbird/83.0a1
+MIME-Version: 1.0
+Content-Type: multipart/signed; micalg=pgp-sha256;
+ protocol="application/pgp-signature";
+ boundary="rj47z8rbyl2MhEfaEZQptaxOOrVHArWV4"
+
+This is an OpenPGP/MIME signed message (RFC 4880 and 3156)
+--rj47z8rbyl2MhEfaEZQptaxOOrVHArWV4
+Content-Type: multipart/mixed; boundary="PNIE8wtZaKiN071KjiT0rwF4fNeu8GK6i";
+ protected-headers="v1"
+From: Bob Babbage <bob@openpgp.example>
+To: alice@openpgp.example
+Message-ID: <de411532-9bd9-a30b-37a5-294171a0e1f5@openpgp.example>
+Subject: Signed Unencrypted
+
+--PNIE8wtZaKiN071KjiT0rwF4fNeu8GK6i
+Content-Type: text/plain; charset=UTF-8; format=flowed
+Content-Transfer-Encoding: quoted-printable
+Content-Language: en-US
+
+Sundays are nothing without callaloo.
+
+
+
+--PNIE8wtZaKiN071KjiT0rwF4fNeu8GK6i--
+
+--rj47z8rbyl2MhEfaEZQptaxOOrVHArWV4
+Content-Type: application/pgp-signature; name="OpenPGP_signature.asc"
+Content-Description: OpenPGP digital signature
+Content-Disposition: attachment; filename="OpenPGP_signature"
+
+-----BEGIN PGP SIGNATURE-----
+
+wsD5BAABCAAjFiEE0aZuGiOxgsmYD3iM+/zIKgFeczAFAl+HQZIFAwAAAAAACgkQ+/zIKgFeczBX
+Pgv8D77zOWXaX3xsREJr6KNHkD6Gj52illymZBY1Km5+WMW0JmEdt5T0UOpAoVTbxHr/1z+G7iw6
+vgoBRNdzMoFTGYHy6wqW+2A3pKiGc2CD/789GYL/c3dVEIJuBr0FzDRMO8VQhjq/56s0FnaFjm7L
+JtEUjBZzaafQaxzmbnSXjSZLfCLh1YRRmgxeOA5CcyMY1HlgsvvSfdNH32o+ZPgSG4C7s4z2iinH
+uZFE2SbQ/qvyBWnslr1+2/r8YFhtknLsK14memZb8bIAtrh8Hxq9BRg3A4+spD4uR7C+1hcLbWRD
+x5b46ehcULzoTcnDLmQ34/zymIANCzSdww7Ofmhw7c/5sK9BL/fjgiT4qKxFOr/12/Ym6cXqtUgN
+Eh9XsQt10ZP707BodH9ga9rIR5NIZr6xYZx0iX7FPKxXw8Kf8ovxiI+ATYb4B6fv6PRxyD6yYfLx
+ZKBnZfk5UOe/GqktKFFHO2EVe3z8eYgS8k1hWXuvkKlXDb6PqDRUE42K6yAD
+=/kuV
+-----END PGP SIGNATURE-----
+
+--rj47z8rbyl2MhEfaEZQptaxOOrVHArWV4--
diff --git a/comm/mail/test/browser/openpgp/data/eml/signed-encrypted-autocrypt-gossip.eml b/comm/mail/test/browser/openpgp/data/eml/signed-encrypted-autocrypt-gossip.eml
new file mode 100644
index 0000000000..23aca2fa21
--- /dev/null
+++ b/comm/mail/test/browser/openpgp/data/eml/signed-encrypted-autocrypt-gossip.eml
@@ -0,0 +1,174 @@
+X-Mozilla-Status: 0800
+X-Mozilla-Status2: 00000000
+Message-ID: <e8690528-d187-4d99-b505-9f3d6a2704ca@openpgp.example>
+Date: Wed, 11 Oct 2023 14:35:24 +0200
+MIME-Version: 1.0
+User-Agent: Thunderbird Daily
+Content-Language: en-US
+To: alice@openpgp.example, carol@example.com
+From: bob@openpgp.example
+Autocrypt: addr=bob@openpgp.example; keydata=
+ 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
+ NEJd3XZRzaXZE2aAMQ==
+X-Mozilla-Draft-Info: internal/draft; vcard=0; receipt=0; DSN=0; uuencode=0;
+ attachmentreminder=0; deliveryformat=0
+X-Identity-Key: id2
+Fcc: mailbox://nobody@Local%20Folders/Sent
+Subject: ...
+Content-Type: multipart/encrypted;
+ protocol="application/pgp-encrypted";
+ boundary="------------PVS0UUCXkX51e6TO2TaXFns1"
+
+This is an OpenPGP/MIME encrypted message (RFC 4880 and 3156)
+--------------PVS0UUCXkX51e6TO2TaXFns1
+Content-Type: application/pgp-encrypted
+Content-Description: PGP/MIME version identification
+
+Version: 1
+
+--------------PVS0UUCXkX51e6TO2TaXFns1
+Content-Type: application/octet-stream; name="encrypted.asc"
+Content-Description: OpenPGP encrypted message
+Content-Disposition: inline; filename="encrypted.asc"
+
+-----BEGIN PGP MESSAGE-----
+
+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
+/uXB41pKNfwTr8Uq/Nt3db/H
+=jflm
+-----END PGP MESSAGE-----
+
+--------------PVS0UUCXkX51e6TO2TaXFns1--
diff --git a/comm/mail/test/browser/openpgp/data/eml/signed-inline-indented.eml b/comm/mail/test/browser/openpgp/data/eml/signed-inline-indented.eml
new file mode 100644
index 0000000000..a6c58e55fc
--- /dev/null
+++ b/comm/mail/test/browser/openpgp/data/eml/signed-inline-indented.eml
@@ -0,0 +1,23 @@
+From: "Alice Lovelace" <alice@openpgp.example>
+To: "Alice Lovelace" <alice@openpgp.example>
+Subject: signed inline with leading whitespace
+Date: Thu, 15 Dec 2020 11:11:03 +0100
+Content-Type: text/plain; charset=UTF-8
+MIME-Version: 1.0
+
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+indent test with £
+ £ 2.00
+ £ 4.00
+ £ 7.00
+ £ 5.00
+end indent
+-----BEGIN PGP SIGNATURE-----
+
+iIkEARYIADEWIQTrhbtfozp14V6UTmPyMVUMT0fjjgUCX9iLtxMcYWxpY2UtdGVz
+dEBrdWl4LmRlAAoJEPIxVQxPR+OOXiQBAPrpjL5tI0ZCrWkNt8VFm9+PF0T8DOgH
+bH7ZaD9RblvUAQCOtx/6kEkGmMwteaGQatVNIwfnfFuiidwlKOtXXxIjBw==
+=Z5ya
+-----END PGP SIGNATURE-----
diff --git a/comm/mail/test/browser/openpgp/data/eml/signed-mismatch-email-date.eml b/comm/mail/test/browser/openpgp/data/eml/signed-mismatch-email-date.eml
new file mode 100644
index 0000000000..f673055c42
--- /dev/null
+++ b/comm/mail/test/browser/openpgp/data/eml/signed-mismatch-email-date.eml
@@ -0,0 +1,54 @@
+X-Mozilla-Status: 0001
+X-Mozilla-Status2: 00800000
+X-Mozilla-Keys:
+To: alice@openpgp.example
+From: Bob Babbage <bob@openpgp.example>
+Subject: Signed Unencrypted, signature date differs from email date
+Message-ID: <de411532-9bd9-a30b-37a5-294171a0e1a6@openpgp.example>
+Date: Wed, 14 Oct 2019 14:21:06 -0400
+User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:83.0) Gecko/20100101
+ Thunderbird/83.0a1
+MIME-Version: 1.0
+Content-Type: multipart/signed; micalg=pgp-sha256;
+ protocol="application/pgp-signature";
+ boundary="rj47z8rbyl2MhEfaEZQptaxOOrVHArWV4"
+
+This is an OpenPGP/MIME signed message (RFC 4880 and 3156)
+--rj47z8rbyl2MhEfaEZQptaxOOrVHArWV4
+Content-Type: multipart/mixed; boundary="PNIE8wtZaKiN071KjiT0rwF4fNeu8GK6i";
+ protected-headers="v1"
+From: Bob Babbage <bob@openpgp.example>
+To: alice@openpgp.example
+Message-ID: <de411532-9bd9-a30b-37a5-294171a0e1f5@openpgp.example>
+Subject: Signed Unencrypted
+
+--PNIE8wtZaKiN071KjiT0rwF4fNeu8GK6i
+Content-Type: text/plain; charset=UTF-8; format=flowed
+Content-Transfer-Encoding: quoted-printable
+Content-Language: en-US
+
+Sundays are nothing without callaloo.
+
+
+
+--PNIE8wtZaKiN071KjiT0rwF4fNeu8GK6i--
+
+--rj47z8rbyl2MhEfaEZQptaxOOrVHArWV4
+Content-Type: application/pgp-signature; name="OpenPGP_signature.asc"
+Content-Description: OpenPGP digital signature
+Content-Disposition: attachment; filename="OpenPGP_signature"
+
+-----BEGIN PGP SIGNATURE-----
+
+wsD5BAABCAAjFiEE0aZuGiOxgsmYD3iM+/zIKgFeczAFAl+HQZIFAwAAAAAACgkQ+/zIKgFeczBX
+Pgv8D77zOWXaX3xsREJr6KNHkD6Gj52illymZBY1Km5+WMW0JmEdt5T0UOpAoVTbxHr/1z+G7iw6
+vgoBRNdzMoFTGYHy6wqW+2A3pKiGc2CD/789GYL/c3dVEIJuBr0FzDRMO8VQhjq/56s0FnaFjm7L
+JtEUjBZzaafQaxzmbnSXjSZLfCLh1YRRmgxeOA5CcyMY1HlgsvvSfdNH32o+ZPgSG4C7s4z2iinH
+uZFE2SbQ/qvyBWnslr1+2/r8YFhtknLsK14memZb8bIAtrh8Hxq9BRg3A4+spD4uR7C+1hcLbWRD
+x5b46ehcULzoTcnDLmQ34/zymIANCzSdww7Ofmhw7c/5sK9BL/fjgiT4qKxFOr/12/Ym6cXqtUgN
+Eh9XsQt10ZP707BodH9ga9rIR5NIZr6xYZx0iX7FPKxXw8Kf8ovxiI+ATYb4B6fv6PRxyD6yYfLx
+ZKBnZfk5UOe/GqktKFFHO2EVe3z8eYgS8k1hWXuvkKlXDb6PqDRUE42K6yAD
+=/kuV
+-----END PGP SIGNATURE-----
+
+--rj47z8rbyl2MhEfaEZQptaxOOrVHArWV4--
diff --git a/comm/mail/test/browser/openpgp/data/eml/signed-with-mailman-footer.eml b/comm/mail/test/browser/openpgp/data/eml/signed-with-mailman-footer.eml
new file mode 100644
index 0000000000..8a48a016c5
--- /dev/null
+++ b/comm/mail/test/browser/openpgp/data/eml/signed-with-mailman-footer.eml
@@ -0,0 +1,75 @@
+X-Mozilla-Status: 0001
+X-Mozilla-Status2: 00800000
+X-Mozilla-Keys:
+To: alice@openpgp.example
+From: Carol <carol@example.com>
+Subject: Signed Unencrypted with unsigned mailing list footer
+Message-ID: <d9c78fbc-8373-4596-d806-20857e15a1ag@example.com>
+Date: Wed, 14 Oct 2020 14:36:08 -0400
+User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:83.0) Gecko/20100101
+ Thunderbird/83.0a1
+MIME-Version: 1.0
+Content-Type: multipart/mixed; boundary="===============5120840899925357875=="
+
+This is an OpenPGP/MIME signed message (RFC 4880 and 3156)
+--===============5120840899925357875==
+Content-Language: en-US
+Content-Type: multipart/signed; micalg=pgp-sha256;
+ protocol="application/pgp-signature";
+ boundary="hUAWHTUaWZ5wnWnHjj7a4qhWdRkydquhh"
+
+This is an OpenPGP/MIME signed message (RFC 4880 and 3156)
+--hUAWHTUaWZ5wnWnHjj7a4qhWdRkydquhh
+Content-Type: multipart/mixed; boundary="oIVAE9YPgX7lo5koqmIMk4gv1QFBbuMEk";
+ protected-headers="v1"
+From: Carol <carol@example.com>
+To: alice@openpgp.example
+Message-ID: <d9c78fbc-8373-4596-d806-20857e15a1ag@example.com>
+Subject: Signed Unencrypted
+
+--oIVAE9YPgX7lo5koqmIMk4gv1QFBbuMEk
+Content-Type: text/plain; charset=UTF-8; format=flowed
+Content-Transfer-Encoding: quoted-printable
+Content-Language: en-US
+
+Sundays are nothing without callaloo.
+
+
+
+--oIVAE9YPgX7lo5koqmIMk4gv1QFBbuMEk--
+
+--hUAWHTUaWZ5wnWnHjj7a4qhWdRkydquhh
+Content-Type: application/pgp-signature; name="OpenPGP_signature.asc"
+Content-Description: OpenPGP digital signature
+Content-Disposition: attachment; filename="OpenPGP_signature"
+
+-----BEGIN PGP SIGNATURE-----
+
+wsF5BAABCAAjFiEEuPL29L060/gtxEaDMJn/EjiFK58FAl+HRRgFAwAAAAAACgkQMJn/EjiFK59T
+xRAAoG7+tqzXKQH2S511jRudl0HaKs+AE7kfyqbqBpWsCzcuxWIvCY3cX9ypIEhLllYWTs15aQq+
+f0GCXIK6PFGukhoQ/m49MmiGh4D7oGYxmPQyn9yZVcijqmzF5f4s7oiSKVl9/4y8H0JCHaWuelkN
+fizcAyXUWdPdefL8pIQkng+EtBM1sZ25HBJYFU6du88u0LuA3A7SNRPcRc+LhrGticIPBsDcRntm
+41bcf9QKo36EnltJjSGv3Rtp/PacyMqsmlR/UDHzVP7yWNvPboPCIB2CHVN9J1URxE2S3hjfrbY0
+fuNTgA3TlJ7crTCztIrqugZT4RxhyP3orDhp5TKYLO8q9bof6C1Zo8VbvGzVrl4eVgP0YRNN19vm
+mPeH7rF7wTPhvht0sLKcFMFTXU458SokWZW94EpTBIGNWjCKlzE8TtQPyhViVpo1RUpJQx/tr6Pb
+9r81aKJ0hnrAcDqL+PMd4UWSAONCpr9YpOEY6hj4ppqI09b0HGnBDMvLwsm+PdZ1cLsRlqzCsYfj
+tsU9QpMBV4lJoAnMkGM7pqucovyHSNcgXU/z+OLH1LmPOfPeG3kCGlbRyaQPOt2ZhQZH2f0C6Dnh
+wvmVUqGG8GWDnfVP4hzKzMQQOyWHa/F+J1nwFlbdEBH640jxPdz80/uACXwkhdn+rssEfCeB7SDP
+Cfc=
+=Q8yQ
+-----END PGP SIGNATURE-----
+
+--hUAWHTUaWZ5wnWnHjj7a4qhWdRkydquhh--
+
+--===============5120840899925357875==
+Content-Type: text/plain; charset="us-ascii"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+Content-Disposition: inline
+
+_______________________________________________
+Mailman mailing list
+Mailman@example.com
+https://example.com/mailman/listinfo/mailman
+
+--===============5120840899925357875==--
diff --git a/comm/mail/test/browser/openpgp/data/eml/unrelated-and-fake-keys-attached.eml b/comm/mail/test/browser/openpgp/data/eml/unrelated-and-fake-keys-attached.eml
new file mode 100644
index 0000000000..8c3c017574
--- /dev/null
+++ b/comm/mail/test/browser/openpgp/data/eml/unrelated-and-fake-keys-attached.eml
@@ -0,0 +1,176 @@
+Content-Type: multipart/mixed; boundary="------------274vgv3mTEV0d72rt4aKcMCU"
+Message-ID: <17d788da-b2c1-ed92-24c5-4caa29ad9db2@example.com>
+Date: Mon, 7 Mar 2022 18:45:18 +0100
+MIME-Version: 1.0
+User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:99.0) Gecko/20100101
+ Thunderbird/99.0a1
+Content-Language: en-US
+To: Alice <alice@openpgp.example>
+From: Bob <bob@openpgp.example>
+Subject: unrelated and fake keys attached
+
+This is a multi-part message in MIME format.
+--------------274vgv3mTEV0d72rt4aKcMCU
+Content-Type: text/plain; charset=UTF-8; format=flowed
+Content-Transfer-Encoding: 7bit
+
+
+--------------274vgv3mTEV0d72rt4aKcMCU
+Content-Type: text/plain; charset=UTF-8; name="alice-fake-pub.asc"
+Content-Disposition: attachment; filename="alice-fake-pub.asc"
+Content-Transfer-Encoding: base64
+
+LS0tLS1CRUdJTiBQR1AgUFVCTElDIEtFWSBCTE9DSy0tLS0tCgptUUdOQkdJbVIwa0JEQUR0
+QytLWlFYMWtNZlVKZThENVJldzZ5aWovT1ovS0s5bWUzMkc1U0d5akFiUFF0eDdLCjRuaE5H
+Q3RXREVoV3VUeXJ0MTlNMmhWaWpqRkU3bGYzYURuZ3F1TVdBSTJCYzM2UjZvZDI3WnArbDBo
+Nm1neEwKME1wZnpxbXRXOFZtMHJncW12VlNGV0dUektjbkphUnoxckFGVi9BR2daVTRKNU1U
+TTBsKzZ1ZG9kcUN3T2dXcApVa0svVmo1aDE3NjZlRjBIbDhzOHR3NnFQY3JwV2ZqQ2s5VlpK
+cUZ3Z3JCdXkyUmtWMy93ZFRZejVJSzhHTk9WClBpdXNaS0RLaWYwQzlybk5HbVI5S3RVRWpw
+RGgyOFBkWE9XbHNaU2dFUGtOQ2tiZWxRRGxPVlRmNDdLekswcGkKNUY4L01iTlhnT0tLMklO
+UTh0MU9qbE04TlBPSnQxZGpNYm1WQWN4Rm1TZGwxWTdkdGVxNG01bEV4dGZJeTdlaAo3SjJn
+RkU1ZGZ6WWo1YnFycitkNXozbU5objJTQVVkak45c3ByZ0FaOEh5V243N3RUb0I2TGZFNGlj
+QXF2NlJMCnIydFVkcXZBb1BEUWpnbytYU2lhK3ZCVXEvQ0tOckYvVWNsZG1leGpTNm1rRHJG
+ajRPRlp0dWZDZjVCbTg0cy8KTUxVczlmM3lhcjExcUxzQUVRRUFBYlFpUVd4cFkyVWdSbUZy
+WlNBOFlXeHBZMlZBYjNCbGJuQm5jQzVsZUdGdApjR3hsUG9rQnpnUVRBUW9BT0JZaEJCTExk
+d1UxdlEzL3dnYVF0eGFWcjNHbXpNSGVCUUppSmtkSkFoc0RCUXNKCkNBY0NCaFVLQ1FnTEFn
+UVdBZ01CQWg0QkFoZUFBQW9KRUJhVnIzR216TUhlWkt3TC8wOVo0bWRYVnFIdHZtZHMKc1l4
+RGM2dGNFTnJaVkFMTUhRWVNiRGJva20zcWg4Mit2ZCt1b2xBNkFHMldkbjZkSUwxV2lIQ0R1
+TjlQM1U0Two1dnpyUFhIdXBsaS9kNVRhbldKNDRXZm53S2V1MDEyL3l5Rk01RHN1cURGeGJa
+bG5GQzg2Q0JCay9SRG5WQkdKCmhFb2xpYW8wM1QwRTZPWWlmUUVOYmptOFo3dE9wSG5pMCty
+ZDg3QjM3UktiMU5TM0ErWVdndUtCUGE1Qmw1dFcKb1drb2VESmZjdDl1NE54bHpNVjcwSUw2
+eDRKeU1SWUQyK2xZdEJCOWIxbUQyRndQaGphRSsycXhncHFyQzJaVQpoUDdEczZMOC9QYU0r
+Q2lZOEZkaW5icUFSb1J1OEY5NWQrelhXZUFxdERIMVFtSndZY2Y3OHhLUUIrSVNxN2E2ClIw
+VTVkWUVla1lzSHlrL0xTaml2OXVLRnlXUU5xWEJjYVBrT2tOQloralZIZzNVS05tazh6YlJS
+WCs0NmJHeXcKTFJCNnBpcFoxZXE3Z1ZJVFI4MWtFZGZnZFZIRFVjcEQvOGRUaHBPVHptYkZv
+Vmh4cEc5UHlzcElsZll5elpuRgpYNEFnYVZZczFuZkcySGMvcmZpMHlrZjJFblRGUWVYRm91
+eER4KzNJWVk4L21KY0xmTGtCalFSaUprZEpBUXdBCitlcGJHaTJhRU95SDcydWp1MmJEVW9X
+VENIdVB3NSs2R3E2TVEvc1BEQlAyaXppL3RQeCtpQmNaQnZwWXM3WngKcHZnWFRnRDNZOGF4
+MTBGdk40Rk45eUlrVGwzMmJtdG9mNjVxOFBEMnhQZTM5ZzNsQTFUd0tvNDdwS0tzdE92cgpj
+ek8vb1d3WWJRcUMvcnMzQ3BiT016TTVQdEhsQVU3WEY2V3FxSFJ5UTdjbUo5V0JDdTYrV1li
+OEt4eHBIQ29ZCnJKa3NmMzVKMjNNbXRMdkliUVJnWVIranFyWHhubU1LazFtaVZZUmh5TXB4
+RXREQzNnSjFOUXFWQ2JQTWRFdTYKU25pdFBiYncrdVBKL3N2NEc4SW1MUUV2cmtORlh1dTRi
+VS82bnV3RmVBbU5mRzNma3Vsb1dOaWswUkxsSFNJawpyNUo1OUhFQ1NiRGhDellubTFNa0V1
+dUZteDVjMEhGejZVcnZxZ0gyYW9zMFYvRHFYQ1YvODNTSmJ1ZE9hSU1PCkhlR3dnSkRSeUpx
+eUpta0JKdnBNOUtDWFd6Rmx1YjRzWjdYR2dwamZzYVpQd2JiRWNkaUp1b1FnSnlNY3V0S3cK
+ZXlZb3BMdDNXTklkU2lwT2pRdFZRRVJjRlJJUmdtcjFBQTVST3JUaktySmRkdFVUZXNFK3ZR
+ZWU5ZzNQR0ZjeApBQkVCQUFHSkFiWUVHQUVLQUNBV0lRUVN5M2NGTmIwTi84SUdrTGNXbGE5
+eHBzekIzZ1VDWWlaSFNRSWJEQUFLCkNSQVdsYTl4cHN6QjNnZExDLzlNcHI4TjJmS09WVUky
+c0tIMm8zOHZCZkxUN2VDcmNIV3dRWnYzYmxwOGkzQUsKZnQzNnVSWmJOQmRDaEF1a28wZUR2
+M1o3S1ZzS3lTdyt4bWZxM2pLWlMxMmlUQWltQzY4Y3dFeHAyL3B0R1k2dAp3V1E2b0t6SW5u
+QXduV2R5STdYS2VqYmg5NENSd1d4SjdZNk9YamFQRTZwY01xLzVaai9GVFBYUUQrWktkNmpS
+CmVRekxzdkVRVW4zbTlaSG9OQ0dtOUhQMVBzemk4M2IxT3hQMGVDNmhlaUo1TWdaWUliRDR1
+RTJqN3I3dnpoTE0KTDVKV2hhejJaNUxBVG9TV2VvMjIzaHFiSnc1TXVCOVowOURZTzlUUVRo
+bFNSUG5VTWl4RStkUnBPcnFQbERJRwpHSFJ5VDJidXNYbGlZSU5Xd3p2Y1lkelpzUG1hTWtX
+aHlSMFZ4cjR6UmoyTm04ZmhqZ1pGRUdEUlBIQWdtUmlFCkJZTHNiMGtwOGJxUUxDQlVrUURH
+eURxUnBoUHgwem1YVk5FVzVIT3B1S1JjMlNhYlpzR3UxZXM0S3prR2dJVCsKdmtaL28wTWFi
+OWc3dTZaUUdHbnF4U0V3bU0xZllLMGdqd0cyK3YrN2MrdzBESXQzeThVN2Vad3UwMHNtYkZ5
+TQpycDI3WUxUZElQOFpjOTV5eXE0PQo9ZWcveAotLS0tLUVORCBQR1AgUFVCTElDIEtFWSBC
+TE9DSy0tLS0tCg==
+--------------274vgv3mTEV0d72rt4aKcMCU
+Content-Type: text/plain; charset=UTF-8; name="stranger-pub.asc"
+Content-Disposition: attachment; filename="stranger-pub.asc"
+Content-Transfer-Encoding: base64
+
+LS0tLS1CRUdJTiBQR1AgUFVCTElDIEtFWSBCTE9DSy0tLS0tCgptUUdOQkdJbVF1UUJEQUM4
+amI5bEpHSEF3VEMyeDdFc0YrbHZrZjhPWkJta2pYR0pEQUtYa2gxenQxRUNvTjZmCnc2clpQ
+aG5SSmtaZUVPc3FRY0U2WklDT0R3dW5xekhLdzhIdk1lOTViWVhCY3hHRUpiZ2NVeW55SUha
+ckdNMGwKa0cycHJQaG11K0t4Q2VIT1lXVWFvNjVKalZuY3puWjZpWWNvL2g0WTZKUzczVGZt
+dlVBaWhDQ0IzaFJHVnRnQwpWdUdKLytKUjRaejBCM2JHa2FCTXNTLyt0VTlSdzFBRHFmemZl
+OHFnTENzY1dQRnBDWU1FRS9zRzRldEJTUkFCClBGRUdHaTViTjcrQzJxSFIveHpKd09haXJL
+Zjd2MGxtRG1URVQwNnIyUzZLS1JpeDVBaUVFak92cEd5NUJISkIKMnlUVWRmUzRVbjJJNThV
+eml2bXpnRGdwbkVYOWdXcWxxeHlONFZDL2xPN3p2dndzMDBJYWIrU3Rzd3g4K1N1dQp0NEM0
+YjI1alpKOGFBSEg4dmpDbVREdlpFTk1BSFdnZjRlVk9sSzFFbTdURHZ4ajZpcUNLdUZVY0Zt
+dFRONUExCllaamZKbW5DMHA3ekdhaXRyUEdwUlh0aVhQT05RWG55WXA2ZEFMTzh0MkpwS1cy
+OEM1M3V5TUJRY292VzFTNnUKV3VVNUxRTUZEV1ExUU1rQUVRRUFBYlFmVTNSeVlXNW5aWEln
+UEhOMGNtRnVaMlZ5UUdWNFlXMXdiR1V1WTI5dApQb2tCemdRVEFRb0FPQlloQkpSQXFqV2Rw
+bVVqNXNVTVYwWEVYVDhhYlUyUEJRSmlKa0xrQWhzREJRc0pDQWNDCkJoVUtDUWdMQWdRV0Fn
+TUJBaDRCQWhlQUFBb0pFRVhFWFQ4YWJVMlBDTU1NQUx0bVpKZnk5U05PQTFyMlowdFoKVVJt
+WTBYTGpaUjVObitGWlgzWjZaWXVCMEwwb2VTL0trVytkZEpad2E4T1pYZHo2TDF6YWo5cVBu
+RktWUDkrWgp0UTY3MS84RFc2YWNTR0cxeW9JZDhUalQrUHM4d3JXMzcwdzdVc2NYNUgrSkpn
+cG83aXdYTS9GeFFhUkVpSHFJCm9CTE15a1ZVQjAwS2NLNW15QlB0ajJOT1JLSzJQNmNKUkdB
+WWFhTzVhNXFYcW90c1o1Zm9CbmN4a0JuWXBkY2sKb1dhZXNDWnRLMVNOUzZMNEh5VmNYaDRt
+M3h0M1lKZzczbWRKMkFjb1NVWXhuckl3Si9rMzlmTGF2NW4zdDZIdwpnRXBKYmkxVlVzV1FN
+OTVkcnBwRkc2bUZQM2YwYVdkeFVGMDl3QU1kODJ4bTNUMkcwUWdUNFpnTlBIWDIyQTVSCmNT
+MGtLeGxrKzhWVzYvWm1xUzcrcmI1UkFqSFhsYjJBM1lPZmdKeGZtbWZ1eHNIQktURDJnQVJD
+S0ticTJkaW0KVW1iMUVRSFl2NTNYU3VzSzNPWGt5VWZReExqUTRHWG43KzBaVHdQbk9ta3pK
+VVJwczNkN1NDWTBsQU9vVXRpQwpBOTFSOTZXdFVlVFdWSGVSNXNuRFJjZjFvZGRGNlRjc0xP
+d3B2aDRkUUFKRkY3a0JqUVJpSmtMa0FRd0FzcnpYCnZGYnlHbndNWW1jeU0zWXNnVkZYQ0Qy
+bHhBOCt4Z081VEtnUUM5S3hNTWZTc3poekhoYmlrUU5BTlhIRncyQTAKbTB3VExqbTl4SDZM
+Mlp0ek9iWWRubS8wajhGNG9lWmowWjJnRTMwOFJDMUFteWZGY2w3Y2N2MkhaZmk1bXg5eQpq
+TXFCMlVwM0F1bEpjMFpEWW0zWFBuMTBET2V2WUV3MmJEeTF1LytCVWZrOVpsK09qQ29KTHRR
+TjNUZEtwSlgyCjh4ZitUc0d3TEtkUUQvYkEzaWMxZVF0bWR1Tm13TVo2RTV3QnFjOGExdHBy
+S2RBbEdPOWV0cnhIS0l6eXJ3aVgKUWU2R2xwUVlTZHAyQWNtdG9kVkRsQllxTjBSdjJhVm84
+RnpJWVhlb0ZzcGxaWGt0WHJRZjhXaDNiWURxdlVtagpSSVpJR1BaUmxidlA1TFJ5c08zclk0
+dHMvTFl0NkloaDhqZjZvQ3pmUjRPV1kza244bDZ0RlR6NEpIK2N6U0hTCk80QnlIV0JkQ0xk
+T1NSK2paVC9mZXdkTFgvSVVieFUrY2UxSmw1YlVQTVBsQk9hWmtUejNUVTBjaGllN1NaTmUK
+akM0bHd5dmVDaGJRSnBQOVhaTjBJMWZraXozTExPNW8rbzV4b01XcnY5Q1ZjYWNMYTREdGlt
+bkI0RWl4QUJFQgpBQUdKQWJZRUdBRUtBQ0FXSVFTVVFLbzFuYVpsSStiRkRGZEZ4RjAvR20x
+Tmp3VUNZaVpDNUFJYkRBQUtDUkJGCnhGMC9HbTFOanlRQ0MvOUFqem9kRThCWmwvckdFOWt4
+MUFjaVZ4Wkd0RTBtYkhrNzgzN01BdlBSTGF3UjBlMXkKVGdNQ3dMK2Ywd0NaQkVIUHJPdys4
+ZHRIZEthWEh4MS9PM1g0S0VzRmdSUE1NTUYzdUluVFZzc1RPM0hhb29ocQpnOUhtcmdkdnMy
+dmtFeVNnOGRPUFlXTldRTkpGNndDRmplbUp6QXdSVldDSXZFU1d1a2R1NUkrczlMcm11T2J1
+CjdTbzc2QlJaNnJlSm5IcjZydVVTNDlYNEl3ZWdVMHdPc3U2STJhTFFoQ01NS295L3Exaldw
+RFp1WXRVMER0OHMKNXJzQlNpN09NUG80em0zdGV1SGdDNVlucXp6UGxGajAzZjRMQXRZWXJF
+cHdzS3FlbG04RGJId2EvbHNjaWRxZgplaitYWmhxVnQ1cVhYcmpGcDMzbGg4SFFCUDJremU0
+SElUZG1YQTVCazRzZ255bFUwWnUySmpJUER1c2VXQXBZCkpMeFQxYi9lUzM2K0VMNFVzZGtP
+QUIzMkUwRkE3aFB0SGxQRlYrMUl3cUZXcEt2VzlLL0dpVVYreXhHL0xGTnoKTzVRcW4waHdH
+YjhJMFNZTytzdFVBOXREYmpTTUUzRURtV3Q4UG1wUGJHc214blhpY2VoWm1aSmdRQzlZNUtR
+OApwcUNIeFJhN3FabHhPMkU9Cj0zOXRyCi0tLS0tRU5EIFBHUCBQVUJMSUMgS0VZIEJMT0NL
+LS0tLS0K
+--------------274vgv3mTEV0d72rt4aKcMCU
+Content-Type: text/plain; charset=UTF-8;
+ name="bob@openpgp.example-0xfbfcc82a015e7330-pub.asc"
+Content-Disposition: attachment;
+ filename="bob@openpgp.example-0xfbfcc82a015e7330-pub.asc"
+Content-Transfer-Encoding: base64
+
+LS0tLS1CRUdJTiBQR1AgUFVCTElDIEtFWSBCTE9DSy0tLS0tCkNvbW1lbnQ6IEJvYidzIE9w
+ZW5QR1AgY2VydGlmaWNhdGUKQ29tbWVudDogaHR0cHM6Ly93d3cuaWV0Zi5vcmcvaWQvZHJh
+ZnQtYnJlLW9wZW5wZ3Atc2FtcGxlcy0wMS5odG1sCgptUUdOQkYybG5QSUJEQUM1Y0w5UFFv
+UUxUTXVoamJZdmI0TmN1dW8wYmZtZ1BSRnl3WDUzalBob0ZmNFpnNm12Ci9zZU9YcGdlY1Rk
+T2NWdHRmekM4eWNJS3J0M2FRVGl3T0cvY3RhUjRCay90NmF5TkZmZFVOeEhXazRXQ0t6ZHoK
+LzU2ZlcyTzBGMjNxSVJkOFVVSnA1SUlsTjRSRGRSQ3RkaFZRSUF1enZwMm9WeS9MYVMya3hR
+b0t2cGgvNXBRLwo1d2hxc3lyb0VXREpvU1YweU9iMjVCL2l3ay9wTFVGb3loREc5Ymowa0l6
+RHhyRXFXKzdCYThub2NRbGVjTUYzClg1S01ONWtwMnpyYUx2OWRsQkJwV1c0M1hrdGpjQ1pn
+TXkyMFNvdXJhVm1hOEplL0VDd1VXWVVpQVp4TElsTXYKOUN1ckVPdHhVdzZOM1JkT3RMbVla
+Uzl1RW5uNXkxVWtGODhvOE5rdTg5MHVrNkJyZXdGekp5TEF4NXdSWjRGMApxVi95cTM2VVdR
+MEpCL0FVR2hIVlBkRmY2cGw2ZWF4QndUNUdYdmJCVWlidGY4WUkyb2c1UnNnVFd0WGZVN2Vi
+ClNHWHJsNVpNcGJBNm1iZmhkMFI4YVB4V2ZtRFdpSU9oQnVmaE1DdlVIaDFzQXBNS1ZabnZJ
+ZmY5LzBEY2Ezd2IKdkxJd2EzVDRDeXNoZlQwQUVRRUFBYlFoUW05aUlFSmhZbUpoWjJVZ1BH
+SnZZa0J2Y0dWdWNHZHdMbVY0WVcxdwpiR1UraVFIT0JCTUJDZ0E0QWhzREJRc0pDQWNDQmhV
+S0NRZ0xBZ1FXQWdNQkFoNEJBaGVBRmlFRTBhWnVHaU94CmdzbVlEM2lNKy96SUtnRmVjekFG
+QWwybG52b0FDZ2tRKy96SUtnRmVjekJ2YkF2L1ZOazkwYTZoRzhPZDl4VHoKWHhINVlSRlVT
+R2ZJQTF5alBJVk9uS3FoTXdwczJVK3NXRTN1ckwrTXZqeVFSbHlSVjhvWTlJT2hRNUVzbTZE
+TwpaWXJUbkU3cVZFVG0xYWpJQVAyT0ZDaEVjNTV1SDg4eC9hbnBQT1hPSlk3UzhqYm4zbmFD
+OXFhZDc1QnJaKzNnCjlFQlVXaXk1cDhUeWtQMDVXU25TeE5SdDd2RktMZkVCNG5Ha2VocHdI
+WE9WRjBDUk53WWxlNDJiZzhscG1kWEYKRGNDWkNpK3FFYmFmbVRRemtBcXl6UzNuQ2gzSUFx
+cTZZMGtCdWFLTG0ydFNOVU9sWmJEK09IWVFOWjVKaXg3YwpaVXpzNlhoNCtJNTVOUldsNXNt
+ckxxNjZ5T1FvRlB5OWpvdC9ReGlreC93UDNNc0F6ZUdhWlNFUGMwZkhwNUcxCjZybEdieFEz
+dmw4L3VzVVY3VytUTUVNbGpnd2Q1eDhQT1I2SEM4RWFDRGZWblVCQ1BpL0d2K2VnTGpzSWJQ
+SloKWkVyb2lFNDBlNi9Vb0NpUXRscFFCNWV4UEpZU2QxUTF0eEN3dWVpaDk5UEhlcHNEaG1V
+UUtpQUNzek5VK1JSbwp6QVlhdTJWZEhxblJKN1FZZHhIRGlINDlqUEs0TlRNeWIvdEpoMlRp
+SXdjbXNJcEd1UUdOQkYybG5QSUJEQURXCk1MOWNiR01ycDEyQ3RGOWIyUDZ6OVRUVDc0Uzhp
+eUJPemFTdmRHRFFZL3NVdFpYUmcyMUhXYW1Ybm45c1NYdkkKREVJTk9RNkE5UXhkeG9xV2RD
+SHJPdVczb2ZuZVlYb0cremVLYzRkQzg2d2ExVFIycTl2VytSTVhTTzR1SW1BKwpVenVsYS82
+azFEb2dEZjI4cWhDeE13Ry9pL205ZzFjLzBhQXB1RHlLZFExUFhzSEhObGdkL0RuNnJyZDV5
+MkFPCmJhaWZWN3dJaEVKbnZxZ0ZYRE4yUlhHakxlQ09IVjRRMldUWVBnL1M0azFuTVhWRHda
+WHJ2SXNBMFl3SU1nSVQKODZSYWZwMXFLbGdQTmJpSWxDMWc5UlkvaUZhR04yYjRJcjZHRG9o
+QlFTZlpXMitMWG9QWnVWRS93R2xRMDFyaAo4MjdLVlpXNGxYdnFzZ2Urd3RuV2xzemNzZWxH
+QVR5enFPSzlMZEhQZFpHelJPWllJMmU4YytwYUxORGRWUEw2CnZkUkJVbmtDYUVrT3RsMW1y
+MkpwUWk1blRVK2dUWDRJZUluQzdFKzFhOVVERi9ZODV5YlV6OFhWOHJVblI3NlUKcVZDN0tp
+ZE5lcGRIYlpqalhDdDgvWm8rVGVjOUpOYllOUUIvZTlFeG1EbnRtbEhFc1NFUXpGd3pqOHN4
+SDQ4QQpFUUVBQVlrQnRnUVlBUW9BSUJZaEJOR21iaG9qc1lMSm1BOTRqUHY4eUNvQlhuTXdC
+UUpkcFp6eUFoc01BQW9KCkVQdjh5Q29CWG5NdzZmOEwvMjZDMzRka2pCZmZUek1qNUJkem04
+TXRGNjdPWW5lSjRUUU13Nys0MUlMNHJWY1MKS2hJaGsvM1VkNWtuYVJ0UDJlZjErNUY2Nmg5
+L1JQUU9KNSt0dkJ3aEJBY1VXU3VwS25VcmRWYVpRYW5ZbXRTeApjVlYyUEw5K1FFaU5OM3R6
+bHVoYVdPLy9yQUN4SitLL1pYUWxJendRVlRwTmhmR3pBYU1WVjl6cGYzdTBrMTRpCnRjdjZh
+bEtZOCtyTFp2TzF3SUllUlpMbVUwdFpERDVIdFdEdlVWN3JJRkkxV3VvTGIrS1pnYlluM09X
+akNQSFYKZFRyZFoyQ3FuWmJHM1NYdzZhd0g5YnpSTFY5RVhrYmhJTWV6MGRlQ1ZkZW8rd0ZG
+a2xoOC81VksyYjB2ay8rdwpxTUp4ZnBhMWxIdkpMb2J6T1A5ZnZyc3dzcjkyTUEyK2s5MDFX
+ZUlTUjdxRXpjSTBGZGc4QXlGQUV4YUVLNlZ5CmpQN1NYR0x3dmZpc3czNE94dVpyM3FteDFT
+dWZ1NHRvSDNYckI3UUpOOFh5cXFic0d4VUNCcVdpZjlSU0s0eGoKelJUZTU2aVBlaVNKSk9J
+Y2lNUDlpMmxkSStLZ0x5Y3llRHZHb0JqMEhDTE8zZ1ZhQmU0dWJWcmo1S2poWDJQVgpORUpk
+M1haUnphWFpFMmFBTVE9PQo9TlhlaQotLS0tLUVORCBQR1AgUFVCTElDIEtFWSBCTE9DSy0t
+LS0tCg==
+
+--------------274vgv3mTEV0d72rt4aKcMCU--
diff --git a/comm/mail/test/browser/openpgp/data/eml/unsigned-encrypted-to-0xf231550c4f47e38e-from-0x3099ff1238852b9f-with-key.eml b/comm/mail/test/browser/openpgp/data/eml/unsigned-encrypted-to-0xf231550c4f47e38e-from-0x3099ff1238852b9f-with-key.eml
new file mode 100644
index 0000000000..c3ea9a5d49
--- /dev/null
+++ b/comm/mail/test/browser/openpgp/data/eml/unsigned-encrypted-to-0xf231550c4f47e38e-from-0x3099ff1238852b9f-with-key.eml
@@ -0,0 +1,163 @@
+X-Mozilla-Status: 0001
+X-Mozilla-Status2: 00800000
+X-Mozilla-Keys:
+To: alice@openpgp.example
+From: Carol <carol@example.com>
+Autocrypt: addr=carol@example.com; keydata=
+ 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
+ meCtpxz2PoYBJfxGPEzu9xTLV6k9wSVTCgE=
+Message-ID: <c88d0689-fc5a-f753-f976-32927c541ddc@example.com>
+Date: Wed, 14 Oct 2020 14:59:26 -0400
+User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:83.0) Gecko/20100101
+ Thunderbird/83.0a1
+MIME-Version: 1.0
+Subject: ...
+Content-Type: multipart/encrypted;
+ protocol="application/pgp-encrypted";
+ boundary="puWBzOWjTqkkgqqMFAKcbmFaxBYZsSBXQ"
+
+This is an OpenPGP/MIME encrypted message (RFC 4880 and 3156)
+--puWBzOWjTqkkgqqMFAKcbmFaxBYZsSBXQ
+Content-Type: application/pgp-encrypted
+Content-Description: PGP/MIME version identification
+
+Version: 1
+
+--puWBzOWjTqkkgqqMFAKcbmFaxBYZsSBXQ
+Content-Type: application/octet-stream; name="encrypted.asc"
+Content-Description: OpenPGP encrypted message
+Content-Disposition: inline; filename="encrypted.asc"
+
+-----BEGIN PGP MESSAGE-----
+
+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
+bszxXXCea8sXQ3WQ78TLvMde
+=V84z
+-----END PGP MESSAGE-----
+
+--puWBzOWjTqkkgqqMFAKcbmFaxBYZsSBXQ--
diff --git a/comm/mail/test/browser/openpgp/data/eml/unsigned-encrypted-to-0xf231550c4f47e38e-from-0x3099ff1238852b9f.eml b/comm/mail/test/browser/openpgp/data/eml/unsigned-encrypted-to-0xf231550c4f47e38e-from-0x3099ff1238852b9f.eml
new file mode 100644
index 0000000000..edaf4c34e0
--- /dev/null
+++ b/comm/mail/test/browser/openpgp/data/eml/unsigned-encrypted-to-0xf231550c4f47e38e-from-0x3099ff1238852b9f.eml
@@ -0,0 +1,54 @@
+X-Mozilla-Status: 0001
+X-Mozilla-Status2: 00800000
+X-Mozilla-Keys:
+To: alice@openpgp.example
+From: Carol <carol@example.com>
+Message-ID: <de515a63-a4fe-022e-4a3c-96f07536dbf8@example.com>
+Date: Wed, 14 Oct 2020 14:57:39 -0400
+User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:83.0) Gecko/20100101
+ Thunderbird/83.0a1
+MIME-Version: 1.0
+Subject: ...
+Content-Type: multipart/encrypted;
+ protocol="application/pgp-encrypted";
+ boundary="INcRzoKbgw6NbXSE5JAUq7uEbtRvQ6Hp7"
+
+This is an OpenPGP/MIME encrypted message (RFC 4880 and 3156)
+--INcRzoKbgw6NbXSE5JAUq7uEbtRvQ6Hp7
+Content-Type: application/pgp-encrypted
+Content-Description: PGP/MIME version identification
+
+Version: 1
+
+--INcRzoKbgw6NbXSE5JAUq7uEbtRvQ6Hp7
+Content-Type: application/octet-stream; name="encrypted.asc"
+Content-Description: OpenPGP encrypted message
+Content-Disposition: inline; filename="encrypted.asc"
+
+-----BEGIN PGP MESSAGE-----
+
+wcFMA7L9So5P9bk9AQ//WTEFHnI2KYZJbgTfk8CaREcQpE/beaO1ysXdzCqpdRGWtU2UlbqmPxbu
+PmGDWg5f43qUEgO9mG2zsEvnGKlEoJmBFYaXXGhz/6+OoFY7VI+9DDtAWD5Oi8jzzKnUbyjPQO2a
+16PbLeOs/ydjt5eRNVaUVtnyTXMhp4JMLET1ISQF1FxjJJ00XRnaYzRRt/U6MHzIFLnZGBZYr+tY
+K1z+5vtsU6P0ZfWV/Hh8tFR6oqJ0Tiwji+zKwgUupKwC2QQIFy3j4GGrqJTejXiFfo5U/P4i5h4O
+X5qcnKzCX2spi7CTIJdx+uXKYAW2e9zsQIEQyIFoe8mZLgZcR0OLoH7ledfAeMBmVgS8GlM9uitj
+SWkiLa98gnudZbKiL7KXQ/e/TBLKVTPFtoorpGBmfYeJ6/YV42kQXPwK+ABHbxX52T7Tm7d12LRa
+Q27sp/SwnJYoi3hASA4NKViBi8B2gdV/DHzgsSfvHtEpMvN1LgaREolwESQ6U68yg/EDfohGdPdW
+eRiyo/p4jQ3Yo9v6n/boIxEb7xhkymhwQi2sZ9lyzU4HO18xrZ4sSpTjoMYyQV4ebA8nMqwbNpWn
+ACxWYeMtMdE4p6wJmMY232LlNtEAXkJbJbY+BDlKb9y6uMLBGHhXH4v7G9zaA3nDBWHNHAvP1cAg
+kgqURvqhxkgZqPz40cHBXgNHZva51fIethIBB0AykUD/87/8UHaKZX7MYUWr/CNBP+N68qFTgGp7
+UzMgSTAdpz+xzeC7S4BNoVh2IAg40r+ie38dJDxYJbEyvkhkr2wRhZf8A8z0/eGJczjEP/vSwW0B
+TkGuH9zZrlqH03jXZ0RUTGnA6oBq2wpGrBniHNZRJ7+ImS/cJT5D4uuITVDXl51EgTJQENxmSdyo
+YGe/lNoB4MVTxzmPfjWdOC2FqkGoc4jVzSwGaZ+OfLA/GviucholvaNz/LobZJ/AMXBvCbc3jh6y
+YvcZnjtDFFdUJHPCA4M8staEIVCz63UT5fdoXLWdr62H1NOhxWQDlyoZle+a2oM3FVEdyVKLt98b
+mTIP71YGhVXU4oRCujtiopVxQXzVugXXTEioebMw1+QLZLr663Xo1Kr+nlZlDDFBY9+NGLB7lX7g
+QqNkFUfw55jWFYWsj1N4U3/IzHplh/xGF9KH296ZKnzi66w6YRfp5QVKCT+fahOhxKWkKeTOl9Lf
+saUhPs93QMcVFRSW0igZrTh/fPZcplsgakpYchR9QcevkeHdCizk3CY5uULqMY6blUz3NU/aOMWw
+6fuLtwo1svBm1Vg0yh/mMA7HsRsIIB5xmkXEaP6PwM3WKLN4AZrcErQTwdvJ8HPGnIECCePugHOK
+EPB5JRj3aSp997Xwv+3z74bmp5GisjjtK3wFn8zYr0QI0hivRd9vz943rdh9iIMxCSAglawaqa0i
+BhUfhPIQyOfEWu5MBoIofW97oxnHaQ8/A/Bj2uvCIDUDPD2C50BHuVdtjsW9GlOmQ3ZUwj7llbuq
+O3oUeDzqaMdPgFt1QmfowXEkFAQcwRb0EbNboHX1q3F1QCXLklw3Dww/lw==
+=rZjL
+-----END PGP MESSAGE-----
+
+--INcRzoKbgw6NbXSE5JAUq7uEbtRvQ6Hp7--
diff --git a/comm/mail/test/browser/openpgp/data/eml/unsigned-encrypted-to-0xf231550c4f47e38e-from-0xfbfcc82a015e7330-with-key.eml b/comm/mail/test/browser/openpgp/data/eml/unsigned-encrypted-to-0xf231550c4f47e38e-from-0xfbfcc82a015e7330-with-key.eml
new file mode 100644
index 0000000000..cf210bf602
--- /dev/null
+++ b/comm/mail/test/browser/openpgp/data/eml/unsigned-encrypted-to-0xf231550c4f47e38e-from-0xfbfcc82a015e7330-with-key.eml
@@ -0,0 +1,139 @@
+X-Mozilla-Status: 0001
+X-Mozilla-Status2: 00800000
+X-Mozilla-Keys:
+To: alice@openpgp.example
+From: Bob Babbage <bob@openpgp.example>
+Autocrypt: addr=bob@openpgp.example; keydata=
+ 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
+ NEJd3XZRzaXZE2aAMQ==
+Message-ID: <3e18d436-f9b8-71ed-bb0c-752146d1e80e@openpgp.example>
+Date: Wed, 14 Oct 2020 14:53:58 -0400
+User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:83.0) Gecko/20100101
+ Thunderbird/83.0a1
+MIME-Version: 1.0
+Subject: ...
+Content-Type: multipart/encrypted;
+ protocol="application/pgp-encrypted";
+ boundary="aVkMKgklfJ97EKIy8RDysG4bsu8ptjSHJ"
+
+This is an OpenPGP/MIME encrypted message (RFC 4880 and 3156)
+--aVkMKgklfJ97EKIy8RDysG4bsu8ptjSHJ
+Content-Type: application/pgp-encrypted
+Content-Description: PGP/MIME version identification
+
+Version: 1
+
+--aVkMKgklfJ97EKIy8RDysG4bsu8ptjSHJ
+Content-Type: application/octet-stream; name="encrypted.asc"
+Content-Description: OpenPGP encrypted message
+Content-Disposition: inline; filename="encrypted.asc"
+
+-----BEGIN PGP MESSAGE-----
+
+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
+=1/9V
+-----END PGP MESSAGE-----
+
+--aVkMKgklfJ97EKIy8RDysG4bsu8ptjSHJ--
diff --git a/comm/mail/test/browser/openpgp/data/eml/unsigned-encrypted-to-0xf231550c4f47e38e-from-0xfbfcc82a015e7330.eml b/comm/mail/test/browser/openpgp/data/eml/unsigned-encrypted-to-0xf231550c4f47e38e-from-0xfbfcc82a015e7330.eml
new file mode 100644
index 0000000000..ab3e0a0f9a
--- /dev/null
+++ b/comm/mail/test/browser/openpgp/data/eml/unsigned-encrypted-to-0xf231550c4f47e38e-from-0xfbfcc82a015e7330.eml
@@ -0,0 +1,52 @@
+X-Mozilla-Status: 0001
+X-Mozilla-Status2: 00800000
+X-Mozilla-Keys:
+To: alice@openpgp.example
+From: Bob Babbage <bob@openpgp.example>
+Message-ID: <41b2b268-52a6-c8a6-3a9e-6222653b9338@openpgp.example>
+Date: Wed, 14 Oct 2020 14:46:19 -0400
+User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:83.0) Gecko/20100101
+ Thunderbird/83.0a1
+MIME-Version: 1.0
+Subject: ...
+Content-Type: multipart/encrypted;
+ protocol="application/pgp-encrypted";
+ boundary="2W16lTBQJ4ZzVzryxZDTtDj0yHOSWfd6l"
+
+This is an OpenPGP/MIME encrypted message (RFC 4880 and 3156)
+--2W16lTBQJ4ZzVzryxZDTtDj0yHOSWfd6l
+Content-Type: application/pgp-encrypted
+Content-Description: PGP/MIME version identification
+
+Version: 1
+
+--2W16lTBQJ4ZzVzryxZDTtDj0yHOSWfd6l
+Content-Type: application/octet-stream; name="encrypted.asc"
+Content-Description: OpenPGP encrypted message
+Content-Disposition: inline; filename="encrypted.asc"
+
+-----BEGIN PGP MESSAGE-----
+
+wcDMA3wvqk35PDeyAQwAx/6/zGSIvT4IyNpRmcM00iVQhUfdfxUTL/o1hV+MdB7rKZIr+qWJEgiJ
+F7IyNPJW0ps2W4myyCkDQtIy1682ahq6D6kHCNmDFxMSpElrG5Xup4Ibf1es3g9n/OytGXx8699m
+RymR4EA5yAiLEiGYO37N+nwnWhP5BNpk8jgzDSNTD9qbOrXb7Tx32rvOwFCrBHqZsx6LbaD5BWp9
+WdeSqNjJ6c35dhBxy7MlIZWOK27y5TQArsgyoq//3645cQX3jYV0jJbJeWHuPMoMxYfdRHi8oEIm
+P3HnqjtSLUtOTwAcc7Vmp5k9/+PG0IZGLtoR0QLNqrJO607mWrCgYowXZofqt3Bs+Nrtf6cuetWd
+pBcGkfdYldCWgG55dER67jP7rKyx6QjFPgPBPbYPFl/H0lqLBH4YrwyVTQDFDcmXe11k1s9JdrlJ
+JXEqITi4gFFF9E4mj7voC97Fhy2GLPdKH+343gCgTVU5stz8+NyNX7wC2QSogtxEIcBd6FQbTj/j
+wV4DR2b2udXyHrYSAQdAJwk2G0weJUqgb4P+/9f76USsiwNpQO9m0k0FxS5OPGowdVTr0bB/bHyV
+fo2DKIkfmgYKnmoiL99VsigzSMIVh1+visa0mDW2a2oVfJBnHS/D0sF5AfHIvERSb7+yLgpMQPkk
+4cizr+7wiQ6BNbTN6FwG/yhrFbBXp+r//y3ZcTGh6G6IDlAbkAwj4VhTTnxdvBHJCpfnAj2G3AZR
+arZ3nC1IC9RLccV66K0oUOdvehgOMBF37Y+BLHXSL6RMc9PZIvtwH4gVMzATUeOQ1SYENGf5LSYq
+5zXs0sfRCXmC74FwM+PF9h4mBm0zOvEbyL6uqxTEMYDwAACkl8QzsHqhUe8VEhZTu2c1BcGhES4b
+9ajkctWgzG/bA4a8kTwyXDaREZoywIHro0iR5+gzbf3aUm+akWGlCRHCOmaF4ZcYpvFfH65tKgwv
+pRzYheCdjK367qiAOwPXh16vBYB1YOZtm7tSot/jBZ60qaIi5BP9FHXAFoR4Y+VWfx8lZYuE1ZNE
+k/VMN47PJPXgK+f8aMXDbalXuuq+sFl1XezGW3osppOkcL7reOZ/0heH1Say3wLLADnb3NyYaBg6
+ihl8FrVMdvzCFt59ytXn+H33BbrrYb2PfiEABPjzEPoeFItpQxltY5E0SGRYSOCKnpN2G7M1yoKf
+eG7/fXa0EUf1KLLzz+Pj88i4Ht6MQkkb19rwYHgxrxPKhmbV8zJfID5ne2PaE28XPa69wzRIyM2+
+DD5IF7iYLF4KcPURqrF7wYuAtTmOQTSWVv6mlHCxjz/ECeCXJhA+24W0m4/O55h0C3dG4looraOD
+JJMITsjObyRasT5sgS1y7axqlJY8NmJrEdZMn735+kjR1HPPinZiat4=
+=s0kk
+-----END PGP MESSAGE-----
+
+--2W16lTBQJ4ZzVzryxZDTtDj0yHOSWfd6l--
diff --git a/comm/mail/test/browser/openpgp/data/eml/unsigned-unencrypted-0x3099ff1238852b9f-autocrypt.eml b/comm/mail/test/browser/openpgp/data/eml/unsigned-unencrypted-0x3099ff1238852b9f-autocrypt.eml
new file mode 100644
index 0000000000..1c1fe5795d
--- /dev/null
+++ b/comm/mail/test/browser/openpgp/data/eml/unsigned-unencrypted-0x3099ff1238852b9f-autocrypt.eml
@@ -0,0 +1,55 @@
+X-Mozilla-Status: 0001
+X-Mozilla-Status2: 00800000
+X-Mozilla-Keys:
+To: alice@openpgp.example
+From: Carol <carol@example.com>
+Subject: Autocrypt only
+Autocrypt: addr=carol@example.com; keydata=
+ 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
+ meCtpxz2PoYBJfxGPEzu9xTLV6k9wSVTCgE=
+Message-ID: <b3609461-36e8-0371-1b9d-7ce6864ec66d@example.com>
+Date: Wed, 14 Oct 2020 14:40:44 -0400
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8; format=flowed
+
+This is autocrypt only.
diff --git a/comm/mail/test/browser/openpgp/data/eml/unsigned-unencrypted-from-bob-to-alice.eml b/comm/mail/test/browser/openpgp/data/eml/unsigned-unencrypted-from-bob-to-alice.eml
new file mode 100644
index 0000000000..4cba7b0b4c
--- /dev/null
+++ b/comm/mail/test/browser/openpgp/data/eml/unsigned-unencrypted-from-bob-to-alice.eml
@@ -0,0 +1,17 @@
+X-Mozilla-Status: 0001
+X-Mozilla-Status2: 00800000
+X-Mozilla-Keys:
+To: alice@openpgp.example
+From: Bob Babbage <bob@openpgp.example>
+Subject: Unsigned Unencrypted
+Message-ID: <838593be-05d6-0579-8112-30f2f82b798e@openpgp.example>
+Date: Wed, 14 Oct 2020 15:01:06 -0400
+User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:83.0) Gecko/20100101
+ Thunderbird/83.0a1
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8; format=flowed
+Content-Transfer-Encoding: 7bit
+Content-Language: en-US
+
+Sundays are nothing without callaloo.
+
diff --git a/comm/mail/test/browser/openpgp/data/eml/unsigned-unencrypted-key-0x1f10171bfb881b1c-attached.eml b/comm/mail/test/browser/openpgp/data/eml/unsigned-unencrypted-key-0x1f10171bfb881b1c-attached.eml
new file mode 100644
index 0000000000..8cdd89a0f2
--- /dev/null
+++ b/comm/mail/test/browser/openpgp/data/eml/unsigned-unencrypted-key-0x1f10171bfb881b1c-attached.eml
@@ -0,0 +1,69 @@
+Content-Type: multipart/mixed; boundary="------------8uVAxTvHI06bBILkEFaO2Vfu"
+Message-ID: <4a735c72-dc19-48ff-4fa5-2c1f65513b27@invalid>
+Date: Thu, 30 Dec 2021 23:06:03 +0200
+MIME-Version: 1.0
+User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:97.0) Gecko/20100101
+ Thunderbird/97.0a1
+Content-Language: en-US
+To: homer@raspberrypi.local
+From: Johnny <jdoe@invalid>
+Subject: my openpgp key attached
+
+This is a multi-part message in MIME format.
+--------------8uVAxTvHI06bBILkEFaO2Vfu
+Content-Type: text/plain; charset=UTF-8; format=flowed
+Content-Transfer-Encoding: 8bit
+
+Hey, the key 0x1F10171BFB881B1C (for jdoe@invalid) attached!
+
+  -Johnny
+
+
+--------------8uVAxTvHI06bBILkEFaO2Vfu
+Content-Type: application/pgp-keys; name="OpenPGP_0x1F10171BFB881B1C.asc"
+Content-Disposition: attachment; filename="OpenPGP_0x1F10171BFB881B1C.asc"
+Content-Description: OpenPGP public key
+Content-Transfer-Encoding: 7bit
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+=MfFc
+-----END PGP PUBLIC KEY BLOCK-----
+
+--------------8uVAxTvHI06bBILkEFaO2Vfu--
diff --git a/comm/mail/test/browser/openpgp/data/keys/alice@openpgp.example-0xf231550c4f47e38e-pub.asc b/comm/mail/test/browser/openpgp/data/keys/alice@openpgp.example-0xf231550c4f47e38e-pub.asc
new file mode 100644
index 0000000000..68fdb39324
--- /dev/null
+++ b/comm/mail/test/browser/openpgp/data/keys/alice@openpgp.example-0xf231550c4f47e38e-pub.asc
@@ -0,0 +1,15 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Comment: Alice's OpenPGP certificate
+Comment: https://www.ietf.org/id/draft-bre-openpgp-samples-01.html
+
+mDMEXEcE6RYJKwYBBAHaRw8BAQdArjWwk3FAqyiFbFBKT4TzXcVBqPTB3gmzlC/U
+b7O1u120JkFsaWNlIExvdmVsYWNlIDxhbGljZUBvcGVucGdwLmV4YW1wbGU+iJAE
+ExYIADgCGwMFCwkIBwIGFQoJCAsCBBYCAwECHgECF4AWIQTrhbtfozp14V6UTmPy
+MVUMT0fjjgUCXaWfOgAKCRDyMVUMT0fjjukrAPoDnHBSogOmsHOsd9qGsiZpgRnO
+dypvbm+QtXZqth9rvwD9HcDC0tC+PHAsO7OTh1S1TC9RiJsvawAfCPaQZoed8gK4
+OARcRwTpEgorBgEEAZdVAQUBAQdAQv8GIa2rSTzgqbXCpDDYMiKRVitCsy203x3s
+E9+eviIDAQgHiHgEGBYIACAWIQTrhbtfozp14V6UTmPyMVUMT0fjjgUCXEcE6QIb
+DAAKCRDyMVUMT0fjjlnQAQDFHUs6TIcxrNTtEZFjUFm1M0PJ1Dng/cDW4xN80fsn
+0QEA22Kr7VkCjeAEC08VSTeV+QFsmz55/lntWkwYWhmvOgE=
+=iIGO
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/comm/mail/test/browser/openpgp/data/keys/alice@openpgp.example-0xf231550c4f47e38e-rev.asc b/comm/mail/test/browser/openpgp/data/keys/alice@openpgp.example-0xf231550c4f47e38e-rev.asc
new file mode 100644
index 0000000000..5e67de7a7c
--- /dev/null
+++ b/comm/mail/test/browser/openpgp/data/keys/alice@openpgp.example-0xf231550c4f47e38e-rev.asc
@@ -0,0 +1,9 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Comment: Alice's revocation certificate
+Comment: https://www.ietf.org/id/draft-bre-openpgp-samples-01.html
+
+iHgEIBYIACAWIQTrhbtfozp14V6UTmPyMVUMT0fjjgUCXaWkOwIdAAAKCRDyMVUM
+T0fjjoBlAQDA9ukZFKRFGCooVcVoDVmxTaHLUXlIg9TPh2f7zzI9KgD/SLNXUOaH
+O6TozOS7C9lwIHwwdHdAxgf5BzuhLT9iuAM=
+=Tm8h
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/comm/mail/test/browser/openpgp/data/keys/alice@openpgp.example-0xf231550c4f47e38e-secret-with-pp.asc b/comm/mail/test/browser/openpgp/data/keys/alice@openpgp.example-0xf231550c4f47e38e-secret-with-pp.asc
new file mode 100644
index 0000000000..3d2081573f
--- /dev/null
+++ b/comm/mail/test/browser/openpgp/data/keys/alice@openpgp.example-0xf231550c4f47e38e-secret-with-pp.asc
@@ -0,0 +1,17 @@
+-----BEGIN PGP PRIVATE KEY BLOCK-----
+
+lIYEXEcE6RYJKwYBBAHaRw8BAQdArjWwk3FAqyiFbFBKT4TzXcVBqPTB3gmzlC/U
+b7O1u13+BwMCd/mqK8s+deb/8ZESR0hHYFgUdnYXaG+iwi6g345EZT7r2HxUgaeb
+Qs/f5Bn4zvUYXsnU5p7BN0QxRWMbzago/JFCYKlHuBQABQ0WN4gaKLQmQWxpY2Ug
+TG92ZWxhY2UgPGFsaWNlQG9wZW5wZ3AuZXhhbXBsZT6IkAQTFggAOAIbAwULCQgH
+AgYVCgkICwIEFgIDAQIeAQIXgBYhBOuFu1+jOnXhXpROY/IxVQxPR+OOBQJdpZ86
+AAoJEPIxVQxPR+OO6SsA+gOccFKiA6awc6x32oayJmmBGc53Km9ub5C1dmq2H2u/
+AP0dwMLS0L48cCw7s5OHVLVML1GImy9rAB8I9pBmh53yApyLBFxHBOkSCisGAQQB
+l1UBBQEBB0BC/wYhratJPOCptcKkMNgyIpFWK0KzLbTfHewT356+IgMBCAf+BwMC
+Q/WYlB23rWL/ldyhBBysb6VudEy48vqp2niO4qZSDcbQiL+tk56SfrnMmP0V/w3M
+I8YuUVsIOPHklnJH3NB0oLbR8HVQq3s14KSImVUOcIh4BBgWCAAgFiEE64W7X6M6
+deFelE5j8jFVDE9H444FAlxHBOkCGwwACgkQ8jFVDE9H445Z0AEAxR1LOkyHMazU
+7RGRY1BZtTNDydQ54P3A1uMTfNH7J9EBANtiq+1ZAo3gBAtPFUk3lfkBbJs+ef5Z
+7VpMGFoZrzoB
+=mz9G
+-----END PGP PRIVATE KEY BLOCK-----
diff --git a/comm/mail/test/browser/openpgp/data/keys/alice@openpgp.example-0xf231550c4f47e38e-secret.asc b/comm/mail/test/browser/openpgp/data/keys/alice@openpgp.example-0xf231550c4f47e38e-secret.asc
new file mode 100644
index 0000000000..d9252bafd6
--- /dev/null
+++ b/comm/mail/test/browser/openpgp/data/keys/alice@openpgp.example-0xf231550c4f47e38e-secret.asc
@@ -0,0 +1,17 @@
+-----BEGIN PGP PRIVATE KEY BLOCK-----
+Comment: Alice's OpenPGP Transferable Secret Key
+Comment: https://www.ietf.org/id/draft-bre-openpgp-samples-01.html
+
+lFgEXEcE6RYJKwYBBAHaRw8BAQdArjWwk3FAqyiFbFBKT4TzXcVBqPTB3gmzlC/U
+b7O1u10AAP9XBeW6lzGOLx7zHH9AsUDUTb2pggYGMzd0P3ulJ2AfvQ4RtCZBbGlj
+ZSBMb3ZlbGFjZSA8YWxpY2VAb3BlbnBncC5leGFtcGxlPoiQBBMWCAA4AhsDBQsJ
+CAcCBhUKCQgLAgQWAgMBAh4BAheAFiEE64W7X6M6deFelE5j8jFVDE9H444FAl2l
+nzoACgkQ8jFVDE9H447pKwD6A5xwUqIDprBzrHfahrImaYEZzncqb25vkLV2arYf
+a78A/R3AwtLQvjxwLDuzk4dUtUwvUYibL2sAHwj2kGaHnfICnF0EXEcE6RIKKwYB
+BAGXVQEFAQEHQEL/BiGtq0k84Km1wqQw2DIikVYrQrMttN8d7BPfnr4iAwEIBwAA
+/3/xFPG6U17rhTuq+07gmEvaFYKfxRB6sgAYiW6TMTpQEK6IeAQYFggAIBYhBOuF
+u1+jOnXhXpROY/IxVQxPR+OOBQJcRwTpAhsMAAoJEPIxVQxPR+OOWdABAMUdSzpM
+hzGs1O0RkWNQWbUzQ8nUOeD9wNbjE3zR+yfRAQDbYqvtWQKN4AQLTxVJN5X5AWyb
+Pnn+We1aTBhaGa86AQ==
+=n8OM
+-----END PGP PRIVATE KEY BLOCK-----
diff --git a/comm/mail/test/browser/openpgp/data/keys/bob@openpgp.example-0xfbfcc82a015e7330-pub.asc b/comm/mail/test/browser/openpgp/data/keys/bob@openpgp.example-0xfbfcc82a015e7330-pub.asc
new file mode 100644
index 0000000000..732ad2fef5
--- /dev/null
+++ b/comm/mail/test/browser/openpgp/data/keys/bob@openpgp.example-0xfbfcc82a015e7330-pub.asc
@@ -0,0 +1,43 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Comment: Bob's OpenPGP certificate
+Comment: https://www.ietf.org/id/draft-bre-openpgp-samples-01.html
+
+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
+NEJd3XZRzaXZE2aAMQ==
+=NXei
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/comm/mail/test/browser/openpgp/data/keys/bob@openpgp.example-0xfbfcc82a015e7330-rev.asc b/comm/mail/test/browser/openpgp/data/keys/bob@openpgp.example-0xfbfcc82a015e7330-rev.asc
new file mode 100644
index 0000000000..ed22c45d1c
--- /dev/null
+++ b/comm/mail/test/browser/openpgp/data/keys/bob@openpgp.example-0xfbfcc82a015e7330-rev.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Comment: Bob's revocation certificate
+Comment: https://www.ietf.org/id/draft-bre-openpgp-samples-01.html
+
+iQG2BCABCgAgFiEE0aZuGiOxgsmYD3iM+/zIKgFeczAFAl2lnQQCHQAACgkQ+/zI
+KgFeczAIHAv/RrlGlPFKsW0BShC8sVtPfbT1N9lUqyrsgBhrUryM/i+rBtkbnSjp
+28R5araupt0og1g2L5VsCRM+ql0jf0zrZXOorKfAO70HCP3X+MlEquvztMUZGJRZ
+7TSMgIY1MeFgLmOw9pDKf3tSoouBOpPe5eVfXviEDDo2zOfdntjPyCMlxHgAcjZo
+XqMaurV+nKWoIx0zbdpNLsRy4JZcmnOSFdPw37R8U2miPi2qNyVwcyCxQy0LjN7Y
+AWadrs9vE0DrneSVP2OpBhl7g+Dj2uXJQRPVXcq6w9g5Fir6DnlhekTLsa78T5cD
+n8q7aRusMlALPAOosENOgINgsVcjuILkPN1eD+zGAgHgdiKaep1+P3pbo5n0CLki
+UCAsLnCEo8eBV9DCb/n1FlI5yhQhgQyMYlp/49H0JSc3IY9KHhv6f0zIaRWs0JuD
+ajcXTJ9AyB+SA6GBb9Q+XsNXjZ1gj75ekUD1sQ3ezTvVfovgP5bD+vPvILhSImKB
+aU6V3zld/x/1
+=mMwU
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/comm/mail/test/browser/openpgp/data/keys/bob@openpgp.example-0xfbfcc82a015e7330-secret-with-pp.asc b/comm/mail/test/browser/openpgp/data/keys/bob@openpgp.example-0xfbfcc82a015e7330-secret-with-pp.asc
new file mode 100644
index 0000000000..8675bb5679
--- /dev/null
+++ b/comm/mail/test/browser/openpgp/data/keys/bob@openpgp.example-0xfbfcc82a015e7330-secret-with-pp.asc
@@ -0,0 +1,83 @@
+-----BEGIN PGP PRIVATE KEY BLOCK-----
+
+lQWGBF2lnPIBDAC5cL9PQoQLTMuhjbYvb4Ncuuo0bfmgPRFywX53jPhoFf4Zg6mv
+/seOXpgecTdOcVttfzC8ycIKrt3aQTiwOG/ctaR4Bk/t6ayNFfdUNxHWk4WCKzdz
+/56fW2O0F23qIRd8UUJp5IIlN4RDdRCtdhVQIAuzvp2oVy/LaS2kxQoKvph/5pQ/
+5whqsyroEWDJoSV0yOb25B/iwk/pLUFoyhDG9bj0kIzDxrEqW+7Ba8nocQlecMF3
+X5KMN5kp2zraLv9dlBBpWW43XktjcCZgMy20SouraVma8Je/ECwUWYUiAZxLIlMv
+9CurEOtxUw6N3RdOtLmYZS9uEnn5y1UkF88o8Nku890uk6BrewFzJyLAx5wRZ4F0
+qV/yq36UWQ0JB/AUGhHVPdFf6pl6eaxBwT5GXvbBUibtf8YI2og5RsgTWtXfU7eb
+SGXrl5ZMpbA6mbfhd0R8aPxWfmDWiIOhBufhMCvUHh1sApMKVZnvIff9/0Dca3wb
+vLIwa3T4CyshfT0AEQEAAf4HAwLAeopJQm+lq//epgc3hfKy5Gp0d5Mn8ajmwGbO
+wY3ywBcpZcSyGzdU7hXj4n9xDh4hG+OTHinYgDfD48gnyAlpD31onmSQ03alTWL9
++Im20D08CmlSgwKAN9LHB82cAfUJWWjIatGc0zTXjsZATNGPkkm90epNsjsfD1vX
+F4sOQ2xi9nz+auQZySHegEP7GN88Ex0gXupWdOP3VgtXwVb9sJ/SEZ69dPe38i3H
+KgEsh/vixLjOzSpCwqG2u+ITJO/y7Go54w3uaGOFGAG8hN2P7U9+mIkT6vGsqQ5K
+NltOwqptdYVQK2KyXCeY1r6aw4yUAFvoVFtsIA+ylq+PyqOUVAkXYV1nSGiSjDDl
+I6iX+gbfhRCgjYmpXLi1qsTMJebv8zuG4rFkjVb+C+H+pZjp5dOFo4texC2P0EDO
+rL1yHP7urGkzZPXAcEGL4bnjqImwAt+bRlZzh3sJsjPhCZIJcRM2CNzdABQk9TuS
+QJQ6fGB+NAliu/QApAqZ3Pu47n6RFB3mQMiXzwybRUBDcZMwkXyYBWNJxqK2r27e
+XcVKgZAwbNH3IvHb64qQq1AIY1M+y+2TsmJ1wABXOreMVoe02ET/p+LLGRsvAiT1
+Aw1rJsMmOb4SNPmLjxHnftxF3vtl0wFW5AiM6rBLgYFgquzcici2wMJmwqfq5F37
+hZjsYeJKyfFRt2fSAyL1GSwx69vJa72oi0t4MHS7uzPvQFAXjVhJaz9sGUrBkPMK
+abJITNEuPz7zRC1ZSekgvqkcr6uebKdTYp6qWVVgEc05SRhWgTS9mAkG0ikTUiHd
+izazEX6rs5vbO/0Fq9KEM/3+zBhb/EE7zqy/tuk8pJ2hHSZtmjrlA2XJIhmPIxcK
+HmjumEeajoI2+J6sW8hWA0jdurXAVYo2TX6Idyl2KRVPaZEldIVDFkvFjN3zB80M
+78C4BuZQFJaWC7F6LQO8P0Ry99HPHIrn6JekyPIH9174GwENuvbkbRWchTHx+fLT
+IGejy5lc24BtcpHIw0eDnidoDNAWZHfCYMCDcRl4QRW76xjT2IILty+VVRiuyQJj
+bqGymBHpyqmBvOrnyAUlZiN30VHf1Fju1ZQWmtrpzFXEUXDTSm8f6Yv4OXP/WQvf
+M3gPIt91V+DAXGI5tIr+1mWTnYsTzrqI6Q33oYgJwuFNtd4TWEYj6tcd76nw0yoe
+TAZjnEJAFAZaz6hphTHIoy2u35r+oBfq67gRVJVb7CtB9cMTc3fjZ8XdsbKsG7Z1
+9yhFYFOjJ8LAuPfa8Uv+tns+sbU6kwOeTuINPbWLUkpgY+Y7gEy7MdScTpPAWxDv
+8199XK0XaqjK5+jgKQddB23a49rfZiSQQLQhQm9iIEJhYmJhZ2UgPGJvYkBvcGVu
+cGdwLmV4YW1wbGU+iQHOBBMBCgA4AhsDBQsJCAcCBhUKCQgLAgQWAgMBAh4BAheA
+FiEE0aZuGiOxgsmYD3iM+/zIKgFeczAFAl2lnvoACgkQ+/zIKgFeczBvbAv/VNk9
+0a6hG8Od9xTzXxH5YRFUSGfIA1yjPIVOnKqhMwps2U+sWE3urL+MvjyQRlyRV8oY
+9IOhQ5Esm6DOZYrTnE7qVETm1ajIAP2OFChEc55uH88x/anpPOXOJY7S8jbn3naC
+9qad75BrZ+3g9EBUWiy5p8TykP05WSnSxNRt7vFKLfEB4nGkehpwHXOVF0CRNwYl
+e42bg8lpmdXFDcCZCi+qEbafmTQzkAqyzS3nCh3IAqq6Y0kBuaKLm2tSNUOlZbD+
+OHYQNZ5Jix7cZUzs6Xh4+I55NRWl5smrLq66yOQoFPy9jot/Qxikx/wP3MsAzeGa
+ZSEPc0fHp5G16rlGbxQ3vl8/usUV7W+TMEMljgwd5x8POR6HC8EaCDfVnUBCPi/G
+v+egLjsIbPJZZEroiE40e6/UoCiQtlpQB5exPJYSd1Q1txCwueih99PHepsDhmUQ
+KiACszNU+RRozAYau2VdHqnRJ7QYdxHDiH49jPK4NTMyb/tJh2TiIwcmsIpGnQWG
+BF2lnPIBDADWML9cbGMrp12CtF9b2P6z9TTT74S8iyBOzaSvdGDQY/sUtZXRg21H
+WamXnn9sSXvIDEINOQ6A9QxdxoqWdCHrOuW3ofneYXoG+zeKc4dC86wa1TR2q9vW
++RMXSO4uImA+Uzula/6k1DogDf28qhCxMwG/i/m9g1c/0aApuDyKdQ1PXsHHNlgd
+/Dn6rrd5y2AObaifV7wIhEJnvqgFXDN2RXGjLeCOHV4Q2WTYPg/S4k1nMXVDwZXr
+vIsA0YwIMgIT86Rafp1qKlgPNbiIlC1g9RY/iFaGN2b4Ir6GDohBQSfZW2+LXoPZ
+uVE/wGlQ01rh827KVZW4lXvqsge+wtnWlszcselGATyzqOK9LdHPdZGzROZYI2e8
+c+paLNDdVPL6vdRBUnkCaEkOtl1mr2JpQi5nTU+gTX4IeInC7E+1a9UDF/Y85ybU
+z8XV8rUnR76UqVC7KidNepdHbZjjXCt8/Zo+Tec9JNbYNQB/e9ExmDntmlHEsSEQ
+zFwzj8sxH48AEQEAAf4HAwJdNHZoxWnWq/8Wny+KGRfVj573VfwaaGR+EX1xYlqq
+rMcZVueUzAs4nADvNmN9CRXbav9g0BDQhpMAIEXOntuGClAMr8mYVOqaYeptSbUx
+c6hmLx7cG2MDo3W+r2b8qb3/oiQB5JoJw4xLKUW+qIxXmYY9+q8Q+UUShLO/CKPr
+RT7n98vOFB0uNI7DFrQmm+GrKZAhCpPXpwc4trUo0ZiJAhxTkB5osDf9bq8T/DVD
+Egb201REDynS0Jn9rbmlV1KZvi5gkpqxNg3KK5jpp/RFPS0frcVI4ZhgFMVFUraA
+hpTKyuLNOIloezRk1Yl8kto6k+whUmjN5aMWn3JokBLGvoaAa6WeH0KNgaCWTnWQ
+AAKZMU1h6rOvGF5OnrO8/P2zPR4XTTZe4jlJOeEsGj8Pa/RH1Nn+j52p1/rBw5BF
+P4tfDQEI7df3FpmzUOHZV1LFRtDk50AogHN+SeQLB1EjsFh02YV22VYftsnk4Ra9
+mJA6632LlhZQQZ2kzyrij7vjaWbP56GsMZQbwOGXhUgYE8O9dnEyyaLVNnwsfWhZ
+DI+lwCxwLkG+PdZ+a5Q0CPsMsoTtH2/uht3HbVMyJ3iuUX9DYupCWjbMk06kTv9i
+CtbnOlCx5+cB9kf6hUvKblDGpsENvEInho6kakEkMDWjzdLPBDcEHzdpY/jEiLtz
+URRX8i4o87Q45goylqyi6bt5dG7ae63xXo7gQNh9F3ykK4dBd7brBdTp6o9f9aLm
+MaGh6s8W2Q9Lx+Om5g4mboV3bx34PMw50NI3uxkMKv/FSBGDAW0cqW6WD48zVmhI
+Lq8af1sFsgxFH+Dkx/JbKMrgREz1XcOj1/9H+eppgCtoV85b+hxSlNsMBrwOQ+BN
+GipVbj8UDpvJEo6w82VU/R7dP43AD3gUs8uw/KhygjwUmTAJx46k+sSVU4oN4hzc
+udR1RtDebpcxe0WI69bS0PDixqMkB03wTSpz1sgWyveLpq5WsgTZ3bnI0+ZOeIry
+WdTcl5B4PB1Xi0k6dW8itQUidGcPWMmeW76C+97SLy3xWOeMgkV6XFGTcreufbbb
+nOiIb5tfFP4j05TVTILG3Y3cA4eucCTFvR/RZ9RK8uPe0vDz0ZstTf3NCDMrCvXZ
+m7vDszCaWpe54X12s02WCWCMyVOVPj1DcJvmttrUz7rMwsls2hajWDFzRNwUgrpy
+L/1YTRiSsWH50S+YXfUazW5OfPSh8ojGLWgHJ7GWFY3Ee39v/yvd/DLhcx2w2oWa
++xaypI7KhI0SoWkHNKgFDIK+N+Voejx5lZ/i3yud+htCcKi5Ss+aVdJc0/jK6+z2
+cLWjFKCV0D3KAuc20Sy/sM28Pfpza4kBtgQYAQoAIBYhBNGmbhojsYLJmA94jPv8
+yCoBXnMwBQJdpZzyAhsMAAoJEPv8yCoBXnMw6f8L/26C34dkjBffTzMj5Bdzm8Mt
+F67OYneJ4TQMw7+41IL4rVcSKhIhk/3Ud5knaRtP2ef1+5F66h9/RPQOJ5+tvBwh
+BAcUWSupKnUrdVaZQanYmtSxcVV2PL9+QEiNN3tzluhaWO//rACxJ+K/ZXQlIzwQ
+VTpNhfGzAaMVV9zpf3u0k14itcv6alKY8+rLZvO1wIIeRZLmU0tZDD5HtWDvUV7r
+IFI1WuoLb+KZgbYn3OWjCPHVdTrdZ2CqnZbG3SXw6awH9bzRLV9EXkbhIMez0deC
+Vdeo+wFFklh8/5VK2b0vk/+wqMJxfpa1lHvJLobzOP9fvrswsr92MA2+k901WeIS
+R7qEzcI0Fdg8AyFAExaEK6VyjP7SXGLwvfisw34OxuZr3qmx1Sufu4toH3XrB7QJ
+N8XyqqbsGxUCBqWif9RSK4xjzRTe56iPeiSJJOIciMP9i2ldI+KgLycyeDvGoBj0
+HCLO3gVaBe4ubVrj5KjhX2PVNEJd3XZRzaXZE2aAMQ==
+=ftGn
+-----END PGP PRIVATE KEY BLOCK-----
diff --git a/comm/mail/test/browser/openpgp/data/keys/bob@openpgp.example-0xfbfcc82a015e7330-secret.asc b/comm/mail/test/browser/openpgp/data/keys/bob@openpgp.example-0xfbfcc82a015e7330-secret.asc
new file mode 100644
index 0000000000..f1d746db3f
--- /dev/null
+++ b/comm/mail/test/browser/openpgp/data/keys/bob@openpgp.example-0xfbfcc82a015e7330-secret.asc
@@ -0,0 +1,83 @@
+-----BEGIN PGP PRIVATE KEY BLOCK-----
+Comment: Bob's OpenPGP Transferable Secret Key
+Comment: https://www.ietf.org/id/draft-bre-openpgp-samples-01.html
+
+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
+=miES
+-----END PGP PRIVATE KEY BLOCK-----
diff --git a/comm/mail/test/browser/openpgp/data/keys/carol@example.com-0x3099ff1238852b9f-pub.asc b/comm/mail/test/browser/openpgp/data/keys/carol@example.com-0x3099ff1238852b9f-pub.asc
new file mode 100644
index 0000000000..d85b176003
--- /dev/null
+++ b/comm/mail/test/browser/openpgp/data/keys/carol@example.com-0x3099ff1238852b9f-pub.asc
@@ -0,0 +1,51 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+=bMNH
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/comm/mail/test/browser/openpgp/data/keys/carol@example.com-0x3099ff1238852b9f-secret.asc b/comm/mail/test/browser/openpgp/data/keys/carol@example.com-0x3099ff1238852b9f-secret.asc
new file mode 100644
index 0000000000..71162efa56
--- /dev/null
+++ b/comm/mail/test/browser/openpgp/data/keys/carol@example.com-0x3099ff1238852b9f-secret.asc
@@ -0,0 +1,107 @@
+-----BEGIN PGP PRIVATE KEY BLOCK-----
+
+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
+ASX8RjxM7vcUy1epPcElUwoB
+=BUDZ
+-----END PGP PRIVATE KEY BLOCK-----
diff --git a/comm/mail/test/browser/openpgp/data/keys/carol@pgp.icu-0xEF2FD01608AFD744-revoked-secret.asc b/comm/mail/test/browser/openpgp/data/keys/carol@pgp.icu-0xEF2FD01608AFD744-revoked-secret.asc
new file mode 100644
index 0000000000..3ac661f8d8
--- /dev/null
+++ b/comm/mail/test/browser/openpgp/data/keys/carol@pgp.icu-0xEF2FD01608AFD744-revoked-secret.asc
@@ -0,0 +1,90 @@
+-----BEGIN PGP PRIVATE KEY BLOCK-----
+
+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
+=gfjr
+-----END PGP PRIVATE KEY BLOCK-----
diff --git a/comm/mail/test/browser/openpgp/data/keys/eddie@openpgp.example-0x15e9357d2c2395c0-pub.asc b/comm/mail/test/browser/openpgp/data/keys/eddie@openpgp.example-0x15e9357d2c2395c0-pub.asc
new file mode 100644
index 0000000000..0924b55332
--- /dev/null
+++ b/comm/mail/test/browser/openpgp/data/keys/eddie@openpgp.example-0x15e9357d2c2395c0-pub.asc
@@ -0,0 +1,13 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mDMEVKScpxYJKwYBBAHaRw8BAQdAcluj90h0Z2/+tKbb8v3lGLaZ1/P75HJnJsoe
+XNW48TG0JUVkZGllIEV4cGlyZWQgPGVkZGllQG9wZW5wZ3AuZXhhbXBsZT6IlgQT
+FggAPhYhBEzDeY/d9NC7FHzcLhXpNX0sI5XABQJUpJynAhsDBQkDwmcABQsJCAcC
+BhUKCQgLAgQWAgMBAh4BAheAAAoJEBXpNX0sI5XA+mEBALOHJDxAY6NnPIFuwsb+
+3paF2V11GdWnQfDiuAJnAJZyAQDhOi700EYgv2hRTvY8BhGE2S9iVxwcPndXK2Ks
+UyflA7g4BFSknKcSCisGAQQBl1UBBQEBB0B8IMA2fUQt9krpM6Qt4gtAaPv2HE0/
+wwot19NzcMvaIgMBCAeIfgQYFggAJhYhBEzDeY/d9NC7FHzcLhXpNX0sI5XABQJU
+pJynAhsMBQkDwmcAAAoJEBXpNX0sI5XA6rEBALHFJbvzYwQ9FlxnoxJNRoiwnQpI
+cb8VSxvutKwmXG0CAQCTRed9yINA2DkYYfNXZntWNzxfx5QpqKaa18NsvC6TAQ==
+=CBRt
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/comm/mail/test/browser/openpgp/data/keys/eddie@openpgp.example-0x15e9357d2c2395c0-secret.asc b/comm/mail/test/browser/openpgp/data/keys/eddie@openpgp.example-0x15e9357d2c2395c0-secret.asc
new file mode 100644
index 0000000000..eda1355c5f
--- /dev/null
+++ b/comm/mail/test/browser/openpgp/data/keys/eddie@openpgp.example-0x15e9357d2c2395c0-secret.asc
@@ -0,0 +1,15 @@
+-----BEGIN PGP PRIVATE KEY BLOCK-----
+
+lFgEVKScpxYJKwYBBAHaRw8BAQdAcluj90h0Z2/+tKbb8v3lGLaZ1/P75HJnJsoe
+XNW48TEAAP9MIfv9mSj3K/xOQNSeSDpA66wvudvPjlY/7CIYKL73ehHOtCVFZGRp
+ZSBFeHBpcmVkIDxlZGRpZUBvcGVucGdwLmV4YW1wbGU+iJYEExYIAD4WIQRMw3mP
+3fTQuxR83C4V6TV9LCOVwAUCVKScpwIbAwUJA8JnAAULCQgHAgYVCgkICwIEFgID
+AQIeAQIXgAAKCRAV6TV9LCOVwPphAQCzhyQ8QGOjZzyBbsLG/t6WhdlddRnVp0Hw
+4rgCZwCWcgEA4Tou9NBGIL9oUU72PAYRhNkvYlccHD53VytirFMn5QOcXQRUpJyn
+EgorBgEEAZdVAQUBAQdAfCDANn1ELfZK6TOkLeILQGj79hxNP8MKLdfTc3DL2iID
+AQgHAAD/Uhh/K3jAQLD8LZ2IPmhXPkbTzmQ2vWOwR+QNjW8gXkAPB4h+BBgWCAAm
+FiEETMN5j9300LsUfNwuFek1fSwjlcAFAlSknKcCGwwFCQPCZwAACgkQFek1fSwj
+lcDqsQEAscUlu/NjBD0WXGejEk1GiLCdCkhxvxVLG+60rCZcbQIBAJNF533Ig0DY
+ORhh81dme1Y3PF/HlCmopprXw2y8LpMB
+=nm40
+-----END PGP PRIVATE KEY BLOCK-----
diff --git a/comm/mail/test/browser/openpgp/data/keys/encryption-subkey-bad.pgp b/comm/mail/test/browser/openpgp/data/keys/encryption-subkey-bad.pgp
new file mode 100644
index 0000000000..5ea124082f
--- /dev/null
+++ b/comm/mail/test/browser/openpgp/data/keys/encryption-subkey-bad.pgp
Binary files differ
diff --git a/comm/mail/test/browser/openpgp/data/keys/heisenberg-signed-by-pinkman.asc b/comm/mail/test/browser/openpgp/data/keys/heisenberg-signed-by-pinkman.asc
new file mode 100644
index 0000000000..388539b907
--- /dev/null
+++ b/comm/mail/test/browser/openpgp/data/keys/heisenberg-signed-by-pinkman.asc
@@ -0,0 +1,37 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+AOAHSyc=
+=M6Ba
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/comm/mail/test/browser/openpgp/data/keys/invalid-pubkey-nosigs.pgp b/comm/mail/test/browser/openpgp/data/keys/invalid-pubkey-nosigs.pgp
new file mode 100644
index 0000000000..a844ae58f2
--- /dev/null
+++ b/comm/mail/test/browser/openpgp/data/keys/invalid-pubkey-nosigs.pgp
Binary files differ
diff --git a/comm/mail/test/browser/openpgp/data/keys/key-binary.gpg b/comm/mail/test/browser/openpgp/data/keys/key-binary.gpg
new file mode 100644
index 0000000000..3d99fc04c1
--- /dev/null
+++ b/comm/mail/test/browser/openpgp/data/keys/key-binary.gpg
Binary files differ
diff --git a/comm/mail/test/browser/openpgp/data/keys/key-with-utf8-comment.asc b/comm/mail/test/browser/openpgp/data/keys/key-with-utf8-comment.asc
new file mode 100644
index 0000000000..5006f29196
--- /dev/null
+++ b/comm/mail/test/browser/openpgp/data/keys/key-with-utf8-comment.asc
@@ -0,0 +1,15 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Comment: 💌 (unicode symbol: love letter)
+Comment: 😀 (unicode symbol: smiley)
+
+mDMEY4d9vRYJKwYBBAHaRw8BAQdAhoLFPAnuWEK0GKQqJfZLeIMJ8mzzo0Bxm47G
+04P6qHC0H3Rlc3QgPHRlc3QtdW5pY29kZUBleGFtcGxlLmNvbT6IkwQTFggAOxYh
+BHJRT0PQBg/FiOgCOIUsVebSr9fvBQJjh329AhsDBQsJCAcCAiICBhUKCQgLAgQW
+AgMBAh4HAheAAAoJEIUsVebSr9fvSqIA/1I5cpEa2UdGGKVXndz3HFoUq5TrRVZd
+1el8bq177HbaAQDkJlNvBxwcjW3yDVo4+nxoqm8nK1b8yPwQet2NXobcArg4BGOH
+fb0SCisGAQQBl1UBBQEBB0CqqMW7jKUygeB9+DmqMWBoWPZXiSLe4imAGj3t+h/c
+JgMBCAeIeAQYFggAIBYhBHJRT0PQBg/FiOgCOIUsVebSr9fvBQJjh329AhsMAAoJ
+EIUsVebSr9fvRbwA/ApVf9/S9YjFEcR74W/R5G+PVaL15ERHfiR0f7AYqDgiAPsG
+N+POP/0TWKb+uT/jz2QYhjxbdQsELGvWQePLhOb0Aw==
+=pPjp
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/comm/mail/test/browser/openpgp/data/keys/kylie-0x1AABD9FAD1E411DD-secret-subkeys.asc b/comm/mail/test/browser/openpgp/data/keys/kylie-0x1AABD9FAD1E411DD-secret-subkeys.asc
new file mode 100644
index 0000000000..d830e8b4f0
--- /dev/null
+++ b/comm/mail/test/browser/openpgp/data/keys/kylie-0x1AABD9FAD1E411DD-secret-subkeys.asc
@@ -0,0 +1,23 @@
+-----BEGIN PGP PRIVATE KEY BLOCK-----
+
+lDsEZTeZ2RYJKwYBBAHaRw8BAQdAqq4XimYIM2vl7huc6QqER7mrVmVLrqUvaRlj
+KDGZ6WX/AGUAR05VAbQ8S3lsaWUgKE9mZmxpbmUgcHJpbWFyeSBrZXksIHR3byBz
+dWJrZXlzKSA8a3lsaWVAZXhhbXBsZS5jb20+iJMEExYKADsWIQT0kImOl5Bh2zJ6
+cYcaq9n60eQR3QUCZTeZ2QIbAwULCQgHAgIiAgYVCgkICwIEFgIDAQIeBwIXgAAK
+CRAaq9n60eQR3Sg/AP0Q1v7QqEdUWmPtMLDmfQq8TM2P5SfxyXdX64YSwSkUJAD/
+bkw2GBTtOpFlZspQiOUqZH0rx64uY3Ol4N2c+HoQjweciwRlN5nZEgorBgEEAZdV
+AQUBAQdAjGGp9Wk2VnkXL6LxrO0pzpDy18pLLoTKbd+OT8+O4HcDAQgH/gcDAjtw
+AvX3bkqb9mr9Z90GFVmc7RTh4DZlrim+XfaUub/U0yBmVvBHO8i/qURr+Y8KIylQ
+emvDPcQ2R6rIyrDSNBMyRhAGvxCSyNlcJqTGqYWIeAQYFgoAIBYhBPSQiY6XkGHb
+Mnpxhxqr2frR5BHdBQJlN5nZAhsMAAoJEBqr2frR5BHdZuYBAMFwcpxybxqWW8lc
+CgisqDFr/6wXrVPVWtPb9F6LrgowAP4zoFdQe+tprNXul7pF/i8MCGB1mW6KPrw4
+xOgce/uaD5yGBGU3mhUWCSsGAQQB2kcPAQEHQBeDD103qyEq9S3nMuGyH7fz375d
+Tg58FRQ5/dgEvuQN/gcDAj1ky4HDCu3h9jxnNzgjSL9r6o/DP+HLIw10eXdVOwZ8
+ILOCq3PBye8cR7MEN+rh93/uggTNo5pzSop4YDcMIqSxKZP/FjCU8QMUEz+ygNSI
+7wQYFgoAIBYhBPSQiY6XkGHbMnpxhxqr2frR5BHdBQJlN5oVAhsCAIEJEBqr2frR
+5BHddiAEGRYKAB0WIQQPgSADIsBrXb3vr6o4nLzJ01hGJQUCZTeaFQAKCRA4nLzJ
+01hGJYEkAP4u6ExG6VqTTm2E40zLxhIo3A8aFwxzjBDtF7KGIiuc9QEAzUa+YLXc
+ztnu4IWhnhefw0u7W3mv6lcOnSv5VkohvA6XkQD/a5Vn3r9t1c89yqJ70MPsqOJk
+nCmjmwAiazsPzEGtZlUA/iBb3C9obolzxtjeEY4uL2DW34LR/eHEaprAd+MXnwAO
+=Yxqq
+-----END PGP PRIVATE KEY BLOCK-----
diff --git a/comm/mail/test/browser/openpgp/data/keys/ofelia-public.asc b/comm/mail/test/browser/openpgp/data/keys/ofelia-public.asc
new file mode 100644
index 0000000000..3f14c948b3
--- /dev/null
+++ b/comm/mail/test/browser/openpgp/data/keys/ofelia-public.asc
@@ -0,0 +1,68 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+pU+YaR+fAGsRti5YsTIyMQ==
+=NsF4
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/comm/mail/test/browser/openpgp/data/keys/ofelia-secret-subkeys.asc b/comm/mail/test/browser/openpgp/data/keys/ofelia-secret-subkeys.asc
new file mode 100644
index 0000000000..f324bda81f
--- /dev/null
+++ b/comm/mail/test/browser/openpgp/data/keys/ofelia-secret-subkeys.asc
@@ -0,0 +1,108 @@
+-----BEGIN PGP PRIVATE KEY BLOCK-----
+
+lQGVBGCIokUBDADHq7bIIV5CJrKuMrQVOAWcFRE21Y8tupL24fPZBTtU+Lq/zkQO
+SOKjjoHCBxj00bQXa4e0Dz1+cWVzsFahM2y52tpbR5J7HuRnoAbSuNDis0NtCnrT
+mWdyktm0zHwNeWdGVpp43RwdZEfb55jeqrymtCjD8RruQvUHbfwubKBed3/PjxHK
+vJTYJ2HzLS+iB2PE6q0sSup5D7RkICU+wpTooRwJXDtkreLWDCO/60b/4EsG7fPJ
+og2EFGqMI3R5PUpdosunT3d6y2/TmPtU8yLxShIHxHD+E4lOhNKfA346W7nE4QHI
+RMhhe3WvBoc8DUaxtlQKj0l363ugCniefXgVlXYWq8aHb3V+9WYXdVAMimZklGaZ
+BnMGUN266LKOdZTq4fPOVgp2mt/xsEdf+LAsdSiSaseOeps2LmVts7VK23yi0PfB
+aNB1IvnPWs/sLaYsGjZU/upcTbliEiRdffTPvPo3b+6Xbih6LCLSJnS5tkRf1EI3
+ZDFMijtAQuSYI90AEQEAAf8AZQBHTlUBtDVPZmVsaWEgKG9mZmxpbmUgcHJpbWFy
+eSBrZXkpIDxvZmVsaWFAb3BlbnBncC5leGFtcGxlPokBzgQTAQoAOBYhBFd114Aa
+9q4p+yj3UJfc2l5W67giBQJgiKJFAhsDBQsJCAcCBhUKCQgLAgQWAgMBAh4BAheA
+AAoJEJfc2l5W67giMJAMAKZl983eqg++H3yDjIKV8vM+ae2scZO1TCkNQ7D/8fA4
+ZJZMA7omLH9H08nUAe/ZcV5hEguQQw4/VJIMssw5fZK/Dzau2osMQ2cap26ZCr/6
+Gu81zyNguJWDtdOZTm7UmwTmwHettglSa8yhbhNyJnU3vepXejGtzv7pDwc+LqnE
+LfYfMwxpjKkeA8/ufO3aehbiGk39KAk1PpzXDok/I60X6hnb1moLGfZIPUtDCnw+
+2+1HK4E5ONeb6/ypNZiGOVRWOaCq4/STDBwxdj7g924nT3OTuy7BlAQdy/bYGv9g
+3XAlT7/X4jZ4NThc65ukwm+Ahwura1ancla86gLoK+cBjWHrKHyVlRuzdo5qoPVz
+Jfc3p8regpJ10gA2OxmrBtA1nfiAk5oocS4dMMxk/cmHZnJ6R2oj4bjymFXggptR
+g6v8lXc90Zxb3umecDqqX6PL+n0+p6N1QI4+fAdbX7L+GnyghFC6gtaSGvTLb2H5
+DYzmZdcidBBqjltkHkUHK50FWARgiKJgAQwA0YYPxBC2l0kqr5xtN7ClgvAKOi0Y
+UQV/AY5yx5SUY3CMTotrdpCJSCz/ytu8eR7RXbpj3vf/uNjDPB/p3pXFcltREzQA
+pEgX4NOneVS/aiqzusTzdLTSI2Yb45koVsK5LhKD3aQx4Mvsk9vyV/Uj36a9dEju
+7WR1lxHYR385iOye1nA7MY/G+bFB5/i/S7XmblTfNviSeQMNBnW1AGr0oVZjJaQm
+pLpN88cAeHxYzHVs5rMwGDfwUgpAbLGYdZhu39NaYk4gnMv8lBdXcHzSDrhu+lEB
+JfqPccbIFDfYcxJH9BDkHp+Fy5ifr8H5nQXRR7/U+is/6jU3m/HT4oEJCWjPiMFs
+Hcz3fwNeNV8H/Ypd3M/zr6d6uGmtV7VMHT+XNSqX6SzOmacn0ogqhPJ77QxVjJgT
+U/gkG5Nbj+ECVGLXlY21PbH52IDj6gg5FgJ10awMuZh9LJCVpM/OnVOv0z9laO8K
+AUe+j2CeTZ97ELEJWH5YN0K1fbcVEz3VT20FABEBAAEAC/sH9aQoWkuFcxsdsWnu
+FquC+OQlPPdShKHu3jQlZCiVn9NEse6ILN96Osi7h8jLf8yLrKavSWk74sgv7Ypw
+kUH/S9Fy/aO/RJnbnvlwFjRwr7nvhhyK5MpNhqCCmfE6sopfDLGuZtbE58T6AlNc
+3LbbKotsnSSufLAsPVpOWlqbhVmsuHYXNj4PLZkHsJ8bx4eUeMGYu1gHzteHf6CQ
+/n8tQzSLBocNSk08eI/froxKYB+d+AADZi9JU+hfTgkxAR8LiIca+mMHPmTjo3UE
+lrrXw2bzJsT3PQBVaulvGOjydZo7pBr0tvjy8WEFfNpsAl97Wii+2Xlv0r7z9gq1
+BVuwI7DSWpTMMaCVPzMjqkz7zfNbKr64HH15MLVtj14D3YZY98aDd9J4gP4chjnb
+1+/J0uKiRkGBR9IPbHpzMcriZIMT3+Dmnh6QHZ41PwIz2Z2MmYIISpyBHxL2Ulpz
+XdaZfGghdqKhHbE5WzYtKG8fuCBqAZQuDLivWo4GH3A6VxUGANpczIKzcwX2E7ns
+ZXpQtUC/hKYklRThhaCSJMzzGj24IgbGP3kcOwJQHxtMJxWZ6QstS3qk/E+7siTe
+WsbKZa59HHAss1Qw5VG63tJcmiEQm9NrVOFSgSx4qEkmOLT3lrk7FGTui2sM7HZ/
+Sq681OUeg+nEhkaS0wnln+wfMvykts6VYHY/UMansnblX9czhJToQP9/cLZwVGHm
+rHKDO9a9ilHA0OaHlQaHUYHMxOzWMrpxFyj18kQtFBQ8jDcqQwYA9aNAbbEpbbJI
+wBVIz0vOic71PWjWP/1JC7jaDIUkI3j+NiAdcz0hqjsJLfTjnLFvV7iJvLeObe7D
+zqY0RxCJfrL6fHxEpxXWuQKsinL0sDL2q8cR4cdTGxbmC204tXtKKLQICHEQdK51
+m67ULRVedg3I4SZQQwl1em+shhWR5ySP22cHO3d5gZD6CoGs+gC8tLixu5u52hS6
+3Ndvy2523cvTkDrK3g0BkJ5lILGbbI+Fv76tO1AmGbUMeiRQE0sXBgDb2AxkmLlc
+p/n7NM8dDpeN5qJ7CSA9lcVNKmGWfEkaXRzPYbh+bXWIawLqB4pdKSCmrYEgEdFk
+1aFerxKwKlZwL2plw3erhQ5auw+zGH5yumPvrQr0jFSYzuzfqzS3WtEWMcrc95Ex
+e6ij4NpgRJI+MVM5ePvpCO4MJFSK5ZRTICkPYFRRvQe/Cm22HyQzdbIToq6sRw21
+DcbFrDZnCKtaPdSx3iV72ZJsu/w9FiURRypoJR1YusNa4pOYEdlf7UXTpokDbAQY
+AQoAIBYhBFd114Aa9q4p+yj3UJfc2l5W67giBQJgiKJgAhsCAcAJEJfc2l5W67gi
+wPQgBBkBCgAdFiEEpYfgrh6lrG5A3YT5G8j1dk00j+EFAmCIomAACgkQG8j1dk00
+j+E8IAwAn39q961rFEt/q9P/oI8AajmV/t26VmiEZYj+DXKuXAqsaUb8d8HqP9/P
+L/IfalPElbBa/6aqmAwMFyM6A/fTRi8LUqCTTjUebWILmrQ51h99hA6p+wkVJo4Y
+LQTQv6eu6YYrOJY7NfkvyTHC+OFmJvVbpfyB3+O2RsBeiGZJKhl4NoHbv31TYl/z
+G3VD9xMJJ32U7QF6Oj4Ueo92EwU79IXPoP37stLn2moDW25emZ7ShLrYUKm1MCy2
+mUTP4369RHQ+2jFv6ih3oCdTObqEU3kCvQdQfl0CNHYUw7yQ7IHvXDDfMQgBScT0
+/8f3DeVqhzE7dWpbgR+3J8VJ0BH7wf1tW5yTpoHNsfWqtvzpmX0uJd3z1i60Bp2x
+CHx6Kd7T+cZ/tTtnw7oCwcsPonSA4Tuc5tP+XuNVr7FbXlBPHQ6Nx27djAwUVF1g
++tdSLZZcKJgGIp7F+o7iFFzDtB6jddXi/6Z0sYuetEek/PYfZuyYULfuTziT2ZUh
+mFrtbloovWwL/0toYKSK2wDPvYEuuZy2GBPwEaOr1rodx7tcwli4hA4i/8idetyZ
+uHt1IV+hCLsbvohBz55Yd107Ft/XX3V6Fp0yrvjfm22CZ7l1p9JQIBfkzhJadEz1
+R4dFeYBoLesOIDSmHb3+7slzSFhIjTOXQ2y+op9++YAxO7rH9t1zi+hIiAhaB+lv
+K9QHKxWw1DVgeC5oq1EavfnWvpyVeJEEVr13ZGC6L3wCnwCSDH/LYeccQhwTgI4R
+iZHrxzqYmylEWl0805loQGqXRJiQ3qJV49d6DwbpxqG5h348q3X9/MBrf33UlE6V
+cGlnA+jJWrTDLFVfvq43tkK5ijwCEARxy2gZbSe2yCJISjUbj91dKZodZSke/Yp5
+b7796hF3BgYfc4/nHwZ3/y1T9QiP9aNqjewdgu5lV0vCWeSuxClDhsN6j26HmAcX
+GskaWqSJQMkFE8XiHMpUCe4XdqRRXD5whKs6p3K/++3TY3iFDg2Rkazqv1lWoioV
+w7mVvoNfjRdeEZ0FWARgiKJvAQwAns+yngkGgkrAWOqNMPQtpSbchsiKQoGieaYN
+fx5PdXW221DLUHTYDQKgN0w6mPCnYqH0oFpozfL8368ZE+sIumpRM1nEyhSqx2fi
+Tv0TX/cM1YkKpSkSfk/sBN8VNiChG4UessVnrxze1waNgikp91bbSSbbjpK/bBvn
+3v1rifFi17K+5Hg8YVLFrm6p7CbGdjVZbMzDrkQlzell0bicrwZu3L5YPEMNozVY
+FIu2EMB6jVh/Digq2EGosw0W1p08b9ZSEcAuHM5WEkArZ1ejOpgKN8JhS1bmsNta
+PMdQvxa7vnaSBCI8mQmG6/8G/1gzerjV00DVsvsViQeCLZdWsvLVHl00lzetnZGI
+kd+EukjnQD4jQTt96ma2teIIKba3EXvDaK5plsI/zHfyvVqoxf/y9Jn90kPBZfxB
+RK3x4Oiu0Q3bHcDzoCKji5HlMBsWzD2/ayo8CLyJqkL5z/B3Hk4fwUSiU8hjJrKm
+woeFQUbDbY3xuxX1bpYkGbL0/H4pABEBAAEAC/wKMkQh1OsD0QhV/SM5DihjFuJo
+TfZgjEGyBUkPDRNlc3wcyyxumz3m4fEG8+A8QxFAKi1SYVOiy3PUacHWr0u1ak+R
+2DTkE50eZetYDnQgwHQkvqJ+FavAC+IXsvoB6mjloy+kIzwDuHsPO7a4sWtmG7/D
+C9ljZ0UejBEgVk2CAwtJVYrfkN+xkParuyOyS5AI9WZrL59tsCbsOEzHAQ8gRq22
+AwuXvOdif/GKiijTnQQRUKoBru8HSPnrmw7JEzm9AK3RrVQPMgKgzttjPDqU7k6e
+S7PHmeWJScRqt9Viq4L8zpHOn1KM+NHN4LgP123MFPSYCXys3Ph6B1RjiePTR0kl
+rFWf7T4y3SEPOBgC9QthJjDl4IhvP+dHJBeFOnz4qbaQNLSSzn86tBmnfljOhTu9
+bkV+aHnfN+Fz00RrZDr37s+Z5459vhL+drvrvTHDzRp3Y5Ywhn5uk5t7oK/csrRv
+fwPoOz7Pns4a9xTjLo7ykPEtq6rHwtW8y8BZxOEGAMcfYszVoZd4LGHh+8zGqTQA
+QRypRmBZ7bNt2MOOWUBIXo1w70hmc3VuuAWBfNI683EDJA49gA/EwRuhmGHnbuUz
+VRi1AYmc8fGk542c94+3ak3KQZP3Pvx9gpzjTeB3aqFtNCtfXQIlcPKF//IwKZUR
+duNXjuw35o17czPfTJiU/Uda3OXko2r4Mjg+oqJhKqFLh93yWvlLxJgHThFt3BrV
+GwJdxXOFOPp6vrdEYjvWtCIYx+VwWl6UvKkHe6DE8QYAzCyYVmIxG2zGk4Pwx96y
+IikF7Kw6J/RXFUn+OiGc8ydk2mmienG3sML905U5tiRYRFBW3BTra3lLSUFx07N5
+EH+EGdOfA2QuqwmUDT1hliFW2XFuC8kxY/NctKmSdkS3ZpHegP4GBjZCgux3W8hr
+ZU/+2TW44m2bnvqJHwuvDYvXnSapyhhuAEqwUrfZ1Y5kJQ18zajyGpvU/ej8TCK4
+3NXOikcxnH4OLeJpjmBlCC3IInkt36JSxgwcrMPsQOy5Bf98SjLxzBN7WSvDfIF8
+D49+pPqhTuetUrgro6nQtcDDgG5FaJPo7KSHBfWFuBingFe7EvrBMjfsJX+RbW7D
+xa/waujiHyfeQaLLdM9tRD5E29cvIHPpit0CJgZlNlrr2hlSNMX7Ymo4S+c0JzWr
+kZUxZBVTwOGUAhZPpSKesq9aISOaTMrpSMmRqoCYYYc5Su+0RP/ah0fZaCmg8kZB
+JUmXPgWT/wv/YjOV8Qq5I/LX8xqf1p+Pg9ej75P+PYfQB//jPYkBtgQYAQoAIBYh
+BFd114Aa9q4p+yj3UJfc2l5W67giBQJgiKJvAhsMAAoJEJfc2l5W67gin9gMAMbF
+890cE1CaNghv2nN5SscmZzAZSc8qTjqWLYMmxftuMNaoL8rjuowp++k/oRXGwW31
+MyqwKrAP3ezv88o7cNDFjriGHKN5ZZxNJRqsiF7VcyMbi/7OoHONAJXF4NcY6+2K
+/F8moxsG50BfX6B1gV1sezlI0Uli275karr7DNHBbpDMBMPBOESBJbF1vwxCgHrR
+CdgNHcQqe43s0goLMsB+8fM+Ge9XrkfJuVS48Bl4QUecddYzzgjZQqB8VcnBQTQf
+bZ+h+TgBIhayKP8EFtDshbiWSTQe8bSjGXHwWwF7BdJQsjEz8nq87oCS5WyCR38D
+1gfTOWhsnZqPFv5n4qZuyT3GSEGPVPa2AH+5ddQ3R58o60eovi0oNScrxk4zXjkG
+aipJhhajGXrzutAyLoesRLnCnhoLYYWAw5wC+Ioa2M3scYa3AG1ZejrE5KZ+tDB2
+iuB6Sp9Aho91nhoGO1ktcqfaUlDX2HmhdGkMdY6ppU+YaR+fAGsRti5YsTIyMQ==
+=dKRC
+-----END PGP PRIVATE KEY BLOCK-----
diff --git a/comm/mail/test/browser/openpgp/data/keys/ofelia-secret.asc b/comm/mail/test/browser/openpgp/data/keys/ofelia-secret.asc
new file mode 100644
index 0000000000..f8a63699d8
--- /dev/null
+++ b/comm/mail/test/browser/openpgp/data/keys/ofelia-secret.asc
@@ -0,0 +1,129 @@
+-----BEGIN PGP PRIVATE KEY BLOCK-----
+
+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
+MQ==
+=lHHo
+-----END PGP PRIVATE KEY BLOCK-----
diff --git a/comm/mail/test/browser/openpgp/data/keys/secret-for-preferred-sign-subkey-is-missing--a-without-second-sub--sec.asc b/comm/mail/test/browser/openpgp/data/keys/secret-for-preferred-sign-subkey-is-missing--a-without-second-sub--sec.asc
new file mode 100644
index 0000000000..bcf9db3064
--- /dev/null
+++ b/comm/mail/test/browser/openpgp/data/keys/secret-for-preferred-sign-subkey-is-missing--a-without-second-sub--sec.asc
@@ -0,0 +1,129 @@
+-----BEGIN PGP PRIVATE KEY BLOCK-----
+
+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
+iUE5
+=f5S8
+-----END PGP PRIVATE KEY BLOCK-----
diff --git a/comm/mail/test/browser/openpgp/data/keys/secret-for-preferred-sign-subkey-is-missing--b-with-second-sub--pub.asc b/comm/mail/test/browser/openpgp/data/keys/secret-for-preferred-sign-subkey-is-missing--b-with-second-sub--pub.asc
new file mode 100644
index 0000000000..a4eec6f4c1
--- /dev/null
+++ b/comm/mail/test/browser/openpgp/data/keys/secret-for-preferred-sign-subkey-is-missing--b-with-second-sub--pub.asc
@@ -0,0 +1,95 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+tA==
+=nDSP
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/comm/mail/test/browser/openpgp/data/keys/two-enc-subkeys-one-deleted.sec.asc b/comm/mail/test/browser/openpgp/data/keys/two-enc-subkeys-one-deleted.sec.asc
new file mode 100644
index 0000000000..99a9c96578
--- /dev/null
+++ b/comm/mail/test/browser/openpgp/data/keys/two-enc-subkeys-one-deleted.sec.asc
@@ -0,0 +1,35 @@
+-----BEGIN PGP PRIVATE KEY BLOCK-----
+
+lFgEY01cZxYJKwYBBAHaRw8BAQdA0/vtsQqotv2/BlbtBvnC9J8oCEADfA0ohd1M
+rckzcFQAAQCRArAmnlHwP/ujI1JPmOfBsng0EREJhcLEvRJV3sO56xAntC90aGly
+ZC11aWQgPG11bHRpLXN1YmtleS10ZXN0LXRoaXJkLXVpZEBwZ3AuaWN1PoiTBBMW
+CgA7FiEEX/tXmslvesUot/ERAG28BiQHOm8FAmNNXkQCGwMFCwkIBwICIgIGFQoJ
+CAsCBBYCAwECHgcCF4AACgkQAG28BiQHOm+YgwD/Uk+D77bi6oQ9Z0CF99GoJM52
+ynn14hSzrZOXNuMVxEsA/juz6AEHkBC3jV/ZeQuBJQliBz7uXLxcj/bl/xYifscC
+tC5zZWNvbmQtdWlkIDxtdWx0aS1zdWJrZXktdGVzdC0ybmQtdWlkQHBncC5pY3U+
+iJMEExYKADsWIQRf+1eayW96xSi38REAbbwGJAc6bwUCY01cpQIbAwULCQgHAgIi
+AgYVCgkICwIEFgIDAQIeBwIXgAAKCRAAbbwGJAc6b2p4AQC3d/O+vFcnNe/GHOzu
+QmsP1ZBz5lAXtrWyauY6Adtp1AEAyj7BRAasgfEXLELb8N2TVX8NIetLU9+FH27Q
+P9AaZAu0LW11bHRpLXN1YmtleS10ZXN0IDxtdWx0aS1zdWJrZXktdGVzdEBwZ3Au
+aWN1PoiTBBMWCgA7FiEEX/tXmslvesUot/ERAG28BiQHOm8FAmNNXGcCGwMFCwkI
+BwICIgIGFQoJCAsCBBYCAwECHgcCF4AACgkQAG28BiQHOm/OnwEA9k/CHig05CxJ
+pjwoCIrilHF62AO0r2kDd3wil4hF1nABAOiUCiSPVTq4AmAd3QW440WQab5dHZd9
+jOuc0WsDRwADnFgEY01ctxYJKwYBBAHaRw8BAQdAcdi+7ywtSvkYlpmmy3Ai3Hgt
+EMTnUnNtNDtTkIfFAugAAP93nRlqvPBPTqaReAq91JYIadNOT3iq3MsyR08RTWcJ
+Ug9RiO8EGBYKACAWIQRf+1eayW96xSi38REAbbwGJAc6bwUCY01ctwIbAgCBCRAA
+bbwGJAc6b3YgBBkWCgAdFiEED5X+QxlFxF1e8EjtPc3XaDh2NHsFAmNNXLcACgkQ
+Pc3XaDh2NHvhpQD9FA/tv7SU23f1xJ8WcvRVCRIh1wzQkgDrKdrBFfdXhPkA/iXd
++ZpJs7xkLYu0N75QYJJWF796WA/Z4DZVxxv6lBgBhnMA/RkmlJT+QUoVnqMfWJSq
+Hu4hFG07+doLPvhMUMKju5P2APwNolvvuIEJtswtcphofdgQnd8/JYjY3HOwPVzz
+ELfBB5xdBGNNXYcSCisGAQQBl1UBBQEBB0AkqcqaLksLBWGlLymck89q/RMsWc1C
+pnI1sYae0H8tOgMBCAcAAP90/BSxTFRDm1gtPsj/rICaHwnpzuxRq6Dx3GnhASE2
+6BHAiHgEGBYKACAWIQRf+1eayW96xSi38REAbbwGJAc6bwUCY01dhwIbDAAKCRAA
+bbwGJAc6b13yAQDuqCmCOKho7sNL6ZCBTWc3oKcUFCt+tj41sXPYwMqSowD+JbpN
+aR0TCo0p7K4fVzZ80/qoTaYubwcI+Cp57AqK1gCcWARjTV2oFgkrBgEEAdpHDwEB
+B0AVh/XLcWJIxjr1lawAyOmXAjSzLtnp4GcvbEPTiuhmwAABAJq1jRaMBch76ML4
+DJTZFq296InZhzdvMe5x3Hp0bm6eEa2IeAQYFgoAIBYhBF/7V5rJb3rFKLfxEQBt
+vAYkBzpvBQJjTV2oAhsgAAoJEABtvAYkBzpvb/kBANsloi0xUnnxT7Nc/j8X10mH
+WXOgGJ6g1RrBiky9l942AP0YrDC6GWfioUsCBb0fSKFHqx6tlnw25JpFH1IhZ1wC
+Aw==
+=gBXR
+-----END PGP PRIVATE KEY BLOCK-----
diff --git a/comm/mail/test/browser/openpgp/data/keys/two-enc-subkeys-still-both.pub.asc b/comm/mail/test/browser/openpgp/data/keys/two-enc-subkeys-still-both.pub.asc
new file mode 100644
index 0000000000..b66dfd8b90
--- /dev/null
+++ b/comm/mail/test/browser/openpgp/data/keys/two-enc-subkeys-still-both.pub.asc
@@ -0,0 +1,31 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mDMEY01cZxYJKwYBBAHaRw8BAQdA0/vtsQqotv2/BlbtBvnC9J8oCEADfA0ohd1M
+rckzcFS0LnNlY29uZC11aWQgPG11bHRpLXN1YmtleS10ZXN0LTJuZC11aWRAcGdw
+LmljdT6IkwQTFgoAOxYhBF/7V5rJb3rFKLfxEQBtvAYkBzpvBQJjTVylAhsDBQsJ
+CAcCAiICBhUKCQgLAgQWAgMBAh4HAheAAAoJEABtvAYkBzpvangBALd38768Vyc1
+78Yc7O5Caw/VkHPmUBe2tbJq5joB22nUAQDKPsFEBqyB8RcsQtvw3ZNVfw0h60tT
+34UfbtA/0BpkC7QtbXVsdGktc3Via2V5LXRlc3QgPG11bHRpLXN1YmtleS10ZXN0
+QHBncC5pY3U+iJMEExYKADsWIQRf+1eayW96xSi38REAbbwGJAc6bwUCY01cZwIb
+AwULCQgHAgIiAgYVCgkICwIEFgIDAQIeBwIXgAAKCRAAbbwGJAc6b86fAQD2T8Ie
+KDTkLEmmPCgIiuKUcXrYA7SvaQN3fCKXiEXWcAEA6JQKJI9VOrgCYB3dBbjjRZBp
+vl0dl32M65zRawNHAAO4OARjTVxnEgorBgEEAZdVAQUBAQdAtEVlipyXCm2fdZO+
+ki8PztQwm8M5l3gfnnmgWZijcHADAQgHiHgEGBYKACAWIQRf+1eayW96xSi38REA
+bbwGJAc6bwUCY01cZwIbDAAKCRAAbbwGJAc6b+McAP0YBPv9FosKyFgs3U6s0qMo
+N3g20mHcnzK8Tn0d2CVXNgD/f0UuMeTNQNaobmKgncX3WxOTRCdU8gq7fTmADuYT
+iAO4MwRjTVy3FgkrBgEEAdpHDwEBB0Bx2L7vLC1K+RiWmabLcCLceC0QxOdSc200
+O1OQh8UC6IjvBBgWCgAgFiEEX/tXmslvesUot/ERAG28BiQHOm8FAmNNXLcCGwIA
+gQkQAG28BiQHOm92IAQZFgoAHRYhBA+V/kMZRcRdXvBI7T3N12g4djR7BQJjTVy3
+AAoJED3N12g4djR74aUA/RQP7b+0lNt39cSfFnL0VQkSIdcM0JIA6ynawRX3V4T5
+AP4l3fmaSbO8ZC2LtDe+UGCSVhe/elgP2eA2Vccb+pQYAYZzAP0ZJpSU/kFKFZ6j
+H1iUqh7uIRRtO/naCz74TFDCo7uT9gD8DaJb77iBCbbMLXKYaH3YEJ3fPyWI2Nxz
+sD1c8xC3wQe4OARjTV2HEgorBgEEAZdVAQUBAQdAJKnKmi5LCwVhpS8pnJPPav0T
+LFnNQqZyNbGGntB/LToDAQgHiHgEGBYKACAWIQRf+1eayW96xSi38REAbbwGJAc6
+bwUCY01dhwIbDAAKCRAAbbwGJAc6b13yAQDuqCmCOKho7sNL6ZCBTWc3oKcUFCt+
+tj41sXPYwMqSowD+JbpNaR0TCo0p7K4fVzZ80/qoTaYubwcI+Cp57AqK1gC4MwRj
+TV2oFgkrBgEEAdpHDwEBB0AVh/XLcWJIxjr1lawAyOmXAjSzLtnp4GcvbEPTiuhm
+wIh4BBgWCgAgFiEEX/tXmslvesUot/ERAG28BiQHOm8FAmNNXagCGyAACgkQAG28
+BiQHOm9v+QEA2yWiLTFSefFPs1z+PxfXSYdZc6AYnqDVGsGKTL2X3jYA/RisMLoZ
+Z+KhSwIFvR9IoUerHq2WfDbkmkUfUiFnXAID
+=217r
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/comm/mail/test/browser/openpgp/data/keys/untweaked-secret.asc b/comm/mail/test/browser/openpgp/data/keys/untweaked-secret.asc
new file mode 100644
index 0000000000..0be1a35ff8
--- /dev/null
+++ b/comm/mail/test/browser/openpgp/data/keys/untweaked-secret.asc
@@ -0,0 +1,15 @@
+-----BEGIN PGP PRIVATE KEY BLOCK-----
+
+xYYEZXNJrhYJKwYBBAHaRw8BAQdAwMIRYaiBLlSzWaTOvX4YpQoJ/I8TSQUDjC0zw7frs5H+CQMI
+Na6GCdd3/p7/KfGebtqCVkavU4e+IYcKBLBGC/G+dyeVphQDH0P2IYtyVbKZdtKEEtpjAP7qSc6t
+M1n1Mpb42m7oLW4RaNENERnWh4drXM0pVW50d2Vha2VkIEVDQyA8dW50d2Vha2VkLWVjY0BleGFt
+cGxlLmNvbT7CiwQTFggAMxYhBEkpZab1ba0kI7NQboSfKbACBwf3BQJlc0muAhsDBQsJCAcCBhUI
+CQoLAgUWAgMBAAAKCRCEnymwAgcH9+Q8AQDqLxLTGc/3UrK23CtVc96WAV7tltj7KKRkUugkBp4H
+MgEAogcAHKOL0BVfZvP6dNsivYnzwQ+ag+9zIHA+sFABzAXHiwRlc0mvEgorBgEEAZdVAQUBAQdA
+ePxMSOnzYXwXII1LGdjTMqx3tCAHbtnLlkV/ZJ1xkTUDAQgH/gkDCHDqhB15/mtK/4WDct+GhyRo
+j7o5YZcyVQ6tybRH5Eh+iGaM3bfYqy4ZRYXPkSFzkdS7NRZ1XljmdljZ6YTZV2/k9Hjhfg0VxI8N
+dC32ysjCeAQYFggAIBYhBEkpZab1ba0kI7NQboSfKbACBwf3BQJlc0mvAhsMAAoJEISfKbACBwf3
+OAAA/3y4RqOyBuQ+ikiPs0QLNNK7ViDZFmgHPPKIAqTa3lRSAP9NTe08wQK6XhT8St0IXxBxKcLf
+2K4znVqxoGrOEFZjDA==
+=0rDW
+-----END PGP PRIVATE KEY BLOCK-----
diff --git a/comm/mail/test/browser/openpgp/data/smime/Bob.p12 b/comm/mail/test/browser/openpgp/data/smime/Bob.p12
new file mode 100644
index 0000000000..b651346cb1
--- /dev/null
+++ b/comm/mail/test/browser/openpgp/data/smime/Bob.p12
Binary files differ
diff --git a/comm/mail/test/browser/openpgp/data/smime/alice.env.eml b/comm/mail/test/browser/openpgp/data/smime/alice.env.eml
new file mode 100644
index 0000000000..0f11bd2835
--- /dev/null
+++ b/comm/mail/test/browser/openpgp/data/smime/alice.env.eml
@@ -0,0 +1,25 @@
+MIME-Version: 1.0
+From: Alice@example.com
+To: Bob@example.com
+Subject: enveloped
+Content-Type: application/pkcs7-mime; name=smime.p7m;
+ smime-type=enveloped-data
+Content-Transfer-Encoding: base64
+Content-Disposition: attachment; filename=smime.p7m
+Content-Description: S/MIME Encrypted Message
+
+MIAGCSqGSIb3DQEHA6CAMIACAQAxggGFMIIBgQIBADBpMGQxCzAJBgNVBAYTAlVT
+MRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRIw
+EAYDVQQKEwlCT0dVUyBOU1MxFDASBgNVBAMTC05TUyBUZXN0IENBAgEoMA0GCSqG
+SIb3DQEBAQUABIIBAEs7IhROhu/wFSuypxWqfseBLKs1lhJJk9cX7o7tJ2mcVSjJ
+qiBn8DVyjXp0HARnkWTdYtNaRvdBNnDDdLIrTl0Furmw85jaamqhX7do+mIgvRPy
+PvEFhbel9zNS9oFxddWYBbMVl6Ib3ADXqjV+m3wZ463iB4SSxvIlxOMUdpluEhuT
+buZH6AyS4THOEMfJbuM6HOH902tK+PrwuJkk1CWR9lzt6tlf1rPuUna0Eq6n0+u2
+c0PpovqELnSUUbF0SpTS4pJU4WhIVpZPouzOSrvYgU4NId7kfJW/bdQQltsBsrcN
+wVGe/SQT+bwgZiJQaocuFylI4iyK7DNMucaWlkMwgAYJKoZIhvcNAQcBMB0GCWCG
+SAFlAwQBAgQQCTtMRKcvkPn97BUXVdftp6CABIGgp2FLzMSQFopatI6MEYm0LSb2
+ihSTtccIH2AROEBD0i+MX8YTyp+3SAZPEAIawavVimqmxfHSHmKXRjO3Ywjp3+yO
+hTvF5SjaSgxpPk8L0Pyh5n2RK+DEoUk1vUu5xufOigVhI9X6xVhcgpZBPJkCmUye
+coWbXmAgvZrsXbfkSB6ZXqxfVVllAFKsVcpbKKvQTL9i/iOIAbu7z1tfynbGyAQQ
+09g7by06cAm7iMe22ldyeAAAAAAAAAAAAAA=
+