ENGINE-247: cleaned up tests, ready to merge ENGINE-247
authorKrista Bennett <krista@pep-project.org>
Wed, 13 Sep 2017 01:59:28 +0200
branchENGINE-247
changeset 205092733656cf1b
parent 2049 87a105b9151c
child 2051 c5b75986b5ff
child 2052 bb355eb0754e
ENGINE-247: cleaned up tests, ready to merge
test/pEp_subject_received_test.cc
test/test_mails/p3p_encrypted_subject_IS_pEp_3b.eml
test/test_mails/p3p_subject_normal_1b.eml
test/test_mails/p3p_subject_normal_signed_2b.eml
test/test_mails/pEp_encrypted_subject_IS_pEp.eml
test/test_mails/pEp_encrypted_subject_IS_pEp2.eml
test/test_mails/pEp_encrypted_subject_IS_pEp_3a.eml
test/test_mails/pEp_subject_normal.eml
test/test_mails/pEp_subject_normal2.eml
test/test_mails/pEp_subject_normal_1a.eml
test/test_mails/pEp_subject_normal_signed.eml
test/test_mails/pEp_subject_normal_signed2.eml
test/test_mails/pEp_subject_normal_signed_2a.eml
test/test_mails/pEp_subject_normal_unencrypted.eml
test/test_mails/pEp_subject_normal_unencrypted_6.eml
test/test_mails/pEp_subject_p3p_replaced_w_p3p_4d.eml
test/test_mails/pEp_subject_p3p_replaced_w_pEp_4c.eml
test/test_mails/pEp_subject_pEp.eml
test/test_mails/pEp_subject_pEp2.eml
test/test_mails/pEp_subject_pEp3.eml
test/test_mails/pEp_subject_pEp4.eml
test/test_mails/pEp_subject_pEp_replaced_w_p3p_4b.eml
test/test_mails/pEp_subject_pEp_replaced_w_pEp_4a.eml
test/test_mails/pEp_unencrypted_p3p_subject_5b.eml
test/test_mails/pEp_unencrypted_pEp_subject.eml
test/test_mails/pEp_unencrypted_pEp_subject2.eml
test/test_mails/pEp_unencrypted_pEp_subject_5a.eml
     1.1 --- a/test/pEp_subject_received_test.cc	Tue Sep 12 19:23:56 2017 +0200
     1.2 +++ b/test/pEp_subject_received_test.cc	Wed Sep 13 01:59:28 2017 +0200
     1.3 @@ -42,27 +42,11 @@
     1.4      trust_personal_key(session, you);
     1.5      status = update_identity(session, you);
     1.6  
     1.7 -
     1.8 -    const char* mailfiles[] = {"test_mails/pEp_subject_normal.eml",
     1.9 -                                "test_mails/pEp_subject_normal2.eml",
    1.10 -                                "test_mails/pEp_subject_normal_signed.eml",
    1.11 -                                "test_mails/pEp_subject_normal_signed2.eml",
    1.12 -                                "test_mails/pEp_encrypted_subject_IS_pEp.eml",
    1.13 -                                "test_mails/pEp_encrypted_subject_IS_pEp2.eml",
    1.14 -                                "test_mails/pEp_subject_pEp.eml",
    1.15 -                                "test_mails/pEp_subject_pEp2.eml",
    1.16 -                                "test_mails/pEp_subject_pEp3.eml",
    1.17 -                                "test_mails/pEp_subject_pEp4.eml",
    1.18 -                                "test_mails/pEp_unencrypted_pEp_subject.eml",
    1.19 -                                "test_mails/pEp_unencrypted_pEp_subject2.eml",
    1.20 -                                "test_mails/pEp_subject_normal_unencrypted.eml"};
    1.21 -                                
    1.22 -
    1.23      cout << "------------------------------------------------------------------------------------------" << endl;
    1.24      cout << "Test 1a: Normal encrypted mail, pEp as substitute subject, regular subject in crypto text." << endl;
    1.25      cout << "------------------------------------------------------------------------------------------" << endl;
    1.26          
    1.27 -    string mailtext = slurp(mailfiles[0]);
    1.28 +    string mailtext = slurp("test_mails/pEp_subject_normal_1a.eml");
    1.29      
    1.30      message* msg_ptr = nullptr;
    1.31      message* dest_msg = nullptr;
    1.32 @@ -95,7 +79,7 @@
    1.33      cout << "Test 1b: Normal encrypted mail, p≡p as substitute subject, regular subject in crypto text." << endl;
    1.34      cout << "------------------------------------------------------------------------------------------" << endl;
    1.35          
    1.36 -    mailtext = slurp(mailfiles[1]);
    1.37 +    mailtext = slurp("test_mails/p3p_subject_normal_1b.eml");
    1.38      
    1.39      msg_ptr = nullptr;
    1.40      dest_msg = nullptr;
    1.41 @@ -133,7 +117,7 @@
    1.42      keylist = nullptr;
    1.43      rating = PEP_rating_unreliable;
    1.44      
    1.45 -    mailtext = slurp(mailfiles[2]);
    1.46 +    mailtext = slurp("test_mails/pEp_subject_normal_signed_2a.eml");
    1.47      
    1.48      status = mime_decode_message(mailtext.c_str(), mailtext.length(), &msg_ptr);
    1.49      assert(status == PEP_STATUS_OK);
    1.50 @@ -165,7 +149,7 @@
    1.51      keylist = nullptr;
    1.52      rating = PEP_rating_unreliable;
    1.53      
    1.54 -    mailtext = slurp(mailfiles[3]);
    1.55 +    mailtext = slurp("test_mails/p3p_subject_normal_signed_2b.eml");
    1.56      
    1.57      status = mime_decode_message(mailtext.c_str(), mailtext.length(), &msg_ptr);
    1.58      assert(status == PEP_STATUS_OK);
    1.59 @@ -198,7 +182,7 @@
    1.60      keylist = nullptr;
    1.61      rating = PEP_rating_unreliable;
    1.62      
    1.63 -    mailtext = slurp(mailfiles[4]);
    1.64 +    mailtext = slurp("test_mails/pEp_encrypted_subject_IS_pEp_3a.eml");
    1.65      
    1.66      status = mime_decode_message(mailtext.c_str(), mailtext.length(), &msg_ptr);
    1.67      assert(status == PEP_STATUS_OK);
    1.68 @@ -230,7 +214,7 @@
    1.69      keylist = nullptr;
    1.70      rating = PEP_rating_unreliable;
    1.71      
    1.72 -    mailtext = slurp(mailfiles[5]);
    1.73 +    mailtext = slurp("test_mails/p3p_encrypted_subject_IS_pEp_3b.eml");
    1.74      
    1.75      status = mime_decode_message(mailtext.c_str(), mailtext.length(), &msg_ptr);
    1.76      assert(status == PEP_STATUS_OK);
    1.77 @@ -263,7 +247,7 @@
    1.78      keylist = nullptr;
    1.79      rating = PEP_rating_unreliable;
    1.80      
    1.81 -    mailtext = slurp(mailfiles[6]);
    1.82 +    mailtext = slurp("test_mails/pEp_subject_pEp_replaced_w_pEp_4a.eml");
    1.83      
    1.84      status = mime_decode_message(mailtext.c_str(), mailtext.length(), &msg_ptr);
    1.85      assert(status == PEP_STATUS_OK);
    1.86 @@ -295,7 +279,7 @@
    1.87      keylist = nullptr;
    1.88      rating = PEP_rating_unreliable;
    1.89      
    1.90 -    mailtext = slurp(mailfiles[7]);
    1.91 +    mailtext = slurp("test_mails/pEp_subject_pEp_replaced_w_p3p_4b.eml");
    1.92      
    1.93      status = mime_decode_message(mailtext.c_str(), mailtext.length(), &msg_ptr);
    1.94      assert(status == PEP_STATUS_OK);
    1.95 @@ -327,7 +311,7 @@
    1.96      keylist = nullptr;
    1.97      rating = PEP_rating_unreliable;
    1.98      
    1.99 -    mailtext = slurp(mailfiles[8]);
   1.100 +    mailtext = slurp("test_mails/pEp_subject_p3p_replaced_w_pEp_4c.eml");
   1.101      
   1.102      status = mime_decode_message(mailtext.c_str(), mailtext.length(), &msg_ptr);
   1.103      assert(status == PEP_STATUS_OK);
   1.104 @@ -359,7 +343,7 @@
   1.105      keylist = nullptr;
   1.106      rating = PEP_rating_unreliable;
   1.107      
   1.108 -    mailtext = slurp(mailfiles[9]);
   1.109 +    mailtext = slurp("test_mails/pEp_subject_p3p_replaced_w_p3p_4d.eml");
   1.110      
   1.111      status = mime_decode_message(mailtext.c_str(), mailtext.length(), &msg_ptr);
   1.112      assert(status == PEP_STATUS_OK);
   1.113 @@ -392,7 +376,7 @@
   1.114      keylist = nullptr;
   1.115      rating = PEP_rating_unreliable;
   1.116      
   1.117 -    mailtext = slurp(mailfiles[10]);
   1.118 +    mailtext = slurp("test_mails/pEp_unencrypted_pEp_subject_5a.eml");
   1.119      
   1.120      status = mime_decode_message(mailtext.c_str(), mailtext.length(), &msg_ptr);
   1.121      assert(status == PEP_STATUS_OK);
   1.122 @@ -425,7 +409,7 @@
   1.123      keylist = nullptr;
   1.124      rating = PEP_rating_unreliable;
   1.125      
   1.126 -    mailtext = slurp(mailfiles[11]);
   1.127 +    mailtext = slurp("test_mails/pEp_unencrypted_p3p_subject_5b.eml");
   1.128      
   1.129      status = mime_decode_message(mailtext.c_str(), mailtext.length(), &msg_ptr);
   1.130      assert(status == PEP_STATUS_OK);
   1.131 @@ -446,6 +430,38 @@
   1.132          free_message(dest_msg);
   1.133      free_message(msg_ptr);
   1.134      free_stringlist(keylist);
   1.135 +
   1.136 +    cout << "----------------------------------------------------------------------------------------------------------------------" << endl;
   1.137 +    cout << "Test 6: Normal unencrypted email where a subject line exists in the text but the subject is not a replacement subject." << endl;
   1.138 +    cout << "----------------------------------------------------------------------------------------------------------------------" << endl;
   1.139 +
   1.140 +    msg_ptr = nullptr;
   1.141 +    dest_msg = nullptr;
   1.142 +    final_ptr = nullptr;
   1.143 +    keylist = nullptr;
   1.144 +    rating = PEP_rating_unreliable;
   1.145 +    
   1.146 +    mailtext = slurp("test_mails/pEp_subject_normal_unencrypted_6.eml");
   1.147 +    
   1.148 +    status = mime_decode_message(mailtext.c_str(), mailtext.length(), &msg_ptr);
   1.149 +    assert(status == PEP_STATUS_OK);
   1.150 +    assert(msg_ptr);
   1.151 +    final_ptr = msg_ptr;
   1.152 +    status = decrypt_message(session, msg_ptr, &dest_msg, &keylist, &rating, &flags);
   1.153 +    final_ptr = dest_msg ? dest_msg : msg_ptr;
   1.154 +  
   1.155 +    cout << "shortmsg: " << final_ptr->shortmsg << endl << endl;
   1.156 +    cout << "longmsg: " << final_ptr->longmsg << endl << endl;
   1.157 +    cout << "longmsg_formatted: " << (final_ptr->longmsg_formatted ? final_ptr->longmsg_formatted : "(empty)") << endl << endl;
   1.158 +
   1.159 +    assert(strcmp("This is just a normal subject, really", final_ptr->shortmsg) == 0);
   1.160 +
   1.161 +    cout << "Test 6: Subject remains intact." << endl << endl;
   1.162 +
   1.163 +    if (final_ptr == dest_msg)
   1.164 +        free_message(dest_msg);
   1.165 +    free_message(msg_ptr);
   1.166 +    free_stringlist(keylist);
   1.167          
   1.168      cout << "calling release()\n";
   1.169      release(session);
     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/test/test_mails/p3p_encrypted_subject_IS_pEp_3b.eml	Wed Sep 13 01:59:28 2017 +0200
     2.3 @@ -0,0 +1,121 @@
     2.4 +Return-Path: <pep.test.alice@pep-project.org>
     2.5 +X-Original-To: krista@gnunet.org
     2.6 +Delivered-To: krista@gnunet.org
     2.7 +Received: from vmmailrelay1.informatik.tu-muenchen.de (mailrelay1.informatik.tu-muenchen.de [131.159.254.14])
     2.8 +	by sam.net.in.tum.de (Postfix) with ESMTP id BE55A1C00BC
     2.9 +	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:27:51 +0200 (CEST)
    2.10 +Received: by vmmailrelay1.informatik.tu-muenchen.de (Postfix, from userid 109)
    2.11 +	id 94D2F1C0394; Mon, 12 Jun 2017 15:27:52 +0200 (CEST)
    2.12 +Received: from vmmailrelay1.informatik.tu-muenchen.de (localhost [127.0.0.1])
    2.13 +	by vmmailrelay1.informatik.tu-muenchen.de (Postfix) with ESMTP id 6D2E21C037A
    2.14 +	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:27:52 +0200 (CEST)
    2.15 +Received: from vmmaildmz1.informatik.tu-muenchen.de (vmmaildmz1.informatik.tu-muenchen.de [131.159.0.87])
    2.16 +	by vmmailrelay1.informatik.tu-muenchen.de (Postfix) with ESMTP id 5876E1C0383
    2.17 +	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:27:52 +0200 (CEST)
    2.18 +Received: by vmmaildmz1.informatik.tu-muenchen.de (Postfix, from userid 109)
    2.19 +	id 56F1F1C2D9D; Mon, 12 Jun 2017 15:27:52 +0200 (CEST)
    2.20 +X-Spam-Checker-Version: SpamAssassin 3.4.0-tuminfo_1 (2014-02-07) on
    2.21 +	vmmaildmz1.informatik.tu-muenchen.de
    2.22 +X-Spam-Level: 
    2.23 +X-Spam-Status: No, score=-3.4 required=7.0 tests=AWL,BAYES_00,
    2.24 +	ENCRYPTED_MESSAGE,RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,
    2.25 +	TVD_RCVD_SPACE_BRACKET,UNPARSEABLE_RELAY autolearn=no autolearn_force=no
    2.26 +	version=3.4.0-tuminfo_1
    2.27 +Received: from vmmaildmz1.informatik.tu-muenchen.de (localhost [127.0.0.1])
    2.28 +	by vmmaildmz1.informatik.tu-muenchen.de (Postfix) with ESMTP id DE3C31C2D9E
    2.29 +	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:27:50 +0200 (CEST)
    2.30 +Received: from mi4-p00-ob.smtp.rzone.de (mi4-p00-ob.smtp.rzone.de [81.169.146.149])
    2.31 +	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
    2.32 +	(No client certificate requested)
    2.33 +	by vmmaildmz1.informatik.tu-muenchen.de (Postfix) with ESMTPS id CDD481C2D9B
    2.34 +	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:27:50 +0200 (CEST)
    2.35 +X-RZG-FWD-BY: pep.test.recip@kgrothoff.org
    2.36 +Received: from mailin.rzone.de ([unix socket])
    2.37 +	by mailin.rzone.de (RZmta 40.9) with LMTPA;
    2.38 +	Mon, 12 Jun 2017 15:27:46 +0200 (CEST)
    2.39 +Authentication-Results: strato.com 1;
    2.40 +	spf=none
    2.41 +		smtp.mailfrom="pep.test.alice@pep-project.org";
    2.42 +	dkim=none;
    2.43 +	domainkeys=none;
    2.44 +	dkim-adsp=none
    2.45 +		header.from="pep.test.alice@pep-project.org"
    2.46 +X-Strato-MessageType: email
    2.47 +X-RZG-CLASS-ID: mi00
    2.48 +Received-SPF: none
    2.49 +	client-ip=131.159.0.8;
    2.50 +	helo="mail-out1.informatik.tu-muenchen.de";
    2.51 +	envelope-from="pep.test.alice@pep-project.org";
    2.52 +	receiver=smtpin.rzone.de;
    2.53 +	identity=mailfrom;
    2.54 +Received: from mail-out1.informatik.tu-muenchen.de ([131.159.0.8])
    2.55 +	by smtpin.rzone.de (RZmta 40.9 OK)
    2.56 +	with ESMTPS id w03564t5CDRkYmx
    2.57 +	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (curve secp521r1 with 521 ECDH bits, eq. 15360 bits RSA))
    2.58 +	(Client did not present a certificate)
    2.59 +	for <pep.test.recip@kgrothoff.org>;
    2.60 +	Mon, 12 Jun 2017 15:27:46 +0200 (CEST)
    2.61 +Received: from [192.168.178.22] (ip5f584089.dynamic.kabel-deutschland.de [95.88.64.137])
    2.62 +	by services.sec.in.tum.de (Postfix) with ESMTPSA id A8EC11013AE47
    2.63 +	for <pep.test.recip@kgrothoff.org>; Mon, 12 Jun 2017 15:27:40 +0200 (CEST)
    2.64 +To: pep.test.recip@kgrothoff.org
    2.65 +Reply-To: krista@pep-project.org
    2.66 +From: pEp Test Alice <pep.test.alice@pep-project.org>
    2.67 +Subject: =?utf-8?Q?p=E2=89=A1p?=
    2.68 +Organization: pEp
    2.69 +Message-ID: <5d37b6c2-9e5e-7217-c80e-1359da8faa5c@pep-project.org>
    2.70 +Date: Mon, 12 Jun 2017 15:27:40 +0200
    2.71 +User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101
    2.72 + Thunderbird/45.8.0
    2.73 +MIME-Version: 1.0
    2.74 +Content-Type: multipart/encrypted;
    2.75 + protocol="application/pgp-encrypted";
    2.76 + boundary="7vTKNA25GePB6VqgrM1km3gCfpFonmKj3"
    2.77 +
    2.78 +This is an OpenPGP/MIME encrypted message (RFC 4880 and 3156)
    2.79 +--7vTKNA25GePB6VqgrM1km3gCfpFonmKj3
    2.80 +Content-Type: application/pgp-encrypted
    2.81 +Content-Description: PGP/MIME version identification
    2.82 +
    2.83 +Version: 1
    2.84 +
    2.85 +--7vTKNA25GePB6VqgrM1km3gCfpFonmKj3
    2.86 +Content-Type: application/octet-stream; name="encrypted.asc"
    2.87 +Content-Description: OpenPGP encrypted message
    2.88 +Content-Disposition: inline; filename="encrypted.asc"
    2.89 +
    2.90 +-----BEGIN PGP MESSAGE-----
    2.91 +
    2.92 +hQEMA4FHqvEumyRHAQf6AkV51E1/uffFSc++oIPAoNCJU71NseNgW3s3XIQ/7TIQ
    2.93 +pDi6a6ksNdN+cJyMhfM7HnO06LjrUDYtgYPkZBHcTDZMWivW/7+5g8z60V3biIpw
    2.94 +mdUqhb+mZb4A0akMk+Ix8paoR8D7y4jmeLHwj/vbQ1J/E64rob9XPDWrLOW63chR
    2.95 +pg+XAo3VbkDKCms8PSuKehzMoTpZUcEVP47TF1OxuKZE0k7yJQ354RlPGxsl/6zM
    2.96 +O1+cJ7XdclkZj9gdeJAWzqCx6kTmDy2DA4e80BwMXXJnQtFIp4B55gTHvfbmxBRL
    2.97 +V8KDHOlvY/YSFV9sikjyaXbiweuqgiycsLb+qRziG4UBDANaAgXZcwg/TQEIAMg9
    2.98 +CVCJiYqS+ke1Zw0VNbb4BccrSBWL5iiQsPPUFOBld8jCFCGFZVBiik7O/XzRGWQh
    2.99 +qsYb2BNb0267viJS+IhTvihFybvR/l/gkzRLRfznFxbsRKgYAI6ipPr4wdAxvRkE
   2.100 +k0LvL3ckRgKtc2UORvfmhKRXu8Hj8dkYD0Asewnx7+p+s685MpyJ3zhhyifPzqKw
   2.101 +VH/6D7g26t3DjjQkvTvkiIMEvxT3beQN6QspdRtoDhHqAH0JhrZjEZyenneXE/AB
   2.102 +2CrnIfEU6V7S1EWP4Ond647K/F89ZG9LfTBpfmYuTXMKM39hmQaNcIsr8dr+mBif
   2.103 +nO2xRkyTMHAtyEk1dQnS6QFdLynwNLfsOvecztOBNBE/j6gH3dqKgZMg2e7ojK/Z
   2.104 +rNohpLMfZqzN37sfopm8htzK0Wg/l0CcgR8S4cUln06UzUm89GF9pokHYTnXYNYb
   2.105 +S2BMMVQ7gTpGDBfBFHVCK8xtCSFJJmxoxIzC9Ojl4JYfqJycip1QdWCWhXJDo0m9
   2.106 +4S+57m1UHAeyfT8v4ggEffVg2fgHF5VF58S3FC3HCtASAqljtmYVlHQSK0hSY00U
   2.107 +t9y/McqDXYuXXtT5O056q2VoYkWjTpvbvuk/TI3IU2np9owZwgHJwiA8I+BMQitd
   2.108 +LWRmSmoRBBHNsaORuEUZYMugZzcTD81C2v5PNDvawB7mcSFqrtI6K30TnZ5iu8DI
   2.109 +qJ9BdP7Htphqk9nusLT7XTYve/6/NC6rmnnEpQhrdXdzPDsyGe0H/s24xU3wFKBY
   2.110 +JdKyfKSJUkXjmCrqJrkq0wAHCaZYK5hLiobhYLGfxxjPpx2UFk33lYXL5R659Gjh
   2.111 +oIgZW5NWOxNRE1GRd2js+WaZy2dwvxeqNGEdEHgi6UN6JRf588lSYjbz+8u2TW21
   2.112 +whH5x5VfDpIqimPdknQwM/w8N2fYEhI4bWv0rp+D0m27hZaVXjInShEQq6YsjAs5
   2.113 +aP19C7WT+VK+FuvOEQ3nxPl+/fGOF5EoceuscxjCxkVu8Ijq4+xdu7Hl6ycJUu40
   2.114 +wGTKOy/rGg0TZ232SyUE83VyxAPtU0fTLvbZAcQaT+YTHqk/c4hdzPW/Ho8L1aZ0
   2.115 +Ax9PpkUHmm7+JS3sbfxyLMQ9Zz2GcE+SCIEyGuFTqO/ESmJUXTNQjDRmLuleOhZt
   2.116 +VmOezek2BEcvWZd5/0w6pd6UBjzXdSdTJA38nBr8Ao217xDMZiLoxg6xZbsG12et
   2.117 +mqWG9m/5dQRECrcN0lRdQqFovSkw7/Az7jOIm0v4ey+i6wmEblg3M0vm7Ky19l7Z
   2.118 +lm0+nC5XwR56n4VPtyRbGgLkI8w//NChYZJJOVpyVpfP57pKPhvhLNcaOk2d5gNU
   2.119 +KDg2bKXilzkMflVqw5eYN2EKCMlLx+hW5U1oSJJlQKqKXQ0qglUfSEzPmBt9Y0g1
   2.120 +DN+blh+m
   2.121 +=UZkH
   2.122 +-----END PGP MESSAGE-----
   2.123 +
   2.124 +--7vTKNA25GePB6VqgrM1km3gCfpFonmKj3--
     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/test/test_mails/p3p_subject_normal_1b.eml	Wed Sep 13 01:59:28 2017 +0200
     3.3 @@ -0,0 +1,114 @@
     3.4 +Return-Path: <SRS0=ne/EAk=AN=pep-project.org=pep.test.alice@srs.smtpin.rzone.de>
     3.5 +X-Original-To: krista@gnunet.org
     3.6 +Delivered-To: krista@gnunet.org
     3.7 +Received: from vmmailrelay1.informatik.tu-muenchen.de (mailrelay1.informatik.tu-muenchen.de [131.159.254.14])
     3.8 +	by sam.net.in.tum.de (Postfix) with ESMTP id 524FF1C00BC
     3.9 +	for <krista@gnunet.org>; Tue, 12 Sep 2017 17:06:56 +0200 (CEST)
    3.10 +Received: by vmmailrelay1.informatik.tu-muenchen.de (Postfix, from userid 109)
    3.11 +	id 68C381C0503; Tue, 12 Sep 2017 17:06:56 +0200 (CEST)
    3.12 +Received: from vmmailrelay1.informatik.tu-muenchen.de (localhost [127.0.0.1])
    3.13 +	by vmmailrelay1.informatik.tu-muenchen.de (Postfix) with ESMTP id 45A4A1C04FD
    3.14 +	for <krista@gnunet.org>; Tue, 12 Sep 2017 17:06:56 +0200 (CEST)
    3.15 +Received: from vmmaildmz1.informatik.tu-muenchen.de (vmmaildmz1.informatik.tu-muenchen.de [131.159.0.87])
    3.16 +	by vmmailrelay1.informatik.tu-muenchen.de (Postfix) with ESMTP id 3162A1C04FC
    3.17 +	for <krista@gnunet.org>; Tue, 12 Sep 2017 17:06:56 +0200 (CEST)
    3.18 +Received: by vmmaildmz1.informatik.tu-muenchen.de (Postfix, from userid 109)
    3.19 +	id 2FBF61C2D66; Tue, 12 Sep 2017 17:06:56 +0200 (CEST)
    3.20 +X-Spam-Checker-Version: SpamAssassin 3.4.0-tuminfo_1 (2014-02-07) on
    3.21 +	vmmaildmz1.informatik.tu-muenchen.de
    3.22 +X-Spam-Level: 
    3.23 +X-Spam-Status: No, score=-1.7 required=7.0 tests=AWL,BAYES_00,BODY_EMPTY,
    3.24 +	ENCRYPTED_MESSAGE,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,
    3.25 +	SPF_HELO_PASS,TVD_RCVD_SPACE_BRACKET,UNPARSEABLE_RELAY autolearn=no
    3.26 +	autolearn_force=no version=3.4.0-tuminfo_1
    3.27 +Received: from vmmaildmz1.informatik.tu-muenchen.de (localhost [127.0.0.1])
    3.28 +	by vmmaildmz1.informatik.tu-muenchen.de (Postfix) with ESMTP id 2B7FA1C2D5F
    3.29 +	for <krista@gnunet.org>; Tue, 12 Sep 2017 17:06:52 +0200 (CEST)
    3.30 +Received: from mi4-p00-ob.smtp.rzone.de (mi4-p00-ob.smtp.rzone.de [81.169.146.146])
    3.31 +	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
    3.32 +	(No client certificate requested)
    3.33 +	by vmmaildmz1.informatik.tu-muenchen.de (Postfix) with ESMTPS id 1AEE31C2D48
    3.34 +	for <krista@gnunet.org>; Tue, 12 Sep 2017 17:06:52 +0200 (CEST)
    3.35 +X-RZG-FWD-BY: pep.test.recip@kgrothoff.org
    3.36 +Received: from mailin.rzone.de ([unix socket])
    3.37 +	by mailin.rzone.de (RZmta 41.4) with LMTPA;
    3.38 +	Tue, 12 Sep 2017 17:06:42 +0200 (CEST)
    3.39 +Authentication-Results: strato.com 1;
    3.40 +	spf=none
    3.41 +		smtp.mailfrom="pep.test.alice@pep-project.org";
    3.42 +	dkim=none;
    3.43 +	domainkeys=none;
    3.44 +	dkim-adsp=none
    3.45 +		header.from="pep.test.alice@pep-project.org"
    3.46 +X-Strato-MessageType: email
    3.47 +X-RZG-CLASS-ID: mi00
    3.48 +Received-SPF: none
    3.49 +	client-ip=131.159.0.8;
    3.50 +	helo="mail-out1.informatik.tu-muenchen.de";
    3.51 +	envelope-from="pep.test.alice@pep-project.org";
    3.52 +	receiver=smtpin.rzone.de;
    3.53 +	identity=mailfrom;
    3.54 +Received: from mail-out1.informatik.tu-muenchen.de ([131.159.0.8])
    3.55 +	by smtpin.rzone.de (RZmta 41.4 OK)
    3.56 +	with ESMTPS id f0bb72t8CF6f5Wa
    3.57 +	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (curve secp521r1 with 521 ECDH bits, eq. 15360 bits RSA))
    3.58 +	(Client did not present a certificate)
    3.59 +	for <pep.test.recip@kgrothoff.org>;
    3.60 +	Tue, 12 Sep 2017 17:06:41 +0200 (CEST)
    3.61 +Received: from [192.168.178.22] (ip5f584089.dynamic.kabel-deutschland.de [95.88.64.137])
    3.62 +	by services.sec.in.tum.de (Postfix) with ESMTPSA id B7EF810C74F82
    3.63 +	for <pep.test.recip@kgrothoff.org>; Tue, 12 Sep 2017 17:06:33 +0200 (CEST)
    3.64 +Reply-To: krista@pep-project.org
    3.65 +To: pep.test.recip@kgrothoff.org
    3.66 +From: pEp Test Alice <pep.test.alice@pep-project.org>
    3.67 +Subject: =?UTF-8?B?cOKJoXA=?=
    3.68 +Organization: pEp
    3.69 +Message-ID: <75dd44fb-5c4a-8678-c51b-836fd1f32af1@pep-project.org>
    3.70 +Date: Tue, 12 Sep 2017 17:06:32 +0200
    3.71 +User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101
    3.72 + Thunderbird/45.8.0
    3.73 +MIME-Version: 1.0
    3.74 +Content-Type: multipart/encrypted;
    3.75 + protocol="application/pgp-encrypted";
    3.76 + boundary="IS7QjataASN5CVBdEDLOfqfNX2N4tkoTu"
    3.77 +
    3.78 +This is an OpenPGP/MIME encrypted message (RFC 4880 and 3156)
    3.79 +--IS7QjataASN5CVBdEDLOfqfNX2N4tkoTu
    3.80 +Content-Type: application/pgp-encrypted
    3.81 +Content-Description: PGP/MIME version identification
    3.82 +
    3.83 +Version: 1
    3.84 +
    3.85 +--IS7QjataASN5CVBdEDLOfqfNX2N4tkoTu
    3.86 +Content-Type: application/octet-stream; name="encrypted.asc"
    3.87 +Content-Description: OpenPGP encrypted message
    3.88 +Content-Disposition: inline; filename="encrypted.asc"
    3.89 +
    3.90 +-----BEGIN PGP MESSAGE-----
    3.91 +
    3.92 +hQEMA4FHqvEumyRHAQf8D4hbDivbAhpgIzOrD42OU5UEPax5wdpSub5vZDbGF++U
    3.93 +pt/MLGoTA5CTLCoJLV5iZiMFjy2LbbJPQaotZixHb619QzVOa3DVwWV8XuHTxmmt
    3.94 +EedLl+Ryq/EupLcjrqajUuxV6wCqS2sBfhHV+ykjZkQfGi+R4cGYRtrRERrfzpGY
    3.95 +QM4Nh6Bp9kLMSYVnIVdhpSUiky1VCxQl5MUqrlgkRY3ZDEdF4r53BNdiFx994I8K
    3.96 +OF8DqvWO/Zqx0GAuljKH7PZOU7CQVn/Xuen04L4olZgCeFxNdLBJv8wNNDX4cyUR
    3.97 +WnRU061CKTER27xVCi9AUlDnq3SghbRJvN3PUJSFkYUBDANaAgXZcwg/TQEH/3kn
    3.98 ++qxj3GuvyYOcg74oBcN8RN+E12HYopVEG1CvjqkpekYj3RVcs3Y9MFINTOZpDW4w
    3.99 +eHpNM7/bz3kzp48saoi3dB8i82FpvxG/XoNyphfPkFtz7tSECCMAKUWCeoi5VyS3
   3.100 +N3wwqa6LwpBpn5wkWUwWVQxgby1eJgYe0ZvBK9Nkv/FhTlD+hm3cn+6LRLC1dBp1
   3.101 +WpXP03YwrspCocfpWHFG+/4uHtLOE0GREqjPwGtNRdf59T2jwpyJykUrsARdkyJs
   3.102 +SqCce8739VjbxK3Ma4LGNyytp8g2z/G7C4JbZ/evmCKI7cxlhpLbSLZRzvIoNt/P
   3.103 +71gfkrzXUaUyHrkaheXSwSsB5p+Bu/msz4ByaAtEPJsQoGL6BBOjyKVm7K++xB90
   3.104 +yEQcJKxIMNeNGH5uvuZF2jkaF5HEHzK0V4+tS05pwS2ZFjyVUlowycAtwqQp3sfW
   3.105 +3zeUUUUW3tykR+uF2lBWhyEF2P5wTTV8eZZ53hy0vcUUwBfNoLpUZPvqoNZowEOf
   3.106 +Vw594AxRav4bokdJ1loWTEh1HtZAZuoMAAhdbQUDGkdlBogn98p+ClSCOSMHAlcl
   3.107 +Ip1AYAl3Os5UK2lr2p3bUBIgrqgbbY17MWfOva+LJ7TvLf6p1VyXKv3KeWoaCxy4
   3.108 +tlKb/D86Sjwo59oRayJvcOKhovd4hBechRxak6twovbGvCs5zE0jGapkY0QBYYky
   3.109 +eom5pYn2pGQpOnUrY7G+9pAjjqBywwLe1/bPh1KvTd38t86rfryLTOt2/gCJqHfN
   3.110 +f/kQCSyhR7HGz5LE0tUIq6hag8sClzh1ELht2Avpjt3YuKEVm/IVdfcGk5NkZqIf
   3.111 +5ghwOnC/1KZTEXWWvqywQKWgFkkRp7j9bgKweRvGSqawG0LtDHGgHmn3DjxlMOR8
   3.112 +hR+IBQg2y536xoSIrAQS3Qw8UcY6clnEx2Ga809wX32I7fiVsgx9rXm9+CBFvLQj
   3.113 +1IKzn2lRvqbquAsYClEmxzWXFETqIoISWPIEzw==
   3.114 +=5ntC
   3.115 +-----END PGP MESSAGE-----
   3.116 +
   3.117 +--IS7QjataASN5CVBdEDLOfqfNX2N4tkoTu--
     4.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.2 +++ b/test/test_mails/p3p_subject_normal_signed_2b.eml	Wed Sep 13 01:59:28 2017 +0200
     4.3 @@ -0,0 +1,119 @@
     4.4 +Return-Path: <pep.test.alice@pep-project.org>
     4.5 +X-Original-To: krista@gnunet.org
     4.6 +Delivered-To: krista@gnunet.org
     4.7 +Received: from vmmailrelay1.informatik.tu-muenchen.de (mailrelay1.informatik.tu-muenchen.de [131.159.254.14])
     4.8 +	by sam.net.in.tum.de (Postfix) with ESMTP id 768301C00BC
     4.9 +	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:26:24 +0200 (CEST)
    4.10 +Received: by vmmailrelay1.informatik.tu-muenchen.de (Postfix, from userid 109)
    4.11 +	id 4DD7D1C0383; Mon, 12 Jun 2017 15:26:25 +0200 (CEST)
    4.12 +Received: from vmmailrelay1.informatik.tu-muenchen.de (localhost [127.0.0.1])
    4.13 +	by vmmailrelay1.informatik.tu-muenchen.de (Postfix) with ESMTP id 2AD621C037C
    4.14 +	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:26:25 +0200 (CEST)
    4.15 +Received: from vmmaildmz2.informatik.tu-muenchen.de (vmmaildmz2.informatik.tu-muenchen.de [131.159.0.88])
    4.16 +	by vmmailrelay1.informatik.tu-muenchen.de (Postfix) with ESMTP id 15DA11C037A
    4.17 +	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:26:25 +0200 (CEST)
    4.18 +Received: by vmmaildmz2.informatik.tu-muenchen.de (Postfix, from userid 109)
    4.19 +	id 13FCC1C2AE2; Mon, 12 Jun 2017 15:26:25 +0200 (CEST)
    4.20 +X-Spam-Checker-Version: SpamAssassin 3.4.0-tuminfo_1 (2014-02-07) on
    4.21 +	vmmaildmz2.informatik.tu-muenchen.de
    4.22 +X-Spam-Level: 
    4.23 +X-Spam-Status: No, score=-2.6 required=7.0 tests=AWL,BAYES_00,
    4.24 +	ENCRYPTED_MESSAGE,RCVD_IN_DNSWL_LOW,TVD_RCVD_SPACE_BRACKET,UNPARSEABLE_RELAY
    4.25 +	autolearn=no autolearn_force=no version=3.4.0-tuminfo_1
    4.26 +Received: from vmmaildmz2.informatik.tu-muenchen.de (localhost [127.0.0.1])
    4.27 +	by vmmaildmz2.informatik.tu-muenchen.de (Postfix) with ESMTP id 953971C2AE1
    4.28 +	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:26:23 +0200 (CEST)
    4.29 +Received: from mi4-p00-ob.smtp.rzone.de (mi4-p00-ob.smtp.rzone.de [81.169.146.144])
    4.30 +	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
    4.31 +	(No client certificate requested)
    4.32 +	by vmmaildmz2.informatik.tu-muenchen.de (Postfix) with ESMTPS id 8540A1C2AE0
    4.33 +	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:26:23 +0200 (CEST)
    4.34 +X-RZG-FWD-BY: pep.test.recip@kgrothoff.org
    4.35 +Received: from mailin.rzone.de ([unix socket])
    4.36 +	by mailin.rzone.de (RZmta 40.9) with LMTPA;
    4.37 +	Mon, 12 Jun 2017 15:26:02 +0200 (CEST)
    4.38 +Authentication-Results: strato.com 1;
    4.39 +	spf=none
    4.40 +		smtp.mailfrom="pep.test.alice@pep-project.org";
    4.41 +	dkim=none;
    4.42 +	domainkeys=none;
    4.43 +	dkim-adsp=none
    4.44 +		header.from="pep.test.alice@pep-project.org"
    4.45 +X-Strato-MessageType: email
    4.46 +X-RZG-CLASS-ID: mi00
    4.47 +Received-SPF: none
    4.48 +	client-ip=131.159.0.8;
    4.49 +	helo="mail-out1.informatik.tu-muenchen.de";
    4.50 +	envelope-from="pep.test.alice@pep-project.org";
    4.51 +	receiver=smtpin.rzone.de;
    4.52 +	identity=mailfrom;
    4.53 +Received: from mail-out1.informatik.tu-muenchen.de ([131.159.0.8])
    4.54 +	by smtpin.rzone.de (RZmta 40.9 OK)
    4.55 +	with ESMTPS id v06d9ft5CDQ2Xj1
    4.56 +	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (curve secp521r1 with 521 ECDH bits, eq. 15360 bits RSA))
    4.57 +	(Client did not present a certificate)
    4.58 +	for <pep.test.recip@kgrothoff.org>;
    4.59 +	Mon, 12 Jun 2017 15:26:02 +0200 (CEST)
    4.60 +Received: from [192.168.178.22] (ip5f584089.dynamic.kabel-deutschland.de [95.88.64.137])
    4.61 +	by services.sec.in.tum.de (Postfix) with ESMTPSA id BEAA21013AE47
    4.62 +	for <pep.test.recip@kgrothoff.org>; Mon, 12 Jun 2017 15:25:56 +0200 (CEST)
    4.63 +To: pep.test.recip@kgrothoff.org
    4.64 +Reply-To: krista@pep-project.org
    4.65 +From: pEp Test Alice <pep.test.alice@pep-project.org>
    4.66 +Subject: =?UTF-8?B?cOKJoXA=?=
    4.67 +Organization: pEp
    4.68 +Message-ID: <988e71f4-df80-906e-8bbb-68d48069d4ac@pep-project.org>
    4.69 +Date: Mon, 12 Jun 2017 15:25:56 +0200
    4.70 +User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101
    4.71 + Thunderbird/45.8.0
    4.72 +MIME-Version: 1.0
    4.73 +Content-Type: multipart/encrypted;
    4.74 + protocol="application/pgp-encrypted";
    4.75 + boundary="hcW81WNiFhQC1SNIcls8J07V1b1sXtfCA"
    4.76 +
    4.77 +This is an OpenPGP/MIME encrypted message (RFC 4880 and 3156)
    4.78 +--hcW81WNiFhQC1SNIcls8J07V1b1sXtfCA
    4.79 +Content-Type: application/pgp-encrypted
    4.80 +Content-Description: PGP/MIME version identification
    4.81 +
    4.82 +Version: 1
    4.83 +
    4.84 +--hcW81WNiFhQC1SNIcls8J07V1b1sXtfCA
    4.85 +Content-Type: application/octet-stream; name="encrypted.asc"
    4.86 +Content-Description: OpenPGP encrypted message
    4.87 +Content-Disposition: inline; filename="encrypted.asc"
    4.88 +
    4.89 +-----BEGIN PGP MESSAGE-----
    4.90 +
    4.91 +hQEMA4FHqvEumyRHAQf+OCG4FM0n6pVREVP2kAUzJWy6NAgRYs4cj7pr5hDoUqZY
    4.92 +lBIfVPqNM2rG2xaSpNLfe1iY5mySKL42M+s/QM0cvfnOlS6p3U58EamslElZ9UhD
    4.93 +hBUrX/1NJwdoKyR07Wq3A1UFFYQMYsszPwoC82SCFOhYjEmdZ8/nppViUk3aAUvq
    4.94 +do80ZzvNnlJqgwPEUmMEy9p19XJxQQwG75yHmUsoTvgi9ELvJpEzAjeYFABNzuNE
    4.95 +lh5whuMqmVbEafAYtopB+dwxQxSUdQUHntLU2MrbH8QXGtP98ZaDTHg/Zj24zkUG
    4.96 +Ur/5DZJgzDMrAttorpp/2/NMmakIezy7JaoGQtyYRYUBDANaAgXZcwg/TQEIALLR
    4.97 +7OlIlUYelrktOnrkTy8BrrEuUj95uBM5TkkvWIfR2b3ylC5iWwa/RlIU4RC0VH3j
    4.98 +epwLQNJJKFi/qKwxReE+RMKZW00loUuYnVWeaj58ExTNsdpFJDut35AIp8FNzTmy
    4.99 +C4xv5VVZZnolRd6CW0GUuxEe1zXq1MiyuGHu5AwFgWl728KaRXF2tEVyrQt/okXx
   4.100 +kF7yWkO4oo25VZWCrboUc1FND/7dbfP/PtLKIj05l+xwNaIEt1gb1IM7SxjN+2Tx
   4.101 +Ayp/w1npFhugBkSV3JaIk9dfHpMlLP5URZn30dXElK0an7aB8IwZWwdObo4zlevI
   4.102 +K4nN+UU1Z/kN1guxYDbS6QGOo2Y8829kaOXkBC3HDQEkef631jj1FuVB6VJvhb0u
   4.103 +5EKaxyw8aVxodRQaK9CcKCqwDlnyhHqd4fdMjPk9zTV9xrnqSdC5yKoAhBJ9sFef
   4.104 +Qv5qjYiBUhB+7uGMvRifvO+bT+8q44IS7z/bdXJFjbImgtx57yKvujyvrZlDe6q3
   4.105 +1nzS1jqMQ8NCDP/CKs5WUlaH9LIQ/NWF10EulTjaZ0QZ6iNU0MTqmhs4ZJIsPmBo
   4.106 +g6Qz9x8imV37cC9lHhw/vp99Dal9YulTxdYZnWSfTh289bHqaMEXGYJUsDh3IEYx
   4.107 +UP1bzza+N2dqeiysDmeTNhbZvwk54VmaKMrj/ut/3WIrsulBY7YxE/azle78Ydab
   4.108 +/tKu5YUbVydnVJ6y1s4yASjaOG7ycMIaXggWKUIfWh5Y7BLFHYbcMMltPrspftW7
   4.109 +tjtbL1SUHw0NTfCkBqRv4GpvIAXTCmlxvLw//ee1JZ0nuLnQZBF2GQ0wJVsbunT9
   4.110 +dUschdnIWLfWlueldt+5wOkB6L4quoZ7LWefMQu/b3bg/GWoBtuC3fJDnCsbJO07
   4.111 +nJxZTPxsI3iFUGGtXkg4jGC+yDMlQu3a7LwEkKzx9LT/S1OUndpaBQr6YjyrnET6
   4.112 +w1Hz6jLb5t/2fzrBwkKw1TCu4+pkevIGaGxgQY6TB15jcmWRkUF3sakTrH0UOCSq
   4.113 +wEzFoPF4+WjtXNk/wHw8zkrW7QCe+wbjLjwcUUK/ulKT9/II/k/aUwTt+GzWCGVq
   4.114 +KWq7VLtwa8lrJ74R+XISks9/Hv/nJ8Ay1DfpcQU2HQSnQpSrXupXIA+VoHU/b8xD
   4.115 +YcgqaRKsGYHUANjNs4PpplXlEHp5bpF/ZOpfVAJNnGQ96Cj182DLQgiB0j7Ishjv
   4.116 +XoNDVL45KKW0uWjimZbCauWrD6tjZfBmydymezbPLCB9R+tE68TA/XmpXzInXWML
   4.117 +YDK7tS8TYEkodzSkfDeB7BtXBRIxH4vm2M0E0OdJuLxjrOYeIH4xToUslS9pdog0
   4.118 +z3aqPQbXF4hFc8Fso83dmoc26mQd3H0LrP7yF4HR
   4.119 +=gLhG
   4.120 +-----END PGP MESSAGE-----
   4.121 +
   4.122 +--hcW81WNiFhQC1SNIcls8J07V1b1sXtfCA--
     5.1 --- a/test/test_mails/pEp_encrypted_subject_IS_pEp.eml	Tue Sep 12 19:23:56 2017 +0200
     5.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     5.3 @@ -1,121 +0,0 @@
     5.4 -Return-Path: <pep.test.alice@pep-project.org>
     5.5 -X-Original-To: krista@gnunet.org
     5.6 -Delivered-To: krista@gnunet.org
     5.7 -Received: from vmmailrelay1.informatik.tu-muenchen.de (mailrelay1.informatik.tu-muenchen.de [131.159.254.14])
     5.8 -	by sam.net.in.tum.de (Postfix) with ESMTP id BE55A1C00BC
     5.9 -	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:27:51 +0200 (CEST)
    5.10 -Received: by vmmailrelay1.informatik.tu-muenchen.de (Postfix, from userid 109)
    5.11 -	id 94D2F1C0394; Mon, 12 Jun 2017 15:27:52 +0200 (CEST)
    5.12 -Received: from vmmailrelay1.informatik.tu-muenchen.de (localhost [127.0.0.1])
    5.13 -	by vmmailrelay1.informatik.tu-muenchen.de (Postfix) with ESMTP id 6D2E21C037A
    5.14 -	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:27:52 +0200 (CEST)
    5.15 -Received: from vmmaildmz1.informatik.tu-muenchen.de (vmmaildmz1.informatik.tu-muenchen.de [131.159.0.87])
    5.16 -	by vmmailrelay1.informatik.tu-muenchen.de (Postfix) with ESMTP id 5876E1C0383
    5.17 -	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:27:52 +0200 (CEST)
    5.18 -Received: by vmmaildmz1.informatik.tu-muenchen.de (Postfix, from userid 109)
    5.19 -	id 56F1F1C2D9D; Mon, 12 Jun 2017 15:27:52 +0200 (CEST)
    5.20 -X-Spam-Checker-Version: SpamAssassin 3.4.0-tuminfo_1 (2014-02-07) on
    5.21 -	vmmaildmz1.informatik.tu-muenchen.de
    5.22 -X-Spam-Level: 
    5.23 -X-Spam-Status: No, score=-3.4 required=7.0 tests=AWL,BAYES_00,
    5.24 -	ENCRYPTED_MESSAGE,RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,
    5.25 -	TVD_RCVD_SPACE_BRACKET,UNPARSEABLE_RELAY autolearn=no autolearn_force=no
    5.26 -	version=3.4.0-tuminfo_1
    5.27 -Received: from vmmaildmz1.informatik.tu-muenchen.de (localhost [127.0.0.1])
    5.28 -	by vmmaildmz1.informatik.tu-muenchen.de (Postfix) with ESMTP id DE3C31C2D9E
    5.29 -	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:27:50 +0200 (CEST)
    5.30 -Received: from mi4-p00-ob.smtp.rzone.de (mi4-p00-ob.smtp.rzone.de [81.169.146.149])
    5.31 -	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
    5.32 -	(No client certificate requested)
    5.33 -	by vmmaildmz1.informatik.tu-muenchen.de (Postfix) with ESMTPS id CDD481C2D9B
    5.34 -	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:27:50 +0200 (CEST)
    5.35 -X-RZG-FWD-BY: pep.test.recip@kgrothoff.org
    5.36 -Received: from mailin.rzone.de ([unix socket])
    5.37 -	by mailin.rzone.de (RZmta 40.9) with LMTPA;
    5.38 -	Mon, 12 Jun 2017 15:27:46 +0200 (CEST)
    5.39 -Authentication-Results: strato.com 1;
    5.40 -	spf=none
    5.41 -		smtp.mailfrom="pep.test.alice@pep-project.org";
    5.42 -	dkim=none;
    5.43 -	domainkeys=none;
    5.44 -	dkim-adsp=none
    5.45 -		header.from="pep.test.alice@pep-project.org"
    5.46 -X-Strato-MessageType: email
    5.47 -X-RZG-CLASS-ID: mi00
    5.48 -Received-SPF: none
    5.49 -	client-ip=131.159.0.8;
    5.50 -	helo="mail-out1.informatik.tu-muenchen.de";
    5.51 -	envelope-from="pep.test.alice@pep-project.org";
    5.52 -	receiver=smtpin.rzone.de;
    5.53 -	identity=mailfrom;
    5.54 -Received: from mail-out1.informatik.tu-muenchen.de ([131.159.0.8])
    5.55 -	by smtpin.rzone.de (RZmta 40.9 OK)
    5.56 -	with ESMTPS id w03564t5CDRkYmx
    5.57 -	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (curve secp521r1 with 521 ECDH bits, eq. 15360 bits RSA))
    5.58 -	(Client did not present a certificate)
    5.59 -	for <pep.test.recip@kgrothoff.org>;
    5.60 -	Mon, 12 Jun 2017 15:27:46 +0200 (CEST)
    5.61 -Received: from [192.168.178.22] (ip5f584089.dynamic.kabel-deutschland.de [95.88.64.137])
    5.62 -	by services.sec.in.tum.de (Postfix) with ESMTPSA id A8EC11013AE47
    5.63 -	for <pep.test.recip@kgrothoff.org>; Mon, 12 Jun 2017 15:27:40 +0200 (CEST)
    5.64 -To: pep.test.recip@kgrothoff.org
    5.65 -Reply-To: krista@pep-project.org
    5.66 -From: pEp Test Alice <pep.test.alice@pep-project.org>
    5.67 -Subject: pEp
    5.68 -Organization: pEp
    5.69 -Message-ID: <5d37b6c2-9e5e-7217-c80e-1359da8faa5c@pep-project.org>
    5.70 -Date: Mon, 12 Jun 2017 15:27:40 +0200
    5.71 -User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101
    5.72 - Thunderbird/45.8.0
    5.73 -MIME-Version: 1.0
    5.74 -Content-Type: multipart/encrypted;
    5.75 - protocol="application/pgp-encrypted";
    5.76 - boundary="7vTKNA25GePB6VqgrM1km3gCfpFonmKj3"
    5.77 -
    5.78 -This is an OpenPGP/MIME encrypted message (RFC 4880 and 3156)
    5.79 ---7vTKNA25GePB6VqgrM1km3gCfpFonmKj3
    5.80 -Content-Type: application/pgp-encrypted
    5.81 -Content-Description: PGP/MIME version identification
    5.82 -
    5.83 -Version: 1
    5.84 -
    5.85 ---7vTKNA25GePB6VqgrM1km3gCfpFonmKj3
    5.86 -Content-Type: application/octet-stream; name="encrypted.asc"
    5.87 -Content-Description: OpenPGP encrypted message
    5.88 -Content-Disposition: inline; filename="encrypted.asc"
    5.89 -
    5.90 ------BEGIN PGP MESSAGE-----
    5.91 -
    5.92 -hQEMA4FHqvEumyRHAQf6AkV51E1/uffFSc++oIPAoNCJU71NseNgW3s3XIQ/7TIQ
    5.93 -pDi6a6ksNdN+cJyMhfM7HnO06LjrUDYtgYPkZBHcTDZMWivW/7+5g8z60V3biIpw
    5.94 -mdUqhb+mZb4A0akMk+Ix8paoR8D7y4jmeLHwj/vbQ1J/E64rob9XPDWrLOW63chR
    5.95 -pg+XAo3VbkDKCms8PSuKehzMoTpZUcEVP47TF1OxuKZE0k7yJQ354RlPGxsl/6zM
    5.96 -O1+cJ7XdclkZj9gdeJAWzqCx6kTmDy2DA4e80BwMXXJnQtFIp4B55gTHvfbmxBRL
    5.97 -V8KDHOlvY/YSFV9sikjyaXbiweuqgiycsLb+qRziG4UBDANaAgXZcwg/TQEIAMg9
    5.98 -CVCJiYqS+ke1Zw0VNbb4BccrSBWL5iiQsPPUFOBld8jCFCGFZVBiik7O/XzRGWQh
    5.99 -qsYb2BNb0267viJS+IhTvihFybvR/l/gkzRLRfznFxbsRKgYAI6ipPr4wdAxvRkE
   5.100 -k0LvL3ckRgKtc2UORvfmhKRXu8Hj8dkYD0Asewnx7+p+s685MpyJ3zhhyifPzqKw
   5.101 -VH/6D7g26t3DjjQkvTvkiIMEvxT3beQN6QspdRtoDhHqAH0JhrZjEZyenneXE/AB
   5.102 -2CrnIfEU6V7S1EWP4Ond647K/F89ZG9LfTBpfmYuTXMKM39hmQaNcIsr8dr+mBif
   5.103 -nO2xRkyTMHAtyEk1dQnS6QFdLynwNLfsOvecztOBNBE/j6gH3dqKgZMg2e7ojK/Z
   5.104 -rNohpLMfZqzN37sfopm8htzK0Wg/l0CcgR8S4cUln06UzUm89GF9pokHYTnXYNYb
   5.105 -S2BMMVQ7gTpGDBfBFHVCK8xtCSFJJmxoxIzC9Ojl4JYfqJycip1QdWCWhXJDo0m9
   5.106 -4S+57m1UHAeyfT8v4ggEffVg2fgHF5VF58S3FC3HCtASAqljtmYVlHQSK0hSY00U
   5.107 -t9y/McqDXYuXXtT5O056q2VoYkWjTpvbvuk/TI3IU2np9owZwgHJwiA8I+BMQitd
   5.108 -LWRmSmoRBBHNsaORuEUZYMugZzcTD81C2v5PNDvawB7mcSFqrtI6K30TnZ5iu8DI
   5.109 -qJ9BdP7Htphqk9nusLT7XTYve/6/NC6rmnnEpQhrdXdzPDsyGe0H/s24xU3wFKBY
   5.110 -JdKyfKSJUkXjmCrqJrkq0wAHCaZYK5hLiobhYLGfxxjPpx2UFk33lYXL5R659Gjh
   5.111 -oIgZW5NWOxNRE1GRd2js+WaZy2dwvxeqNGEdEHgi6UN6JRf588lSYjbz+8u2TW21
   5.112 -whH5x5VfDpIqimPdknQwM/w8N2fYEhI4bWv0rp+D0m27hZaVXjInShEQq6YsjAs5
   5.113 -aP19C7WT+VK+FuvOEQ3nxPl+/fGOF5EoceuscxjCxkVu8Ijq4+xdu7Hl6ycJUu40
   5.114 -wGTKOy/rGg0TZ232SyUE83VyxAPtU0fTLvbZAcQaT+YTHqk/c4hdzPW/Ho8L1aZ0
   5.115 -Ax9PpkUHmm7+JS3sbfxyLMQ9Zz2GcE+SCIEyGuFTqO/ESmJUXTNQjDRmLuleOhZt
   5.116 -VmOezek2BEcvWZd5/0w6pd6UBjzXdSdTJA38nBr8Ao217xDMZiLoxg6xZbsG12et
   5.117 -mqWG9m/5dQRECrcN0lRdQqFovSkw7/Az7jOIm0v4ey+i6wmEblg3M0vm7Ky19l7Z
   5.118 -lm0+nC5XwR56n4VPtyRbGgLkI8w//NChYZJJOVpyVpfP57pKPhvhLNcaOk2d5gNU
   5.119 -KDg2bKXilzkMflVqw5eYN2EKCMlLx+hW5U1oSJJlQKqKXQ0qglUfSEzPmBt9Y0g1
   5.120 -DN+blh+m
   5.121 -=UZkH
   5.122 ------END PGP MESSAGE-----
   5.123 -
   5.124 ---7vTKNA25GePB6VqgrM1km3gCfpFonmKj3--
     6.1 --- a/test/test_mails/pEp_encrypted_subject_IS_pEp2.eml	Tue Sep 12 19:23:56 2017 +0200
     6.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     6.3 @@ -1,121 +0,0 @@
     6.4 -Return-Path: <pep.test.alice@pep-project.org>
     6.5 -X-Original-To: krista@gnunet.org
     6.6 -Delivered-To: krista@gnunet.org
     6.7 -Received: from vmmailrelay1.informatik.tu-muenchen.de (mailrelay1.informatik.tu-muenchen.de [131.159.254.14])
     6.8 -	by sam.net.in.tum.de (Postfix) with ESMTP id BE55A1C00BC
     6.9 -	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:27:51 +0200 (CEST)
    6.10 -Received: by vmmailrelay1.informatik.tu-muenchen.de (Postfix, from userid 109)
    6.11 -	id 94D2F1C0394; Mon, 12 Jun 2017 15:27:52 +0200 (CEST)
    6.12 -Received: from vmmailrelay1.informatik.tu-muenchen.de (localhost [127.0.0.1])
    6.13 -	by vmmailrelay1.informatik.tu-muenchen.de (Postfix) with ESMTP id 6D2E21C037A
    6.14 -	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:27:52 +0200 (CEST)
    6.15 -Received: from vmmaildmz1.informatik.tu-muenchen.de (vmmaildmz1.informatik.tu-muenchen.de [131.159.0.87])
    6.16 -	by vmmailrelay1.informatik.tu-muenchen.de (Postfix) with ESMTP id 5876E1C0383
    6.17 -	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:27:52 +0200 (CEST)
    6.18 -Received: by vmmaildmz1.informatik.tu-muenchen.de (Postfix, from userid 109)
    6.19 -	id 56F1F1C2D9D; Mon, 12 Jun 2017 15:27:52 +0200 (CEST)
    6.20 -X-Spam-Checker-Version: SpamAssassin 3.4.0-tuminfo_1 (2014-02-07) on
    6.21 -	vmmaildmz1.informatik.tu-muenchen.de
    6.22 -X-Spam-Level: 
    6.23 -X-Spam-Status: No, score=-3.4 required=7.0 tests=AWL,BAYES_00,
    6.24 -	ENCRYPTED_MESSAGE,RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,
    6.25 -	TVD_RCVD_SPACE_BRACKET,UNPARSEABLE_RELAY autolearn=no autolearn_force=no
    6.26 -	version=3.4.0-tuminfo_1
    6.27 -Received: from vmmaildmz1.informatik.tu-muenchen.de (localhost [127.0.0.1])
    6.28 -	by vmmaildmz1.informatik.tu-muenchen.de (Postfix) with ESMTP id DE3C31C2D9E
    6.29 -	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:27:50 +0200 (CEST)
    6.30 -Received: from mi4-p00-ob.smtp.rzone.de (mi4-p00-ob.smtp.rzone.de [81.169.146.149])
    6.31 -	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
    6.32 -	(No client certificate requested)
    6.33 -	by vmmaildmz1.informatik.tu-muenchen.de (Postfix) with ESMTPS id CDD481C2D9B
    6.34 -	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:27:50 +0200 (CEST)
    6.35 -X-RZG-FWD-BY: pep.test.recip@kgrothoff.org
    6.36 -Received: from mailin.rzone.de ([unix socket])
    6.37 -	by mailin.rzone.de (RZmta 40.9) with LMTPA;
    6.38 -	Mon, 12 Jun 2017 15:27:46 +0200 (CEST)
    6.39 -Authentication-Results: strato.com 1;
    6.40 -	spf=none
    6.41 -		smtp.mailfrom="pep.test.alice@pep-project.org";
    6.42 -	dkim=none;
    6.43 -	domainkeys=none;
    6.44 -	dkim-adsp=none
    6.45 -		header.from="pep.test.alice@pep-project.org"
    6.46 -X-Strato-MessageType: email
    6.47 -X-RZG-CLASS-ID: mi00
    6.48 -Received-SPF: none
    6.49 -	client-ip=131.159.0.8;
    6.50 -	helo="mail-out1.informatik.tu-muenchen.de";
    6.51 -	envelope-from="pep.test.alice@pep-project.org";
    6.52 -	receiver=smtpin.rzone.de;
    6.53 -	identity=mailfrom;
    6.54 -Received: from mail-out1.informatik.tu-muenchen.de ([131.159.0.8])
    6.55 -	by smtpin.rzone.de (RZmta 40.9 OK)
    6.56 -	with ESMTPS id w03564t5CDRkYmx
    6.57 -	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (curve secp521r1 with 521 ECDH bits, eq. 15360 bits RSA))
    6.58 -	(Client did not present a certificate)
    6.59 -	for <pep.test.recip@kgrothoff.org>;
    6.60 -	Mon, 12 Jun 2017 15:27:46 +0200 (CEST)
    6.61 -Received: from [192.168.178.22] (ip5f584089.dynamic.kabel-deutschland.de [95.88.64.137])
    6.62 -	by services.sec.in.tum.de (Postfix) with ESMTPSA id A8EC11013AE47
    6.63 -	for <pep.test.recip@kgrothoff.org>; Mon, 12 Jun 2017 15:27:40 +0200 (CEST)
    6.64 -To: pep.test.recip@kgrothoff.org
    6.65 -Reply-To: krista@pep-project.org
    6.66 -From: pEp Test Alice <pep.test.alice@pep-project.org>
    6.67 -Subject: =?utf-8?Q?p=E2=89=A1p?=
    6.68 -Organization: pEp
    6.69 -Message-ID: <5d37b6c2-9e5e-7217-c80e-1359da8faa5c@pep-project.org>
    6.70 -Date: Mon, 12 Jun 2017 15:27:40 +0200
    6.71 -User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101
    6.72 - Thunderbird/45.8.0
    6.73 -MIME-Version: 1.0
    6.74 -Content-Type: multipart/encrypted;
    6.75 - protocol="application/pgp-encrypted";
    6.76 - boundary="7vTKNA25GePB6VqgrM1km3gCfpFonmKj3"
    6.77 -
    6.78 -This is an OpenPGP/MIME encrypted message (RFC 4880 and 3156)
    6.79 ---7vTKNA25GePB6VqgrM1km3gCfpFonmKj3
    6.80 -Content-Type: application/pgp-encrypted
    6.81 -Content-Description: PGP/MIME version identification
    6.82 -
    6.83 -Version: 1
    6.84 -
    6.85 ---7vTKNA25GePB6VqgrM1km3gCfpFonmKj3
    6.86 -Content-Type: application/octet-stream; name="encrypted.asc"
    6.87 -Content-Description: OpenPGP encrypted message
    6.88 -Content-Disposition: inline; filename="encrypted.asc"
    6.89 -
    6.90 ------BEGIN PGP MESSAGE-----
    6.91 -
    6.92 -hQEMA4FHqvEumyRHAQf6AkV51E1/uffFSc++oIPAoNCJU71NseNgW3s3XIQ/7TIQ
    6.93 -pDi6a6ksNdN+cJyMhfM7HnO06LjrUDYtgYPkZBHcTDZMWivW/7+5g8z60V3biIpw
    6.94 -mdUqhb+mZb4A0akMk+Ix8paoR8D7y4jmeLHwj/vbQ1J/E64rob9XPDWrLOW63chR
    6.95 -pg+XAo3VbkDKCms8PSuKehzMoTpZUcEVP47TF1OxuKZE0k7yJQ354RlPGxsl/6zM
    6.96 -O1+cJ7XdclkZj9gdeJAWzqCx6kTmDy2DA4e80BwMXXJnQtFIp4B55gTHvfbmxBRL
    6.97 -V8KDHOlvY/YSFV9sikjyaXbiweuqgiycsLb+qRziG4UBDANaAgXZcwg/TQEIAMg9
    6.98 -CVCJiYqS+ke1Zw0VNbb4BccrSBWL5iiQsPPUFOBld8jCFCGFZVBiik7O/XzRGWQh
    6.99 -qsYb2BNb0267viJS+IhTvihFybvR/l/gkzRLRfznFxbsRKgYAI6ipPr4wdAxvRkE
   6.100 -k0LvL3ckRgKtc2UORvfmhKRXu8Hj8dkYD0Asewnx7+p+s685MpyJ3zhhyifPzqKw
   6.101 -VH/6D7g26t3DjjQkvTvkiIMEvxT3beQN6QspdRtoDhHqAH0JhrZjEZyenneXE/AB
   6.102 -2CrnIfEU6V7S1EWP4Ond647K/F89ZG9LfTBpfmYuTXMKM39hmQaNcIsr8dr+mBif
   6.103 -nO2xRkyTMHAtyEk1dQnS6QFdLynwNLfsOvecztOBNBE/j6gH3dqKgZMg2e7ojK/Z
   6.104 -rNohpLMfZqzN37sfopm8htzK0Wg/l0CcgR8S4cUln06UzUm89GF9pokHYTnXYNYb
   6.105 -S2BMMVQ7gTpGDBfBFHVCK8xtCSFJJmxoxIzC9Ojl4JYfqJycip1QdWCWhXJDo0m9
   6.106 -4S+57m1UHAeyfT8v4ggEffVg2fgHF5VF58S3FC3HCtASAqljtmYVlHQSK0hSY00U
   6.107 -t9y/McqDXYuXXtT5O056q2VoYkWjTpvbvuk/TI3IU2np9owZwgHJwiA8I+BMQitd
   6.108 -LWRmSmoRBBHNsaORuEUZYMugZzcTD81C2v5PNDvawB7mcSFqrtI6K30TnZ5iu8DI
   6.109 -qJ9BdP7Htphqk9nusLT7XTYve/6/NC6rmnnEpQhrdXdzPDsyGe0H/s24xU3wFKBY
   6.110 -JdKyfKSJUkXjmCrqJrkq0wAHCaZYK5hLiobhYLGfxxjPpx2UFk33lYXL5R659Gjh
   6.111 -oIgZW5NWOxNRE1GRd2js+WaZy2dwvxeqNGEdEHgi6UN6JRf588lSYjbz+8u2TW21
   6.112 -whH5x5VfDpIqimPdknQwM/w8N2fYEhI4bWv0rp+D0m27hZaVXjInShEQq6YsjAs5
   6.113 -aP19C7WT+VK+FuvOEQ3nxPl+/fGOF5EoceuscxjCxkVu8Ijq4+xdu7Hl6ycJUu40
   6.114 -wGTKOy/rGg0TZ232SyUE83VyxAPtU0fTLvbZAcQaT+YTHqk/c4hdzPW/Ho8L1aZ0
   6.115 -Ax9PpkUHmm7+JS3sbfxyLMQ9Zz2GcE+SCIEyGuFTqO/ESmJUXTNQjDRmLuleOhZt
   6.116 -VmOezek2BEcvWZd5/0w6pd6UBjzXdSdTJA38nBr8Ao217xDMZiLoxg6xZbsG12et
   6.117 -mqWG9m/5dQRECrcN0lRdQqFovSkw7/Az7jOIm0v4ey+i6wmEblg3M0vm7Ky19l7Z
   6.118 -lm0+nC5XwR56n4VPtyRbGgLkI8w//NChYZJJOVpyVpfP57pKPhvhLNcaOk2d5gNU
   6.119 -KDg2bKXilzkMflVqw5eYN2EKCMlLx+hW5U1oSJJlQKqKXQ0qglUfSEzPmBt9Y0g1
   6.120 -DN+blh+m
   6.121 -=UZkH
   6.122 ------END PGP MESSAGE-----
   6.123 -
   6.124 ---7vTKNA25GePB6VqgrM1km3gCfpFonmKj3--
     7.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     7.2 +++ b/test/test_mails/pEp_encrypted_subject_IS_pEp_3a.eml	Wed Sep 13 01:59:28 2017 +0200
     7.3 @@ -0,0 +1,121 @@
     7.4 +Return-Path: <pep.test.alice@pep-project.org>
     7.5 +X-Original-To: krista@gnunet.org
     7.6 +Delivered-To: krista@gnunet.org
     7.7 +Received: from vmmailrelay1.informatik.tu-muenchen.de (mailrelay1.informatik.tu-muenchen.de [131.159.254.14])
     7.8 +	by sam.net.in.tum.de (Postfix) with ESMTP id BE55A1C00BC
     7.9 +	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:27:51 +0200 (CEST)
    7.10 +Received: by vmmailrelay1.informatik.tu-muenchen.de (Postfix, from userid 109)
    7.11 +	id 94D2F1C0394; Mon, 12 Jun 2017 15:27:52 +0200 (CEST)
    7.12 +Received: from vmmailrelay1.informatik.tu-muenchen.de (localhost [127.0.0.1])
    7.13 +	by vmmailrelay1.informatik.tu-muenchen.de (Postfix) with ESMTP id 6D2E21C037A
    7.14 +	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:27:52 +0200 (CEST)
    7.15 +Received: from vmmaildmz1.informatik.tu-muenchen.de (vmmaildmz1.informatik.tu-muenchen.de [131.159.0.87])
    7.16 +	by vmmailrelay1.informatik.tu-muenchen.de (Postfix) with ESMTP id 5876E1C0383
    7.17 +	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:27:52 +0200 (CEST)
    7.18 +Received: by vmmaildmz1.informatik.tu-muenchen.de (Postfix, from userid 109)
    7.19 +	id 56F1F1C2D9D; Mon, 12 Jun 2017 15:27:52 +0200 (CEST)
    7.20 +X-Spam-Checker-Version: SpamAssassin 3.4.0-tuminfo_1 (2014-02-07) on
    7.21 +	vmmaildmz1.informatik.tu-muenchen.de
    7.22 +X-Spam-Level: 
    7.23 +X-Spam-Status: No, score=-3.4 required=7.0 tests=AWL,BAYES_00,
    7.24 +	ENCRYPTED_MESSAGE,RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,
    7.25 +	TVD_RCVD_SPACE_BRACKET,UNPARSEABLE_RELAY autolearn=no autolearn_force=no
    7.26 +	version=3.4.0-tuminfo_1
    7.27 +Received: from vmmaildmz1.informatik.tu-muenchen.de (localhost [127.0.0.1])
    7.28 +	by vmmaildmz1.informatik.tu-muenchen.de (Postfix) with ESMTP id DE3C31C2D9E
    7.29 +	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:27:50 +0200 (CEST)
    7.30 +Received: from mi4-p00-ob.smtp.rzone.de (mi4-p00-ob.smtp.rzone.de [81.169.146.149])
    7.31 +	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
    7.32 +	(No client certificate requested)
    7.33 +	by vmmaildmz1.informatik.tu-muenchen.de (Postfix) with ESMTPS id CDD481C2D9B
    7.34 +	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:27:50 +0200 (CEST)
    7.35 +X-RZG-FWD-BY: pep.test.recip@kgrothoff.org
    7.36 +Received: from mailin.rzone.de ([unix socket])
    7.37 +	by mailin.rzone.de (RZmta 40.9) with LMTPA;
    7.38 +	Mon, 12 Jun 2017 15:27:46 +0200 (CEST)
    7.39 +Authentication-Results: strato.com 1;
    7.40 +	spf=none
    7.41 +		smtp.mailfrom="pep.test.alice@pep-project.org";
    7.42 +	dkim=none;
    7.43 +	domainkeys=none;
    7.44 +	dkim-adsp=none
    7.45 +		header.from="pep.test.alice@pep-project.org"
    7.46 +X-Strato-MessageType: email
    7.47 +X-RZG-CLASS-ID: mi00
    7.48 +Received-SPF: none
    7.49 +	client-ip=131.159.0.8;
    7.50 +	helo="mail-out1.informatik.tu-muenchen.de";
    7.51 +	envelope-from="pep.test.alice@pep-project.org";
    7.52 +	receiver=smtpin.rzone.de;
    7.53 +	identity=mailfrom;
    7.54 +Received: from mail-out1.informatik.tu-muenchen.de ([131.159.0.8])
    7.55 +	by smtpin.rzone.de (RZmta 40.9 OK)
    7.56 +	with ESMTPS id w03564t5CDRkYmx
    7.57 +	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (curve secp521r1 with 521 ECDH bits, eq. 15360 bits RSA))
    7.58 +	(Client did not present a certificate)
    7.59 +	for <pep.test.recip@kgrothoff.org>;
    7.60 +	Mon, 12 Jun 2017 15:27:46 +0200 (CEST)
    7.61 +Received: from [192.168.178.22] (ip5f584089.dynamic.kabel-deutschland.de [95.88.64.137])
    7.62 +	by services.sec.in.tum.de (Postfix) with ESMTPSA id A8EC11013AE47
    7.63 +	for <pep.test.recip@kgrothoff.org>; Mon, 12 Jun 2017 15:27:40 +0200 (CEST)
    7.64 +To: pep.test.recip@kgrothoff.org
    7.65 +Reply-To: krista@pep-project.org
    7.66 +From: pEp Test Alice <pep.test.alice@pep-project.org>
    7.67 +Subject: pEp
    7.68 +Organization: pEp
    7.69 +Message-ID: <5d37b6c2-9e5e-7217-c80e-1359da8faa5c@pep-project.org>
    7.70 +Date: Mon, 12 Jun 2017 15:27:40 +0200
    7.71 +User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101
    7.72 + Thunderbird/45.8.0
    7.73 +MIME-Version: 1.0
    7.74 +Content-Type: multipart/encrypted;
    7.75 + protocol="application/pgp-encrypted";
    7.76 + boundary="7vTKNA25GePB6VqgrM1km3gCfpFonmKj3"
    7.77 +
    7.78 +This is an OpenPGP/MIME encrypted message (RFC 4880 and 3156)
    7.79 +--7vTKNA25GePB6VqgrM1km3gCfpFonmKj3
    7.80 +Content-Type: application/pgp-encrypted
    7.81 +Content-Description: PGP/MIME version identification
    7.82 +
    7.83 +Version: 1
    7.84 +
    7.85 +--7vTKNA25GePB6VqgrM1km3gCfpFonmKj3
    7.86 +Content-Type: application/octet-stream; name="encrypted.asc"
    7.87 +Content-Description: OpenPGP encrypted message
    7.88 +Content-Disposition: inline; filename="encrypted.asc"
    7.89 +
    7.90 +-----BEGIN PGP MESSAGE-----
    7.91 +
    7.92 +hQEMA4FHqvEumyRHAQf6AkV51E1/uffFSc++oIPAoNCJU71NseNgW3s3XIQ/7TIQ
    7.93 +pDi6a6ksNdN+cJyMhfM7HnO06LjrUDYtgYPkZBHcTDZMWivW/7+5g8z60V3biIpw
    7.94 +mdUqhb+mZb4A0akMk+Ix8paoR8D7y4jmeLHwj/vbQ1J/E64rob9XPDWrLOW63chR
    7.95 +pg+XAo3VbkDKCms8PSuKehzMoTpZUcEVP47TF1OxuKZE0k7yJQ354RlPGxsl/6zM
    7.96 +O1+cJ7XdclkZj9gdeJAWzqCx6kTmDy2DA4e80BwMXXJnQtFIp4B55gTHvfbmxBRL
    7.97 +V8KDHOlvY/YSFV9sikjyaXbiweuqgiycsLb+qRziG4UBDANaAgXZcwg/TQEIAMg9
    7.98 +CVCJiYqS+ke1Zw0VNbb4BccrSBWL5iiQsPPUFOBld8jCFCGFZVBiik7O/XzRGWQh
    7.99 +qsYb2BNb0267viJS+IhTvihFybvR/l/gkzRLRfznFxbsRKgYAI6ipPr4wdAxvRkE
   7.100 +k0LvL3ckRgKtc2UORvfmhKRXu8Hj8dkYD0Asewnx7+p+s685MpyJ3zhhyifPzqKw
   7.101 +VH/6D7g26t3DjjQkvTvkiIMEvxT3beQN6QspdRtoDhHqAH0JhrZjEZyenneXE/AB
   7.102 +2CrnIfEU6V7S1EWP4Ond647K/F89ZG9LfTBpfmYuTXMKM39hmQaNcIsr8dr+mBif
   7.103 +nO2xRkyTMHAtyEk1dQnS6QFdLynwNLfsOvecztOBNBE/j6gH3dqKgZMg2e7ojK/Z
   7.104 +rNohpLMfZqzN37sfopm8htzK0Wg/l0CcgR8S4cUln06UzUm89GF9pokHYTnXYNYb
   7.105 +S2BMMVQ7gTpGDBfBFHVCK8xtCSFJJmxoxIzC9Ojl4JYfqJycip1QdWCWhXJDo0m9
   7.106 +4S+57m1UHAeyfT8v4ggEffVg2fgHF5VF58S3FC3HCtASAqljtmYVlHQSK0hSY00U
   7.107 +t9y/McqDXYuXXtT5O056q2VoYkWjTpvbvuk/TI3IU2np9owZwgHJwiA8I+BMQitd
   7.108 +LWRmSmoRBBHNsaORuEUZYMugZzcTD81C2v5PNDvawB7mcSFqrtI6K30TnZ5iu8DI
   7.109 +qJ9BdP7Htphqk9nusLT7XTYve/6/NC6rmnnEpQhrdXdzPDsyGe0H/s24xU3wFKBY
   7.110 +JdKyfKSJUkXjmCrqJrkq0wAHCaZYK5hLiobhYLGfxxjPpx2UFk33lYXL5R659Gjh
   7.111 +oIgZW5NWOxNRE1GRd2js+WaZy2dwvxeqNGEdEHgi6UN6JRf588lSYjbz+8u2TW21
   7.112 +whH5x5VfDpIqimPdknQwM/w8N2fYEhI4bWv0rp+D0m27hZaVXjInShEQq6YsjAs5
   7.113 +aP19C7WT+VK+FuvOEQ3nxPl+/fGOF5EoceuscxjCxkVu8Ijq4+xdu7Hl6ycJUu40
   7.114 +wGTKOy/rGg0TZ232SyUE83VyxAPtU0fTLvbZAcQaT+YTHqk/c4hdzPW/Ho8L1aZ0
   7.115 +Ax9PpkUHmm7+JS3sbfxyLMQ9Zz2GcE+SCIEyGuFTqO/ESmJUXTNQjDRmLuleOhZt
   7.116 +VmOezek2BEcvWZd5/0w6pd6UBjzXdSdTJA38nBr8Ao217xDMZiLoxg6xZbsG12et
   7.117 +mqWG9m/5dQRECrcN0lRdQqFovSkw7/Az7jOIm0v4ey+i6wmEblg3M0vm7Ky19l7Z
   7.118 +lm0+nC5XwR56n4VPtyRbGgLkI8w//NChYZJJOVpyVpfP57pKPhvhLNcaOk2d5gNU
   7.119 +KDg2bKXilzkMflVqw5eYN2EKCMlLx+hW5U1oSJJlQKqKXQ0qglUfSEzPmBt9Y0g1
   7.120 +DN+blh+m
   7.121 +=UZkH
   7.122 +-----END PGP MESSAGE-----
   7.123 +
   7.124 +--7vTKNA25GePB6VqgrM1km3gCfpFonmKj3--
     8.1 --- a/test/test_mails/pEp_subject_normal.eml	Tue Sep 12 19:23:56 2017 +0200
     8.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     8.3 @@ -1,112 +0,0 @@
     8.4 -Return-Path: <pep.test.alice@pep-project.org>
     8.5 -X-Original-To: krista@gnunet.org
     8.6 -Delivered-To: krista@gnunet.org
     8.7 -Received: from vmmailrelay1.informatik.tu-muenchen.de (mailrelay1.informatik.tu-muenchen.de [131.159.254.14])
     8.8 -	by sam.net.in.tum.de (Postfix) with ESMTP id 98B571C00BC
     8.9 -	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:25:44 +0200 (CEST)
    8.10 -Received: by vmmailrelay1.informatik.tu-muenchen.de (Postfix, from userid 109)
    8.11 -	id 620431C0383; Mon, 12 Jun 2017 15:25:45 +0200 (CEST)
    8.12 -Received: from vmmailrelay1.informatik.tu-muenchen.de (localhost [127.0.0.1])
    8.13 -	by vmmailrelay1.informatik.tu-muenchen.de (Postfix) with ESMTP id 3F4961C037C
    8.14 -	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:25:45 +0200 (CEST)
    8.15 -Received: from vmmaildmz1.informatik.tu-muenchen.de (vmmaildmz1.informatik.tu-muenchen.de [131.159.0.87])
    8.16 -	by vmmailrelay1.informatik.tu-muenchen.de (Postfix) with ESMTP id 2BCE31C037A
    8.17 -	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:25:45 +0200 (CEST)
    8.18 -Received: by vmmaildmz1.informatik.tu-muenchen.de (Postfix, from userid 109)
    8.19 -	id 2A4741C2D9D; Mon, 12 Jun 2017 15:25:45 +0200 (CEST)
    8.20 -X-Spam-Checker-Version: SpamAssassin 3.4.0-tuminfo_1 (2014-02-07) on
    8.21 -	vmmaildmz1.informatik.tu-muenchen.de
    8.22 -X-Spam-Level: 
    8.23 -X-Spam-Status: No, score=-3.6 required=7.0 tests=BAYES_00,ENCRYPTED_MESSAGE,
    8.24 -	RCVD_IN_DNSWL_LOW,TVD_RCVD_SPACE_BRACKET,UNPARSEABLE_RELAY autolearn=no
    8.25 -	autolearn_force=no version=3.4.0-tuminfo_1
    8.26 -Received: from vmmaildmz1.informatik.tu-muenchen.de (localhost [127.0.0.1])
    8.27 -	by vmmaildmz1.informatik.tu-muenchen.de (Postfix) with ESMTP id 6EF791C2D9E
    8.28 -	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:25:43 +0200 (CEST)
    8.29 -Received: from mi4-p00-ob.smtp.rzone.de (mi4-p00-ob.smtp.rzone.de [81.169.146.144])
    8.30 -	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
    8.31 -	(No client certificate requested)
    8.32 -	by vmmaildmz1.informatik.tu-muenchen.de (Postfix) with ESMTPS id 5E75D1C2D9B
    8.33 -	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:25:43 +0200 (CEST)
    8.34 -X-RZG-FWD-BY: pep.test.recip@kgrothoff.org
    8.35 -Received: from mailin.rzone.de ([unix socket])
    8.36 -	by mailin.rzone.de (RZmta 40.9) with LMTPA;
    8.37 -	Mon, 12 Jun 2017 15:25:24 +0200 (CEST)
    8.38 -Authentication-Results: strato.com 1;
    8.39 -	spf=none
    8.40 -		smtp.mailfrom="pep.test.alice@pep-project.org";
    8.41 -	dkim=none;
    8.42 -	domainkeys=none;
    8.43 -	dkim-adsp=none
    8.44 -		header.from="pep.test.alice@pep-project.org"
    8.45 -X-Strato-MessageType: email
    8.46 -X-RZG-CLASS-ID: mi00
    8.47 -Received-SPF: none
    8.48 -	client-ip=131.159.0.8;
    8.49 -	helo="mail-out1.informatik.tu-muenchen.de";
    8.50 -	envelope-from="pep.test.alice@pep-project.org";
    8.51 -	receiver=smtpin.rzone.de;
    8.52 -	identity=mailfrom;
    8.53 -Received: from mail-out1.informatik.tu-muenchen.de ([131.159.0.8])
    8.54 -	by smtpin.rzone.de (RZmta 40.9 OK)
    8.55 -	with ESMTPS id v06d9ft5CDPHXhF
    8.56 -	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (curve secp521r1 with 521 ECDH bits, eq. 15360 bits RSA))
    8.57 -	(Client did not present a certificate)
    8.58 -	for <pep.test.recip@kgrothoff.org>;
    8.59 -	Mon, 12 Jun 2017 15:25:17 +0200 (CEST)
    8.60 -Received: from [192.168.178.22] (ip5f584089.dynamic.kabel-deutschland.de [95.88.64.137])
    8.61 -	by services.sec.in.tum.de (Postfix) with ESMTPSA id 4697F1013AE47
    8.62 -	for <pep.test.recip@kgrothoff.org>; Mon, 12 Jun 2017 15:25:11 +0200 (CEST)
    8.63 -Reply-To: krista@pep-project.org
    8.64 -To: pep.test.recip@kgrothoff.org
    8.65 -From: pEp Test Alice <pep.test.alice@pep-project.org>
    8.66 -Subject: pEp
    8.67 -Organization: pEp
    8.68 -Message-ID: <92ee4ca2-17cd-bcf1-377c-3367470bb571@pep-project.org>
    8.69 -Date: Mon, 12 Jun 2017 15:25:10 +0200
    8.70 -User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101
    8.71 - Thunderbird/45.8.0
    8.72 -MIME-Version: 1.0
    8.73 -Content-Type: multipart/encrypted;
    8.74 - protocol="application/pgp-encrypted";
    8.75 - boundary="e7R73MXx31oWAX8HMqNvMDNt9cAMWtSTV"
    8.76 -
    8.77 -This is an OpenPGP/MIME encrypted message (RFC 4880 and 3156)
    8.78 ---e7R73MXx31oWAX8HMqNvMDNt9cAMWtSTV
    8.79 -Content-Type: application/pgp-encrypted
    8.80 -Content-Description: PGP/MIME version identification
    8.81 -
    8.82 -Version: 1
    8.83 -
    8.84 ---e7R73MXx31oWAX8HMqNvMDNt9cAMWtSTV
    8.85 -Content-Type: application/octet-stream; name="encrypted.asc"
    8.86 -Content-Description: OpenPGP encrypted message
    8.87 -Content-Disposition: inline; filename="encrypted.asc"
    8.88 -
    8.89 ------BEGIN PGP MESSAGE-----
    8.90 -
    8.91 -hQEMA4FHqvEumyRHAQf+KW54G6f25yDJs6MdhWSs/766uFEIy8pq+j49AykOBsh2
    8.92 -W8BeB7yBqwjVFsBYPwGFNza187QHQVQlOHGRtxkXSX/iSym/O82YPvSwZj7GkKS9
    8.93 -sMgX2/dOMaEoTitn72f26ww5PvAqltJLD5TGhSM0RxK+0OemSrI0wDZxUb2Ll8DT
    8.94 -aVwpuKnLYFMcnk8SQLa3eZ/YpFV3TCMDFUgtIEqmHoh74dwemQjpP+qhbExZvY/k
    8.95 -rSZuJoU8siuLJ72vbEn8n2x8UCCfyTpacBZkC6Ukhsm/XrSg2GjqqzjSeR0T0Nbr
    8.96 -y/sFblbE8fbmouAf5k670oUot+j5aoHV79Rntcdm1oUBDANaAgXZcwg/TQEH/jhF
    8.97 -1ayYCROI8xEhj01Qbn60OtG+iKO+3B5/+uwizYgyW5mhKjrdgA/wsKMTMXj1BG+J
    8.98 -JJJ1TdEbxbL2UCai6nuHd0CbqJWSuTAicteKudUclAJHnpm2Qv+Yq2t/8JwJllMR
    8.99 -Wum8Cj4WuD0K3te5uHDZuu7Vfj9r3+7WYJ7FUkSYp2DUIFMM+hG+8OJtdjKd6kAA
   8.100 -FtAOijws+1r4jYFGYkCMRfnQatiFXf0n6Nr8qjSskkMtNQk41AG4LauYFTphR/G+
   8.101 -ayXPd8buDyBh3XuyoMcg5vLMJfWVTfiKM/wxv1jBBrQwFd5JpqCNr9dHYWMJ0gg9
   8.102 -aMdvaDEEd7I4VlwU+4DSwQMBF7R9V3cYj1XOxHjX2EikIxR/kviUrB8vDE4LAYJE
   8.103 -UFvoXgKRe4lQbQlLwoBp6R8L6mPTytLzlQnjQ4AJhPWhXkJUeCetURr5BzNCEfOy
   8.104 -+2Nq+9XLGM0wSCY09BOsGAQSL56kIGL61AnhvhpPUi9w9SOVjLHge6pzSzAW3h5E
   8.105 -vf8a8oGyLjyHR9VWBUqrMQ0tTWdHkoeHenXpwA+rckr0kzJXW1RJt2oQJEE0LI2I
   8.106 -0p9j7o6imaYWdtbHS7Kcbg2DxbT63QVOoO4OTPLHjYj0eqf1NDlwKBzQYaknNScI
   8.107 -LHnXrzMqqylU3ki8hUIh0K1ULernaA8LEIuegKMuguHCs2B/Xgee+Hor6l4XBRzD
   8.108 -V/8WFIU1lxthnYEceik/OD2U+LDKT4i+AogJAA+rCw0WbUC8f1HXQeV/8CVarcUn
   8.109 -GrS7AjjZlwQfiE8R/CtKdNaiJa4Z8GuQZJD/AqOe5zH0HLBykaheHS6ynw9yuNb7
   8.110 -d6lArIYdW5S8D0RDYRwu7z/lI3sgVgwiuoAk1OiYtrYUUNiXcpO59aE59iXjMW61
   8.111 -EvUAZzgfRyuzYdZtYNaM3FvUSm2aAsQRP+NJFW3YkqkbLvyo
   8.112 -=VpGy
   8.113 ------END PGP MESSAGE-----
   8.114 -
   8.115 ---e7R73MXx31oWAX8HMqNvMDNt9cAMWtSTV--
     9.1 --- a/test/test_mails/pEp_subject_normal2.eml	Tue Sep 12 19:23:56 2017 +0200
     9.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     9.3 @@ -1,114 +0,0 @@
     9.4 -Return-Path: <SRS0=ne/EAk=AN=pep-project.org=pep.test.alice@srs.smtpin.rzone.de>
     9.5 -X-Original-To: krista@gnunet.org
     9.6 -Delivered-To: krista@gnunet.org
     9.7 -Received: from vmmailrelay1.informatik.tu-muenchen.de (mailrelay1.informatik.tu-muenchen.de [131.159.254.14])
     9.8 -	by sam.net.in.tum.de (Postfix) with ESMTP id 524FF1C00BC
     9.9 -	for <krista@gnunet.org>; Tue, 12 Sep 2017 17:06:56 +0200 (CEST)
    9.10 -Received: by vmmailrelay1.informatik.tu-muenchen.de (Postfix, from userid 109)
    9.11 -	id 68C381C0503; Tue, 12 Sep 2017 17:06:56 +0200 (CEST)
    9.12 -Received: from vmmailrelay1.informatik.tu-muenchen.de (localhost [127.0.0.1])
    9.13 -	by vmmailrelay1.informatik.tu-muenchen.de (Postfix) with ESMTP id 45A4A1C04FD
    9.14 -	for <krista@gnunet.org>; Tue, 12 Sep 2017 17:06:56 +0200 (CEST)
    9.15 -Received: from vmmaildmz1.informatik.tu-muenchen.de (vmmaildmz1.informatik.tu-muenchen.de [131.159.0.87])
    9.16 -	by vmmailrelay1.informatik.tu-muenchen.de (Postfix) with ESMTP id 3162A1C04FC
    9.17 -	for <krista@gnunet.org>; Tue, 12 Sep 2017 17:06:56 +0200 (CEST)
    9.18 -Received: by vmmaildmz1.informatik.tu-muenchen.de (Postfix, from userid 109)
    9.19 -	id 2FBF61C2D66; Tue, 12 Sep 2017 17:06:56 +0200 (CEST)
    9.20 -X-Spam-Checker-Version: SpamAssassin 3.4.0-tuminfo_1 (2014-02-07) on
    9.21 -	vmmaildmz1.informatik.tu-muenchen.de
    9.22 -X-Spam-Level: 
    9.23 -X-Spam-Status: No, score=-1.7 required=7.0 tests=AWL,BAYES_00,BODY_EMPTY,
    9.24 -	ENCRYPTED_MESSAGE,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,
    9.25 -	SPF_HELO_PASS,TVD_RCVD_SPACE_BRACKET,UNPARSEABLE_RELAY autolearn=no
    9.26 -	autolearn_force=no version=3.4.0-tuminfo_1
    9.27 -Received: from vmmaildmz1.informatik.tu-muenchen.de (localhost [127.0.0.1])
    9.28 -	by vmmaildmz1.informatik.tu-muenchen.de (Postfix) with ESMTP id 2B7FA1C2D5F
    9.29 -	for <krista@gnunet.org>; Tue, 12 Sep 2017 17:06:52 +0200 (CEST)
    9.30 -Received: from mi4-p00-ob.smtp.rzone.de (mi4-p00-ob.smtp.rzone.de [81.169.146.146])
    9.31 -	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
    9.32 -	(No client certificate requested)
    9.33 -	by vmmaildmz1.informatik.tu-muenchen.de (Postfix) with ESMTPS id 1AEE31C2D48
    9.34 -	for <krista@gnunet.org>; Tue, 12 Sep 2017 17:06:52 +0200 (CEST)
    9.35 -X-RZG-FWD-BY: pep.test.recip@kgrothoff.org
    9.36 -Received: from mailin.rzone.de ([unix socket])
    9.37 -	by mailin.rzone.de (RZmta 41.4) with LMTPA;
    9.38 -	Tue, 12 Sep 2017 17:06:42 +0200 (CEST)
    9.39 -Authentication-Results: strato.com 1;
    9.40 -	spf=none
    9.41 -		smtp.mailfrom="pep.test.alice@pep-project.org";
    9.42 -	dkim=none;
    9.43 -	domainkeys=none;
    9.44 -	dkim-adsp=none
    9.45 -		header.from="pep.test.alice@pep-project.org"
    9.46 -X-Strato-MessageType: email
    9.47 -X-RZG-CLASS-ID: mi00
    9.48 -Received-SPF: none
    9.49 -	client-ip=131.159.0.8;
    9.50 -	helo="mail-out1.informatik.tu-muenchen.de";
    9.51 -	envelope-from="pep.test.alice@pep-project.org";
    9.52 -	receiver=smtpin.rzone.de;
    9.53 -	identity=mailfrom;
    9.54 -Received: from mail-out1.informatik.tu-muenchen.de ([131.159.0.8])
    9.55 -	by smtpin.rzone.de (RZmta 41.4 OK)
    9.56 -	with ESMTPS id f0bb72t8CF6f5Wa
    9.57 -	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (curve secp521r1 with 521 ECDH bits, eq. 15360 bits RSA))
    9.58 -	(Client did not present a certificate)
    9.59 -	for <pep.test.recip@kgrothoff.org>;
    9.60 -	Tue, 12 Sep 2017 17:06:41 +0200 (CEST)
    9.61 -Received: from [192.168.178.22] (ip5f584089.dynamic.kabel-deutschland.de [95.88.64.137])
    9.62 -	by services.sec.in.tum.de (Postfix) with ESMTPSA id B7EF810C74F82
    9.63 -	for <pep.test.recip@kgrothoff.org>; Tue, 12 Sep 2017 17:06:33 +0200 (CEST)
    9.64 -Reply-To: krista@pep-project.org
    9.65 -To: pep.test.recip@kgrothoff.org
    9.66 -From: pEp Test Alice <pep.test.alice@pep-project.org>
    9.67 -Subject: =?UTF-8?B?cOKJoXA=?=
    9.68 -Organization: pEp
    9.69 -Message-ID: <75dd44fb-5c4a-8678-c51b-836fd1f32af1@pep-project.org>
    9.70 -Date: Tue, 12 Sep 2017 17:06:32 +0200
    9.71 -User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101
    9.72 - Thunderbird/45.8.0
    9.73 -MIME-Version: 1.0
    9.74 -Content-Type: multipart/encrypted;
    9.75 - protocol="application/pgp-encrypted";
    9.76 - boundary="IS7QjataASN5CVBdEDLOfqfNX2N4tkoTu"
    9.77 -
    9.78 -This is an OpenPGP/MIME encrypted message (RFC 4880 and 3156)
    9.79 ---IS7QjataASN5CVBdEDLOfqfNX2N4tkoTu
    9.80 -Content-Type: application/pgp-encrypted
    9.81 -Content-Description: PGP/MIME version identification
    9.82 -
    9.83 -Version: 1
    9.84 -
    9.85 ---IS7QjataASN5CVBdEDLOfqfNX2N4tkoTu
    9.86 -Content-Type: application/octet-stream; name="encrypted.asc"
    9.87 -Content-Description: OpenPGP encrypted message
    9.88 -Content-Disposition: inline; filename="encrypted.asc"
    9.89 -
    9.90 ------BEGIN PGP MESSAGE-----
    9.91 -
    9.92 -hQEMA4FHqvEumyRHAQf8D4hbDivbAhpgIzOrD42OU5UEPax5wdpSub5vZDbGF++U
    9.93 -pt/MLGoTA5CTLCoJLV5iZiMFjy2LbbJPQaotZixHb619QzVOa3DVwWV8XuHTxmmt
    9.94 -EedLl+Ryq/EupLcjrqajUuxV6wCqS2sBfhHV+ykjZkQfGi+R4cGYRtrRERrfzpGY
    9.95 -QM4Nh6Bp9kLMSYVnIVdhpSUiky1VCxQl5MUqrlgkRY3ZDEdF4r53BNdiFx994I8K
    9.96 -OF8DqvWO/Zqx0GAuljKH7PZOU7CQVn/Xuen04L4olZgCeFxNdLBJv8wNNDX4cyUR
    9.97 -WnRU061CKTER27xVCi9AUlDnq3SghbRJvN3PUJSFkYUBDANaAgXZcwg/TQEH/3kn
    9.98 -+qxj3GuvyYOcg74oBcN8RN+E12HYopVEG1CvjqkpekYj3RVcs3Y9MFINTOZpDW4w
    9.99 -eHpNM7/bz3kzp48saoi3dB8i82FpvxG/XoNyphfPkFtz7tSECCMAKUWCeoi5VyS3
   9.100 -N3wwqa6LwpBpn5wkWUwWVQxgby1eJgYe0ZvBK9Nkv/FhTlD+hm3cn+6LRLC1dBp1
   9.101 -WpXP03YwrspCocfpWHFG+/4uHtLOE0GREqjPwGtNRdf59T2jwpyJykUrsARdkyJs
   9.102 -SqCce8739VjbxK3Ma4LGNyytp8g2z/G7C4JbZ/evmCKI7cxlhpLbSLZRzvIoNt/P
   9.103 -71gfkrzXUaUyHrkaheXSwSsB5p+Bu/msz4ByaAtEPJsQoGL6BBOjyKVm7K++xB90
   9.104 -yEQcJKxIMNeNGH5uvuZF2jkaF5HEHzK0V4+tS05pwS2ZFjyVUlowycAtwqQp3sfW
   9.105 -3zeUUUUW3tykR+uF2lBWhyEF2P5wTTV8eZZ53hy0vcUUwBfNoLpUZPvqoNZowEOf
   9.106 -Vw594AxRav4bokdJ1loWTEh1HtZAZuoMAAhdbQUDGkdlBogn98p+ClSCOSMHAlcl
   9.107 -Ip1AYAl3Os5UK2lr2p3bUBIgrqgbbY17MWfOva+LJ7TvLf6p1VyXKv3KeWoaCxy4
   9.108 -tlKb/D86Sjwo59oRayJvcOKhovd4hBechRxak6twovbGvCs5zE0jGapkY0QBYYky
   9.109 -eom5pYn2pGQpOnUrY7G+9pAjjqBywwLe1/bPh1KvTd38t86rfryLTOt2/gCJqHfN
   9.110 -f/kQCSyhR7HGz5LE0tUIq6hag8sClzh1ELht2Avpjt3YuKEVm/IVdfcGk5NkZqIf
   9.111 -5ghwOnC/1KZTEXWWvqywQKWgFkkRp7j9bgKweRvGSqawG0LtDHGgHmn3DjxlMOR8
   9.112 -hR+IBQg2y536xoSIrAQS3Qw8UcY6clnEx2Ga809wX32I7fiVsgx9rXm9+CBFvLQj
   9.113 -1IKzn2lRvqbquAsYClEmxzWXFETqIoISWPIEzw==
   9.114 -=5ntC
   9.115 ------END PGP MESSAGE-----
   9.116 -
   9.117 ---IS7QjataASN5CVBdEDLOfqfNX2N4tkoTu--
    10.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    10.2 +++ b/test/test_mails/pEp_subject_normal_1a.eml	Wed Sep 13 01:59:28 2017 +0200
    10.3 @@ -0,0 +1,112 @@
    10.4 +Return-Path: <pep.test.alice@pep-project.org>
    10.5 +X-Original-To: krista@gnunet.org
    10.6 +Delivered-To: krista@gnunet.org
    10.7 +Received: from vmmailrelay1.informatik.tu-muenchen.de (mailrelay1.informatik.tu-muenchen.de [131.159.254.14])
    10.8 +	by sam.net.in.tum.de (Postfix) with ESMTP id 98B571C00BC
    10.9 +	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:25:44 +0200 (CEST)
   10.10 +Received: by vmmailrelay1.informatik.tu-muenchen.de (Postfix, from userid 109)
   10.11 +	id 620431C0383; Mon, 12 Jun 2017 15:25:45 +0200 (CEST)
   10.12 +Received: from vmmailrelay1.informatik.tu-muenchen.de (localhost [127.0.0.1])
   10.13 +	by vmmailrelay1.informatik.tu-muenchen.de (Postfix) with ESMTP id 3F4961C037C
   10.14 +	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:25:45 +0200 (CEST)
   10.15 +Received: from vmmaildmz1.informatik.tu-muenchen.de (vmmaildmz1.informatik.tu-muenchen.de [131.159.0.87])
   10.16 +	by vmmailrelay1.informatik.tu-muenchen.de (Postfix) with ESMTP id 2BCE31C037A
   10.17 +	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:25:45 +0200 (CEST)
   10.18 +Received: by vmmaildmz1.informatik.tu-muenchen.de (Postfix, from userid 109)
   10.19 +	id 2A4741C2D9D; Mon, 12 Jun 2017 15:25:45 +0200 (CEST)
   10.20 +X-Spam-Checker-Version: SpamAssassin 3.4.0-tuminfo_1 (2014-02-07) on
   10.21 +	vmmaildmz1.informatik.tu-muenchen.de
   10.22 +X-Spam-Level: 
   10.23 +X-Spam-Status: No, score=-3.6 required=7.0 tests=BAYES_00,ENCRYPTED_MESSAGE,
   10.24 +	RCVD_IN_DNSWL_LOW,TVD_RCVD_SPACE_BRACKET,UNPARSEABLE_RELAY autolearn=no
   10.25 +	autolearn_force=no version=3.4.0-tuminfo_1
   10.26 +Received: from vmmaildmz1.informatik.tu-muenchen.de (localhost [127.0.0.1])
   10.27 +	by vmmaildmz1.informatik.tu-muenchen.de (Postfix) with ESMTP id 6EF791C2D9E
   10.28 +	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:25:43 +0200 (CEST)
   10.29 +Received: from mi4-p00-ob.smtp.rzone.de (mi4-p00-ob.smtp.rzone.de [81.169.146.144])
   10.30 +	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
   10.31 +	(No client certificate requested)
   10.32 +	by vmmaildmz1.informatik.tu-muenchen.de (Postfix) with ESMTPS id 5E75D1C2D9B
   10.33 +	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:25:43 +0200 (CEST)
   10.34 +X-RZG-FWD-BY: pep.test.recip@kgrothoff.org
   10.35 +Received: from mailin.rzone.de ([unix socket])
   10.36 +	by mailin.rzone.de (RZmta 40.9) with LMTPA;
   10.37 +	Mon, 12 Jun 2017 15:25:24 +0200 (CEST)
   10.38 +Authentication-Results: strato.com 1;
   10.39 +	spf=none
   10.40 +		smtp.mailfrom="pep.test.alice@pep-project.org";
   10.41 +	dkim=none;
   10.42 +	domainkeys=none;
   10.43 +	dkim-adsp=none
   10.44 +		header.from="pep.test.alice@pep-project.org"
   10.45 +X-Strato-MessageType: email
   10.46 +X-RZG-CLASS-ID: mi00
   10.47 +Received-SPF: none
   10.48 +	client-ip=131.159.0.8;
   10.49 +	helo="mail-out1.informatik.tu-muenchen.de";
   10.50 +	envelope-from="pep.test.alice@pep-project.org";
   10.51 +	receiver=smtpin.rzone.de;
   10.52 +	identity=mailfrom;
   10.53 +Received: from mail-out1.informatik.tu-muenchen.de ([131.159.0.8])
   10.54 +	by smtpin.rzone.de (RZmta 40.9 OK)
   10.55 +	with ESMTPS id v06d9ft5CDPHXhF
   10.56 +	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (curve secp521r1 with 521 ECDH bits, eq. 15360 bits RSA))
   10.57 +	(Client did not present a certificate)
   10.58 +	for <pep.test.recip@kgrothoff.org>;
   10.59 +	Mon, 12 Jun 2017 15:25:17 +0200 (CEST)
   10.60 +Received: from [192.168.178.22] (ip5f584089.dynamic.kabel-deutschland.de [95.88.64.137])
   10.61 +	by services.sec.in.tum.de (Postfix) with ESMTPSA id 4697F1013AE47
   10.62 +	for <pep.test.recip@kgrothoff.org>; Mon, 12 Jun 2017 15:25:11 +0200 (CEST)
   10.63 +Reply-To: krista@pep-project.org
   10.64 +To: pep.test.recip@kgrothoff.org
   10.65 +From: pEp Test Alice <pep.test.alice@pep-project.org>
   10.66 +Subject: pEp
   10.67 +Organization: pEp
   10.68 +Message-ID: <92ee4ca2-17cd-bcf1-377c-3367470bb571@pep-project.org>
   10.69 +Date: Mon, 12 Jun 2017 15:25:10 +0200
   10.70 +User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101
   10.71 + Thunderbird/45.8.0
   10.72 +MIME-Version: 1.0
   10.73 +Content-Type: multipart/encrypted;
   10.74 + protocol="application/pgp-encrypted";
   10.75 + boundary="e7R73MXx31oWAX8HMqNvMDNt9cAMWtSTV"
   10.76 +
   10.77 +This is an OpenPGP/MIME encrypted message (RFC 4880 and 3156)
   10.78 +--e7R73MXx31oWAX8HMqNvMDNt9cAMWtSTV
   10.79 +Content-Type: application/pgp-encrypted
   10.80 +Content-Description: PGP/MIME version identification
   10.81 +
   10.82 +Version: 1
   10.83 +
   10.84 +--e7R73MXx31oWAX8HMqNvMDNt9cAMWtSTV
   10.85 +Content-Type: application/octet-stream; name="encrypted.asc"
   10.86 +Content-Description: OpenPGP encrypted message
   10.87 +Content-Disposition: inline; filename="encrypted.asc"
   10.88 +
   10.89 +-----BEGIN PGP MESSAGE-----
   10.90 +
   10.91 +hQEMA4FHqvEumyRHAQf+KW54G6f25yDJs6MdhWSs/766uFEIy8pq+j49AykOBsh2
   10.92 +W8BeB7yBqwjVFsBYPwGFNza187QHQVQlOHGRtxkXSX/iSym/O82YPvSwZj7GkKS9
   10.93 +sMgX2/dOMaEoTitn72f26ww5PvAqltJLD5TGhSM0RxK+0OemSrI0wDZxUb2Ll8DT
   10.94 +aVwpuKnLYFMcnk8SQLa3eZ/YpFV3TCMDFUgtIEqmHoh74dwemQjpP+qhbExZvY/k
   10.95 +rSZuJoU8siuLJ72vbEn8n2x8UCCfyTpacBZkC6Ukhsm/XrSg2GjqqzjSeR0T0Nbr
   10.96 +y/sFblbE8fbmouAf5k670oUot+j5aoHV79Rntcdm1oUBDANaAgXZcwg/TQEH/jhF
   10.97 +1ayYCROI8xEhj01Qbn60OtG+iKO+3B5/+uwizYgyW5mhKjrdgA/wsKMTMXj1BG+J
   10.98 +JJJ1TdEbxbL2UCai6nuHd0CbqJWSuTAicteKudUclAJHnpm2Qv+Yq2t/8JwJllMR
   10.99 +Wum8Cj4WuD0K3te5uHDZuu7Vfj9r3+7WYJ7FUkSYp2DUIFMM+hG+8OJtdjKd6kAA
  10.100 +FtAOijws+1r4jYFGYkCMRfnQatiFXf0n6Nr8qjSskkMtNQk41AG4LauYFTphR/G+
  10.101 +ayXPd8buDyBh3XuyoMcg5vLMJfWVTfiKM/wxv1jBBrQwFd5JpqCNr9dHYWMJ0gg9
  10.102 +aMdvaDEEd7I4VlwU+4DSwQMBF7R9V3cYj1XOxHjX2EikIxR/kviUrB8vDE4LAYJE
  10.103 +UFvoXgKRe4lQbQlLwoBp6R8L6mPTytLzlQnjQ4AJhPWhXkJUeCetURr5BzNCEfOy
  10.104 ++2Nq+9XLGM0wSCY09BOsGAQSL56kIGL61AnhvhpPUi9w9SOVjLHge6pzSzAW3h5E
  10.105 +vf8a8oGyLjyHR9VWBUqrMQ0tTWdHkoeHenXpwA+rckr0kzJXW1RJt2oQJEE0LI2I
  10.106 +0p9j7o6imaYWdtbHS7Kcbg2DxbT63QVOoO4OTPLHjYj0eqf1NDlwKBzQYaknNScI
  10.107 +LHnXrzMqqylU3ki8hUIh0K1ULernaA8LEIuegKMuguHCs2B/Xgee+Hor6l4XBRzD
  10.108 +V/8WFIU1lxthnYEceik/OD2U+LDKT4i+AogJAA+rCw0WbUC8f1HXQeV/8CVarcUn
  10.109 +GrS7AjjZlwQfiE8R/CtKdNaiJa4Z8GuQZJD/AqOe5zH0HLBykaheHS6ynw9yuNb7
  10.110 +d6lArIYdW5S8D0RDYRwu7z/lI3sgVgwiuoAk1OiYtrYUUNiXcpO59aE59iXjMW61
  10.111 +EvUAZzgfRyuzYdZtYNaM3FvUSm2aAsQRP+NJFW3YkqkbLvyo
  10.112 +=VpGy
  10.113 +-----END PGP MESSAGE-----
  10.114 +
  10.115 +--e7R73MXx31oWAX8HMqNvMDNt9cAMWtSTV--
    11.1 --- a/test/test_mails/pEp_subject_normal_signed.eml	Tue Sep 12 19:23:56 2017 +0200
    11.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    11.3 @@ -1,119 +0,0 @@
    11.4 -Return-Path: <pep.test.alice@pep-project.org>
    11.5 -X-Original-To: krista@gnunet.org
    11.6 -Delivered-To: krista@gnunet.org
    11.7 -Received: from vmmailrelay1.informatik.tu-muenchen.de (mailrelay1.informatik.tu-muenchen.de [131.159.254.14])
    11.8 -	by sam.net.in.tum.de (Postfix) with ESMTP id 768301C00BC
    11.9 -	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:26:24 +0200 (CEST)
   11.10 -Received: by vmmailrelay1.informatik.tu-muenchen.de (Postfix, from userid 109)
   11.11 -	id 4DD7D1C0383; Mon, 12 Jun 2017 15:26:25 +0200 (CEST)
   11.12 -Received: from vmmailrelay1.informatik.tu-muenchen.de (localhost [127.0.0.1])
   11.13 -	by vmmailrelay1.informatik.tu-muenchen.de (Postfix) with ESMTP id 2AD621C037C
   11.14 -	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:26:25 +0200 (CEST)
   11.15 -Received: from vmmaildmz2.informatik.tu-muenchen.de (vmmaildmz2.informatik.tu-muenchen.de [131.159.0.88])
   11.16 -	by vmmailrelay1.informatik.tu-muenchen.de (Postfix) with ESMTP id 15DA11C037A
   11.17 -	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:26:25 +0200 (CEST)
   11.18 -Received: by vmmaildmz2.informatik.tu-muenchen.de (Postfix, from userid 109)
   11.19 -	id 13FCC1C2AE2; Mon, 12 Jun 2017 15:26:25 +0200 (CEST)
   11.20 -X-Spam-Checker-Version: SpamAssassin 3.4.0-tuminfo_1 (2014-02-07) on
   11.21 -	vmmaildmz2.informatik.tu-muenchen.de
   11.22 -X-Spam-Level: 
   11.23 -X-Spam-Status: No, score=-2.6 required=7.0 tests=AWL,BAYES_00,
   11.24 -	ENCRYPTED_MESSAGE,RCVD_IN_DNSWL_LOW,TVD_RCVD_SPACE_BRACKET,UNPARSEABLE_RELAY
   11.25 -	autolearn=no autolearn_force=no version=3.4.0-tuminfo_1
   11.26 -Received: from vmmaildmz2.informatik.tu-muenchen.de (localhost [127.0.0.1])
   11.27 -	by vmmaildmz2.informatik.tu-muenchen.de (Postfix) with ESMTP id 953971C2AE1
   11.28 -	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:26:23 +0200 (CEST)
   11.29 -Received: from mi4-p00-ob.smtp.rzone.de (mi4-p00-ob.smtp.rzone.de [81.169.146.144])
   11.30 -	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
   11.31 -	(No client certificate requested)
   11.32 -	by vmmaildmz2.informatik.tu-muenchen.de (Postfix) with ESMTPS id 8540A1C2AE0
   11.33 -	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:26:23 +0200 (CEST)
   11.34 -X-RZG-FWD-BY: pep.test.recip@kgrothoff.org
   11.35 -Received: from mailin.rzone.de ([unix socket])
   11.36 -	by mailin.rzone.de (RZmta 40.9) with LMTPA;
   11.37 -	Mon, 12 Jun 2017 15:26:02 +0200 (CEST)
   11.38 -Authentication-Results: strato.com 1;
   11.39 -	spf=none
   11.40 -		smtp.mailfrom="pep.test.alice@pep-project.org";
   11.41 -	dkim=none;
   11.42 -	domainkeys=none;
   11.43 -	dkim-adsp=none
   11.44 -		header.from="pep.test.alice@pep-project.org"
   11.45 -X-Strato-MessageType: email
   11.46 -X-RZG-CLASS-ID: mi00
   11.47 -Received-SPF: none
   11.48 -	client-ip=131.159.0.8;
   11.49 -	helo="mail-out1.informatik.tu-muenchen.de";
   11.50 -	envelope-from="pep.test.alice@pep-project.org";
   11.51 -	receiver=smtpin.rzone.de;
   11.52 -	identity=mailfrom;
   11.53 -Received: from mail-out1.informatik.tu-muenchen.de ([131.159.0.8])
   11.54 -	by smtpin.rzone.de (RZmta 40.9 OK)
   11.55 -	with ESMTPS id v06d9ft5CDQ2Xj1
   11.56 -	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (curve secp521r1 with 521 ECDH bits, eq. 15360 bits RSA))
   11.57 -	(Client did not present a certificate)
   11.58 -	for <pep.test.recip@kgrothoff.org>;
   11.59 -	Mon, 12 Jun 2017 15:26:02 +0200 (CEST)
   11.60 -Received: from [192.168.178.22] (ip5f584089.dynamic.kabel-deutschland.de [95.88.64.137])
   11.61 -	by services.sec.in.tum.de (Postfix) with ESMTPSA id BEAA21013AE47
   11.62 -	for <pep.test.recip@kgrothoff.org>; Mon, 12 Jun 2017 15:25:56 +0200 (CEST)
   11.63 -To: pep.test.recip@kgrothoff.org
   11.64 -Reply-To: krista@pep-project.org
   11.65 -From: pEp Test Alice <pep.test.alice@pep-project.org>
   11.66 -Subject: pEp
   11.67 -Organization: pEp
   11.68 -Message-ID: <988e71f4-df80-906e-8bbb-68d48069d4ac@pep-project.org>
   11.69 -Date: Mon, 12 Jun 2017 15:25:56 +0200
   11.70 -User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101
   11.71 - Thunderbird/45.8.0
   11.72 -MIME-Version: 1.0
   11.73 -Content-Type: multipart/encrypted;
   11.74 - protocol="application/pgp-encrypted";
   11.75 - boundary="hcW81WNiFhQC1SNIcls8J07V1b1sXtfCA"
   11.76 -
   11.77 -This is an OpenPGP/MIME encrypted message (RFC 4880 and 3156)
   11.78 ---hcW81WNiFhQC1SNIcls8J07V1b1sXtfCA
   11.79 -Content-Type: application/pgp-encrypted
   11.80 -Content-Description: PGP/MIME version identification
   11.81 -
   11.82 -Version: 1
   11.83 -
   11.84 ---hcW81WNiFhQC1SNIcls8J07V1b1sXtfCA
   11.85 -Content-Type: application/octet-stream; name="encrypted.asc"
   11.86 -Content-Description: OpenPGP encrypted message
   11.87 -Content-Disposition: inline; filename="encrypted.asc"
   11.88 -
   11.89 ------BEGIN PGP MESSAGE-----
   11.90 -
   11.91 -hQEMA4FHqvEumyRHAQf+OCG4FM0n6pVREVP2kAUzJWy6NAgRYs4cj7pr5hDoUqZY
   11.92 -lBIfVPqNM2rG2xaSpNLfe1iY5mySKL42M+s/QM0cvfnOlS6p3U58EamslElZ9UhD
   11.93 -hBUrX/1NJwdoKyR07Wq3A1UFFYQMYsszPwoC82SCFOhYjEmdZ8/nppViUk3aAUvq
   11.94 -do80ZzvNnlJqgwPEUmMEy9p19XJxQQwG75yHmUsoTvgi9ELvJpEzAjeYFABNzuNE
   11.95 -lh5whuMqmVbEafAYtopB+dwxQxSUdQUHntLU2MrbH8QXGtP98ZaDTHg/Zj24zkUG
   11.96 -Ur/5DZJgzDMrAttorpp/2/NMmakIezy7JaoGQtyYRYUBDANaAgXZcwg/TQEIALLR
   11.97 -7OlIlUYelrktOnrkTy8BrrEuUj95uBM5TkkvWIfR2b3ylC5iWwa/RlIU4RC0VH3j
   11.98 -epwLQNJJKFi/qKwxReE+RMKZW00loUuYnVWeaj58ExTNsdpFJDut35AIp8FNzTmy
   11.99 -C4xv5VVZZnolRd6CW0GUuxEe1zXq1MiyuGHu5AwFgWl728KaRXF2tEVyrQt/okXx
  11.100 -kF7yWkO4oo25VZWCrboUc1FND/7dbfP/PtLKIj05l+xwNaIEt1gb1IM7SxjN+2Tx
  11.101 -Ayp/w1npFhugBkSV3JaIk9dfHpMlLP5URZn30dXElK0an7aB8IwZWwdObo4zlevI
  11.102 -K4nN+UU1Z/kN1guxYDbS6QGOo2Y8829kaOXkBC3HDQEkef631jj1FuVB6VJvhb0u
  11.103 -5EKaxyw8aVxodRQaK9CcKCqwDlnyhHqd4fdMjPk9zTV9xrnqSdC5yKoAhBJ9sFef
  11.104 -Qv5qjYiBUhB+7uGMvRifvO+bT+8q44IS7z/bdXJFjbImgtx57yKvujyvrZlDe6q3
  11.105 -1nzS1jqMQ8NCDP/CKs5WUlaH9LIQ/NWF10EulTjaZ0QZ6iNU0MTqmhs4ZJIsPmBo
  11.106 -g6Qz9x8imV37cC9lHhw/vp99Dal9YulTxdYZnWSfTh289bHqaMEXGYJUsDh3IEYx
  11.107 -UP1bzza+N2dqeiysDmeTNhbZvwk54VmaKMrj/ut/3WIrsulBY7YxE/azle78Ydab
  11.108 -/tKu5YUbVydnVJ6y1s4yASjaOG7ycMIaXggWKUIfWh5Y7BLFHYbcMMltPrspftW7
  11.109 -tjtbL1SUHw0NTfCkBqRv4GpvIAXTCmlxvLw//ee1JZ0nuLnQZBF2GQ0wJVsbunT9
  11.110 -dUschdnIWLfWlueldt+5wOkB6L4quoZ7LWefMQu/b3bg/GWoBtuC3fJDnCsbJO07
  11.111 -nJxZTPxsI3iFUGGtXkg4jGC+yDMlQu3a7LwEkKzx9LT/S1OUndpaBQr6YjyrnET6
  11.112 -w1Hz6jLb5t/2fzrBwkKw1TCu4+pkevIGaGxgQY6TB15jcmWRkUF3sakTrH0UOCSq
  11.113 -wEzFoPF4+WjtXNk/wHw8zkrW7QCe+wbjLjwcUUK/ulKT9/II/k/aUwTt+GzWCGVq
  11.114 -KWq7VLtwa8lrJ74R+XISks9/Hv/nJ8Ay1DfpcQU2HQSnQpSrXupXIA+VoHU/b8xD
  11.115 -YcgqaRKsGYHUANjNs4PpplXlEHp5bpF/ZOpfVAJNnGQ96Cj182DLQgiB0j7Ishjv
  11.116 -XoNDVL45KKW0uWjimZbCauWrD6tjZfBmydymezbPLCB9R+tE68TA/XmpXzInXWML
  11.117 -YDK7tS8TYEkodzSkfDeB7BtXBRIxH4vm2M0E0OdJuLxjrOYeIH4xToUslS9pdog0
  11.118 -z3aqPQbXF4hFc8Fso83dmoc26mQd3H0LrP7yF4HR
  11.119 -=gLhG
  11.120 ------END PGP MESSAGE-----
  11.121 -
  11.122 ---hcW81WNiFhQC1SNIcls8J07V1b1sXtfCA--
    12.1 --- a/test/test_mails/pEp_subject_normal_signed2.eml	Tue Sep 12 19:23:56 2017 +0200
    12.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    12.3 @@ -1,119 +0,0 @@
    12.4 -Return-Path: <pep.test.alice@pep-project.org>
    12.5 -X-Original-To: krista@gnunet.org
    12.6 -Delivered-To: krista@gnunet.org
    12.7 -Received: from vmmailrelay1.informatik.tu-muenchen.de (mailrelay1.informatik.tu-muenchen.de [131.159.254.14])
    12.8 -	by sam.net.in.tum.de (Postfix) with ESMTP id 768301C00BC
    12.9 -	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:26:24 +0200 (CEST)
   12.10 -Received: by vmmailrelay1.informatik.tu-muenchen.de (Postfix, from userid 109)
   12.11 -	id 4DD7D1C0383; Mon, 12 Jun 2017 15:26:25 +0200 (CEST)
   12.12 -Received: from vmmailrelay1.informatik.tu-muenchen.de (localhost [127.0.0.1])
   12.13 -	by vmmailrelay1.informatik.tu-muenchen.de (Postfix) with ESMTP id 2AD621C037C
   12.14 -	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:26:25 +0200 (CEST)
   12.15 -Received: from vmmaildmz2.informatik.tu-muenchen.de (vmmaildmz2.informatik.tu-muenchen.de [131.159.0.88])
   12.16 -	by vmmailrelay1.informatik.tu-muenchen.de (Postfix) with ESMTP id 15DA11C037A
   12.17 -	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:26:25 +0200 (CEST)
   12.18 -Received: by vmmaildmz2.informatik.tu-muenchen.de (Postfix, from userid 109)
   12.19 -	id 13FCC1C2AE2; Mon, 12 Jun 2017 15:26:25 +0200 (CEST)
   12.20 -X-Spam-Checker-Version: SpamAssassin 3.4.0-tuminfo_1 (2014-02-07) on
   12.21 -	vmmaildmz2.informatik.tu-muenchen.de
   12.22 -X-Spam-Level: 
   12.23 -X-Spam-Status: No, score=-2.6 required=7.0 tests=AWL,BAYES_00,
   12.24 -	ENCRYPTED_MESSAGE,RCVD_IN_DNSWL_LOW,TVD_RCVD_SPACE_BRACKET,UNPARSEABLE_RELAY
   12.25 -	autolearn=no autolearn_force=no version=3.4.0-tuminfo_1
   12.26 -Received: from vmmaildmz2.informatik.tu-muenchen.de (localhost [127.0.0.1])
   12.27 -	by vmmaildmz2.informatik.tu-muenchen.de (Postfix) with ESMTP id 953971C2AE1
   12.28 -	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:26:23 +0200 (CEST)
   12.29 -Received: from mi4-p00-ob.smtp.rzone.de (mi4-p00-ob.smtp.rzone.de [81.169.146.144])
   12.30 -	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
   12.31 -	(No client certificate requested)
   12.32 -	by vmmaildmz2.informatik.tu-muenchen.de (Postfix) with ESMTPS id 8540A1C2AE0
   12.33 -	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:26:23 +0200 (CEST)
   12.34 -X-RZG-FWD-BY: pep.test.recip@kgrothoff.org
   12.35 -Received: from mailin.rzone.de ([unix socket])
   12.36 -	by mailin.rzone.de (RZmta 40.9) with LMTPA;
   12.37 -	Mon, 12 Jun 2017 15:26:02 +0200 (CEST)
   12.38 -Authentication-Results: strato.com 1;
   12.39 -	spf=none
   12.40 -		smtp.mailfrom="pep.test.alice@pep-project.org";
   12.41 -	dkim=none;
   12.42 -	domainkeys=none;
   12.43 -	dkim-adsp=none
   12.44 -		header.from="pep.test.alice@pep-project.org"
   12.45 -X-Strato-MessageType: email
   12.46 -X-RZG-CLASS-ID: mi00
   12.47 -Received-SPF: none
   12.48 -	client-ip=131.159.0.8;
   12.49 -	helo="mail-out1.informatik.tu-muenchen.de";
   12.50 -	envelope-from="pep.test.alice@pep-project.org";
   12.51 -	receiver=smtpin.rzone.de;
   12.52 -	identity=mailfrom;
   12.53 -Received: from mail-out1.informatik.tu-muenchen.de ([131.159.0.8])
   12.54 -	by smtpin.rzone.de (RZmta 40.9 OK)
   12.55 -	with ESMTPS id v06d9ft5CDQ2Xj1
   12.56 -	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (curve secp521r1 with 521 ECDH bits, eq. 15360 bits RSA))
   12.57 -	(Client did not present a certificate)
   12.58 -	for <pep.test.recip@kgrothoff.org>;
   12.59 -	Mon, 12 Jun 2017 15:26:02 +0200 (CEST)
   12.60 -Received: from [192.168.178.22] (ip5f584089.dynamic.kabel-deutschland.de [95.88.64.137])
   12.61 -	by services.sec.in.tum.de (Postfix) with ESMTPSA id BEAA21013AE47
   12.62 -	for <pep.test.recip@kgrothoff.org>; Mon, 12 Jun 2017 15:25:56 +0200 (CEST)
   12.63 -To: pep.test.recip@kgrothoff.org
   12.64 -Reply-To: krista@pep-project.org
   12.65 -From: pEp Test Alice <pep.test.alice@pep-project.org>
   12.66 -Subject: =?UTF-8?B?cOKJoXA=?=
   12.67 -Organization: pEp
   12.68 -Message-ID: <988e71f4-df80-906e-8bbb-68d48069d4ac@pep-project.org>
   12.69 -Date: Mon, 12 Jun 2017 15:25:56 +0200
   12.70 -User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101
   12.71 - Thunderbird/45.8.0
   12.72 -MIME-Version: 1.0
   12.73 -Content-Type: multipart/encrypted;
   12.74 - protocol="application/pgp-encrypted";
   12.75 - boundary="hcW81WNiFhQC1SNIcls8J07V1b1sXtfCA"
   12.76 -
   12.77 -This is an OpenPGP/MIME encrypted message (RFC 4880 and 3156)
   12.78 ---hcW81WNiFhQC1SNIcls8J07V1b1sXtfCA
   12.79 -Content-Type: application/pgp-encrypted
   12.80 -Content-Description: PGP/MIME version identification
   12.81 -
   12.82 -Version: 1
   12.83 -
   12.84 ---hcW81WNiFhQC1SNIcls8J07V1b1sXtfCA
   12.85 -Content-Type: application/octet-stream; name="encrypted.asc"
   12.86 -Content-Description: OpenPGP encrypted message
   12.87 -Content-Disposition: inline; filename="encrypted.asc"
   12.88 -
   12.89 ------BEGIN PGP MESSAGE-----
   12.90 -
   12.91 -hQEMA4FHqvEumyRHAQf+OCG4FM0n6pVREVP2kAUzJWy6NAgRYs4cj7pr5hDoUqZY
   12.92 -lBIfVPqNM2rG2xaSpNLfe1iY5mySKL42M+s/QM0cvfnOlS6p3U58EamslElZ9UhD
   12.93 -hBUrX/1NJwdoKyR07Wq3A1UFFYQMYsszPwoC82SCFOhYjEmdZ8/nppViUk3aAUvq
   12.94 -do80ZzvNnlJqgwPEUmMEy9p19XJxQQwG75yHmUsoTvgi9ELvJpEzAjeYFABNzuNE
   12.95 -lh5whuMqmVbEafAYtopB+dwxQxSUdQUHntLU2MrbH8QXGtP98ZaDTHg/Zj24zkUG
   12.96 -Ur/5DZJgzDMrAttorpp/2/NMmakIezy7JaoGQtyYRYUBDANaAgXZcwg/TQEIALLR
   12.97 -7OlIlUYelrktOnrkTy8BrrEuUj95uBM5TkkvWIfR2b3ylC5iWwa/RlIU4RC0VH3j
   12.98 -epwLQNJJKFi/qKwxReE+RMKZW00loUuYnVWeaj58ExTNsdpFJDut35AIp8FNzTmy
   12.99 -C4xv5VVZZnolRd6CW0GUuxEe1zXq1MiyuGHu5AwFgWl728KaRXF2tEVyrQt/okXx
  12.100 -kF7yWkO4oo25VZWCrboUc1FND/7dbfP/PtLKIj05l+xwNaIEt1gb1IM7SxjN+2Tx
  12.101 -Ayp/w1npFhugBkSV3JaIk9dfHpMlLP5URZn30dXElK0an7aB8IwZWwdObo4zlevI
  12.102 -K4nN+UU1Z/kN1guxYDbS6QGOo2Y8829kaOXkBC3HDQEkef631jj1FuVB6VJvhb0u
  12.103 -5EKaxyw8aVxodRQaK9CcKCqwDlnyhHqd4fdMjPk9zTV9xrnqSdC5yKoAhBJ9sFef
  12.104 -Qv5qjYiBUhB+7uGMvRifvO+bT+8q44IS7z/bdXJFjbImgtx57yKvujyvrZlDe6q3
  12.105 -1nzS1jqMQ8NCDP/CKs5WUlaH9LIQ/NWF10EulTjaZ0QZ6iNU0MTqmhs4ZJIsPmBo
  12.106 -g6Qz9x8imV37cC9lHhw/vp99Dal9YulTxdYZnWSfTh289bHqaMEXGYJUsDh3IEYx
  12.107 -UP1bzza+N2dqeiysDmeTNhbZvwk54VmaKMrj/ut/3WIrsulBY7YxE/azle78Ydab
  12.108 -/tKu5YUbVydnVJ6y1s4yASjaOG7ycMIaXggWKUIfWh5Y7BLFHYbcMMltPrspftW7
  12.109 -tjtbL1SUHw0NTfCkBqRv4GpvIAXTCmlxvLw//ee1JZ0nuLnQZBF2GQ0wJVsbunT9
  12.110 -dUschdnIWLfWlueldt+5wOkB6L4quoZ7LWefMQu/b3bg/GWoBtuC3fJDnCsbJO07
  12.111 -nJxZTPxsI3iFUGGtXkg4jGC+yDMlQu3a7LwEkKzx9LT/S1OUndpaBQr6YjyrnET6
  12.112 -w1Hz6jLb5t/2fzrBwkKw1TCu4+pkevIGaGxgQY6TB15jcmWRkUF3sakTrH0UOCSq
  12.113 -wEzFoPF4+WjtXNk/wHw8zkrW7QCe+wbjLjwcUUK/ulKT9/II/k/aUwTt+GzWCGVq
  12.114 -KWq7VLtwa8lrJ74R+XISks9/Hv/nJ8Ay1DfpcQU2HQSnQpSrXupXIA+VoHU/b8xD
  12.115 -YcgqaRKsGYHUANjNs4PpplXlEHp5bpF/ZOpfVAJNnGQ96Cj182DLQgiB0j7Ishjv
  12.116 -XoNDVL45KKW0uWjimZbCauWrD6tjZfBmydymezbPLCB9R+tE68TA/XmpXzInXWML
  12.117 -YDK7tS8TYEkodzSkfDeB7BtXBRIxH4vm2M0E0OdJuLxjrOYeIH4xToUslS9pdog0
  12.118 -z3aqPQbXF4hFc8Fso83dmoc26mQd3H0LrP7yF4HR
  12.119 -=gLhG
  12.120 ------END PGP MESSAGE-----
  12.121 -
  12.122 ---hcW81WNiFhQC1SNIcls8J07V1b1sXtfCA--
    13.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    13.2 +++ b/test/test_mails/pEp_subject_normal_signed_2a.eml	Wed Sep 13 01:59:28 2017 +0200
    13.3 @@ -0,0 +1,119 @@
    13.4 +Return-Path: <pep.test.alice@pep-project.org>
    13.5 +X-Original-To: krista@gnunet.org
    13.6 +Delivered-To: krista@gnunet.org
    13.7 +Received: from vmmailrelay1.informatik.tu-muenchen.de (mailrelay1.informatik.tu-muenchen.de [131.159.254.14])
    13.8 +	by sam.net.in.tum.de (Postfix) with ESMTP id 768301C00BC
    13.9 +	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:26:24 +0200 (CEST)
   13.10 +Received: by vmmailrelay1.informatik.tu-muenchen.de (Postfix, from userid 109)
   13.11 +	id 4DD7D1C0383; Mon, 12 Jun 2017 15:26:25 +0200 (CEST)
   13.12 +Received: from vmmailrelay1.informatik.tu-muenchen.de (localhost [127.0.0.1])
   13.13 +	by vmmailrelay1.informatik.tu-muenchen.de (Postfix) with ESMTP id 2AD621C037C
   13.14 +	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:26:25 +0200 (CEST)
   13.15 +Received: from vmmaildmz2.informatik.tu-muenchen.de (vmmaildmz2.informatik.tu-muenchen.de [131.159.0.88])
   13.16 +	by vmmailrelay1.informatik.tu-muenchen.de (Postfix) with ESMTP id 15DA11C037A
   13.17 +	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:26:25 +0200 (CEST)
   13.18 +Received: by vmmaildmz2.informatik.tu-muenchen.de (Postfix, from userid 109)
   13.19 +	id 13FCC1C2AE2; Mon, 12 Jun 2017 15:26:25 +0200 (CEST)
   13.20 +X-Spam-Checker-Version: SpamAssassin 3.4.0-tuminfo_1 (2014-02-07) on
   13.21 +	vmmaildmz2.informatik.tu-muenchen.de
   13.22 +X-Spam-Level: 
   13.23 +X-Spam-Status: No, score=-2.6 required=7.0 tests=AWL,BAYES_00,
   13.24 +	ENCRYPTED_MESSAGE,RCVD_IN_DNSWL_LOW,TVD_RCVD_SPACE_BRACKET,UNPARSEABLE_RELAY
   13.25 +	autolearn=no autolearn_force=no version=3.4.0-tuminfo_1
   13.26 +Received: from vmmaildmz2.informatik.tu-muenchen.de (localhost [127.0.0.1])
   13.27 +	by vmmaildmz2.informatik.tu-muenchen.de (Postfix) with ESMTP id 953971C2AE1
   13.28 +	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:26:23 +0200 (CEST)
   13.29 +Received: from mi4-p00-ob.smtp.rzone.de (mi4-p00-ob.smtp.rzone.de [81.169.146.144])
   13.30 +	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
   13.31 +	(No client certificate requested)
   13.32 +	by vmmaildmz2.informatik.tu-muenchen.de (Postfix) with ESMTPS id 8540A1C2AE0
   13.33 +	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:26:23 +0200 (CEST)
   13.34 +X-RZG-FWD-BY: pep.test.recip@kgrothoff.org
   13.35 +Received: from mailin.rzone.de ([unix socket])
   13.36 +	by mailin.rzone.de (RZmta 40.9) with LMTPA;
   13.37 +	Mon, 12 Jun 2017 15:26:02 +0200 (CEST)
   13.38 +Authentication-Results: strato.com 1;
   13.39 +	spf=none
   13.40 +		smtp.mailfrom="pep.test.alice@pep-project.org";
   13.41 +	dkim=none;
   13.42 +	domainkeys=none;
   13.43 +	dkim-adsp=none
   13.44 +		header.from="pep.test.alice@pep-project.org"
   13.45 +X-Strato-MessageType: email
   13.46 +X-RZG-CLASS-ID: mi00
   13.47 +Received-SPF: none
   13.48 +	client-ip=131.159.0.8;
   13.49 +	helo="mail-out1.informatik.tu-muenchen.de";
   13.50 +	envelope-from="pep.test.alice@pep-project.org";
   13.51 +	receiver=smtpin.rzone.de;
   13.52 +	identity=mailfrom;
   13.53 +Received: from mail-out1.informatik.tu-muenchen.de ([131.159.0.8])
   13.54 +	by smtpin.rzone.de (RZmta 40.9 OK)
   13.55 +	with ESMTPS id v06d9ft5CDQ2Xj1
   13.56 +	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (curve secp521r1 with 521 ECDH bits, eq. 15360 bits RSA))
   13.57 +	(Client did not present a certificate)
   13.58 +	for <pep.test.recip@kgrothoff.org>;
   13.59 +	Mon, 12 Jun 2017 15:26:02 +0200 (CEST)
   13.60 +Received: from [192.168.178.22] (ip5f584089.dynamic.kabel-deutschland.de [95.88.64.137])
   13.61 +	by services.sec.in.tum.de (Postfix) with ESMTPSA id BEAA21013AE47
   13.62 +	for <pep.test.recip@kgrothoff.org>; Mon, 12 Jun 2017 15:25:56 +0200 (CEST)
   13.63 +To: pep.test.recip@kgrothoff.org
   13.64 +Reply-To: krista@pep-project.org
   13.65 +From: pEp Test Alice <pep.test.alice@pep-project.org>
   13.66 +Subject: pEp
   13.67 +Organization: pEp
   13.68 +Message-ID: <988e71f4-df80-906e-8bbb-68d48069d4ac@pep-project.org>
   13.69 +Date: Mon, 12 Jun 2017 15:25:56 +0200
   13.70 +User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101
   13.71 + Thunderbird/45.8.0
   13.72 +MIME-Version: 1.0
   13.73 +Content-Type: multipart/encrypted;
   13.74 + protocol="application/pgp-encrypted";
   13.75 + boundary="hcW81WNiFhQC1SNIcls8J07V1b1sXtfCA"
   13.76 +
   13.77 +This is an OpenPGP/MIME encrypted message (RFC 4880 and 3156)
   13.78 +--hcW81WNiFhQC1SNIcls8J07V1b1sXtfCA
   13.79 +Content-Type: application/pgp-encrypted
   13.80 +Content-Description: PGP/MIME version identification
   13.81 +
   13.82 +Version: 1
   13.83 +
   13.84 +--hcW81WNiFhQC1SNIcls8J07V1b1sXtfCA
   13.85 +Content-Type: application/octet-stream; name="encrypted.asc"
   13.86 +Content-Description: OpenPGP encrypted message
   13.87 +Content-Disposition: inline; filename="encrypted.asc"
   13.88 +
   13.89 +-----BEGIN PGP MESSAGE-----
   13.90 +
   13.91 +hQEMA4FHqvEumyRHAQf+OCG4FM0n6pVREVP2kAUzJWy6NAgRYs4cj7pr5hDoUqZY
   13.92 +lBIfVPqNM2rG2xaSpNLfe1iY5mySKL42M+s/QM0cvfnOlS6p3U58EamslElZ9UhD
   13.93 +hBUrX/1NJwdoKyR07Wq3A1UFFYQMYsszPwoC82SCFOhYjEmdZ8/nppViUk3aAUvq
   13.94 +do80ZzvNnlJqgwPEUmMEy9p19XJxQQwG75yHmUsoTvgi9ELvJpEzAjeYFABNzuNE
   13.95 +lh5whuMqmVbEafAYtopB+dwxQxSUdQUHntLU2MrbH8QXGtP98ZaDTHg/Zj24zkUG
   13.96 +Ur/5DZJgzDMrAttorpp/2/NMmakIezy7JaoGQtyYRYUBDANaAgXZcwg/TQEIALLR
   13.97 +7OlIlUYelrktOnrkTy8BrrEuUj95uBM5TkkvWIfR2b3ylC5iWwa/RlIU4RC0VH3j
   13.98 +epwLQNJJKFi/qKwxReE+RMKZW00loUuYnVWeaj58ExTNsdpFJDut35AIp8FNzTmy
   13.99 +C4xv5VVZZnolRd6CW0GUuxEe1zXq1MiyuGHu5AwFgWl728KaRXF2tEVyrQt/okXx
  13.100 +kF7yWkO4oo25VZWCrboUc1FND/7dbfP/PtLKIj05l+xwNaIEt1gb1IM7SxjN+2Tx
  13.101 +Ayp/w1npFhugBkSV3JaIk9dfHpMlLP5URZn30dXElK0an7aB8IwZWwdObo4zlevI
  13.102 +K4nN+UU1Z/kN1guxYDbS6QGOo2Y8829kaOXkBC3HDQEkef631jj1FuVB6VJvhb0u
  13.103 +5EKaxyw8aVxodRQaK9CcKCqwDlnyhHqd4fdMjPk9zTV9xrnqSdC5yKoAhBJ9sFef
  13.104 +Qv5qjYiBUhB+7uGMvRifvO+bT+8q44IS7z/bdXJFjbImgtx57yKvujyvrZlDe6q3
  13.105 +1nzS1jqMQ8NCDP/CKs5WUlaH9LIQ/NWF10EulTjaZ0QZ6iNU0MTqmhs4ZJIsPmBo
  13.106 +g6Qz9x8imV37cC9lHhw/vp99Dal9YulTxdYZnWSfTh289bHqaMEXGYJUsDh3IEYx
  13.107 +UP1bzza+N2dqeiysDmeTNhbZvwk54VmaKMrj/ut/3WIrsulBY7YxE/azle78Ydab
  13.108 +/tKu5YUbVydnVJ6y1s4yASjaOG7ycMIaXggWKUIfWh5Y7BLFHYbcMMltPrspftW7
  13.109 +tjtbL1SUHw0NTfCkBqRv4GpvIAXTCmlxvLw//ee1JZ0nuLnQZBF2GQ0wJVsbunT9
  13.110 +dUschdnIWLfWlueldt+5wOkB6L4quoZ7LWefMQu/b3bg/GWoBtuC3fJDnCsbJO07
  13.111 +nJxZTPxsI3iFUGGtXkg4jGC+yDMlQu3a7LwEkKzx9LT/S1OUndpaBQr6YjyrnET6
  13.112 +w1Hz6jLb5t/2fzrBwkKw1TCu4+pkevIGaGxgQY6TB15jcmWRkUF3sakTrH0UOCSq
  13.113 +wEzFoPF4+WjtXNk/wHw8zkrW7QCe+wbjLjwcUUK/ulKT9/II/k/aUwTt+GzWCGVq
  13.114 +KWq7VLtwa8lrJ74R+XISks9/Hv/nJ8Ay1DfpcQU2HQSnQpSrXupXIA+VoHU/b8xD
  13.115 +YcgqaRKsGYHUANjNs4PpplXlEHp5bpF/ZOpfVAJNnGQ96Cj182DLQgiB0j7Ishjv
  13.116 +XoNDVL45KKW0uWjimZbCauWrD6tjZfBmydymezbPLCB9R+tE68TA/XmpXzInXWML
  13.117 +YDK7tS8TYEkodzSkfDeB7BtXBRIxH4vm2M0E0OdJuLxjrOYeIH4xToUslS9pdog0
  13.118 +z3aqPQbXF4hFc8Fso83dmoc26mQd3H0LrP7yF4HR
  13.119 +=gLhG
  13.120 +-----END PGP MESSAGE-----
  13.121 +
  13.122 +--hcW81WNiFhQC1SNIcls8J07V1b1sXtfCA--
    14.1 --- a/test/test_mails/pEp_subject_normal_unencrypted.eml	Tue Sep 12 19:23:56 2017 +0200
    14.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    14.3 @@ -1,75 +0,0 @@
    14.4 -Return-Path: <pep.test.alice@pep-project.org>
    14.5 -X-Original-To: krista@gnunet.org
    14.6 -Delivered-To: krista@gnunet.org
    14.7 -Received: from vmmailrelay1.informatik.tu-muenchen.de (mailrelay1.informatik.tu-muenchen.de [131.159.254.14])
    14.8 -	by sam.net.in.tum.de (Postfix) with ESMTP id 140C01C00BC
    14.9 -	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:27:21 +0200 (CEST)
   14.10 -Received: by vmmailrelay1.informatik.tu-muenchen.de (Postfix, from userid 109)
   14.11 -	id DAE901C0390; Mon, 12 Jun 2017 15:27:21 +0200 (CEST)
   14.12 -Received: from vmmailrelay1.informatik.tu-muenchen.de (localhost [127.0.0.1])
   14.13 -	by vmmailrelay1.informatik.tu-muenchen.de (Postfix) with ESMTP id B86091C0383
   14.14 -	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:27:21 +0200 (CEST)
   14.15 -Received: from vmmaildmz1.informatik.tu-muenchen.de (vmmaildmz1.informatik.tu-muenchen.de [131.159.0.87])
   14.16 -	by vmmailrelay1.informatik.tu-muenchen.de (Postfix) with ESMTP id AE13F1C037A
   14.17 -	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:27:21 +0200 (CEST)
   14.18 -Received: by vmmaildmz1.informatik.tu-muenchen.de (Postfix, from userid 109)
   14.19 -	id AC51F1C2D9F; Mon, 12 Jun 2017 15:27:21 +0200 (CEST)
   14.20 -X-Spam-Checker-Version: SpamAssassin 3.4.0-tuminfo_1 (2014-02-07) on
   14.21 -	vmmaildmz1.informatik.tu-muenchen.de
   14.22 -X-Spam-Level: 
   14.23 -X-Spam-Status: No, score=-3.1 required=7.0 tests=AWL,BAYES_00,
   14.24 -	RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,TVD_RCVD_SPACE_BRACKET,
   14.25 -	UNPARSEABLE_RELAY autolearn=no autolearn_force=no version=3.4.0-tuminfo_1
   14.26 -Received: from vmmaildmz1.informatik.tu-muenchen.de (localhost [127.0.0.1])
   14.27 -	by vmmaildmz1.informatik.tu-muenchen.de (Postfix) with ESMTP id 3B30C1C2D9E
   14.28 -	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:27:20 +0200 (CEST)
   14.29 -Received: from mi4-p00-ob.smtp.rzone.de (mi4-p00-ob.smtp.rzone.de [81.169.146.148])
   14.30 -	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
   14.31 -	(No client certificate requested)
   14.32 -	by vmmaildmz1.informatik.tu-muenchen.de (Postfix) with ESMTPS id 2AEF61C2D9B
   14.33 -	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:27:20 +0200 (CEST)
   14.34 -X-RZG-FWD-BY: pep.test.recip@kgrothoff.org
   14.35 -Received: from mailin.rzone.de ([unix socket])
   14.36 -	by mailin.rzone.de (RZmta 40.9) with LMTPA;
   14.37 -	Mon, 12 Jun 2017 15:27:00 +0200 (CEST)
   14.38 -Authentication-Results: strato.com 1;
   14.39 -	spf=none
   14.40 -		smtp.mailfrom="pep.test.alice@pep-project.org";
   14.41 -	dkim=none;
   14.42 -	domainkeys=none;
   14.43 -	dkim-adsp=none
   14.44 -		header.from="pep.test.alice@pep-project.org"
   14.45 -X-Strato-MessageType: email
   14.46 -X-RZG-CLASS-ID: mi00
   14.47 -Received-SPF: none
   14.48 -	client-ip=131.159.0.8;
   14.49 -	helo="mail-out1.informatik.tu-muenchen.de";
   14.50 -	envelope-from="pep.test.alice@pep-project.org";
   14.51 -	receiver=smtpin.rzone.de;
   14.52 -	identity=mailfrom;
   14.53 -Received: from mail-out1.informatik.tu-muenchen.de ([131.159.0.8])
   14.54 -	by smtpin.rzone.de (RZmta 40.9 OK)
   14.55 -	with ESMTPS id T01d0bt5CDR0XKI
   14.56 -	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (curve secp521r1 with 521 ECDH bits, eq. 15360 bits RSA))
   14.57 -	(Client did not present a certificate)
   14.58 -	for <pep.test.recip@kgrothoff.org>;
   14.59 -	Mon, 12 Jun 2017 15:27:00 +0200 (CEST)
   14.60 -Received: from [192.168.178.22] (ip5f584089.dynamic.kabel-deutschland.de [95.88.64.137])
   14.61 -	by services.sec.in.tum.de (Postfix) with ESMTPSA id 1DF211013AE47
   14.62 -	for <pep.test.recip@kgrothoff.org>; Mon, 12 Jun 2017 15:26:55 +0200 (CEST)
   14.63 -Reply-To: krista@pep-project.org
   14.64 -To: pep.test.recip@kgrothoff.org
   14.65 -From: pEp Test Alice <pep.test.alice@pep-project.org>
   14.66 -Subject: pEp
   14.67 -Organization: pEp
   14.68 -Message-ID: <6205efbe-684d-9f21-8a2e-887d46a145e6@pep-project.org>
   14.69 -Date: Mon, 12 Jun 2017 15:26:54 +0200
   14.70 -User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101
   14.71 - Thunderbird/45.8.0
   14.72 -MIME-Version: 1.0
   14.73 -Content-Type: text/plain; charset=utf-8
   14.74 -Content-Transfer-Encoding: 7bit
   14.75 -
   14.76 -Subject: Unencrypted try...
   14.77 -
   14.78 -La la la...
    15.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    15.2 +++ b/test/test_mails/pEp_subject_normal_unencrypted_6.eml	Wed Sep 13 01:59:28 2017 +0200
    15.3 @@ -0,0 +1,75 @@
    15.4 +Return-Path: <pep.test.alice@pep-project.org>
    15.5 +X-Original-To: krista@gnunet.org
    15.6 +Delivered-To: krista@gnunet.org
    15.7 +Received: from vmmailrelay1.informatik.tu-muenchen.de (mailrelay1.informatik.tu-muenchen.de [131.159.254.14])
    15.8 +	by sam.net.in.tum.de (Postfix) with ESMTP id 140C01C00BC
    15.9 +	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:27:21 +0200 (CEST)
   15.10 +Received: by vmmailrelay1.informatik.tu-muenchen.de (Postfix, from userid 109)
   15.11 +	id DAE901C0390; Mon, 12 Jun 2017 15:27:21 +0200 (CEST)
   15.12 +Received: from vmmailrelay1.informatik.tu-muenchen.de (localhost [127.0.0.1])
   15.13 +	by vmmailrelay1.informatik.tu-muenchen.de (Postfix) with ESMTP id B86091C0383
   15.14 +	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:27:21 +0200 (CEST)
   15.15 +Received: from vmmaildmz1.informatik.tu-muenchen.de (vmmaildmz1.informatik.tu-muenchen.de [131.159.0.87])
   15.16 +	by vmmailrelay1.informatik.tu-muenchen.de (Postfix) with ESMTP id AE13F1C037A
   15.17 +	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:27:21 +0200 (CEST)
   15.18 +Received: by vmmaildmz1.informatik.tu-muenchen.de (Postfix, from userid 109)
   15.19 +	id AC51F1C2D9F; Mon, 12 Jun 2017 15:27:21 +0200 (CEST)
   15.20 +X-Spam-Checker-Version: SpamAssassin 3.4.0-tuminfo_1 (2014-02-07) on
   15.21 +	vmmaildmz1.informatik.tu-muenchen.de
   15.22 +X-Spam-Level: 
   15.23 +X-Spam-Status: No, score=-3.1 required=7.0 tests=AWL,BAYES_00,
   15.24 +	RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,TVD_RCVD_SPACE_BRACKET,
   15.25 +	UNPARSEABLE_RELAY autolearn=no autolearn_force=no version=3.4.0-tuminfo_1
   15.26 +Received: from vmmaildmz1.informatik.tu-muenchen.de (localhost [127.0.0.1])
   15.27 +	by vmmaildmz1.informatik.tu-muenchen.de (Postfix) with ESMTP id 3B30C1C2D9E
   15.28 +	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:27:20 +0200 (CEST)
   15.29 +Received: from mi4-p00-ob.smtp.rzone.de (mi4-p00-ob.smtp.rzone.de [81.169.146.148])
   15.30 +	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
   15.31 +	(No client certificate requested)
   15.32 +	by vmmaildmz1.informatik.tu-muenchen.de (Postfix) with ESMTPS id 2AEF61C2D9B
   15.33 +	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:27:20 +0200 (CEST)
   15.34 +X-RZG-FWD-BY: pep.test.recip@kgrothoff.org
   15.35 +Received: from mailin.rzone.de ([unix socket])
   15.36 +	by mailin.rzone.de (RZmta 40.9) with LMTPA;
   15.37 +	Mon, 12 Jun 2017 15:27:00 +0200 (CEST)
   15.38 +Authentication-Results: strato.com 1;
   15.39 +	spf=none
   15.40 +		smtp.mailfrom="pep.test.alice@pep-project.org";
   15.41 +	dkim=none;
   15.42 +	domainkeys=none;
   15.43 +	dkim-adsp=none
   15.44 +		header.from="pep.test.alice@pep-project.org"
   15.45 +X-Strato-MessageType: email
   15.46 +X-RZG-CLASS-ID: mi00
   15.47 +Received-SPF: none
   15.48 +	client-ip=131.159.0.8;
   15.49 +	helo="mail-out1.informatik.tu-muenchen.de";
   15.50 +	envelope-from="pep.test.alice@pep-project.org";
   15.51 +	receiver=smtpin.rzone.de;
   15.52 +	identity=mailfrom;
   15.53 +Received: from mail-out1.informatik.tu-muenchen.de ([131.159.0.8])
   15.54 +	by smtpin.rzone.de (RZmta 40.9 OK)
   15.55 +	with ESMTPS id T01d0bt5CDR0XKI
   15.56 +	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (curve secp521r1 with 521 ECDH bits, eq. 15360 bits RSA))
   15.57 +	(Client did not present a certificate)
   15.58 +	for <pep.test.recip@kgrothoff.org>;
   15.59 +	Mon, 12 Jun 2017 15:27:00 +0200 (CEST)
   15.60 +Received: from [192.168.178.22] (ip5f584089.dynamic.kabel-deutschland.de [95.88.64.137])
   15.61 +	by services.sec.in.tum.de (Postfix) with ESMTPSA id 1DF211013AE47
   15.62 +	for <pep.test.recip@kgrothoff.org>; Mon, 12 Jun 2017 15:26:55 +0200 (CEST)
   15.63 +Reply-To: krista@pep-project.org
   15.64 +To: pep.test.recip@kgrothoff.org
   15.65 +From: pEp Test Alice <pep.test.alice@pep-project.org>
   15.66 +Subject: This is just a normal subject, really
   15.67 +Organization: pEp
   15.68 +Message-ID: <6205efbe-684d-9f21-8a2e-887d46a145e6@pep-project.org>
   15.69 +Date: Mon, 12 Jun 2017 15:26:54 +0200
   15.70 +User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101
   15.71 + Thunderbird/45.8.0
   15.72 +MIME-Version: 1.0
   15.73 +Content-Type: text/plain; charset=utf-8
   15.74 +Content-Transfer-Encoding: 7bit
   15.75 +
   15.76 +Subject: Unencrypted try...
   15.77 +
   15.78 +La la la...
    16.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    16.2 +++ b/test/test_mails/pEp_subject_p3p_replaced_w_p3p_4d.eml	Wed Sep 13 01:59:28 2017 +0200
    16.3 @@ -0,0 +1,113 @@
    16.4 +Return-Path: <SRS0=ne/EAk=AN=pep-project.org=pep.test.alice@srs.smtpin.rzone.de>
    16.5 +X-Original-To: krista@gnunet.org
    16.6 +Delivered-To: krista@gnunet.org
    16.7 +Received: from vmmailrelay1.informatik.tu-muenchen.de (mailrelay1.informatik.tu-muenchen.de [131.159.254.14])
    16.8 +	by sam.net.in.tum.de (Postfix) with ESMTP id 1FEF71C00BC
    16.9 +	for <krista@gnunet.org>; Tue, 12 Sep 2017 17:29:07 +0200 (CEST)
   16.10 +Received: by vmmailrelay1.informatik.tu-muenchen.de (Postfix, from userid 109)
   16.11 +	id 3444A1C1133; Tue, 12 Sep 2017 17:29:07 +0200 (CEST)
   16.12 +Received: from vmmailrelay1.informatik.tu-muenchen.de (localhost [127.0.0.1])
   16.13 +	by vmmailrelay1.informatik.tu-muenchen.de (Postfix) with ESMTP id 11D9E1C089D
   16.14 +	for <krista@gnunet.org>; Tue, 12 Sep 2017 17:29:07 +0200 (CEST)
   16.15 +Received: from vmmaildmz1.informatik.tu-muenchen.de (vmmaildmz1.informatik.tu-muenchen.de [131.159.0.87])
   16.16 +	by vmmailrelay1.informatik.tu-muenchen.de (Postfix) with ESMTP id F14C51C0E06
   16.17 +	for <krista@gnunet.org>; Tue, 12 Sep 2017 17:29:06 +0200 (CEST)
   16.18 +Received: by vmmaildmz1.informatik.tu-muenchen.de (Postfix, from userid 109)
   16.19 +	id EFDB11C2DCE; Tue, 12 Sep 2017 17:29:06 +0200 (CEST)
   16.20 +X-Spam-Checker-Version: SpamAssassin 3.4.0-tuminfo_1 (2014-02-07) on
   16.21 +	vmmaildmz1.informatik.tu-muenchen.de
   16.22 +X-Spam-Level: 
   16.23 +X-Spam-Status: No, score=-2.0 required=7.0 tests=AWL,BAYES_00,BODY_EMPTY,
   16.24 +	ENCRYPTED_MESSAGE,RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,
   16.25 +	SPF_HELO_PASS,TVD_RCVD_SPACE_BRACKET,UNPARSEABLE_RELAY autolearn=no
   16.26 +	autolearn_force=no version=3.4.0-tuminfo_1
   16.27 +Received: from vmmaildmz1.informatik.tu-muenchen.de (localhost [127.0.0.1])
   16.28 +	by vmmaildmz1.informatik.tu-muenchen.de (Postfix) with ESMTP id 0C4521C2DCE
   16.29 +	for <krista@gnunet.org>; Tue, 12 Sep 2017 17:29:05 +0200 (CEST)
   16.30 +Received: from mi4-p00-ob.smtp.rzone.de (mi4-p00-ob.smtp.rzone.de [81.169.146.149])
   16.31 +	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
   16.32 +	(No client certificate requested)
   16.33 +	by vmmaildmz1.informatik.tu-muenchen.de (Postfix) with ESMTPS id EF5321C2D88
   16.34 +	for <krista@gnunet.org>; Tue, 12 Sep 2017 17:29:04 +0200 (CEST)
   16.35 +X-RZG-FWD-BY: pep.test.recip@kgrothoff.org
   16.36 +Received: from mailin.rzone.de ([unix socket])
   16.37 +	by mailin.rzone.de (RZmta 41.4) with LMTPA;
   16.38 +	Tue, 12 Sep 2017 17:28:41 +0200 (CEST)
   16.39 +Authentication-Results: strato.com 1;
   16.40 +	spf=none
   16.41 +		smtp.mailfrom="pep.test.alice@pep-project.org";
   16.42 +	dkim=none;
   16.43 +	domainkeys=none;
   16.44 +	dkim-adsp=none
   16.45 +		header.from="pep.test.alice@pep-project.org"
   16.46 +X-Strato-MessageType: email
   16.47 +X-RZG-CLASS-ID: mi00
   16.48 +Received-SPF: none
   16.49 +	client-ip=131.159.0.8;
   16.50 +	helo="mail-out1.informatik.tu-muenchen.de";
   16.51 +	envelope-from="pep.test.alice@pep-project.org";
   16.52 +	receiver=smtpin.rzone.de;
   16.53 +	identity=mailfrom;
   16.54 +Received: from mail-out1.informatik.tu-muenchen.de ([131.159.0.8])
   16.55 +	by smtpin.rzone.de (RZmta 41.4 OK)
   16.56 +	with ESMTPS id v031a7t8CFSf6GR
   16.57 +	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (curve secp521r1 with 521 ECDH bits, eq. 15360 bits RSA))
   16.58 +	(Client did not present a certificate)
   16.59 +	for <pep.test.recip@kgrothoff.org>;
   16.60 +	Tue, 12 Sep 2017 17:28:41 +0200 (CEST)
   16.61 +Received: from [192.168.178.22] (ip5f584089.dynamic.kabel-deutschland.de [95.88.64.137])
   16.62 +	by services.sec.in.tum.de (Postfix) with ESMTPSA id E252F10C75356
   16.63 +	for <pep.test.recip@kgrothoff.org>; Tue, 12 Sep 2017 17:28:35 +0200 (CEST)
   16.64 +Reply-To: krista@pep-project.org
   16.65 +To: pep.test.recip@kgrothoff.org
   16.66 +From: pEp Test Alice <pep.test.alice@pep-project.org>
   16.67 +Subject: =?utf-8?Q?p=E2=89=A1p?=
   16.68 +Organization: pEp
   16.69 +Message-ID: <f80baf8e-0323-8be7-be21-b3ecaade6a2a@pep-project.org>
   16.70 +Date: Tue, 12 Sep 2017 17:28:35 +0200
   16.71 +User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101
   16.72 + Thunderbird/45.8.0
   16.73 +MIME-Version: 1.0
   16.74 +Content-Type: multipart/encrypted;
   16.75 + protocol="application/pgp-encrypted";
   16.76 + boundary="k1bsDcHaNcB6liQG9AJTIgqMMmV6ukLr4"
   16.77 +
   16.78 +This is an OpenPGP/MIME encrypted message (RFC 4880 and 3156)
   16.79 +--k1bsDcHaNcB6liQG9AJTIgqMMmV6ukLr4
   16.80 +Content-Type: application/pgp-encrypted
   16.81 +Content-Description: PGP/MIME version identification
   16.82 +
   16.83 +Version: 1
   16.84 +
   16.85 +--k1bsDcHaNcB6liQG9AJTIgqMMmV6ukLr4
   16.86 +Content-Type: application/octet-stream; name="encrypted.asc"
   16.87 +Content-Description: OpenPGP encrypted message
   16.88 +Content-Disposition: inline; filename="encrypted.asc"
   16.89 +
   16.90 +-----BEGIN PGP MESSAGE-----
   16.91 +
   16.92 +hQEMA4FHqvEumyRHAQf/UgdO9gLH0rwZZWqiy40V0pOlgI8+DCBpL8CvSROeEBcS
   16.93 +ELmLjpUb2tO58upJ8XYIFCbOGEufnEvaa0XcHnQSw0F8Rsenjs8MstSNKu2/1Snm
   16.94 +1qD5ephHgBTCPW6NbXY69e30HpbtHwf1Eh+NWIzrzy74i96pFfeXcRWQX5ykOM0U
   16.95 +zW+82/Ztt9CgB23PtDuRQ8gh2Y9Hq91MB0DbtwzL+KZDAWHEVRPqSSfc6e9VzHP8
   16.96 +rkzyfx+BF9nE/oJYwSevQ5R797cnpwHOIVpcmMJjtR+yA+7EVQd0FlSHGnXMjMY/
   16.97 +Qkp/zLCuEfAHVN/P91GKjtVO1CrcRjqbOdcIkh57FYUBDANaAgXZcwg/TQEH/AgN
   16.98 +CSYGTPZSoSLqcog+jTzZACeuy/a5SvuDPBTklqaaFolutvEj4mprHzUASLYSIJW2
   16.99 +P3o2sv+F1SoqCYgfi/77LAGaztXQECsH2zTvTG5Ax7tM97VMZpIc405btPGAGaxc
  16.100 +MUZ2SwivrPDWPFZgEU05gc8UOasKjxX7C9+hxNTppEgtJsM+bZHYnvjbaeZz/kGZ
  16.101 +P17qhHDVrtWVdsF9qGRQY5CMe/hByKTRVL2T1/FimVX/f1EbN/FB/bxX44rmKROc
  16.102 +r8TsOBamW50xMthspZl/w5G81XwtWIDc4XUx8lgtcKo3yLrcbq2Za2LDixT23J3f
  16.103 +bnH17pLOTOlZyKAdZ5zSwQwBvycuQ1nTUkXqhWKB8++wvhp77ILbxp0n/F+BiIHv
  16.104 +SRTT5YIZH8tVnPftmlMcANoUhW0fJOAfVexErO/QjJubXy7Ofc5QAjmsfnU2gX0f
  16.105 +A0+nN9zH2x7X+QbtxNTw0/3r2zE28VhZAZYblHqcVvtDXPuylM3/N0+gDIk8WDyb
  16.106 +KzdwH3TWefvG3Ec4+s7heZpQ+ZHHXolmwYRsGqT+TKeJoZ+cjFEOl4kJsd/K7nCs
  16.107 +v75BjqAl3ebZbncYlCNdLkjyrPifnjBJFURQP4aj3lhRNnMQfyS1dAxPcyq/eCjA
  16.108 +MFuixwFbAQbN63M/rT0ISYtf1KTO14ov7JSVUHZJZPFLU9tuewOMukLybAsXAf1h
  16.109 +YyMUsdvsWVdjzGA4MA652hYcQ4nypwyYfaojIm6so5VNlHu0IUPIN5mcNGkhFve2
  16.110 +VgvDC3/T9pwz7Y8iiLtgWbJQAUOCSpxuV06URG2vvZuUrK8fB4LfNdJk+leVHirh
  16.111 +3L5DehtOnhl/P76mYmQ7V/U1revhDmkDJ5qQ3k9mnhwdUqsJ9w5mBh+DTUrS5ZOl
  16.112 +1PjiqosaRnygOlYV6TGm7JA52QBl7bkvofb96aG7VHIg4/z30VI24QhBrHWq
  16.113 +=O8A4
  16.114 +-----END PGP MESSAGE-----
  16.115 +
  16.116 +--k1bsDcHaNcB6liQG9AJTIgqMMmV6ukLr4--
    17.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    17.2 +++ b/test/test_mails/pEp_subject_p3p_replaced_w_pEp_4c.eml	Wed Sep 13 01:59:28 2017 +0200
    17.3 @@ -0,0 +1,113 @@
    17.4 +Return-Path: <SRS0=ne/EAk=AN=pep-project.org=pep.test.alice@srs.smtpin.rzone.de>
    17.5 +X-Original-To: krista@gnunet.org
    17.6 +Delivered-To: krista@gnunet.org
    17.7 +Received: from vmmailrelay1.informatik.tu-muenchen.de (mailrelay1.informatik.tu-muenchen.de [131.159.254.14])
    17.8 +	by sam.net.in.tum.de (Postfix) with ESMTP id 1FEF71C00BC
    17.9 +	for <krista@gnunet.org>; Tue, 12 Sep 2017 17:29:07 +0200 (CEST)
   17.10 +Received: by vmmailrelay1.informatik.tu-muenchen.de (Postfix, from userid 109)
   17.11 +	id 3444A1C1133; Tue, 12 Sep 2017 17:29:07 +0200 (CEST)
   17.12 +Received: from vmmailrelay1.informatik.tu-muenchen.de (localhost [127.0.0.1])
   17.13 +	by vmmailrelay1.informatik.tu-muenchen.de (Postfix) with ESMTP id 11D9E1C089D
   17.14 +	for <krista@gnunet.org>; Tue, 12 Sep 2017 17:29:07 +0200 (CEST)
   17.15 +Received: from vmmaildmz1.informatik.tu-muenchen.de (vmmaildmz1.informatik.tu-muenchen.de [131.159.0.87])
   17.16 +	by vmmailrelay1.informatik.tu-muenchen.de (Postfix) with ESMTP id F14C51C0E06
   17.17 +	for <krista@gnunet.org>; Tue, 12 Sep 2017 17:29:06 +0200 (CEST)
   17.18 +Received: by vmmaildmz1.informatik.tu-muenchen.de (Postfix, from userid 109)
   17.19 +	id EFDB11C2DCE; Tue, 12 Sep 2017 17:29:06 +0200 (CEST)
   17.20 +X-Spam-Checker-Version: SpamAssassin 3.4.0-tuminfo_1 (2014-02-07) on
   17.21 +	vmmaildmz1.informatik.tu-muenchen.de
   17.22 +X-Spam-Level: 
   17.23 +X-Spam-Status: No, score=-2.0 required=7.0 tests=AWL,BAYES_00,BODY_EMPTY,
   17.24 +	ENCRYPTED_MESSAGE,RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,
   17.25 +	SPF_HELO_PASS,TVD_RCVD_SPACE_BRACKET,UNPARSEABLE_RELAY autolearn=no
   17.26 +	autolearn_force=no version=3.4.0-tuminfo_1
   17.27 +Received: from vmmaildmz1.informatik.tu-muenchen.de (localhost [127.0.0.1])
   17.28 +	by vmmaildmz1.informatik.tu-muenchen.de (Postfix) with ESMTP id 0C4521C2DCE
   17.29 +	for <krista@gnunet.org>; Tue, 12 Sep 2017 17:29:05 +0200 (CEST)
   17.30 +Received: from mi4-p00-ob.smtp.rzone.de (mi4-p00-ob.smtp.rzone.de [81.169.146.149])
   17.31 +	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
   17.32 +	(No client certificate requested)
   17.33 +	by vmmaildmz1.informatik.tu-muenchen.de (Postfix) with ESMTPS id EF5321C2D88
   17.34 +	for <krista@gnunet.org>; Tue, 12 Sep 2017 17:29:04 +0200 (CEST)
   17.35 +X-RZG-FWD-BY: pep.test.recip@kgrothoff.org
   17.36 +Received: from mailin.rzone.de ([unix socket])
   17.37 +	by mailin.rzone.de (RZmta 41.4) with LMTPA;
   17.38 +	Tue, 12 Sep 2017 17:28:41 +0200 (CEST)
   17.39 +Authentication-Results: strato.com 1;
   17.40 +	spf=none
   17.41 +		smtp.mailfrom="pep.test.alice@pep-project.org";
   17.42 +	dkim=none;
   17.43 +	domainkeys=none;
   17.44 +	dkim-adsp=none
   17.45 +		header.from="pep.test.alice@pep-project.org"
   17.46 +X-Strato-MessageType: email
   17.47 +X-RZG-CLASS-ID: mi00
   17.48 +Received-SPF: none
   17.49 +	client-ip=131.159.0.8;
   17.50 +	helo="mail-out1.informatik.tu-muenchen.de";
   17.51 +	envelope-from="pep.test.alice@pep-project.org";
   17.52 +	receiver=smtpin.rzone.de;
   17.53 +	identity=mailfrom;
   17.54 +Received: from mail-out1.informatik.tu-muenchen.de ([131.159.0.8])
   17.55 +	by smtpin.rzone.de (RZmta 41.4 OK)
   17.56 +	with ESMTPS id v031a7t8CFSf6GR
   17.57 +	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (curve secp521r1 with 521 ECDH bits, eq. 15360 bits RSA))
   17.58 +	(Client did not present a certificate)
   17.59 +	for <pep.test.recip@kgrothoff.org>;
   17.60 +	Tue, 12 Sep 2017 17:28:41 +0200 (CEST)
   17.61 +Received: from [192.168.178.22] (ip5f584089.dynamic.kabel-deutschland.de [95.88.64.137])
   17.62 +	by services.sec.in.tum.de (Postfix) with ESMTPSA id E252F10C75356
   17.63 +	for <pep.test.recip@kgrothoff.org>; Tue, 12 Sep 2017 17:28:35 +0200 (CEST)
   17.64 +Reply-To: krista@pep-project.org
   17.65 +To: pep.test.recip@kgrothoff.org
   17.66 +From: pEp Test Alice <pep.test.alice@pep-project.org>
   17.67 +Subject: pEp
   17.68 +Organization: pEp
   17.69 +Message-ID: <f80baf8e-0323-8be7-be21-b3ecaade6a2a@pep-project.org>
   17.70 +Date: Tue, 12 Sep 2017 17:28:35 +0200
   17.71 +User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101
   17.72 + Thunderbird/45.8.0
   17.73 +MIME-Version: 1.0
   17.74 +Content-Type: multipart/encrypted;
   17.75 + protocol="application/pgp-encrypted";
   17.76 + boundary="k1bsDcHaNcB6liQG9AJTIgqMMmV6ukLr4"
   17.77 +
   17.78 +This is an OpenPGP/MIME encrypted message (RFC 4880 and 3156)
   17.79 +--k1bsDcHaNcB6liQG9AJTIgqMMmV6ukLr4
   17.80 +Content-Type: application/pgp-encrypted
   17.81 +Content-Description: PGP/MIME version identification
   17.82 +
   17.83 +Version: 1
   17.84 +
   17.85 +--k1bsDcHaNcB6liQG9AJTIgqMMmV6ukLr4
   17.86 +Content-Type: application/octet-stream; name="encrypted.asc"
   17.87 +Content-Description: OpenPGP encrypted message
   17.88 +Content-Disposition: inline; filename="encrypted.asc"
   17.89 +
   17.90 +-----BEGIN PGP MESSAGE-----
   17.91 +
   17.92 +hQEMA4FHqvEumyRHAQf/UgdO9gLH0rwZZWqiy40V0pOlgI8+DCBpL8CvSROeEBcS
   17.93 +ELmLjpUb2tO58upJ8XYIFCbOGEufnEvaa0XcHnQSw0F8Rsenjs8MstSNKu2/1Snm
   17.94 +1qD5ephHgBTCPW6NbXY69e30HpbtHwf1Eh+NWIzrzy74i96pFfeXcRWQX5ykOM0U
   17.95 +zW+82/Ztt9CgB23PtDuRQ8gh2Y9Hq91MB0DbtwzL+KZDAWHEVRPqSSfc6e9VzHP8
   17.96 +rkzyfx+BF9nE/oJYwSevQ5R797cnpwHOIVpcmMJjtR+yA+7EVQd0FlSHGnXMjMY/
   17.97 +Qkp/zLCuEfAHVN/P91GKjtVO1CrcRjqbOdcIkh57FYUBDANaAgXZcwg/TQEH/AgN
   17.98 +CSYGTPZSoSLqcog+jTzZACeuy/a5SvuDPBTklqaaFolutvEj4mprHzUASLYSIJW2
   17.99 +P3o2sv+F1SoqCYgfi/77LAGaztXQECsH2zTvTG5Ax7tM97VMZpIc405btPGAGaxc
  17.100 +MUZ2SwivrPDWPFZgEU05gc8UOasKjxX7C9+hxNTppEgtJsM+bZHYnvjbaeZz/kGZ
  17.101 +P17qhHDVrtWVdsF9qGRQY5CMe/hByKTRVL2T1/FimVX/f1EbN/FB/bxX44rmKROc
  17.102 +r8TsOBamW50xMthspZl/w5G81XwtWIDc4XUx8lgtcKo3yLrcbq2Za2LDixT23J3f
  17.103 +bnH17pLOTOlZyKAdZ5zSwQwBvycuQ1nTUkXqhWKB8++wvhp77ILbxp0n/F+BiIHv
  17.104 +SRTT5YIZH8tVnPftmlMcANoUhW0fJOAfVexErO/QjJubXy7Ofc5QAjmsfnU2gX0f
  17.105 +A0+nN9zH2x7X+QbtxNTw0/3r2zE28VhZAZYblHqcVvtDXPuylM3/N0+gDIk8WDyb
  17.106 +KzdwH3TWefvG3Ec4+s7heZpQ+ZHHXolmwYRsGqT+TKeJoZ+cjFEOl4kJsd/K7nCs
  17.107 +v75BjqAl3ebZbncYlCNdLkjyrPifnjBJFURQP4aj3lhRNnMQfyS1dAxPcyq/eCjA
  17.108 +MFuixwFbAQbN63M/rT0ISYtf1KTO14ov7JSVUHZJZPFLU9tuewOMukLybAsXAf1h
  17.109 +YyMUsdvsWVdjzGA4MA652hYcQ4nypwyYfaojIm6so5VNlHu0IUPIN5mcNGkhFve2
  17.110 +VgvDC3/T9pwz7Y8iiLtgWbJQAUOCSpxuV06URG2vvZuUrK8fB4LfNdJk+leVHirh
  17.111 +3L5DehtOnhl/P76mYmQ7V/U1revhDmkDJ5qQ3k9mnhwdUqsJ9w5mBh+DTUrS5ZOl
  17.112 +1PjiqosaRnygOlYV6TGm7JA52QBl7bkvofb96aG7VHIg4/z30VI24QhBrHWq
  17.113 +=O8A4
  17.114 +-----END PGP MESSAGE-----
  17.115 +
  17.116 +--k1bsDcHaNcB6liQG9AJTIgqMMmV6ukLr4--
    18.1 --- a/test/test_mails/pEp_subject_pEp.eml	Tue Sep 12 19:23:56 2017 +0200
    18.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    18.3 @@ -1,120 +0,0 @@
    18.4 -Return-Path: <pep.test.alice@pep-project.org>
    18.5 -X-Original-To: krista@gnunet.org
    18.6 -Delivered-To: krista@gnunet.org
    18.7 -Received: from vmmailrelay1.informatik.tu-muenchen.de (mailrelay1.informatik.tu-muenchen.de [131.159.254.14])
    18.8 -	by sam.net.in.tum.de (Postfix) with ESMTP id 1C8731C00BC
    18.9 -	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:28:42 +0200 (CEST)
   18.10 -Received: by vmmailrelay1.informatik.tu-muenchen.de (Postfix, from userid 109)
   18.11 -	id E78B01C0383; Mon, 12 Jun 2017 15:28:42 +0200 (CEST)
   18.12 -Received: from vmmailrelay1.informatik.tu-muenchen.de (localhost [127.0.0.1])
   18.13 -	by vmmailrelay1.informatik.tu-muenchen.de (Postfix) with ESMTP id C414C1C037C
   18.14 -	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:28:42 +0200 (CEST)
   18.15 -Received: from vmmaildmz2.informatik.tu-muenchen.de (vmmaildmz2.informatik.tu-muenchen.de [131.159.0.88])
   18.16 -	by vmmailrelay1.informatik.tu-muenchen.de (Postfix) with ESMTP id AFA401C037A
   18.17 -	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:28:42 +0200 (CEST)
   18.18 -Received: by vmmaildmz2.informatik.tu-muenchen.de (Postfix, from userid 109)
   18.19 -	id AE03E1C2AE1; Mon, 12 Jun 2017 15:28:42 +0200 (CEST)
   18.20 -X-Spam-Checker-Version: SpamAssassin 3.4.0-tuminfo_1 (2014-02-07) on
   18.21 -	vmmaildmz2.informatik.tu-muenchen.de
   18.22 -X-Spam-Level: 
   18.23 -X-Spam-Status: No, score=-2.9 required=7.0 tests=AWL,BAYES_00,
   18.24 -	ENCRYPTED_MESSAGE,RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,
   18.25 -	TVD_RCVD_SPACE_BRACKET,UNPARSEABLE_RELAY autolearn=no autolearn_force=no
   18.26 -	version=3.4.0-tuminfo_1
   18.27 -Received: from vmmaildmz2.informatik.tu-muenchen.de (localhost [127.0.0.1])
   18.28 -	by vmmaildmz2.informatik.tu-muenchen.de (Postfix) with ESMTP id 441B11C2AE0
   18.29 -	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:28:41 +0200 (CEST)
   18.30 -Received: from mi4-p00-ob.smtp.rzone.de (mi4-p00-ob.smtp.rzone.de [81.169.146.149])
   18.31 -	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
   18.32 -	(No client certificate requested)
   18.33 -	by vmmaildmz2.informatik.tu-muenchen.de (Postfix) with ESMTPS id 3420F1C2ADF
   18.34 -	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:28:41 +0200 (CEST)
   18.35 -X-RZG-FWD-BY: pep.test.recip@kgrothoff.org
   18.36 -Received: from mailin.rzone.de ([unix socket])
   18.37 -	by mailin.rzone.de (RZmta 40.9) with LMTPA;
   18.38 -	Mon, 12 Jun 2017 15:28:27 +0200 (CEST)
   18.39 -Authentication-Results: strato.com 1;
   18.40 -	spf=none
   18.41 -		smtp.mailfrom="pep.test.alice@pep-project.org";
   18.42 -	dkim=none;
   18.43 -	domainkeys=none;
   18.44 -	dkim-adsp=none
   18.45 -		header.from="pep.test.alice@pep-project.org"
   18.46 -X-Strato-MessageType: email
   18.47 -X-RZG-CLASS-ID: mi00
   18.48 -Received-SPF: none
   18.49 -	client-ip=131.159.0.8;
   18.50 -	helo="mail-out1.informatik.tu-muenchen.de";
   18.51 -	envelope-from="pep.test.alice@pep-project.org";
   18.52 -	receiver=smtpin.rzone.de;
   18.53 -	identity=mailfrom;
   18.54 -Received: from mail-out1.informatik.tu-muenchen.de ([131.159.0.8])
   18.55 -	by smtpin.rzone.de (RZmta 40.9 OK)
   18.56 -	with ESMTPS id R04db2t5CDSRaBk
   18.57 -	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (curve secp521r1 with 521 ECDH bits, eq. 15360 bits RSA))
   18.58 -	(Client did not present a certificate)
   18.59 -	for <pep.test.recip@kgrothoff.org>;
   18.60 -	Mon, 12 Jun 2017 15:28:27 +0200 (CEST)
   18.61 -Received: from [192.168.178.22] (ip5f584089.dynamic.kabel-deutschland.de [95.88.64.137])
   18.62 -	by services.sec.in.tum.de (Postfix) with ESMTPSA id E7A551013AE47
   18.63 -	for <pep.test.recip@kgrothoff.org>; Mon, 12 Jun 2017 15:28:20 +0200 (CEST)
   18.64 -Reply-To: krista@pep-project.org
   18.65 -To: pep.test.recip@kgrothoff.org
   18.66 -From: pEp Test Alice <pep.test.alice@pep-project.org>
   18.67 -Subject: pEp
   18.68 -Organization: pEp
   18.69 -Message-ID: <1779982d-d48e-6d8c-2dcb-a2c337c496cb@pep-project.org>
   18.70 -Date: Mon, 12 Jun 2017 15:28:20 +0200
   18.71 -User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101
   18.72 - Thunderbird/45.8.0
   18.73 -MIME-Version: 1.0
   18.74 -Content-Type: multipart/encrypted;
   18.75 - protocol="application/pgp-encrypted";
   18.76 - boundary="xNhsqki3RTDSnTgiBbeAIkT3t5whv1bAM"
   18.77 -
   18.78 -This is an OpenPGP/MIME encrypted message (RFC 4880 and 3156)
   18.79 ---xNhsqki3RTDSnTgiBbeAIkT3t5whv1bAM
   18.80 -Content-Type: application/pgp-encrypted
   18.81 -Content-Description: PGP/MIME version identification
   18.82 -
   18.83 -Version: 1
   18.84 -
   18.85 ---xNhsqki3RTDSnTgiBbeAIkT3t5whv1bAM
   18.86 -Content-Type: application/octet-stream; name="encrypted.asc"
   18.87 -Content-Description: OpenPGP encrypted message
   18.88 -Content-Disposition: inline; filename="encrypted.asc"
   18.89 -
   18.90 ------BEGIN PGP MESSAGE-----
   18.91 -
   18.92 -hQEMA4FHqvEumyRHAQgAjsyn0zCm0jHAp+SshDzqhMFNPuRc8VhDK9DpxiA1jLy8
   18.93 -bH2CKJIZEWApyfmwX5xLEXhfr0wb4BthHDXLzHCDqLSFo5FoavTwNL44kaX83yPv
   18.94 -Ts2WrvOcXGRpNLD94tvyDBqngtk3yKYaSkKKPok4Ou5gHrIDJaNZf/mybmPa0aTX
   18.95 -BEOxgAaRZJoPhgeVF8/twwiDv+ixFtdnPx9gGUXvgc5tPyrIkFkWtwrsoS2RmtJT
   18.96 -QqdsMmPbTFrsZ+d7qhdkcedeoKRg84SlXgtFpXkkbKHB/NU2ZQ2h2xTeUqdkFGN7
   18.97 -vBv17C+5jv8wzYlrlni9P1Mbc+dVBZTal9gYtBGwxIUBDANaAgXZcwg/TQEH/0vs
   18.98 -xQCJEdqbHKLz+xOmrpQEoFLdf2W9B7z2jGQe9F0K+gnPE3E+1wVf/IQgLj4YDXtN
   18.99 -Gkzc6J3UPBN9b1WSTPcJQ47hU5IXO/Sb39dU9X1s01JtCorTKmHlefosg6YaZ8CX
  18.100 -OhTkGYHqcJa9xE8kOMi4xnhP2Z3xaSkPSQvQ4WDWSapOwDkcM2a59Nwbu5PIGZpj
  18.101 -FM9WVLawN1/SVbaKOUEhFKdbl7UYW64JNWE6ZaLa0sfigt4QaXd5GrQcP2vmVVGz
  18.102 -WOuCaEb/HnxgiUvLQI2tCnW8aWluc6PnNk3HwLydvCL0tHSXPJno4Wbs1GzRJ4G7
  18.103 -CleoojpLytgTfIlZ7anS6QEAXXAuWGT3jddP4hcTnsfX40bQnIH1m49RX/4OHuMY
  18.104 -n7RyzSfyVghBQeA3fEQ48ep3WHuFHEn0Kn9rvcr/JZRO2NM4nBv1FjOIBTUMTlX+
  18.105 -hf0F/mYz1ycNg/rt6Taf9xcIP0IzRfQEa/dFqnEnBYCxGvRSr+EnMzg+ETT1p+aa
  18.106 -YAyjsbikhOqmle9G4LFUyblMmIlwFvAklAAlXTUJAEn3pc5mxH6vz0JitDpLdFDM
  18.107 -pW51y0HYgUNKS+9+qoVK2WXhkK/+hCbLzWVwzN5FlsIPucH+L+afquR6W5IKA8uZ
  18.108 -ixDPokbP1H608f/TobwX988nWby54kihoxaMvmEDbqT5Ivi5hHDhj5e79mxhUoZx
  18.109 -wb6fsm+d2vewDRhSIUF6/iioPaQt2AhmHNMBUYS5RrlOY8mc9BP8PwKym5SgkpE4
  18.110 -NKxoMjbQwUi3SHseA1hluMBieV+d7nYHqwBtSgMC/ax/AcDwmoLusXlf3OiBytdL
  18.111 -2v4OtPu6kt/QIlEABEDlqDK70wM6BChzWYrc5ErsixZ9NHunNshAjYsVeNtStOFV
  18.112 -TPGiy7a8rKB3xJhqzZhhLh9ly8JxVNfkb2LVXP/yzBS8LJpCluzyXZZpH2Q2a8lP
  18.113 -t71tjf/R/Uff2ZeF5yWO7zldyoEfx00yQWDyfmM6zHm17moXH5Mql2ZvTI0C0mk6
  18.114 -wDYNVEFe9YIXvxhdu5ym67ba8t5eV2t3c4zdhFy5YHZOC/KvpcZBLcvLY2jgVmNr
  18.115 -UYNqKpGK9m03jHRT2ZuG6F19QrxKqUIvgnYWsenecCvjjOIcWH7KqqNp+d4RyNRr
  18.116 -4VyoJk9nxzlUT/wKQJ6d5OtY5wytCCxpv8ihBFS3R2f0Sk2yXOgKE2sq0DEicWe+
  18.117 -x8Yqg3C/47hrtiUnEwwmp3VEYHfBTaaXMUkpmoRJ066u+8K2Jfo/pQnX6vcyUpvY
  18.118 -tJNqH+SMYKMXVBigU0ayWQFwVcoNEqFNVTm9K3MBQlIQiYqumBptG8rYhzF/eSUC
  18.119 -doDA15Ibgsk=
  18.120 -=P9h8
  18.121 ------END PGP MESSAGE-----
  18.122 -
  18.123 ---xNhsqki3RTDSnTgiBbeAIkT3t5whv1bAM--
    19.1 --- a/test/test_mails/pEp_subject_pEp2.eml	Tue Sep 12 19:23:56 2017 +0200
    19.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    19.3 @@ -1,120 +0,0 @@
    19.4 -Return-Path: <pep.test.alice@pep-project.org>
    19.5 -X-Original-To: krista@gnunet.org
    19.6 -Delivered-To: krista@gnunet.org
    19.7 -Received: from vmmailrelay1.informatik.tu-muenchen.de (mailrelay1.informatik.tu-muenchen.de [131.159.254.14])
    19.8 -	by sam.net.in.tum.de (Postfix) with ESMTP id 1C8731C00BC
    19.9 -	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:28:42 +0200 (CEST)
   19.10 -Received: by vmmailrelay1.informatik.tu-muenchen.de (Postfix, from userid 109)
   19.11 -	id E78B01C0383; Mon, 12 Jun 2017 15:28:42 +0200 (CEST)
   19.12 -Received: from vmmailrelay1.informatik.tu-muenchen.de (localhost [127.0.0.1])
   19.13 -	by vmmailrelay1.informatik.tu-muenchen.de (Postfix) with ESMTP id C414C1C037C
   19.14 -	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:28:42 +0200 (CEST)
   19.15 -Received: from vmmaildmz2.informatik.tu-muenchen.de (vmmaildmz2.informatik.tu-muenchen.de [131.159.0.88])
   19.16 -	by vmmailrelay1.informatik.tu-muenchen.de (Postfix) with ESMTP id AFA401C037A
   19.17 -	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:28:42 +0200 (CEST)
   19.18 -Received: by vmmaildmz2.informatik.tu-muenchen.de (Postfix, from userid 109)
   19.19 -	id AE03E1C2AE1; Mon, 12 Jun 2017 15:28:42 +0200 (CEST)
   19.20 -X-Spam-Checker-Version: SpamAssassin 3.4.0-tuminfo_1 (2014-02-07) on
   19.21 -	vmmaildmz2.informatik.tu-muenchen.de
   19.22 -X-Spam-Level: 
   19.23 -X-Spam-Status: No, score=-2.9 required=7.0 tests=AWL,BAYES_00,
   19.24 -	ENCRYPTED_MESSAGE,RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,
   19.25 -	TVD_RCVD_SPACE_BRACKET,UNPARSEABLE_RELAY autolearn=no autolearn_force=no
   19.26 -	version=3.4.0-tuminfo_1
   19.27 -Received: from vmmaildmz2.informatik.tu-muenchen.de (localhost [127.0.0.1])
   19.28 -	by vmmaildmz2.informatik.tu-muenchen.de (Postfix) with ESMTP id 441B11C2AE0
   19.29 -	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:28:41 +0200 (CEST)
   19.30 -Received: from mi4-p00-ob.smtp.rzone.de (mi4-p00-ob.smtp.rzone.de [81.169.146.149])
   19.31 -	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
   19.32 -	(No client certificate requested)
   19.33 -	by vmmaildmz2.informatik.tu-muenchen.de (Postfix) with ESMTPS id 3420F1C2ADF
   19.34 -	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:28:41 +0200 (CEST)
   19.35 -X-RZG-FWD-BY: pep.test.recip@kgrothoff.org
   19.36 -Received: from mailin.rzone.de ([unix socket])
   19.37 -	by mailin.rzone.de (RZmta 40.9) with LMTPA;
   19.38 -	Mon, 12 Jun 2017 15:28:27 +0200 (CEST)
   19.39 -Authentication-Results: strato.com 1;
   19.40 -	spf=none
   19.41 -		smtp.mailfrom="pep.test.alice@pep-project.org";
   19.42 -	dkim=none;
   19.43 -	domainkeys=none;
   19.44 -	dkim-adsp=none
   19.45 -		header.from="pep.test.alice@pep-project.org"
   19.46 -X-Strato-MessageType: email
   19.47 -X-RZG-CLASS-ID: mi00
   19.48 -Received-SPF: none
   19.49 -	client-ip=131.159.0.8;
   19.50 -	helo="mail-out1.informatik.tu-muenchen.de";
   19.51 -	envelope-from="pep.test.alice@pep-project.org";
   19.52 -	receiver=smtpin.rzone.de;
   19.53 -	identity=mailfrom;
   19.54 -Received: from mail-out1.informatik.tu-muenchen.de ([131.159.0.8])
   19.55 -	by smtpin.rzone.de (RZmta 40.9 OK)
   19.56 -	with ESMTPS id R04db2t5CDSRaBk
   19.57 -	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (curve secp521r1 with 521 ECDH bits, eq. 15360 bits RSA))
   19.58 -	(Client did not present a certificate)
   19.59 -	for <pep.test.recip@kgrothoff.org>;
   19.60 -	Mon, 12 Jun 2017 15:28:27 +0200 (CEST)
   19.61 -Received: from [192.168.178.22] (ip5f584089.dynamic.kabel-deutschland.de [95.88.64.137])
   19.62 -	by services.sec.in.tum.de (Postfix) with ESMTPSA id E7A551013AE47
   19.63 -	for <pep.test.recip@kgrothoff.org>; Mon, 12 Jun 2017 15:28:20 +0200 (CEST)
   19.64 -Reply-To: krista@pep-project.org
   19.65 -To: pep.test.recip@kgrothoff.org
   19.66 -From: pEp Test Alice <pep.test.alice@pep-project.org>
   19.67 -Subject: =?utf-8?Q?p=E2=89=A1p?=
   19.68 -Organization: pEp
   19.69 -Message-ID: <1779982d-d48e-6d8c-2dcb-a2c337c496cb@pep-project.org>
   19.70 -Date: Mon, 12 Jun 2017 15:28:20 +0200
   19.71 -User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101
   19.72 - Thunderbird/45.8.0
   19.73 -MIME-Version: 1.0
   19.74 -Content-Type: multipart/encrypted;
   19.75 - protocol="application/pgp-encrypted";
   19.76 - boundary="xNhsqki3RTDSnTgiBbeAIkT3t5whv1bAM"
   19.77 -
   19.78 -This is an OpenPGP/MIME encrypted message (RFC 4880 and 3156)
   19.79 ---xNhsqki3RTDSnTgiBbeAIkT3t5whv1bAM
   19.80 -Content-Type: application/pgp-encrypted
   19.81 -Content-Description: PGP/MIME version identification
   19.82 -
   19.83 -Version: 1
   19.84 -
   19.85 ---xNhsqki3RTDSnTgiBbeAIkT3t5whv1bAM
   19.86 -Content-Type: application/octet-stream; name="encrypted.asc"
   19.87 -Content-Description: OpenPGP encrypted message
   19.88 -Content-Disposition: inline; filename="encrypted.asc"
   19.89 -
   19.90 ------BEGIN PGP MESSAGE-----
   19.91 -
   19.92 -hQEMA4FHqvEumyRHAQgAjsyn0zCm0jHAp+SshDzqhMFNPuRc8VhDK9DpxiA1jLy8
   19.93 -bH2CKJIZEWApyfmwX5xLEXhfr0wb4BthHDXLzHCDqLSFo5FoavTwNL44kaX83yPv
   19.94 -Ts2WrvOcXGRpNLD94tvyDBqngtk3yKYaSkKKPok4Ou5gHrIDJaNZf/mybmPa0aTX
   19.95 -BEOxgAaRZJoPhgeVF8/twwiDv+ixFtdnPx9gGUXvgc5tPyrIkFkWtwrsoS2RmtJT
   19.96 -QqdsMmPbTFrsZ+d7qhdkcedeoKRg84SlXgtFpXkkbKHB/NU2ZQ2h2xTeUqdkFGN7
   19.97 -vBv17C+5jv8wzYlrlni9P1Mbc+dVBZTal9gYtBGwxIUBDANaAgXZcwg/TQEH/0vs
   19.98 -xQCJEdqbHKLz+xOmrpQEoFLdf2W9B7z2jGQe9F0K+gnPE3E+1wVf/IQgLj4YDXtN
   19.99 -Gkzc6J3UPBN9b1WSTPcJQ47hU5IXO/Sb39dU9X1s01JtCorTKmHlefosg6YaZ8CX
  19.100 -OhTkGYHqcJa9xE8kOMi4xnhP2Z3xaSkPSQvQ4WDWSapOwDkcM2a59Nwbu5PIGZpj
  19.101 -FM9WVLawN1/SVbaKOUEhFKdbl7UYW64JNWE6ZaLa0sfigt4QaXd5GrQcP2vmVVGz
  19.102 -WOuCaEb/HnxgiUvLQI2tCnW8aWluc6PnNk3HwLydvCL0tHSXPJno4Wbs1GzRJ4G7
  19.103 -CleoojpLytgTfIlZ7anS6QEAXXAuWGT3jddP4hcTnsfX40bQnIH1m49RX/4OHuMY
  19.104 -n7RyzSfyVghBQeA3fEQ48ep3WHuFHEn0Kn9rvcr/JZRO2NM4nBv1FjOIBTUMTlX+
  19.105 -hf0F/mYz1ycNg/rt6Taf9xcIP0IzRfQEa/dFqnEnBYCxGvRSr+EnMzg+ETT1p+aa
  19.106 -YAyjsbikhOqmle9G4LFUyblMmIlwFvAklAAlXTUJAEn3pc5mxH6vz0JitDpLdFDM
  19.107 -pW51y0HYgUNKS+9+qoVK2WXhkK/+hCbLzWVwzN5FlsIPucH+L+afquR6W5IKA8uZ
  19.108 -ixDPokbP1H608f/TobwX988nWby54kihoxaMvmEDbqT5Ivi5hHDhj5e79mxhUoZx
  19.109 -wb6fsm+d2vewDRhSIUF6/iioPaQt2AhmHNMBUYS5RrlOY8mc9BP8PwKym5SgkpE4
  19.110 -NKxoMjbQwUi3SHseA1hluMBieV+d7nYHqwBtSgMC/ax/AcDwmoLusXlf3OiBytdL
  19.111 -2v4OtPu6kt/QIlEABEDlqDK70wM6BChzWYrc5ErsixZ9NHunNshAjYsVeNtStOFV
  19.112 -TPGiy7a8rKB3xJhqzZhhLh9ly8JxVNfkb2LVXP/yzBS8LJpCluzyXZZpH2Q2a8lP
  19.113 -t71tjf/R/Uff2ZeF5yWO7zldyoEfx00yQWDyfmM6zHm17moXH5Mql2ZvTI0C0mk6
  19.114 -wDYNVEFe9YIXvxhdu5ym67ba8t5eV2t3c4zdhFy5YHZOC/KvpcZBLcvLY2jgVmNr
  19.115 -UYNqKpGK9m03jHRT2ZuG6F19QrxKqUIvgnYWsenecCvjjOIcWH7KqqNp+d4RyNRr
  19.116 -4VyoJk9nxzlUT/wKQJ6d5OtY5wytCCxpv8ihBFS3R2f0Sk2yXOgKE2sq0DEicWe+
  19.117 -x8Yqg3C/47hrtiUnEwwmp3VEYHfBTaaXMUkpmoRJ066u+8K2Jfo/pQnX6vcyUpvY
  19.118 -tJNqH+SMYKMXVBigU0ayWQFwVcoNEqFNVTm9K3MBQlIQiYqumBptG8rYhzF/eSUC
  19.119 -doDA15Ibgsk=
  19.120 -=P9h8
  19.121 ------END PGP MESSAGE-----
  19.122 -
  19.123 ---xNhsqki3RTDSnTgiBbeAIkT3t5whv1bAM--
    20.1 --- a/test/test_mails/pEp_subject_pEp3.eml	Tue Sep 12 19:23:56 2017 +0200
    20.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    20.3 @@ -1,113 +0,0 @@
    20.4 -Return-Path: <SRS0=ne/EAk=AN=pep-project.org=pep.test.alice@srs.smtpin.rzone.de>
    20.5 -X-Original-To: krista@gnunet.org
    20.6 -Delivered-To: krista@gnunet.org
    20.7 -Received: from vmmailrelay1.informatik.tu-muenchen.de (mailrelay1.informatik.tu-muenchen.de [131.159.254.14])
    20.8 -	by sam.net.in.tum.de (Postfix) with ESMTP id 1FEF71C00BC
    20.9 -	for <krista@gnunet.org>; Tue, 12 Sep 2017 17:29:07 +0200 (CEST)
   20.10 -Received: by vmmailrelay1.informatik.tu-muenchen.de (Postfix, from userid 109)
   20.11 -	id 3444A1C1133; Tue, 12 Sep 2017 17:29:07 +0200 (CEST)
   20.12 -Received: from vmmailrelay1.informatik.tu-muenchen.de (localhost [127.0.0.1])
   20.13 -	by vmmailrelay1.informatik.tu-muenchen.de (Postfix) with ESMTP id 11D9E1C089D
   20.14 -	for <krista@gnunet.org>; Tue, 12 Sep 2017 17:29:07 +0200 (CEST)
   20.15 -Received: from vmmaildmz1.informatik.tu-muenchen.de (vmmaildmz1.informatik.tu-muenchen.de [131.159.0.87])
   20.16 -	by vmmailrelay1.informatik.tu-muenchen.de (Postfix) with ESMTP id F14C51C0E06
   20.17 -	for <krista@gnunet.org>; Tue, 12 Sep 2017 17:29:06 +0200 (CEST)
   20.18 -Received: by vmmaildmz1.informatik.tu-muenchen.de (Postfix, from userid 109)
   20.19 -	id EFDB11C2DCE; Tue, 12 Sep 2017 17:29:06 +0200 (CEST)
   20.20 -X-Spam-Checker-Version: SpamAssassin 3.4.0-tuminfo_1 (2014-02-07) on
   20.21 -	vmmaildmz1.informatik.tu-muenchen.de
   20.22 -X-Spam-Level: 
   20.23 -X-Spam-Status: No, score=-2.0 required=7.0 tests=AWL,BAYES_00,BODY_EMPTY,
   20.24 -	ENCRYPTED_MESSAGE,RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,
   20.25 -	SPF_HELO_PASS,TVD_RCVD_SPACE_BRACKET,UNPARSEABLE_RELAY autolearn=no
   20.26 -	autolearn_force=no version=3.4.0-tuminfo_1
   20.27 -Received: from vmmaildmz1.informatik.tu-muenchen.de (localhost [127.0.0.1])
   20.28 -	by vmmaildmz1.informatik.tu-muenchen.de (Postfix) with ESMTP id 0C4521C2DCE
   20.29 -	for <krista@gnunet.org>; Tue, 12 Sep 2017 17:29:05 +0200 (CEST)
   20.30 -Received: from mi4-p00-ob.smtp.rzone.de (mi4-p00-ob.smtp.rzone.de [81.169.146.149])
   20.31 -	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
   20.32 -	(No client certificate requested)
   20.33 -	by vmmaildmz1.informatik.tu-muenchen.de (Postfix) with ESMTPS id EF5321C2D88
   20.34 -	for <krista@gnunet.org>; Tue, 12 Sep 2017 17:29:04 +0200 (CEST)
   20.35 -X-RZG-FWD-BY: pep.test.recip@kgrothoff.org
   20.36 -Received: from mailin.rzone.de ([unix socket])
   20.37 -	by mailin.rzone.de (RZmta 41.4) with LMTPA;
   20.38 -	Tue, 12 Sep 2017 17:28:41 +0200 (CEST)
   20.39 -Authentication-Results: strato.com 1;
   20.40 -	spf=none
   20.41 -		smtp.mailfrom="pep.test.alice@pep-project.org";
   20.42 -	dkim=none;
   20.43 -	domainkeys=none;
   20.44 -	dkim-adsp=none
   20.45 -		header.from="pep.test.alice@pep-project.org"
   20.46 -X-Strato-MessageType: email
   20.47 -X-RZG-CLASS-ID: mi00
   20.48 -Received-SPF: none
   20.49 -	client-ip=131.159.0.8;
   20.50 -	helo="mail-out1.informatik.tu-muenchen.de";
   20.51 -	envelope-from="pep.test.alice@pep-project.org";
   20.52 -	receiver=smtpin.rzone.de;
   20.53 -	identity=mailfrom;
   20.54 -Received: from mail-out1.informatik.tu-muenchen.de ([131.159.0.8])
   20.55 -	by smtpin.rzone.de (RZmta 41.4 OK)
   20.56 -	with ESMTPS id v031a7t8CFSf6GR
   20.57 -	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (curve secp521r1 with 521 ECDH bits, eq. 15360 bits RSA))
   20.58 -	(Client did not present a certificate)
   20.59 -	for <pep.test.recip@kgrothoff.org>;
   20.60 -	Tue, 12 Sep 2017 17:28:41 +0200 (CEST)
   20.61 -Received: from [192.168.178.22] (ip5f584089.dynamic.kabel-deutschland.de [95.88.64.137])
   20.62 -	by services.sec.in.tum.de (Postfix) with ESMTPSA id E252F10C75356
   20.63 -	for <pep.test.recip@kgrothoff.org>; Tue, 12 Sep 2017 17:28:35 +0200 (CEST)
   20.64 -Reply-To: krista@pep-project.org
   20.65 -To: pep.test.recip@kgrothoff.org
   20.66 -From: pEp Test Alice <pep.test.alice@pep-project.org>
   20.67 -Subject: pEp
   20.68 -Organization: pEp
   20.69 -Message-ID: <f80baf8e-0323-8be7-be21-b3ecaade6a2a@pep-project.org>
   20.70 -Date: Tue, 12 Sep 2017 17:28:35 +0200
   20.71 -User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101
   20.72 - Thunderbird/45.8.0
   20.73 -MIME-Version: 1.0
   20.74 -Content-Type: multipart/encrypted;
   20.75 - protocol="application/pgp-encrypted";
   20.76 - boundary="k1bsDcHaNcB6liQG9AJTIgqMMmV6ukLr4"
   20.77 -
   20.78 -This is an OpenPGP/MIME encrypted message (RFC 4880 and 3156)
   20.79 ---k1bsDcHaNcB6liQG9AJTIgqMMmV6ukLr4
   20.80 -Content-Type: application/pgp-encrypted
   20.81 -Content-Description: PGP/MIME version identification
   20.82 -
   20.83 -Version: 1
   20.84 -
   20.85 ---k1bsDcHaNcB6liQG9AJTIgqMMmV6ukLr4
   20.86 -Content-Type: application/octet-stream; name="encrypted.asc"
   20.87 -Content-Description: OpenPGP encrypted message
   20.88 -Content-Disposition: inline; filename="encrypted.asc"
   20.89 -
   20.90 ------BEGIN PGP MESSAGE-----
   20.91 -
   20.92 -hQEMA4FHqvEumyRHAQf/UgdO9gLH0rwZZWqiy40V0pOlgI8+DCBpL8CvSROeEBcS
   20.93 -ELmLjpUb2tO58upJ8XYIFCbOGEufnEvaa0XcHnQSw0F8Rsenjs8MstSNKu2/1Snm
   20.94 -1qD5ephHgBTCPW6NbXY69e30HpbtHwf1Eh+NWIzrzy74i96pFfeXcRWQX5ykOM0U
   20.95 -zW+82/Ztt9CgB23PtDuRQ8gh2Y9Hq91MB0DbtwzL+KZDAWHEVRPqSSfc6e9VzHP8
   20.96 -rkzyfx+BF9nE/oJYwSevQ5R797cnpwHOIVpcmMJjtR+yA+7EVQd0FlSHGnXMjMY/
   20.97 -Qkp/zLCuEfAHVN/P91GKjtVO1CrcRjqbOdcIkh57FYUBDANaAgXZcwg/TQEH/AgN
   20.98 -CSYGTPZSoSLqcog+jTzZACeuy/a5SvuDPBTklqaaFolutvEj4mprHzUASLYSIJW2
   20.99 -P3o2sv+F1SoqCYgfi/77LAGaztXQECsH2zTvTG5Ax7tM97VMZpIc405btPGAGaxc
  20.100 -MUZ2SwivrPDWPFZgEU05gc8UOasKjxX7C9+hxNTppEgtJsM+bZHYnvjbaeZz/kGZ
  20.101 -P17qhHDVrtWVdsF9qGRQY5CMe/hByKTRVL2T1/FimVX/f1EbN/FB/bxX44rmKROc
  20.102 -r8TsOBamW50xMthspZl/w5G81XwtWIDc4XUx8lgtcKo3yLrcbq2Za2LDixT23J3f
  20.103 -bnH17pLOTOlZyKAdZ5zSwQwBvycuQ1nTUkXqhWKB8++wvhp77ILbxp0n/F+BiIHv
  20.104 -SRTT5YIZH8tVnPftmlMcANoUhW0fJOAfVexErO/QjJubXy7Ofc5QAjmsfnU2gX0f
  20.105 -A0+nN9zH2x7X+QbtxNTw0/3r2zE28VhZAZYblHqcVvtDXPuylM3/N0+gDIk8WDyb
  20.106 -KzdwH3TWefvG3Ec4+s7heZpQ+ZHHXolmwYRsGqT+TKeJoZ+cjFEOl4kJsd/K7nCs
  20.107 -v75BjqAl3ebZbncYlCNdLkjyrPifnjBJFURQP4aj3lhRNnMQfyS1dAxPcyq/eCjA
  20.108 -MFuixwFbAQbN63M/rT0ISYtf1KTO14ov7JSVUHZJZPFLU9tuewOMukLybAsXAf1h
  20.109 -YyMUsdvsWVdjzGA4MA652hYcQ4nypwyYfaojIm6so5VNlHu0IUPIN5mcNGkhFve2
  20.110 -VgvDC3/T9pwz7Y8iiLtgWbJQAUOCSpxuV06URG2vvZuUrK8fB4LfNdJk+leVHirh
  20.111 -3L5DehtOnhl/P76mYmQ7V/U1revhDmkDJ5qQ3k9mnhwdUqsJ9w5mBh+DTUrS5ZOl
  20.112 -1PjiqosaRnygOlYV6TGm7JA52QBl7bkvofb96aG7VHIg4/z30VI24QhBrHWq
  20.113 -=O8A4
  20.114 ------END PGP MESSAGE-----
  20.115 -
  20.116 ---k1bsDcHaNcB6liQG9AJTIgqMMmV6ukLr4--
    21.1 --- a/test/test_mails/pEp_subject_pEp4.eml	Tue Sep 12 19:23:56 2017 +0200
    21.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    21.3 @@ -1,113 +0,0 @@
    21.4 -Return-Path: <SRS0=ne/EAk=AN=pep-project.org=pep.test.alice@srs.smtpin.rzone.de>
    21.5 -X-Original-To: krista@gnunet.org
    21.6 -Delivered-To: krista@gnunet.org
    21.7 -Received: from vmmailrelay1.informatik.tu-muenchen.de (mailrelay1.informatik.tu-muenchen.de [131.159.254.14])
    21.8 -	by sam.net.in.tum.de (Postfix) with ESMTP id 1FEF71C00BC
    21.9 -	for <krista@gnunet.org>; Tue, 12 Sep 2017 17:29:07 +0200 (CEST)
   21.10 -Received: by vmmailrelay1.informatik.tu-muenchen.de (Postfix, from userid 109)
   21.11 -	id 3444A1C1133; Tue, 12 Sep 2017 17:29:07 +0200 (CEST)
   21.12 -Received: from vmmailrelay1.informatik.tu-muenchen.de (localhost [127.0.0.1])
   21.13 -	by vmmailrelay1.informatik.tu-muenchen.de (Postfix) with ESMTP id 11D9E1C089D
   21.14 -	for <krista@gnunet.org>; Tue, 12 Sep 2017 17:29:07 +0200 (CEST)
   21.15 -Received: from vmmaildmz1.informatik.tu-muenchen.de (vmmaildmz1.informatik.tu-muenchen.de [131.159.0.87])
   21.16 -	by vmmailrelay1.informatik.tu-muenchen.de (Postfix) with ESMTP id F14C51C0E06
   21.17 -	for <krista@gnunet.org>; Tue, 12 Sep 2017 17:29:06 +0200 (CEST)
   21.18 -Received: by vmmaildmz1.informatik.tu-muenchen.de (Postfix, from userid 109)
   21.19 -	id EFDB11C2DCE; Tue, 12 Sep 2017 17:29:06 +0200 (CEST)
   21.20 -X-Spam-Checker-Version: SpamAssassin 3.4.0-tuminfo_1 (2014-02-07) on
   21.21 -	vmmaildmz1.informatik.tu-muenchen.de
   21.22 -X-Spam-Level: 
   21.23 -X-Spam-Status: No, score=-2.0 required=7.0 tests=AWL,BAYES_00,BODY_EMPTY,
   21.24 -	ENCRYPTED_MESSAGE,RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,
   21.25 -	SPF_HELO_PASS,TVD_RCVD_SPACE_BRACKET,UNPARSEABLE_RELAY autolearn=no
   21.26 -	autolearn_force=no version=3.4.0-tuminfo_1
   21.27 -Received: from vmmaildmz1.informatik.tu-muenchen.de (localhost [127.0.0.1])
   21.28 -	by vmmaildmz1.informatik.tu-muenchen.de (Postfix) with ESMTP id 0C4521C2DCE
   21.29 -	for <krista@gnunet.org>; Tue, 12 Sep 2017 17:29:05 +0200 (CEST)
   21.30 -Received: from mi4-p00-ob.smtp.rzone.de (mi4-p00-ob.smtp.rzone.de [81.169.146.149])
   21.31 -	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
   21.32 -	(No client certificate requested)
   21.33 -	by vmmaildmz1.informatik.tu-muenchen.de (Postfix) with ESMTPS id EF5321C2D88
   21.34 -	for <krista@gnunet.org>; Tue, 12 Sep 2017 17:29:04 +0200 (CEST)
   21.35 -X-RZG-FWD-BY: pep.test.recip@kgrothoff.org
   21.36 -Received: from mailin.rzone.de ([unix socket])
   21.37 -	by mailin.rzone.de (RZmta 41.4) with LMTPA;
   21.38 -	Tue, 12 Sep 2017 17:28:41 +0200 (CEST)
   21.39 -Authentication-Results: strato.com 1;
   21.40 -	spf=none
   21.41 -		smtp.mailfrom="pep.test.alice@pep-project.org";
   21.42 -	dkim=none;
   21.43 -	domainkeys=none;
   21.44 -	dkim-adsp=none
   21.45 -		header.from="pep.test.alice@pep-project.org"
   21.46 -X-Strato-MessageType: email
   21.47 -X-RZG-CLASS-ID: mi00
   21.48 -Received-SPF: none
   21.49 -	client-ip=131.159.0.8;
   21.50 -	helo="mail-out1.informatik.tu-muenchen.de";
   21.51 -	envelope-from="pep.test.alice@pep-project.org";
   21.52 -	receiver=smtpin.rzone.de;
   21.53 -	identity=mailfrom;
   21.54 -Received: from mail-out1.informatik.tu-muenchen.de ([131.159.0.8])
   21.55 -	by smtpin.rzone.de (RZmta 41.4 OK)
   21.56 -	with ESMTPS id v031a7t8CFSf6GR
   21.57 -	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (curve secp521r1 with 521 ECDH bits, eq. 15360 bits RSA))
   21.58 -	(Client did not present a certificate)
   21.59 -	for <pep.test.recip@kgrothoff.org>;
   21.60 -	Tue, 12 Sep 2017 17:28:41 +0200 (CEST)
   21.61 -Received: from [192.168.178.22] (ip5f584089.dynamic.kabel-deutschland.de [95.88.64.137])
   21.62 -	by services.sec.in.tum.de (Postfix) with ESMTPSA id E252F10C75356
   21.63 -	for <pep.test.recip@kgrothoff.org>; Tue, 12 Sep 2017 17:28:35 +0200 (CEST)
   21.64 -Reply-To: krista@pep-project.org
   21.65 -To: pep.test.recip@kgrothoff.org
   21.66 -From: pEp Test Alice <pep.test.alice@pep-project.org>
   21.67 -Subject: =?utf-8?Q?p=E2=89=A1p?=
   21.68 -Organization: pEp
   21.69 -Message-ID: <f80baf8e-0323-8be7-be21-b3ecaade6a2a@pep-project.org>
   21.70 -Date: Tue, 12 Sep 2017 17:28:35 +0200
   21.71 -User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101
   21.72 - Thunderbird/45.8.0
   21.73 -MIME-Version: 1.0
   21.74 -Content-Type: multipart/encrypted;
   21.75 - protocol="application/pgp-encrypted";
   21.76 - boundary="k1bsDcHaNcB6liQG9AJTIgqMMmV6ukLr4"
   21.77 -
   21.78 -This is an OpenPGP/MIME encrypted message (RFC 4880 and 3156)
   21.79 ---k1bsDcHaNcB6liQG9AJTIgqMMmV6ukLr4
   21.80 -Content-Type: application/pgp-encrypted
   21.81 -Content-Description: PGP/MIME version identification
   21.82 -
   21.83 -Version: 1
   21.84 -
   21.85 ---k1bsDcHaNcB6liQG9AJTIgqMMmV6ukLr4
   21.86 -Content-Type: application/octet-stream; name="encrypted.asc"
   21.87 -Content-Description: OpenPGP encrypted message
   21.88 -Content-Disposition: inline; filename="encrypted.asc"
   21.89 -
   21.90 ------BEGIN PGP MESSAGE-----
   21.91 -
   21.92 -hQEMA4FHqvEumyRHAQf/UgdO9gLH0rwZZWqiy40V0pOlgI8+DCBpL8CvSROeEBcS
   21.93 -ELmLjpUb2tO58upJ8XYIFCbOGEufnEvaa0XcHnQSw0F8Rsenjs8MstSNKu2/1Snm
   21.94 -1qD5ephHgBTCPW6NbXY69e30HpbtHwf1Eh+NWIzrzy74i96pFfeXcRWQX5ykOM0U
   21.95 -zW+82/Ztt9CgB23PtDuRQ8gh2Y9Hq91MB0DbtwzL+KZDAWHEVRPqSSfc6e9VzHP8
   21.96 -rkzyfx+BF9nE/oJYwSevQ5R797cnpwHOIVpcmMJjtR+yA+7EVQd0FlSHGnXMjMY/
   21.97 -Qkp/zLCuEfAHVN/P91GKjtVO1CrcRjqbOdcIkh57FYUBDANaAgXZcwg/TQEH/AgN
   21.98 -CSYGTPZSoSLqcog+jTzZACeuy/a5SvuDPBTklqaaFolutvEj4mprHzUASLYSIJW2
   21.99 -P3o2sv+F1SoqCYgfi/77LAGaztXQECsH2zTvTG5Ax7tM97VMZpIc405btPGAGaxc
  21.100 -MUZ2SwivrPDWPFZgEU05gc8UOasKjxX7C9+hxNTppEgtJsM+bZHYnvjbaeZz/kGZ
  21.101 -P17qhHDVrtWVdsF9qGRQY5CMe/hByKTRVL2T1/FimVX/f1EbN/FB/bxX44rmKROc
  21.102 -r8TsOBamW50xMthspZl/w5G81XwtWIDc4XUx8lgtcKo3yLrcbq2Za2LDixT23J3f
  21.103 -bnH17pLOTOlZyKAdZ5zSwQwBvycuQ1nTUkXqhWKB8++wvhp77ILbxp0n/F+BiIHv
  21.104 -SRTT5YIZH8tVnPftmlMcANoUhW0fJOAfVexErO/QjJubXy7Ofc5QAjmsfnU2gX0f
  21.105 -A0+nN9zH2x7X+QbtxNTw0/3r2zE28VhZAZYblHqcVvtDXPuylM3/N0+gDIk8WDyb
  21.106 -KzdwH3TWefvG3Ec4+s7heZpQ+ZHHXolmwYRsGqT+TKeJoZ+cjFEOl4kJsd/K7nCs
  21.107 -v75BjqAl3ebZbncYlCNdLkjyrPifnjBJFURQP4aj3lhRNnMQfyS1dAxPcyq/eCjA
  21.108 -MFuixwFbAQbN63M/rT0ISYtf1KTO14ov7JSVUHZJZPFLU9tuewOMukLybAsXAf1h
  21.109 -YyMUsdvsWVdjzGA4MA652hYcQ4nypwyYfaojIm6so5VNlHu0IUPIN5mcNGkhFve2
  21.110 -VgvDC3/T9pwz7Y8iiLtgWbJQAUOCSpxuV06URG2vvZuUrK8fB4LfNdJk+leVHirh
  21.111 -3L5DehtOnhl/P76mYmQ7V/U1revhDmkDJ5qQ3k9mnhwdUqsJ9w5mBh+DTUrS5ZOl
  21.112 -1PjiqosaRnygOlYV6TGm7JA52QBl7bkvofb96aG7VHIg4/z30VI24QhBrHWq
  21.113 -=O8A4
  21.114 ------END PGP MESSAGE-----
  21.115 -
  21.116 ---k1bsDcHaNcB6liQG9AJTIgqMMmV6ukLr4--
    22.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    22.2 +++ b/test/test_mails/pEp_subject_pEp_replaced_w_p3p_4b.eml	Wed Sep 13 01:59:28 2017 +0200
    22.3 @@ -0,0 +1,120 @@
    22.4 +Return-Path: <pep.test.alice@pep-project.org>
    22.5 +X-Original-To: krista@gnunet.org
    22.6 +Delivered-To: krista@gnunet.org
    22.7 +Received: from vmmailrelay1.informatik.tu-muenchen.de (mailrelay1.informatik.tu-muenchen.de [131.159.254.14])
    22.8 +	by sam.net.in.tum.de (Postfix) with ESMTP id 1C8731C00BC
    22.9 +	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:28:42 +0200 (CEST)
   22.10 +Received: by vmmailrelay1.informatik.tu-muenchen.de (Postfix, from userid 109)
   22.11 +	id E78B01C0383; Mon, 12 Jun 2017 15:28:42 +0200 (CEST)
   22.12 +Received: from vmmailrelay1.informatik.tu-muenchen.de (localhost [127.0.0.1])
   22.13 +	by vmmailrelay1.informatik.tu-muenchen.de (Postfix) with ESMTP id C414C1C037C
   22.14 +	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:28:42 +0200 (CEST)
   22.15 +Received: from vmmaildmz2.informatik.tu-muenchen.de (vmmaildmz2.informatik.tu-muenchen.de [131.159.0.88])
   22.16 +	by vmmailrelay1.informatik.tu-muenchen.de (Postfix) with ESMTP id AFA401C037A
   22.17 +	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:28:42 +0200 (CEST)
   22.18 +Received: by vmmaildmz2.informatik.tu-muenchen.de (Postfix, from userid 109)
   22.19 +	id AE03E1C2AE1; Mon, 12 Jun 2017 15:28:42 +0200 (CEST)
   22.20 +X-Spam-Checker-Version: SpamAssassin 3.4.0-tuminfo_1 (2014-02-07) on
   22.21 +	vmmaildmz2.informatik.tu-muenchen.de
   22.22 +X-Spam-Level: 
   22.23 +X-Spam-Status: No, score=-2.9 required=7.0 tests=AWL,BAYES_00,
   22.24 +	ENCRYPTED_MESSAGE,RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,
   22.25 +	TVD_RCVD_SPACE_BRACKET,UNPARSEABLE_RELAY autolearn=no autolearn_force=no
   22.26 +	version=3.4.0-tuminfo_1
   22.27 +Received: from vmmaildmz2.informatik.tu-muenchen.de (localhost [127.0.0.1])
   22.28 +	by vmmaildmz2.informatik.tu-muenchen.de (Postfix) with ESMTP id 441B11C2AE0
   22.29 +	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:28:41 +0200 (CEST)
   22.30 +Received: from mi4-p00-ob.smtp.rzone.de (mi4-p00-ob.smtp.rzone.de [81.169.146.149])
   22.31 +	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
   22.32 +	(No client certificate requested)
   22.33 +	by vmmaildmz2.informatik.tu-muenchen.de (Postfix) with ESMTPS id 3420F1C2ADF
   22.34 +	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:28:41 +0200 (CEST)
   22.35 +X-RZG-FWD-BY: pep.test.recip@kgrothoff.org
   22.36 +Received: from mailin.rzone.de ([unix socket])
   22.37 +	by mailin.rzone.de (RZmta 40.9) with LMTPA;
   22.38 +	Mon, 12 Jun 2017 15:28:27 +0200 (CEST)
   22.39 +Authentication-Results: strato.com 1;
   22.40 +	spf=none
   22.41 +		smtp.mailfrom="pep.test.alice@pep-project.org";
   22.42 +	dkim=none;
   22.43 +	domainkeys=none;
   22.44 +	dkim-adsp=none
   22.45 +		header.from="pep.test.alice@pep-project.org"
   22.46 +X-Strato-MessageType: email
   22.47 +X-RZG-CLASS-ID: mi00
   22.48 +Received-SPF: none
   22.49 +	client-ip=131.159.0.8;
   22.50 +	helo="mail-out1.informatik.tu-muenchen.de";
   22.51 +	envelope-from="pep.test.alice@pep-project.org";
   22.52 +	receiver=smtpin.rzone.de;
   22.53 +	identity=mailfrom;
   22.54 +Received: from mail-out1.informatik.tu-muenchen.de ([131.159.0.8])
   22.55 +	by smtpin.rzone.de (RZmta 40.9 OK)
   22.56 +	with ESMTPS id R04db2t5CDSRaBk
   22.57 +	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (curve secp521r1 with 521 ECDH bits, eq. 15360 bits RSA))
   22.58 +	(Client did not present a certificate)
   22.59 +	for <pep.test.recip@kgrothoff.org>;
   22.60 +	Mon, 12 Jun 2017 15:28:27 +0200 (CEST)
   22.61 +Received: from [192.168.178.22] (ip5f584089.dynamic.kabel-deutschland.de [95.88.64.137])
   22.62 +	by services.sec.in.tum.de (Postfix) with ESMTPSA id E7A551013AE47
   22.63 +	for <pep.test.recip@kgrothoff.org>; Mon, 12 Jun 2017 15:28:20 +0200 (CEST)
   22.64 +Reply-To: krista@pep-project.org
   22.65 +To: pep.test.recip@kgrothoff.org
   22.66 +From: pEp Test Alice <pep.test.alice@pep-project.org>
   22.67 +Subject: =?utf-8?Q?p=E2=89=A1p?=
   22.68 +Organization: pEp
   22.69 +Message-ID: <1779982d-d48e-6d8c-2dcb-a2c337c496cb@pep-project.org>
   22.70 +Date: Mon, 12 Jun 2017 15:28:20 +0200
   22.71 +User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101
   22.72 + Thunderbird/45.8.0
   22.73 +MIME-Version: 1.0
   22.74 +Content-Type: multipart/encrypted;
   22.75 + protocol="application/pgp-encrypted";
   22.76 + boundary="xNhsqki3RTDSnTgiBbeAIkT3t5whv1bAM"
   22.77 +
   22.78 +This is an OpenPGP/MIME encrypted message (RFC 4880 and 3156)
   22.79 +--xNhsqki3RTDSnTgiBbeAIkT3t5whv1bAM
   22.80 +Content-Type: application/pgp-encrypted
   22.81 +Content-Description: PGP/MIME version identification
   22.82 +
   22.83 +Version: 1
   22.84 +
   22.85 +--xNhsqki3RTDSnTgiBbeAIkT3t5whv1bAM
   22.86 +Content-Type: application/octet-stream; name="encrypted.asc"
   22.87 +Content-Description: OpenPGP encrypted message
   22.88 +Content-Disposition: inline; filename="encrypted.asc"
   22.89 +
   22.90 +-----BEGIN PGP MESSAGE-----
   22.91 +
   22.92 +hQEMA4FHqvEumyRHAQgAjsyn0zCm0jHAp+SshDzqhMFNPuRc8VhDK9DpxiA1jLy8
   22.93 +bH2CKJIZEWApyfmwX5xLEXhfr0wb4BthHDXLzHCDqLSFo5FoavTwNL44kaX83yPv
   22.94 +Ts2WrvOcXGRpNLD94tvyDBqngtk3yKYaSkKKPok4Ou5gHrIDJaNZf/mybmPa0aTX
   22.95 +BEOxgAaRZJoPhgeVF8/twwiDv+ixFtdnPx9gGUXvgc5tPyrIkFkWtwrsoS2RmtJT
   22.96 +QqdsMmPbTFrsZ+d7qhdkcedeoKRg84SlXgtFpXkkbKHB/NU2ZQ2h2xTeUqdkFGN7
   22.97 +vBv17C+5jv8wzYlrlni9P1Mbc+dVBZTal9gYtBGwxIUBDANaAgXZcwg/TQEH/0vs
   22.98 +xQCJEdqbHKLz+xOmrpQEoFLdf2W9B7z2jGQe9F0K+gnPE3E+1wVf/IQgLj4YDXtN
   22.99 +Gkzc6J3UPBN9b1WSTPcJQ47hU5IXO/Sb39dU9X1s01JtCorTKmHlefosg6YaZ8CX
  22.100 +OhTkGYHqcJa9xE8kOMi4xnhP2Z3xaSkPSQvQ4WDWSapOwDkcM2a59Nwbu5PIGZpj
  22.101 +FM9WVLawN1/SVbaKOUEhFKdbl7UYW64JNWE6ZaLa0sfigt4QaXd5GrQcP2vmVVGz
  22.102 +WOuCaEb/HnxgiUvLQI2tCnW8aWluc6PnNk3HwLydvCL0tHSXPJno4Wbs1GzRJ4G7
  22.103 +CleoojpLytgTfIlZ7anS6QEAXXAuWGT3jddP4hcTnsfX40bQnIH1m49RX/4OHuMY
  22.104 +n7RyzSfyVghBQeA3fEQ48ep3WHuFHEn0Kn9rvcr/JZRO2NM4nBv1FjOIBTUMTlX+
  22.105 +hf0F/mYz1ycNg/rt6Taf9xcIP0IzRfQEa/dFqnEnBYCxGvRSr+EnMzg+ETT1p+aa
  22.106 +YAyjsbikhOqmle9G4LFUyblMmIlwFvAklAAlXTUJAEn3pc5mxH6vz0JitDpLdFDM
  22.107 +pW51y0HYgUNKS+9+qoVK2WXhkK/+hCbLzWVwzN5FlsIPucH+L+afquR6W5IKA8uZ
  22.108 +ixDPokbP1H608f/TobwX988nWby54kihoxaMvmEDbqT5Ivi5hHDhj5e79mxhUoZx
  22.109 +wb6fsm+d2vewDRhSIUF6/iioPaQt2AhmHNMBUYS5RrlOY8mc9BP8PwKym5SgkpE4
  22.110 +NKxoMjbQwUi3SHseA1hluMBieV+d7nYHqwBtSgMC/ax/AcDwmoLusXlf3OiBytdL
  22.111 +2v4OtPu6kt/QIlEABEDlqDK70wM6BChzWYrc5ErsixZ9NHunNshAjYsVeNtStOFV
  22.112 +TPGiy7a8rKB3xJhqzZhhLh9ly8JxVNfkb2LVXP/yzBS8LJpCluzyXZZpH2Q2a8lP
  22.113 +t71tjf/R/Uff2ZeF5yWO7zldyoEfx00yQWDyfmM6zHm17moXH5Mql2ZvTI0C0mk6
  22.114 +wDYNVEFe9YIXvxhdu5ym67ba8t5eV2t3c4zdhFy5YHZOC/KvpcZBLcvLY2jgVmNr
  22.115 +UYNqKpGK9m03jHRT2ZuG6F19QrxKqUIvgnYWsenecCvjjOIcWH7KqqNp+d4RyNRr
  22.116 +4VyoJk9nxzlUT/wKQJ6d5OtY5wytCCxpv8ihBFS3R2f0Sk2yXOgKE2sq0DEicWe+
  22.117 +x8Yqg3C/47hrtiUnEwwmp3VEYHfBTaaXMUkpmoRJ066u+8K2Jfo/pQnX6vcyUpvY
  22.118 +tJNqH+SMYKMXVBigU0ayWQFwVcoNEqFNVTm9K3MBQlIQiYqumBptG8rYhzF/eSUC
  22.119 +doDA15Ibgsk=
  22.120 +=P9h8
  22.121 +-----END PGP MESSAGE-----
  22.122 +
  22.123 +--xNhsqki3RTDSnTgiBbeAIkT3t5whv1bAM--
    23.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    23.2 +++ b/test/test_mails/pEp_subject_pEp_replaced_w_pEp_4a.eml	Wed Sep 13 01:59:28 2017 +0200
    23.3 @@ -0,0 +1,120 @@
    23.4 +Return-Path: <pep.test.alice@pep-project.org>
    23.5 +X-Original-To: krista@gnunet.org
    23.6 +Delivered-To: krista@gnunet.org
    23.7 +Received: from vmmailrelay1.informatik.tu-muenchen.de (mailrelay1.informatik.tu-muenchen.de [131.159.254.14])
    23.8 +	by sam.net.in.tum.de (Postfix) with ESMTP id 1C8731C00BC
    23.9 +	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:28:42 +0200 (CEST)
   23.10 +Received: by vmmailrelay1.informatik.tu-muenchen.de (Postfix, from userid 109)
   23.11 +	id E78B01C0383; Mon, 12 Jun 2017 15:28:42 +0200 (CEST)
   23.12 +Received: from vmmailrelay1.informatik.tu-muenchen.de (localhost [127.0.0.1])
   23.13 +	by vmmailrelay1.informatik.tu-muenchen.de (Postfix) with ESMTP id C414C1C037C
   23.14 +	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:28:42 +0200 (CEST)
   23.15 +Received: from vmmaildmz2.informatik.tu-muenchen.de (vmmaildmz2.informatik.tu-muenchen.de [131.159.0.88])
   23.16 +	by vmmailrelay1.informatik.tu-muenchen.de (Postfix) with ESMTP id AFA401C037A
   23.17 +	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:28:42 +0200 (CEST)
   23.18 +Received: by vmmaildmz2.informatik.tu-muenchen.de (Postfix, from userid 109)
   23.19 +	id AE03E1C2AE1; Mon, 12 Jun 2017 15:28:42 +0200 (CEST)
   23.20 +X-Spam-Checker-Version: SpamAssassin 3.4.0-tuminfo_1 (2014-02-07) on
   23.21 +	vmmaildmz2.informatik.tu-muenchen.de
   23.22 +X-Spam-Level: 
   23.23 +X-Spam-Status: No, score=-2.9 required=7.0 tests=AWL,BAYES_00,
   23.24 +	ENCRYPTED_MESSAGE,RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,
   23.25 +	TVD_RCVD_SPACE_BRACKET,UNPARSEABLE_RELAY autolearn=no autolearn_force=no
   23.26 +	version=3.4.0-tuminfo_1
   23.27 +Received: from vmmaildmz2.informatik.tu-muenchen.de (localhost [127.0.0.1])
   23.28 +	by vmmaildmz2.informatik.tu-muenchen.de (Postfix) with ESMTP id 441B11C2AE0
   23.29 +	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:28:41 +0200 (CEST)
   23.30 +Received: from mi4-p00-ob.smtp.rzone.de (mi4-p00-ob.smtp.rzone.de [81.169.146.149])
   23.31 +	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
   23.32 +	(No client certificate requested)
   23.33 +	by vmmaildmz2.informatik.tu-muenchen.de (Postfix) with ESMTPS id 3420F1C2ADF
   23.34 +	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:28:41 +0200 (CEST)
   23.35 +X-RZG-FWD-BY: pep.test.recip@kgrothoff.org
   23.36 +Received: from mailin.rzone.de ([unix socket])
   23.37 +	by mailin.rzone.de (RZmta 40.9) with LMTPA;
   23.38 +	Mon, 12 Jun 2017 15:28:27 +0200 (CEST)
   23.39 +Authentication-Results: strato.com 1;
   23.40 +	spf=none
   23.41 +		smtp.mailfrom="pep.test.alice@pep-project.org";
   23.42 +	dkim=none;
   23.43 +	domainkeys=none;
   23.44 +	dkim-adsp=none
   23.45 +		header.from="pep.test.alice@pep-project.org"
   23.46 +X-Strato-MessageType: email
   23.47 +X-RZG-CLASS-ID: mi00
   23.48 +Received-SPF: none
   23.49 +	client-ip=131.159.0.8;
   23.50 +	helo="mail-out1.informatik.tu-muenchen.de";
   23.51 +	envelope-from="pep.test.alice@pep-project.org";
   23.52 +	receiver=smtpin.rzone.de;
   23.53 +	identity=mailfrom;
   23.54 +Received: from mail-out1.informatik.tu-muenchen.de ([131.159.0.8])
   23.55 +	by smtpin.rzone.de (RZmta 40.9 OK)
   23.56 +	with ESMTPS id R04db2t5CDSRaBk
   23.57 +	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (curve secp521r1 with 521 ECDH bits, eq. 15360 bits RSA))
   23.58 +	(Client did not present a certificate)
   23.59 +	for <pep.test.recip@kgrothoff.org>;
   23.60 +	Mon, 12 Jun 2017 15:28:27 +0200 (CEST)
   23.61 +Received: from [192.168.178.22] (ip5f584089.dynamic.kabel-deutschland.de [95.88.64.137])
   23.62 +	by services.sec.in.tum.de (Postfix) with ESMTPSA id E7A551013AE47
   23.63 +	for <pep.test.recip@kgrothoff.org>; Mon, 12 Jun 2017 15:28:20 +0200 (CEST)
   23.64 +Reply-To: krista@pep-project.org
   23.65 +To: pep.test.recip@kgrothoff.org
   23.66 +From: pEp Test Alice <pep.test.alice@pep-project.org>
   23.67 +Subject: pEp
   23.68 +Organization: pEp
   23.69 +Message-ID: <1779982d-d48e-6d8c-2dcb-a2c337c496cb@pep-project.org>
   23.70 +Date: Mon, 12 Jun 2017 15:28:20 +0200
   23.71 +User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101
   23.72 + Thunderbird/45.8.0
   23.73 +MIME-Version: 1.0
   23.74 +Content-Type: multipart/encrypted;
   23.75 + protocol="application/pgp-encrypted";
   23.76 + boundary="xNhsqki3RTDSnTgiBbeAIkT3t5whv1bAM"
   23.77 +
   23.78 +This is an OpenPGP/MIME encrypted message (RFC 4880 and 3156)
   23.79 +--xNhsqki3RTDSnTgiBbeAIkT3t5whv1bAM
   23.80 +Content-Type: application/pgp-encrypted
   23.81 +Content-Description: PGP/MIME version identification
   23.82 +
   23.83 +Version: 1
   23.84 +
   23.85 +--xNhsqki3RTDSnTgiBbeAIkT3t5whv1bAM
   23.86 +Content-Type: application/octet-stream; name="encrypted.asc"
   23.87 +Content-Description: OpenPGP encrypted message
   23.88 +Content-Disposition: inline; filename="encrypted.asc"
   23.89 +
   23.90 +-----BEGIN PGP MESSAGE-----
   23.91 +
   23.92 +hQEMA4FHqvEumyRHAQgAjsyn0zCm0jHAp+SshDzqhMFNPuRc8VhDK9DpxiA1jLy8
   23.93 +bH2CKJIZEWApyfmwX5xLEXhfr0wb4BthHDXLzHCDqLSFo5FoavTwNL44kaX83yPv
   23.94 +Ts2WrvOcXGRpNLD94tvyDBqngtk3yKYaSkKKPok4Ou5gHrIDJaNZf/mybmPa0aTX
   23.95 +BEOxgAaRZJoPhgeVF8/twwiDv+ixFtdnPx9gGUXvgc5tPyrIkFkWtwrsoS2RmtJT
   23.96 +QqdsMmPbTFrsZ+d7qhdkcedeoKRg84SlXgtFpXkkbKHB/NU2ZQ2h2xTeUqdkFGN7
   23.97 +vBv17C+5jv8wzYlrlni9P1Mbc+dVBZTal9gYtBGwxIUBDANaAgXZcwg/TQEH/0vs
   23.98 +xQCJEdqbHKLz+xOmrpQEoFLdf2W9B7z2jGQe9F0K+gnPE3E+1wVf/IQgLj4YDXtN
   23.99 +Gkzc6J3UPBN9b1WSTPcJQ47hU5IXO/Sb39dU9X1s01JtCorTKmHlefosg6YaZ8CX
  23.100 +OhTkGYHqcJa9xE8kOMi4xnhP2Z3xaSkPSQvQ4WDWSapOwDkcM2a59Nwbu5PIGZpj
  23.101 +FM9WVLawN1/SVbaKOUEhFKdbl7UYW64JNWE6ZaLa0sfigt4QaXd5GrQcP2vmVVGz
  23.102 +WOuCaEb/HnxgiUvLQI2tCnW8aWluc6PnNk3HwLydvCL0tHSXPJno4Wbs1GzRJ4G7
  23.103 +CleoojpLytgTfIlZ7anS6QEAXXAuWGT3jddP4hcTnsfX40bQnIH1m49RX/4OHuMY
  23.104 +n7RyzSfyVghBQeA3fEQ48ep3WHuFHEn0Kn9rvcr/JZRO2NM4nBv1FjOIBTUMTlX+
  23.105 +hf0F/mYz1ycNg/rt6Taf9xcIP0IzRfQEa/dFqnEnBYCxGvRSr+EnMzg+ETT1p+aa
  23.106 +YAyjsbikhOqmle9G4LFUyblMmIlwFvAklAAlXTUJAEn3pc5mxH6vz0JitDpLdFDM
  23.107 +pW51y0HYgUNKS+9+qoVK2WXhkK/+hCbLzWVwzN5FlsIPucH+L+afquR6W5IKA8uZ
  23.108 +ixDPokbP1H608f/TobwX988nWby54kihoxaMvmEDbqT5Ivi5hHDhj5e79mxhUoZx
  23.109 +wb6fsm+d2vewDRhSIUF6/iioPaQt2AhmHNMBUYS5RrlOY8mc9BP8PwKym5SgkpE4
  23.110 +NKxoMjbQwUi3SHseA1hluMBieV+d7nYHqwBtSgMC/ax/AcDwmoLusXlf3OiBytdL
  23.111 +2v4OtPu6kt/QIlEABEDlqDK70wM6BChzWYrc5ErsixZ9NHunNshAjYsVeNtStOFV
  23.112 +TPGiy7a8rKB3xJhqzZhhLh9ly8JxVNfkb2LVXP/yzBS8LJpCluzyXZZpH2Q2a8lP
  23.113 +t71tjf/R/Uff2ZeF5yWO7zldyoEfx00yQWDyfmM6zHm17moXH5Mql2ZvTI0C0mk6
  23.114 +wDYNVEFe9YIXvxhdu5ym67ba8t5eV2t3c4zdhFy5YHZOC/KvpcZBLcvLY2jgVmNr
  23.115 +UYNqKpGK9m03jHRT2ZuG6F19QrxKqUIvgnYWsenecCvjjOIcWH7KqqNp+d4RyNRr
  23.116 +4VyoJk9nxzlUT/wKQJ6d5OtY5wytCCxpv8ihBFS3R2f0Sk2yXOgKE2sq0DEicWe+
  23.117 +x8Yqg3C/47hrtiUnEwwmp3VEYHfBTaaXMUkpmoRJ066u+8K2Jfo/pQnX6vcyUpvY
  23.118 +tJNqH+SMYKMXVBigU0ayWQFwVcoNEqFNVTm9K3MBQlIQiYqumBptG8rYhzF/eSUC
  23.119 +doDA15Ibgsk=
  23.120 +=P9h8
  23.121 +-----END PGP MESSAGE-----
  23.122 +
  23.123 +--xNhsqki3RTDSnTgiBbeAIkT3t5whv1bAM--
    24.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    24.2 +++ b/test/test_mails/pEp_unencrypted_p3p_subject_5b.eml	Wed Sep 13 01:59:28 2017 +0200
    24.3 @@ -0,0 +1,73 @@
    24.4 +Return-Path: <pep.test.alice@pep-project.org>
    24.5 +X-Original-To: krista@gnunet.org
    24.6 +Delivered-To: krista@gnunet.org
    24.7 +Received: from vmmailrelay1.informatik.tu-muenchen.de (mailrelay1.informatik.tu-muenchen.de [131.159.254.14])
    24.8 +	by sam.net.in.tum.de (Postfix) with ESMTP id 39CD11C00BC
    24.9 +	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:36:35 +0200 (CEST)
   24.10 +Received: by vmmailrelay1.informatik.tu-muenchen.de (Postfix, from userid 109)
   24.11 +	id 0CEA81C0390; Mon, 12 Jun 2017 15:36:36 +0200 (CEST)
   24.12 +Received: from vmmailrelay1.informatik.tu-muenchen.de (localhost [127.0.0.1])
   24.13 +	by vmmailrelay1.informatik.tu-muenchen.de (Postfix) with ESMTP id DE7711C0383
   24.14 +	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:36:35 +0200 (CEST)
   24.15 +Received: from vmmaildmz1.informatik.tu-muenchen.de (vmmaildmz1.informatik.tu-muenchen.de [131.159.0.87])
   24.16 +	by vmmailrelay1.informatik.tu-muenchen.de (Postfix) with ESMTP id D3D7A1C037A
   24.17 +	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:36:35 +0200 (CEST)
   24.18 +Received: by vmmaildmz1.informatik.tu-muenchen.de (Postfix, from userid 109)
   24.19 +	id D22771C2D9E; Mon, 12 Jun 2017 15:36:35 +0200 (CEST)
   24.20 +X-Spam-Checker-Version: SpamAssassin 3.4.0-tuminfo_1 (2014-02-07) on
   24.21 +	vmmaildmz1.informatik.tu-muenchen.de
   24.22 +X-Spam-Level: 
   24.23 +X-Spam-Status: No, score=-2.9 required=7.0 tests=AWL,BAYES_00,
   24.24 +	RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,TVD_RCVD_SPACE_BRACKET,
   24.25 +	UNPARSEABLE_RELAY autolearn=no autolearn_force=no version=3.4.0-tuminfo_1
   24.26 +Received: from vmmaildmz1.informatik.tu-muenchen.de (localhost [127.0.0.1])
   24.27 +	by vmmaildmz1.informatik.tu-muenchen.de (Postfix) with ESMTP id 615241C2D9E
   24.28 +	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:36:34 +0200 (CEST)
   24.29 +Received: from mi4-p00-ob.smtp.rzone.de (mi4-p00-ob.smtp.rzone.de [81.169.146.146])
   24.30 +	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
   24.31 +	(No client certificate requested)
   24.32 +	by vmmaildmz1.informatik.tu-muenchen.de (Postfix) with ESMTPS id 50C3E1C2D9B
   24.33 +	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:36:34 +0200 (CEST)
   24.34 +X-RZG-FWD-BY: pep.test.recip@kgrothoff.org
   24.35 +Received: from mailin.rzone.de ([unix socket])
   24.36 +	by mailin.rzone.de (RZmta 40.9) with LMTPA;
   24.37 +	Mon, 12 Jun 2017 15:36:18 +0200 (CEST)
   24.38 +Authentication-Results: strato.com 1;
   24.39 +	spf=none
   24.40 +		smtp.mailfrom="pep.test.alice@pep-project.org";
   24.41 +	dkim=none;
   24.42 +	domainkeys=none;
   24.43 +	dkim-adsp=none
   24.44 +		header.from="pep.test.alice@pep-project.org"
   24.45 +X-Strato-MessageType: email
   24.46 +X-RZG-CLASS-ID: mi00
   24.47 +Received-SPF: none
   24.48 +	client-ip=131.159.0.8;
   24.49 +	helo="mail-out1.informatik.tu-muenchen.de";
   24.50 +	envelope-from="pep.test.alice@pep-project.org";
   24.51 +	receiver=smtpin.rzone.de;
   24.52 +	identity=mailfrom;
   24.53 +Received: from mail-out1.informatik.tu-muenchen.de ([131.159.0.8])
   24.54 +	by smtpin.rzone.de (RZmta 40.9 OK)
   24.55 +	with ESMTPS id p044e9t5CDaIXCz
   24.56 +	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (curve secp521r1 with 521 ECDH bits, eq. 15360 bits RSA))
   24.57 +	(Client did not present a certificate)
   24.58 +	for <pep.test.recip@kgrothoff.org>;
   24.59 +	Mon, 12 Jun 2017 15:36:18 +0200 (CEST)
   24.60 +Received: from [192.168.178.22] (ip5f584089.dynamic.kabel-deutschland.de [95.88.64.137])
   24.61 +	by services.sec.in.tum.de (Postfix) with ESMTPSA id D40EB1013AE4F
   24.62 +	for <pep.test.recip@kgrothoff.org>; Mon, 12 Jun 2017 15:36:12 +0200 (CEST)
   24.63 +To: pep.test.recip@kgrothoff.org
   24.64 +Reply-To: krista@pep-project.org
   24.65 +From: pEp Test Alice <pep.test.alice@pep-project.org>
   24.66 +Subject: =?utf-8?Q?p=E2=89=A1p?=
   24.67 +Organization: pEp
   24.68 +Message-ID: <7b251ab6-f1c0-163b-0891-574d4eb095e1@pep-project.org>
   24.69 +Date: Mon, 12 Jun 2017 15:36:12 +0200
   24.70 +User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101
   24.71 + Thunderbird/45.8.0
   24.72 +MIME-Version: 1.0
   24.73 +Content-Type: text/plain; charset=utf-8
   24.74 +Content-Transfer-Encoding: 7bit
   24.75 +
   24.76 +Unencrypted mail where pEp (using equivalence symbol) is the actual subject.
    25.1 --- a/test/test_mails/pEp_unencrypted_pEp_subject.eml	Tue Sep 12 19:23:56 2017 +0200
    25.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    25.3 @@ -1,73 +0,0 @@
    25.4 -Return-Path: <pep.test.alice@pep-project.org>
    25.5 -X-Original-To: krista@gnunet.org
    25.6 -Delivered-To: krista@gnunet.org
    25.7 -Received: from vmmailrelay1.informatik.tu-muenchen.de (mailrelay1.informatik.tu-muenchen.de [131.159.254.14])
    25.8 -	by sam.net.in.tum.de (Postfix) with ESMTP id 39CD11C00BC
    25.9 -	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:36:35 +0200 (CEST)
   25.10 -Received: by vmmailrelay1.informatik.tu-muenchen.de (Postfix, from userid 109)
   25.11 -	id 0CEA81C0390; Mon, 12 Jun 2017 15:36:36 +0200 (CEST)
   25.12 -Received: from vmmailrelay1.informatik.tu-muenchen.de (localhost [127.0.0.1])
   25.13 -	by vmmailrelay1.informatik.tu-muenchen.de (Postfix) with ESMTP id DE7711C0383
   25.14 -	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:36:35 +0200 (CEST)
   25.15 -Received: from vmmaildmz1.informatik.tu-muenchen.de (vmmaildmz1.informatik.tu-muenchen.de [131.159.0.87])
   25.16 -	by vmmailrelay1.informatik.tu-muenchen.de (Postfix) with ESMTP id D3D7A1C037A
   25.17 -	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:36:35 +0200 (CEST)
   25.18 -Received: by vmmaildmz1.informatik.tu-muenchen.de (Postfix, from userid 109)
   25.19 -	id D22771C2D9E; Mon, 12 Jun 2017 15:36:35 +0200 (CEST)
   25.20 -X-Spam-Checker-Version: SpamAssassin 3.4.0-tuminfo_1 (2014-02-07) on
   25.21 -	vmmaildmz1.informatik.tu-muenchen.de
   25.22 -X-Spam-Level: 
   25.23 -X-Spam-Status: No, score=-2.9 required=7.0 tests=AWL,BAYES_00,
   25.24 -	RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,TVD_RCVD_SPACE_BRACKET,
   25.25 -	UNPARSEABLE_RELAY autolearn=no autolearn_force=no version=3.4.0-tuminfo_1
   25.26 -Received: from vmmaildmz1.informatik.tu-muenchen.de (localhost [127.0.0.1])
   25.27 -	by vmmaildmz1.informatik.tu-muenchen.de (Postfix) with ESMTP id 615241C2D9E
   25.28 -	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:36:34 +0200 (CEST)
   25.29 -Received: from mi4-p00-ob.smtp.rzone.de (mi4-p00-ob.smtp.rzone.de [81.169.146.146])
   25.30 -	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
   25.31 -	(No client certificate requested)
   25.32 -	by vmmaildmz1.informatik.tu-muenchen.de (Postfix) with ESMTPS id 50C3E1C2D9B
   25.33 -	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:36:34 +0200 (CEST)
   25.34 -X-RZG-FWD-BY: pep.test.recip@kgrothoff.org
   25.35 -Received: from mailin.rzone.de ([unix socket])
   25.36 -	by mailin.rzone.de (RZmta 40.9) with LMTPA;
   25.37 -	Mon, 12 Jun 2017 15:36:18 +0200 (CEST)
   25.38 -Authentication-Results: strato.com 1;
   25.39 -	spf=none
   25.40 -		smtp.mailfrom="pep.test.alice@pep-project.org";
   25.41 -	dkim=none;
   25.42 -	domainkeys=none;
   25.43 -	dkim-adsp=none
   25.44 -		header.from="pep.test.alice@pep-project.org"
   25.45 -X-Strato-MessageType: email
   25.46 -X-RZG-CLASS-ID: mi00
   25.47 -Received-SPF: none
   25.48 -	client-ip=131.159.0.8;
   25.49 -	helo="mail-out1.informatik.tu-muenchen.de";
   25.50 -	envelope-from="pep.test.alice@pep-project.org";
   25.51 -	receiver=smtpin.rzone.de;
   25.52 -	identity=mailfrom;
   25.53 -Received: from mail-out1.informatik.tu-muenchen.de ([131.159.0.8])
   25.54 -	by smtpin.rzone.de (RZmta 40.9 OK)
   25.55 -	with ESMTPS id p044e9t5CDaIXCz
   25.56 -	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (curve secp521r1 with 521 ECDH bits, eq. 15360 bits RSA))
   25.57 -	(Client did not present a certificate)
   25.58 -	for <pep.test.recip@kgrothoff.org>;
   25.59 -	Mon, 12 Jun 2017 15:36:18 +0200 (CEST)
   25.60 -Received: from [192.168.178.22] (ip5f584089.dynamic.kabel-deutschland.de [95.88.64.137])
   25.61 -	by services.sec.in.tum.de (Postfix) with ESMTPSA id D40EB1013AE4F
   25.62 -	for <pep.test.recip@kgrothoff.org>; Mon, 12 Jun 2017 15:36:12 +0200 (CEST)
   25.63 -To: pep.test.recip@kgrothoff.org
   25.64 -Reply-To: krista@pep-project.org
   25.65 -From: pEp Test Alice <pep.test.alice@pep-project.org>
   25.66 -Subject: pEp
   25.67 -Organization: pEp
   25.68 -Message-ID: <7b251ab6-f1c0-163b-0891-574d4eb095e1@pep-project.org>
   25.69 -Date: Mon, 12 Jun 2017 15:36:12 +0200
   25.70 -User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101
   25.71 - Thunderbird/45.8.0
   25.72 -MIME-Version: 1.0
   25.73 -Content-Type: text/plain; charset=utf-8
   25.74 -Content-Transfer-Encoding: 7bit
   25.75 -
   25.76 -Unencrypted variable where pEp is the actual subject.
    26.1 --- a/test/test_mails/pEp_unencrypted_pEp_subject2.eml	Tue Sep 12 19:23:56 2017 +0200
    26.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    26.3 @@ -1,73 +0,0 @@
    26.4 -Return-Path: <pep.test.alice@pep-project.org>
    26.5 -X-Original-To: krista@gnunet.org
    26.6 -Delivered-To: krista@gnunet.org
    26.7 -Received: from vmmailrelay1.informatik.tu-muenchen.de (mailrelay1.informatik.tu-muenchen.de [131.159.254.14])
    26.8 -	by sam.net.in.tum.de (Postfix) with ESMTP id 39CD11C00BC
    26.9 -	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:36:35 +0200 (CEST)
   26.10 -Received: by vmmailrelay1.informatik.tu-muenchen.de (Postfix, from userid 109)
   26.11 -	id 0CEA81C0390; Mon, 12 Jun 2017 15:36:36 +0200 (CEST)
   26.12 -Received: from vmmailrelay1.informatik.tu-muenchen.de (localhost [127.0.0.1])
   26.13 -	by vmmailrelay1.informatik.tu-muenchen.de (Postfix) with ESMTP id DE7711C0383
   26.14 -	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:36:35 +0200 (CEST)
   26.15 -Received: from vmmaildmz1.informatik.tu-muenchen.de (vmmaildmz1.informatik.tu-muenchen.de [131.159.0.87])
   26.16 -	by vmmailrelay1.informatik.tu-muenchen.de (Postfix) with ESMTP id D3D7A1C037A
   26.17 -	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:36:35 +0200 (CEST)
   26.18 -Received: by vmmaildmz1.informatik.tu-muenchen.de (Postfix, from userid 109)
   26.19 -	id D22771C2D9E; Mon, 12 Jun 2017 15:36:35 +0200 (CEST)
   26.20 -X-Spam-Checker-Version: SpamAssassin 3.4.0-tuminfo_1 (2014-02-07) on
   26.21 -	vmmaildmz1.informatik.tu-muenchen.de
   26.22 -X-Spam-Level: 
   26.23 -X-Spam-Status: No, score=-2.9 required=7.0 tests=AWL,BAYES_00,
   26.24 -	RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,TVD_RCVD_SPACE_BRACKET,
   26.25 -	UNPARSEABLE_RELAY autolearn=no autolearn_force=no version=3.4.0-tuminfo_1
   26.26 -Received: from vmmaildmz1.informatik.tu-muenchen.de (localhost [127.0.0.1])
   26.27 -	by vmmaildmz1.informatik.tu-muenchen.de (Postfix) with ESMTP id 615241C2D9E
   26.28 -	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:36:34 +0200 (CEST)
   26.29 -Received: from mi4-p00-ob.smtp.rzone.de (mi4-p00-ob.smtp.rzone.de [81.169.146.146])
   26.30 -	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
   26.31 -	(No client certificate requested)
   26.32 -	by vmmaildmz1.informatik.tu-muenchen.de (Postfix) with ESMTPS id 50C3E1C2D9B
   26.33 -	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:36:34 +0200 (CEST)
   26.34 -X-RZG-FWD-BY: pep.test.recip@kgrothoff.org
   26.35 -Received: from mailin.rzone.de ([unix socket])
   26.36 -	by mailin.rzone.de (RZmta 40.9) with LMTPA;
   26.37 -	Mon, 12 Jun 2017 15:36:18 +0200 (CEST)
   26.38 -Authentication-Results: strato.com 1;
   26.39 -	spf=none
   26.40 -		smtp.mailfrom="pep.test.alice@pep-project.org";
   26.41 -	dkim=none;
   26.42 -	domainkeys=none;
   26.43 -	dkim-adsp=none
   26.44 -		header.from="pep.test.alice@pep-project.org"
   26.45 -X-Strato-MessageType: email
   26.46 -X-RZG-CLASS-ID: mi00
   26.47 -Received-SPF: none
   26.48 -	client-ip=131.159.0.8;
   26.49 -	helo="mail-out1.informatik.tu-muenchen.de";
   26.50 -	envelope-from="pep.test.alice@pep-project.org";
   26.51 -	receiver=smtpin.rzone.de;
   26.52 -	identity=mailfrom;
   26.53 -Received: from mail-out1.informatik.tu-muenchen.de ([131.159.0.8])
   26.54 -	by smtpin.rzone.de (RZmta 40.9 OK)
   26.55 -	with ESMTPS id p044e9t5CDaIXCz
   26.56 -	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (curve secp521r1 with 521 ECDH bits, eq. 15360 bits RSA))
   26.57 -	(Client did not present a certificate)
   26.58 -	for <pep.test.recip@kgrothoff.org>;
   26.59 -	Mon, 12 Jun 2017 15:36:18 +0200 (CEST)
   26.60 -Received: from [192.168.178.22] (ip5f584089.dynamic.kabel-deutschland.de [95.88.64.137])
   26.61 -	by services.sec.in.tum.de (Postfix) with ESMTPSA id D40EB1013AE4F
   26.62 -	for <pep.test.recip@kgrothoff.org>; Mon, 12 Jun 2017 15:36:12 +0200 (CEST)
   26.63 -To: pep.test.recip@kgrothoff.org
   26.64 -Reply-To: krista@pep-project.org
   26.65 -From: pEp Test Alice <pep.test.alice@pep-project.org>
   26.66 -Subject: =?utf-8?Q?p=E2=89=A1p?=
   26.67 -Organization: pEp
   26.68 -Message-ID: <7b251ab6-f1c0-163b-0891-574d4eb095e1@pep-project.org>
   26.69 -Date: Mon, 12 Jun 2017 15:36:12 +0200
   26.70 -User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101
   26.71 - Thunderbird/45.8.0
   26.72 -MIME-Version: 1.0
   26.73 -Content-Type: text/plain; charset=utf-8
   26.74 -Content-Transfer-Encoding: 7bit
   26.75 -
   26.76 -Unencrypted mail where pEp (using equivalence symbol) is the actual subject.
    27.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    27.2 +++ b/test/test_mails/pEp_unencrypted_pEp_subject_5a.eml	Wed Sep 13 01:59:28 2017 +0200
    27.3 @@ -0,0 +1,73 @@
    27.4 +Return-Path: <pep.test.alice@pep-project.org>
    27.5 +X-Original-To: krista@gnunet.org
    27.6 +Delivered-To: krista@gnunet.org
    27.7 +Received: from vmmailrelay1.informatik.tu-muenchen.de (mailrelay1.informatik.tu-muenchen.de [131.159.254.14])
    27.8 +	by sam.net.in.tum.de (Postfix) with ESMTP id 39CD11C00BC
    27.9 +	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:36:35 +0200 (CEST)
   27.10 +Received: by vmmailrelay1.informatik.tu-muenchen.de (Postfix, from userid 109)
   27.11 +	id 0CEA81C0390; Mon, 12 Jun 2017 15:36:36 +0200 (CEST)
   27.12 +Received: from vmmailrelay1.informatik.tu-muenchen.de (localhost [127.0.0.1])
   27.13 +	by vmmailrelay1.informatik.tu-muenchen.de (Postfix) with ESMTP id DE7711C0383
   27.14 +	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:36:35 +0200 (CEST)
   27.15 +Received: from vmmaildmz1.informatik.tu-muenchen.de (vmmaildmz1.informatik.tu-muenchen.de [131.159.0.87])
   27.16 +	by vmmailrelay1.informatik.tu-muenchen.de (Postfix) with ESMTP id D3D7A1C037A
   27.17 +	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:36:35 +0200 (CEST)
   27.18 +Received: by vmmaildmz1.informatik.tu-muenchen.de (Postfix, from userid 109)
   27.19 +	id D22771C2D9E; Mon, 12 Jun 2017 15:36:35 +0200 (CEST)
   27.20 +X-Spam-Checker-Version: SpamAssassin 3.4.0-tuminfo_1 (2014-02-07) on
   27.21 +	vmmaildmz1.informatik.tu-muenchen.de
   27.22 +X-Spam-Level: 
   27.23 +X-Spam-Status: No, score=-2.9 required=7.0 tests=AWL,BAYES_00,
   27.24 +	RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,TVD_RCVD_SPACE_BRACKET,
   27.25 +	UNPARSEABLE_RELAY autolearn=no autolearn_force=no version=3.4.0-tuminfo_1
   27.26 +Received: from vmmaildmz1.informatik.tu-muenchen.de (localhost [127.0.0.1])
   27.27 +	by vmmaildmz1.informatik.tu-muenchen.de (Postfix) with ESMTP id 615241C2D9E
   27.28 +	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:36:34 +0200 (CEST)
   27.29 +Received: from mi4-p00-ob.smtp.rzone.de (mi4-p00-ob.smtp.rzone.de [81.169.146.146])
   27.30 +	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
   27.31 +	(No client certificate requested)
   27.32 +	by vmmaildmz1.informatik.tu-muenchen.de (Postfix) with ESMTPS id 50C3E1C2D9B
   27.33 +	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:36:34 +0200 (CEST)
   27.34 +X-RZG-FWD-BY: pep.test.recip@kgrothoff.org
   27.35 +Received: from mailin.rzone.de ([unix socket])
   27.36 +	by mailin.rzone.de (RZmta 40.9) with LMTPA;
   27.37 +	Mon, 12 Jun 2017 15:36:18 +0200 (CEST)
   27.38 +Authentication-Results: strato.com 1;
   27.39 +	spf=none
   27.40 +		smtp.mailfrom="pep.test.alice@pep-project.org";
   27.41 +	dkim=none;
   27.42 +	domainkeys=none;
   27.43 +	dkim-adsp=none
   27.44 +		header.from="pep.test.alice@pep-project.org"
   27.45 +X-Strato-MessageType: email
   27.46 +X-RZG-CLASS-ID: mi00
   27.47 +Received-SPF: none
   27.48 +	client-ip=131.159.0.8;
   27.49 +	helo="mail-out1.informatik.tu-muenchen.de";
   27.50 +	envelope-from="pep.test.alice@pep-project.org";
   27.51 +	receiver=smtpin.rzone.de;
   27.52 +	identity=mailfrom;
   27.53 +Received: from mail-out1.informatik.tu-muenchen.de ([131.159.0.8])
   27.54 +	by smtpin.rzone.de (RZmta 40.9 OK)
   27.55 +	with ESMTPS id p044e9t5CDaIXCz
   27.56 +	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (curve secp521r1 with 521 ECDH bits, eq. 15360 bits RSA))
   27.57 +	(Client did not present a certificate)
   27.58 +	for <pep.test.recip@kgrothoff.org>;
   27.59 +	Mon, 12 Jun 2017 15:36:18 +0200 (CEST)
   27.60 +Received: from [192.168.178.22] (ip5f584089.dynamic.kabel-deutschland.de [95.88.64.137])
   27.61 +	by services.sec.in.tum.de (Postfix) with ESMTPSA id D40EB1013AE4F
   27.62 +	for <pep.test.recip@kgrothoff.org>; Mon, 12 Jun 2017 15:36:12 +0200 (CEST)
   27.63 +To: pep.test.recip@kgrothoff.org
   27.64 +Reply-To: krista@pep-project.org
   27.65 +From: pEp Test Alice <pep.test.alice@pep-project.org>
   27.66 +Subject: pEp
   27.67 +Organization: pEp
   27.68 +Message-ID: <7b251ab6-f1c0-163b-0891-574d4eb095e1@pep-project.org>
   27.69 +Date: Mon, 12 Jun 2017 15:36:12 +0200
   27.70 +User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101
   27.71 + Thunderbird/45.8.0
   27.72 +MIME-Version: 1.0
   27.73 +Content-Type: text/plain; charset=utf-8
   27.74 +Content-Transfer-Encoding: 7bit
   27.75 +
   27.76 +Unencrypted variable where pEp is the actual subject.