merged in ENGINE-247
authorKrista Bennett <krista@pep-project.org>
Wed, 13 Sep 2017 02:00:36 +0200
changeset 2051c5b75986b5ff
parent 2047 a4d4320b09bc
parent 2050 92733656cf1b
child 2053 786e5620b35e
child 2054 9430eba25d39
child 2056 416d7d4e26b1
merged in ENGINE-247
test/test_mails/pEp_encrypted_subject_IS_pEp.eml
test/test_mails/pEp_subject_normal.eml
test/test_mails/pEp_subject_normal_signed.eml
test/test_mails/pEp_subject_normal_unencrypted.eml
test/test_mails/pEp_subject_pEp.eml
test/test_mails/pEp_unencrypted_pEp_subject.eml
     1.1 --- a/src/message_api.c	Tue Sep 12 19:17:44 2017 +0200
     1.2 +++ b/src/message_api.c	Wed Sep 13 02:00:36 2017 +0200
     1.3 @@ -103,9 +103,12 @@
     1.4  static char * combine_short_and_long(const char *shortmsg, const char *longmsg)
     1.5  {
     1.6      assert(shortmsg);
     1.7 -    assert(strcmp(shortmsg, "pEp") != 0);
     1.8 -
     1.9 -    if (!shortmsg || strcmp(shortmsg, "pEp") == 0) {
    1.10 +    
    1.11 +    unsigned char pepstr[] = PEP_SUBJ_STRING;
    1.12 +    assert(strcmp(shortmsg, "pEp") != 0 && _unsigned_signed_strcmp(pepstr, shortmsg, PEP_SUBJ_BYTELEN) != 0); 
    1.13 +    
    1.14 +    if (!shortmsg || strcmp(shortmsg, "pEp") == 0 || 
    1.15 +                     _unsigned_signed_strcmp(pepstr, shortmsg, PEP_SUBJ_BYTELEN) == 0) {
    1.16          if (!longmsg) {
    1.17              return NULL;
    1.18          }
    1.19 @@ -370,8 +373,10 @@
    1.20      size_t csize;
    1.21      assert(dst->longmsg == NULL);
    1.22      dst->enc_format = PEP_enc_PGP_MIME;
    1.23 -
    1.24 -    if (src->shortmsg && strcmp(src->shortmsg, "pEp") != 0) {
    1.25 +    unsigned char pepstr[] = PEP_SUBJ_STRING;
    1.26 +
    1.27 +    if (src->shortmsg && strcmp(src->shortmsg, "pEp") != 0 
    1.28 +                      && _unsigned_signed_strcmp(pepstr, src->shortmsg, PEP_SUBJ_BYTELEN) != 0) {
    1.29          if (session->unencrypted_subject) {
    1.30              dst->shortmsg = strdup(src->shortmsg);
    1.31              assert(dst->shortmsg);
    1.32 @@ -390,7 +395,7 @@
    1.33          ptext = src->longmsg;
    1.34      }
    1.35      else {
    1.36 -        ptext = "pEp";
    1.37 +        ptext = (char*)pepstr;
    1.38      }
    1.39  
    1.40      message *_src = calloc(1, sizeof(message));
    1.41 @@ -471,7 +476,8 @@
    1.42      size_t csize;
    1.43      char *ptext = NULL;
    1.44      bool free_ptext = false;
    1.45 -
    1.46 +    unsigned char pepstr[] = PEP_SUBJ_STRING;
    1.47 +    
    1.48      assert(dst->longmsg == NULL);
    1.49      assert(dst->attachments == NULL);
    1.50  
    1.51 @@ -479,7 +485,8 @@
    1.52  
    1.53      bool nosign = (flags & PEP_encrypt_flag_force_unsigned);
    1.54  
    1.55 -    if (src->shortmsg && src->shortmsg[0] && strcmp(src->shortmsg, "pEp") != 0) {
    1.56 +    if (src->shortmsg && src->shortmsg[0] && strcmp(src->shortmsg, "pEp") != 0 && 
    1.57 +        _unsigned_signed_strcmp(pepstr, src->shortmsg, PEP_SUBJ_BYTELEN) != 0) {
    1.58          if (session->unencrypted_subject) {
    1.59              dst->shortmsg = strdup(src->shortmsg);
    1.60              assert(dst->shortmsg);
    1.61 @@ -1284,7 +1291,7 @@
    1.62      free_stringlist(keys);
    1.63  
    1.64      if (msg && msg->shortmsg == NULL) {
    1.65 -        msg->shortmsg = strdup("pEp");
    1.66 +        msg->shortmsg = _pep_subj_copy();
    1.67          assert(msg->shortmsg);
    1.68          if (msg->shortmsg == NULL)
    1.69              goto enomem;
    1.70 @@ -1395,7 +1402,7 @@
    1.71          goto pep_error;
    1.72  
    1.73       if (msg && msg->shortmsg == NULL) {
    1.74 -         msg->shortmsg = strdup("pEp");
    1.75 +         msg->shortmsg = _pep_subj_copy();
    1.76           assert(msg->shortmsg);
    1.77           if (msg->shortmsg == NULL)
    1.78               goto enomem;
    1.79 @@ -1680,6 +1687,7 @@
    1.80      char *ptext = NULL;
    1.81      size_t psize;
    1.82      stringlist_t *_keylist = NULL;
    1.83 +    unsigned char pepstr[] = PEP_SUBJ_STRING;
    1.84  
    1.85      assert(session);
    1.86      assert(src);
    1.87 @@ -1972,7 +1980,8 @@
    1.88                      GOTO(pep_error);
    1.89                  }
    1.90  
    1.91 -                if (src->shortmsg == NULL || strcmp(src->shortmsg, "pEp") == 0)
    1.92 +                if (src->shortmsg == NULL || strcmp(src->shortmsg, "pEp") == 0 ||
    1.93 +                    _unsigned_signed_strcmp(pepstr, src->shortmsg, PEP_SUBJ_BYTELEN) == 0)
    1.94                  {
    1.95                      char * shortmsg;
    1.96                      char * longmsg;
     2.1 --- a/src/mime.c	Tue Sep 12 19:17:44 2017 +0200
     2.2 +++ b/src/mime.c	Wed Sep 13 02:00:36 2017 +0200
     2.3 @@ -418,7 +418,8 @@
     2.4      struct mailimf_fields * fields = NULL;
     2.5      int r;
     2.6      clist * fields_list = NULL;
     2.7 -    char *subject = msg->shortmsg ? msg->shortmsg : "pEp";
     2.8 +    unsigned char pepstr[] = PEP_SUBJ_STRING; // unsigned due to UTF-8 byte fun
     2.9 +    char *subject = msg->shortmsg ? msg->shortmsg : (char*)pepstr;
    2.10  
    2.11      assert(msg);
    2.12      assert(msg->from);
     3.1 --- a/src/pEp_internal.h	Tue Sep 12 19:17:44 2017 +0200
     3.2 +++ b/src/pEp_internal.h	Wed Sep 13 02:00:36 2017 +0200
     3.3 @@ -31,6 +31,12 @@
     3.4  #endif
     3.5  #define CRASHDUMP_MAX_LINES 32767
     3.6  
     3.7 +// p≡p full string, NUL-terminated
     3.8 +#ifndef PEP_SUBJ_STRING
     3.9 +#define PEP_SUBJ_STRING {0x70,0xE2,0x89,0xA1,0x70,0x00}
    3.10 +#define PEP_SUBJ_BYTELEN 5
    3.11 +#endif
    3.12 +
    3.13  #include "platform.h"
    3.14  
    3.15  #ifdef WIN32
    3.16 @@ -324,6 +330,24 @@
    3.17      return identity->user_id && strcmp(identity->user_id, PEP_OWN_USERID) == 0;
    3.18  }
    3.19  
    3.20 +// size is the length of the bytestr that's coming in. This is really only intended
    3.21 +// for comparing two full strings. If charstr's length is different from bytestr_size,
    3.22 +// we'll return a non-zero value.
    3.23 +static inline int _unsigned_signed_strcmp(const unsigned char* bytestr, const char* charstr, int bytestr_size) {
    3.24 +    int charstr_len = strlen(charstr);
    3.25 +    if (charstr_len != bytestr_size)
    3.26 +        return -1; // we don't actually care except that it's non-zero
    3.27 +    return memcmp(bytestr, charstr, bytestr_size);
    3.28 +}
    3.29 +
    3.30 +// This is just a horrible example of C type madness. UTF-8 made me do it.
    3.31 +static inline char* _pep_subj_copy() {
    3.32 +    unsigned char pepstr[] = PEP_SUBJ_STRING;
    3.33 +    void* retval = calloc(1, sizeof(unsigned char)*PEP_SUBJ_BYTELEN + 1);
    3.34 +    memcpy(retval, pepstr, PEP_SUBJ_BYTELEN);
    3.35 +    return (char*)retval;
    3.36 +}
    3.37 +
    3.38  #ifdef DEBUG_ERRORSTACK
    3.39      PEP_STATUS session_add_error(PEP_SESSION session, const char* file, unsigned line, PEP_STATUS status);
    3.40      #define ADD_TO_LOG(status)   session_add_error(session, __FILE__, __LINE__, (status))
     4.1 --- a/test/pEp_subject_received_test.cc	Tue Sep 12 19:17:44 2017 +0200
     4.2 +++ b/test/pEp_subject_received_test.cc	Wed Sep 13 02:00:36 2017 +0200
     4.3 @@ -14,7 +14,7 @@
     4.4  
     4.5  int main(int argc, char** argv) {
     4.6  
     4.7 -    cout << "\n*** check that pEp subject is handled properly in received mails ***\n\n";
     4.8 +    cout << "\n*** check that p≡p subject is handled properly in received mails ***\n\n";
     4.9  
    4.10      PEP_SESSION session;
    4.11      
    4.12 @@ -42,21 +42,11 @@
    4.13      trust_personal_key(session, you);
    4.14      status = update_identity(session, you);
    4.15  
    4.16 -
    4.17 -    
    4.18 -    const char* mailfiles[] = {"test_mails/pEp_encrypted_subject_IS_pEp.eml",
    4.19 -                                "test_mails/pEp_subject_normal.eml",
    4.20 -                                "test_mails/pEp_subject_normal_signed.eml",
    4.21 -                                "test_mails/pEp_subject_normal_unencrypted.eml",
    4.22 -                                "test_mails/pEp_subject_pEp.eml",
    4.23 -                                "test_mails/pEp_unencrypted_pEp_subject.eml"};
    4.24 -                                
    4.25 -
    4.26      cout << "------------------------------------------------------------------------------------------" << endl;
    4.27 -    cout << "Test 1: Normal encrypted mail, pEp as substitute subject, regular subject in crypto text." << endl;
    4.28 +    cout << "Test 1a: Normal encrypted mail, pEp as substitute subject, regular subject in crypto text." << endl;
    4.29      cout << "------------------------------------------------------------------------------------------" << endl;
    4.30          
    4.31 -    string mailtext = slurp(mailfiles[1]);
    4.32 +    string mailtext = slurp("test_mails/pEp_subject_normal_1a.eml");
    4.33      
    4.34      message* msg_ptr = nullptr;
    4.35      message* dest_msg = nullptr;
    4.36 @@ -78,7 +68,39 @@
    4.37  
    4.38      assert(strcmp("This is the usual pEp subject that should replace the above.", final_ptr->shortmsg) == 0);
    4.39  
    4.40 -    cout << "Test 1: Subject replaced as expected." << endl << endl;
    4.41 +    cout << "Test 1a: Subject replaced as expected." << endl << endl;
    4.42 +
    4.43 +    if (final_ptr == dest_msg)
    4.44 +    	free_message(dest_msg);
    4.45 +    free_message(msg_ptr);
    4.46 +    free_stringlist(keylist);
    4.47 +
    4.48 +    cout << "------------------------------------------------------------------------------------------" << endl;
    4.49 +    cout << "Test 1b: Normal encrypted mail, p≡p as substitute subject, regular subject in crypto text." << endl;
    4.50 +    cout << "------------------------------------------------------------------------------------------" << endl;
    4.51 +        
    4.52 +    mailtext = slurp("test_mails/p3p_subject_normal_1b.eml");
    4.53 +    
    4.54 +    msg_ptr = nullptr;
    4.55 +    dest_msg = nullptr;
    4.56 +    final_ptr = nullptr;
    4.57 +    keylist = nullptr;
    4.58 +    rating = PEP_rating_unreliable;
    4.59 +    
    4.60 +    status = mime_decode_message(mailtext.c_str(), mailtext.length(), &msg_ptr);
    4.61 +    assert(status == PEP_STATUS_OK);
    4.62 +    assert(msg_ptr);
    4.63 +    final_ptr = msg_ptr;
    4.64 +    status = decrypt_message(session, msg_ptr, &dest_msg, &keylist, &rating, &flags);
    4.65 +    final_ptr = dest_msg ? dest_msg : msg_ptr;
    4.66 +  
    4.67 +    cout << "shortmsg: " << final_ptr->shortmsg << endl << endl;
    4.68 +    cout << "longmsg: " << final_ptr->longmsg << endl << endl;
    4.69 +    cout << "longmsg_formatted: " << (final_ptr->longmsg_formatted ? final_ptr->longmsg_formatted : "(empty)") << endl << endl;
    4.70 +
    4.71 +    assert(strcmp("This is the usual pEp subject that should replace the above.", final_ptr->shortmsg) == 0);
    4.72 +
    4.73 +    cout << "Test 1b: Subject replaced as expected." << endl << endl;
    4.74  
    4.75      if (final_ptr == dest_msg)
    4.76      	free_message(dest_msg);
    4.77 @@ -86,7 +108,7 @@
    4.78      free_stringlist(keylist);
    4.79  
    4.80      cout << "-------------------------------------------------------------------------------------------------" << endl;
    4.81 -    cout << "Test 2: Normal encrypted/signed mail, pEp as substitute subject, regular subject in crypto text." << endl;
    4.82 +    cout << "Test 2a: Normal encrypted/signed mail, pEp as substitute subject, regular subject in crypto text." << endl;
    4.83      cout << "-------------------------------------------------------------------------------------------------" << endl;
    4.84  
    4.85      msg_ptr = nullptr;
    4.86 @@ -95,7 +117,7 @@
    4.87      keylist = nullptr;
    4.88      rating = PEP_rating_unreliable;
    4.89      
    4.90 -    mailtext = slurp(mailfiles[2]);
    4.91 +    mailtext = slurp("test_mails/pEp_subject_normal_signed_2a.eml");
    4.92      
    4.93      status = mime_decode_message(mailtext.c_str(), mailtext.length(), &msg_ptr);
    4.94      assert(status == PEP_STATUS_OK);
    4.95 @@ -110,16 +132,16 @@
    4.96  
    4.97      assert(strcmp("Now signed!", final_ptr->shortmsg) == 0);
    4.98  
    4.99 -    cout << "Test 2: Subject replaced as expected." << endl << endl;
   4.100 +    cout << "Test 2a: Subject replaced as expected." << endl << endl;
   4.101  
   4.102      if (final_ptr == dest_msg)
   4.103          free_message(dest_msg);
   4.104      free_message(msg_ptr);
   4.105      free_stringlist(keylist);
   4.106 -    
   4.107 -    cout << "-----------------------------------------------------------------------" << endl;
   4.108 -    cout << "Test 3: Encrypted mail, pEp as actual subject, no subject in body text." << endl;
   4.109 -    cout << "-----------------------------------------------------------------------" << endl;
   4.110 +
   4.111 +    cout << "-------------------------------------------------------------------------------------------------" << endl;
   4.112 +    cout << "Test 2b: Normal encrypted/signed mail, p≡p as substitute subject, regular subject in crypto text." << endl;
   4.113 +    cout << "-------------------------------------------------------------------------------------------------" << endl;
   4.114  
   4.115      msg_ptr = nullptr;
   4.116      dest_msg = nullptr;
   4.117 @@ -127,7 +149,40 @@
   4.118      keylist = nullptr;
   4.119      rating = PEP_rating_unreliable;
   4.120      
   4.121 -    mailtext = slurp(mailfiles[0]);
   4.122 +    mailtext = slurp("test_mails/p3p_subject_normal_signed_2b.eml");
   4.123 +    
   4.124 +    status = mime_decode_message(mailtext.c_str(), mailtext.length(), &msg_ptr);
   4.125 +    assert(status == PEP_STATUS_OK);
   4.126 +    assert(msg_ptr);
   4.127 +    final_ptr = msg_ptr;
   4.128 +    status = decrypt_message(session, msg_ptr, &dest_msg, &keylist, &rating, &flags);
   4.129 +    final_ptr = dest_msg ? dest_msg : msg_ptr;
   4.130 +  
   4.131 +    cout << "shortmsg: " << final_ptr->shortmsg << endl << endl;
   4.132 +    cout << "longmsg: " << final_ptr->longmsg << endl << endl;
   4.133 +    cout << "longmsg_formatted: " << (final_ptr->longmsg_formatted ? final_ptr->longmsg_formatted : "(empty)") << endl << endl;
   4.134 +
   4.135 +    assert(strcmp("Now signed!", final_ptr->shortmsg) == 0);
   4.136 +
   4.137 +    cout << "Test 2b: Subject replaced as expected." << endl << endl;
   4.138 +
   4.139 +    if (final_ptr == dest_msg)
   4.140 +        free_message(dest_msg);
   4.141 +    free_message(msg_ptr);
   4.142 +    free_stringlist(keylist);
   4.143 +
   4.144 +    
   4.145 +    cout << "---------------------------------------------------------------------------" << endl;
   4.146 +    cout << "Test 3a: Encrypted mail, pEp as displayed subject, no subject in body text." << endl;
   4.147 +    cout << "---------------------------------------------------------------------------" << endl;
   4.148 +
   4.149 +    msg_ptr = nullptr;
   4.150 +    dest_msg = nullptr;
   4.151 +    final_ptr = nullptr;
   4.152 +    keylist = nullptr;
   4.153 +    rating = PEP_rating_unreliable;
   4.154 +    
   4.155 +    mailtext = slurp("test_mails/pEp_encrypted_subject_IS_pEp_3a.eml");
   4.156      
   4.157      status = mime_decode_message(mailtext.c_str(), mailtext.length(), &msg_ptr);
   4.158      assert(status == PEP_STATUS_OK);
   4.159 @@ -142,6 +197,38 @@
   4.160  
   4.161      assert(strcmp("pEp", final_ptr->shortmsg) == 0);
   4.162  
   4.163 +    cout << "Test 3a: Subject remains intact as desired." << endl << endl;
   4.164 +
   4.165 +    if (final_ptr == dest_msg)
   4.166 +        free_message(dest_msg);
   4.167 +    free_message(msg_ptr);
   4.168 +    free_stringlist(keylist);
   4.169 +
   4.170 +    cout << "---------------------------------------------------------------------------" << endl;
   4.171 +    cout << "Test 3b: Encrypted mail, p≡p as displayed subject, no subject in body text." << endl;
   4.172 +    cout << "---------------------------------------------------------------------------" << endl;
   4.173 +
   4.174 +    msg_ptr = nullptr;
   4.175 +    dest_msg = nullptr;
   4.176 +    final_ptr = nullptr;
   4.177 +    keylist = nullptr;
   4.178 +    rating = PEP_rating_unreliable;
   4.179 +    
   4.180 +    mailtext = slurp("test_mails/p3p_encrypted_subject_IS_pEp_3b.eml");
   4.181 +    
   4.182 +    status = mime_decode_message(mailtext.c_str(), mailtext.length(), &msg_ptr);
   4.183 +    assert(status == PEP_STATUS_OK);
   4.184 +    assert(msg_ptr);
   4.185 +    final_ptr = msg_ptr;
   4.186 +    status = decrypt_message(session, msg_ptr, &dest_msg, &keylist, &rating, &flags);
   4.187 +    final_ptr = dest_msg ? dest_msg : msg_ptr;
   4.188 +  
   4.189 +    cout << "shortmsg: " << final_ptr->shortmsg << endl << endl;
   4.190 +    cout << "longmsg: " << final_ptr->longmsg << endl << endl;
   4.191 +    cout << "longmsg_formatted: " << (final_ptr->longmsg_formatted ? final_ptr->longmsg_formatted : "(empty)") << endl << endl;
   4.192 +
   4.193 +    assert(strcmp("p≡p", final_ptr->shortmsg) == 0);
   4.194 +
   4.195      cout << "Test 3: Subject remains intact as desired." << endl << endl;
   4.196  
   4.197      if (final_ptr == dest_msg)
   4.198 @@ -149,9 +236,10 @@
   4.199      free_message(msg_ptr);
   4.200      free_stringlist(keylist);
   4.201  
   4.202 -    cout << "-----------------------------------------------------------------------" << endl;
   4.203 -    cout << "Test 4: Encrypted mail, pEp as actual subject, pEp subject in body text." << endl;
   4.204 -    cout << "-----------------------------------------------------------------------" << endl;
   4.205 +
   4.206 +    cout << "----------------------------------------------------------------------------" << endl;
   4.207 +    cout << "Test 4a: Encrypted mail, pEp as displayed subject, pEp subject in body text." << endl;
   4.208 +    cout << "----------------------------------------------------------------------------" << endl;
   4.209  
   4.210      msg_ptr = nullptr;
   4.211      dest_msg = nullptr;
   4.212 @@ -159,7 +247,7 @@
   4.213      keylist = nullptr;
   4.214      rating = PEP_rating_unreliable;
   4.215      
   4.216 -    mailtext = slurp(mailfiles[4]);
   4.217 +    mailtext = slurp("test_mails/pEp_subject_pEp_replaced_w_pEp_4a.eml");
   4.218      
   4.219      status = mime_decode_message(mailtext.c_str(), mailtext.length(), &msg_ptr);
   4.220      assert(status == PEP_STATUS_OK);
   4.221 @@ -174,16 +262,16 @@
   4.222  
   4.223      assert(strcmp("pEp", final_ptr->shortmsg) == 0);
   4.224  
   4.225 -    cout << "Test 4: Subject correct, in any event." << endl << endl;
   4.226 +    cout << "Test 4a: Subject correct." << endl << endl;
   4.227  
   4.228      if (final_ptr == dest_msg)
   4.229          free_message(dest_msg);
   4.230      free_message(msg_ptr);
   4.231      free_stringlist(keylist);
   4.232  
   4.233 -    cout << "-------------------------------------------------------------------------" << endl;
   4.234 -    cout << "Test 5: Unencrypted variant where pEp in the subject line is the subject." << endl;
   4.235 -    cout << "-------------------------------------------------------------------------" << endl;
   4.236 +    cout << "----------------------------------------------------------------------------" << endl;
   4.237 +    cout << "Test 4b: Encrypted mail, p≡p as displayed subject, pEp subject in body text." << endl;
   4.238 +    cout << "----------------------------------------------------------------------------" << endl;
   4.239  
   4.240      msg_ptr = nullptr;
   4.241      dest_msg = nullptr;
   4.242 @@ -191,7 +279,7 @@
   4.243      keylist = nullptr;
   4.244      rating = PEP_rating_unreliable;
   4.245      
   4.246 -    mailtext = slurp(mailfiles[5]);
   4.247 +    mailtext = slurp("test_mails/pEp_subject_pEp_replaced_w_p3p_4b.eml");
   4.248      
   4.249      status = mime_decode_message(mailtext.c_str(), mailtext.length(), &msg_ptr);
   4.250      assert(status == PEP_STATUS_OK);
   4.251 @@ -206,13 +294,174 @@
   4.252  
   4.253      assert(strcmp("pEp", final_ptr->shortmsg) == 0);
   4.254  
   4.255 -    cout << "Test 5: Subject remains intact." << endl << endl;
   4.256 +    cout << "Test 4b: Subject correct." << endl << endl;
   4.257  
   4.258      if (final_ptr == dest_msg)
   4.259          free_message(dest_msg);
   4.260      free_message(msg_ptr);
   4.261      free_stringlist(keylist);
   4.262  
   4.263 +    cout << "----------------------------------------------------------------------------" << endl;
   4.264 +    cout << "Test 4c: Encrypted mail, pEp as displayed subject, p≡p subject in body text." << endl;
   4.265 +    cout << "----------------------------------------------------------------------------" << endl;
   4.266 +
   4.267 +    msg_ptr = nullptr;
   4.268 +    dest_msg = nullptr;
   4.269 +    final_ptr = nullptr;
   4.270 +    keylist = nullptr;
   4.271 +    rating = PEP_rating_unreliable;
   4.272 +    
   4.273 +    mailtext = slurp("test_mails/pEp_subject_p3p_replaced_w_pEp_4c.eml");
   4.274 +    
   4.275 +    status = mime_decode_message(mailtext.c_str(), mailtext.length(), &msg_ptr);
   4.276 +    assert(status == PEP_STATUS_OK);
   4.277 +    assert(msg_ptr);
   4.278 +    final_ptr = msg_ptr;
   4.279 +    status = decrypt_message(session, msg_ptr, &dest_msg, &keylist, &rating, &flags);
   4.280 +    final_ptr = dest_msg ? dest_msg : msg_ptr;
   4.281 +  
   4.282 +    cout << "shortmsg: " << final_ptr->shortmsg << endl << endl;
   4.283 +    cout << "longmsg: " << final_ptr->longmsg << endl << endl;
   4.284 +    cout << "longmsg_formatted: " << (final_ptr->longmsg_formatted ? final_ptr->longmsg_formatted : "(empty)") << endl << endl;
   4.285 +
   4.286 +    assert(strcmp("p≡p", final_ptr->shortmsg) == 0);
   4.287 +
   4.288 +    cout << "Test 4c: Subject correct." << endl << endl;
   4.289 +
   4.290 +    if (final_ptr == dest_msg)
   4.291 +        free_message(dest_msg);
   4.292 +    free_message(msg_ptr);
   4.293 +    free_stringlist(keylist);
   4.294 +
   4.295 +    cout << "----------------------------------------------------------------------------" << endl;
   4.296 +    cout << "Test 4d: Encrypted mail, p≡p as displayed subject, p≡p subject in body text." << endl;
   4.297 +    cout << "----------------------------------------------------------------------------" << endl;
   4.298 +
   4.299 +    msg_ptr = nullptr;
   4.300 +    dest_msg = nullptr;
   4.301 +    final_ptr = nullptr;
   4.302 +    keylist = nullptr;
   4.303 +    rating = PEP_rating_unreliable;
   4.304 +    
   4.305 +    mailtext = slurp("test_mails/pEp_subject_p3p_replaced_w_p3p_4d.eml");
   4.306 +    
   4.307 +    status = mime_decode_message(mailtext.c_str(), mailtext.length(), &msg_ptr);
   4.308 +    assert(status == PEP_STATUS_OK);
   4.309 +    assert(msg_ptr);
   4.310 +    final_ptr = msg_ptr;
   4.311 +    status = decrypt_message(session, msg_ptr, &dest_msg, &keylist, &rating, &flags);
   4.312 +    final_ptr = dest_msg ? dest_msg : msg_ptr;
   4.313 +  
   4.314 +    cout << "shortmsg: " << final_ptr->shortmsg << endl << endl;
   4.315 +    cout << "longmsg: " << final_ptr->longmsg << endl << endl;
   4.316 +    cout << "longmsg_formatted: " << (final_ptr->longmsg_formatted ? final_ptr->longmsg_formatted : "(empty)") << endl << endl;
   4.317 +
   4.318 +    assert(strcmp("p≡p", final_ptr->shortmsg) == 0);
   4.319 +
   4.320 +    cout << "Test 4d: Subject correct, in any event." << endl << endl;
   4.321 +
   4.322 +    if (final_ptr == dest_msg)
   4.323 +        free_message(dest_msg);
   4.324 +    free_message(msg_ptr);
   4.325 +    free_stringlist(keylist);
   4.326 +
   4.327 +
   4.328 +    cout << "-------------------------------------------------------------------------" << endl;
   4.329 +    cout << "Test 5a: Unencrypted variant where pEp in the subject line is the subject." << endl;
   4.330 +    cout << "-------------------------------------------------------------------------" << endl;
   4.331 +
   4.332 +    msg_ptr = nullptr;
   4.333 +    dest_msg = nullptr;
   4.334 +    final_ptr = nullptr;
   4.335 +    keylist = nullptr;
   4.336 +    rating = PEP_rating_unreliable;
   4.337 +    
   4.338 +    mailtext = slurp("test_mails/pEp_unencrypted_pEp_subject_5a.eml");
   4.339 +    
   4.340 +    status = mime_decode_message(mailtext.c_str(), mailtext.length(), &msg_ptr);
   4.341 +    assert(status == PEP_STATUS_OK);
   4.342 +    assert(msg_ptr);
   4.343 +    final_ptr = msg_ptr;
   4.344 +    status = decrypt_message(session, msg_ptr, &dest_msg, &keylist, &rating, &flags);
   4.345 +    final_ptr = dest_msg ? dest_msg : msg_ptr;
   4.346 +  
   4.347 +    cout << "shortmsg: " << final_ptr->shortmsg << endl << endl;
   4.348 +    cout << "longmsg: " << final_ptr->longmsg << endl << endl;
   4.349 +    cout << "longmsg_formatted: " << (final_ptr->longmsg_formatted ? final_ptr->longmsg_formatted : "(empty)") << endl << endl;
   4.350 +
   4.351 +    assert(strcmp("pEp", final_ptr->shortmsg) == 0);
   4.352 +
   4.353 +    cout << "Test 5a: Subject remains intact." << endl << endl;
   4.354 +
   4.355 +    if (final_ptr == dest_msg)
   4.356 +        free_message(dest_msg);
   4.357 +    free_message(msg_ptr);
   4.358 +    free_stringlist(keylist);
   4.359 +
   4.360 +
   4.361 +    cout << "--------------------------------------------------------------------------" << endl;
   4.362 +    cout << "Test 5b: Unencrypted variant where p≡p in the subject line is the subject." << endl;
   4.363 +    cout << "--------------------------------------------------------------------------" << endl;
   4.364 +
   4.365 +    msg_ptr = nullptr;
   4.366 +    dest_msg = nullptr;
   4.367 +    final_ptr = nullptr;
   4.368 +    keylist = nullptr;
   4.369 +    rating = PEP_rating_unreliable;
   4.370 +    
   4.371 +    mailtext = slurp("test_mails/pEp_unencrypted_p3p_subject_5b.eml");
   4.372 +    
   4.373 +    status = mime_decode_message(mailtext.c_str(), mailtext.length(), &msg_ptr);
   4.374 +    assert(status == PEP_STATUS_OK);
   4.375 +    assert(msg_ptr);
   4.376 +    final_ptr = msg_ptr;
   4.377 +    status = decrypt_message(session, msg_ptr, &dest_msg, &keylist, &rating, &flags);
   4.378 +    final_ptr = dest_msg ? dest_msg : msg_ptr;
   4.379 +  
   4.380 +    cout << "shortmsg: " << final_ptr->shortmsg << endl << endl;
   4.381 +    cout << "longmsg: " << final_ptr->longmsg << endl << endl;
   4.382 +    cout << "longmsg_formatted: " << (final_ptr->longmsg_formatted ? final_ptr->longmsg_formatted : "(empty)") << endl << endl;
   4.383 +
   4.384 +    assert(strcmp("p≡p", final_ptr->shortmsg) == 0);
   4.385 +
   4.386 +    cout << "Test 5b: Subject remains intact." << endl << endl;
   4.387 +
   4.388 +    if (final_ptr == dest_msg)
   4.389 +        free_message(dest_msg);
   4.390 +    free_message(msg_ptr);
   4.391 +    free_stringlist(keylist);
   4.392 +
   4.393 +    cout << "----------------------------------------------------------------------------------------------------------------------" << endl;
   4.394 +    cout << "Test 6: Normal unencrypted email where a subject line exists in the text but the subject is not a replacement subject." << endl;
   4.395 +    cout << "----------------------------------------------------------------------------------------------------------------------" << endl;
   4.396 +
   4.397 +    msg_ptr = nullptr;
   4.398 +    dest_msg = nullptr;
   4.399 +    final_ptr = nullptr;
   4.400 +    keylist = nullptr;
   4.401 +    rating = PEP_rating_unreliable;
   4.402 +    
   4.403 +    mailtext = slurp("test_mails/pEp_subject_normal_unencrypted_6.eml");
   4.404 +    
   4.405 +    status = mime_decode_message(mailtext.c_str(), mailtext.length(), &msg_ptr);
   4.406 +    assert(status == PEP_STATUS_OK);
   4.407 +    assert(msg_ptr);
   4.408 +    final_ptr = msg_ptr;
   4.409 +    status = decrypt_message(session, msg_ptr, &dest_msg, &keylist, &rating, &flags);
   4.410 +    final_ptr = dest_msg ? dest_msg : msg_ptr;
   4.411 +  
   4.412 +    cout << "shortmsg: " << final_ptr->shortmsg << endl << endl;
   4.413 +    cout << "longmsg: " << final_ptr->longmsg << endl << endl;
   4.414 +    cout << "longmsg_formatted: " << (final_ptr->longmsg_formatted ? final_ptr->longmsg_formatted : "(empty)") << endl << endl;
   4.415 +
   4.416 +    assert(strcmp("This is just a normal subject, really", final_ptr->shortmsg) == 0);
   4.417 +
   4.418 +    cout << "Test 6: Subject remains intact." << endl << endl;
   4.419 +
   4.420 +    if (final_ptr == dest_msg)
   4.421 +        free_message(dest_msg);
   4.422 +    free_message(msg_ptr);
   4.423 +    free_stringlist(keylist);
   4.424          
   4.425      cout << "calling release()\n";
   4.426      release(session);
     5.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     5.2 +++ b/test/test_mails/encrypted_signed_w_file_attachment.eml	Wed Sep 13 02:00:36 2017 +0200
     5.3 @@ -0,0 +1,124 @@
     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 73C291C00BC
     5.9 +	for <krista@gnunet.org>; Fri, 30 Jun 2017 09:15:37 +0200 (CEST)
    5.10 +Received: by vmmailrelay1.informatik.tu-muenchen.de (Postfix, from userid 109)
    5.11 +	id 9A3CC1C03AE; Fri, 30 Jun 2017 09:15:37 +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 77EF81C0390
    5.14 +	for <krista@gnunet.org>; Fri, 30 Jun 2017 09:15:37 +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 635501C0376
    5.17 +	for <krista@gnunet.org>; Fri, 30 Jun 2017 09:15:37 +0200 (CEST)
    5.18 +Received: by vmmaildmz1.informatik.tu-muenchen.de (Postfix, from userid 109)
    5.19 +	id 61B251C2D8A; Fri, 30 Jun 2017 09:15:37 +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=-1.9 required=7.0 tests=AWL,BAYES_00,BODY_EMPTY,
    5.24 +	ENCRYPTED_MESSAGE,RCVD_IN_DNSWL_NONE,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 E715A1C2D89
    5.29 +	for <krista@gnunet.org>; Fri, 30 Jun 2017 09:15:35 +0200 (CEST)
    5.30 +Received: from mi4-p00-ob.smtp.rzone.de (mi4-p00-ob.smtp.rzone.de [81.169.146.146])
    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 D4C5C1C2D86
    5.34 +	for <krista@gnunet.org>; Fri, 30 Jun 2017 09:15:35 +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 41.0) with LMTPA;
    5.38 +	Fri, 30 Jun 2017 09:15:12 +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 41.0 OK)
    5.56 +	with ESMTPS id V0ae62t5U7FC2yO
    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 +	Fri, 30 Jun 2017 09:15:12 +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 3D31010C7ECF6
    5.63 +	for <pep.test.recip@kgrothoff.org>; Fri, 30 Jun 2017 09:15:07 +0200 (CEST)
    5.64 +From: pEp Test Alice <pep.test.alice@pep-project.org>
    5.65 +Subject: Super special test message!
    5.66 +Reply-To: krista@pep-project.org
    5.67 +To: pep.test.recip@kgrothoff.org
    5.68 +Organization: pEp
    5.69 +Message-ID: <becc8fbc-2b96-c805-985f-51d4594058d2@pep-project.org>
    5.70 +Date: Fri, 30 Jun 2017 09:15:06 +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="brkfFM15aBvMbvobckVTRXCXObQjHWDW1"
    5.77 +
    5.78 +This is an OpenPGP/MIME encrypted message (RFC 4880 and 3156)
    5.79 +--brkfFM15aBvMbvobckVTRXCXObQjHWDW1
    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 +--brkfFM15aBvMbvobckVTRXCXObQjHWDW1
    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 +hQEMA4FHqvEumyRHAQf/TVUMpvsM3zPmi8BgYs7QXYNMmVqS2hJd+ezG4ntL/AAL
    5.93 +Li5woTOXKElQE3Q+diGD3spSyd7v9pQl37h/xX17D2yFzuQfNuyQ807AiYMnc/iD
    5.94 +CboVd8DlFDF65ODwMpCut70xwiG9Nn95fh61bj3wKeMSD5J1nqHx1jaceihtJMh9
    5.95 +KFveCsCtigWV+agxeShpiM/CszrHJ/aMvUj18t43y7KQKaBoiNbKLT91HrUeZot4
    5.96 +nabyw6iHBKSFhHjM4vM9Y2V4I9kLBU6h1FdgaI/nsRmCiNdZOB34g6tryGKDKVW7
    5.97 +d3eGX9hCKwOKgZtw0LxI1hFYoE8ZwlEokQEd8rehzIUBDANaAgXZcwg/TQEH/jWc
    5.98 +ggX/Q0e9VmzEY8UPl1JNPuMJc/pAsIEfNYpu2Rbvu0SDKFx5VpGZONK4j33/KgeM
    5.99 +Oh+cg+XdiUQjFOuoQfLN6czxOewdLpb+bNHhNIOnOkaADpg2x4XYK8y5q2C8FxGm
   5.100 +sOKnSQpdb20j13UoAzsalxQx3FipFUnwfJvGVLmHsb6qD0u/vQzWqP9I+wen7HUd
   5.101 +Iq8vzaPTsBzyYIqKtAHiV4V4NfRIrWmgrvMK7q16/K/f0fbZ1ORzZ250mybGWdAJ
   5.102 +c/J3wnwPTBIw9wThLLl2RaOjpMdXztXbLq98y3GwzIgQUGoUbwXsI9drZtdXsOOM
   5.103 +t/e3d7MfpabZaiLkyFHS6QFgXy5AKawTG/2yTi4WDVAwLxZP/TgtmaK3sBhffLQi
   5.104 +ojUUMCfN/8+T8WvMW8BtJR5h5XAmA/bKYqcO0A24O8/8WamjyYaUGCyZRGimCx03
   5.105 +eSDBr6pE2hJTIpPYkWccHVIcC1fDXH5A22/0pieRfTUMTjDuXbFro0Jw9zZtb3Sz
   5.106 +HRRh4Hj0mIZpTnOl3KCsikHq/2zpMeZVlWOnKbhIIo5xy0vpb3dxdSQ+uim38z3K
   5.107 +Ya9m+aBQ829UaqrPgM1qwmV773rUQIx2XXHS8k6TO5SSBa2e3Bjk2/1cDI/NR7hv
   5.108 +moYF8KbxmVHbeCUqxSjBBSN3pAoT8SphkbH+BMQcESMCDELNFvf7maCTv2qqgwJJ
   5.109 +hRHIpXmHD1p/No9U23iTKfK9EzvJFalNfVRzmEFpwAMLmcmXvf++OvsuBvgScqxt
   5.110 +dnmX+xaq87hJGwFKQYFFXo4Fi9TpE/CejW9VrJ5v/VyorXebUPFKzCrMCTEhhSy+
   5.111 +RRjcfxxQIwanagTXXPbOeO22BjHD6dH9jl0PVK7q/YxuKnMtQelFZeSEqDeLYBRB
   5.112 +o0zkJDHc64LF/nUxhicRRMcpBvYZSJbmoLcKZSm/FAlVO4qHOEafO+R/RCzlwu54
   5.113 +5vSEauTyq92ytZRzhRK17JRTwR5ew5Gz2S0ZCv4phMIVODWz0JBOkp/kE2k8KZxG
   5.114 +wQBLOTN/X+Acl+B+Me2BdinKgj2i2WVtUamzZyjcIJX8I1NOqIx3Za/LrJUuDddS
   5.115 +cnWC53QBSp8ymNLkMqDT2Y5Fc3VKEg0jMkMYN1EcTq7bL5mSnrvBQqLSO75WteYv
   5.116 +tIYAF1ZY/IZRCeP7z6Tg6YapTssS88r0EmEvUq38sMD3bwedGP1iTPIfhIYtS3Lw
   5.117 +aPpq5Y5hfxSJSXelQlWqoeIeL3mAA9QEEGe0uWSVviVavtbQDTKnip1Gcs1lVP/3
   5.118 +izxRZKgfp97s2LdD4OGGhslgNFPNgOmKUSShgtGDQjwBKiDuUV4OhKfjBQnNGXO/
   5.119 +zZZ6zeMp1g9psMaLteoJT2OWhK1fHJwJj1eiyDfO1BzlfqkJSQ8sdrlai4lLQmh8
   5.120 +Rzlo16120njw4YIB6RttZQMi54YKB7cfCsPxTvCtK8SDwVk9qdgWcD8jePhCQpo5
   5.121 +CgdkdZ5XwKi15rX+tTUYujZKinWePgsVh4qWfh+NgaEDISDJs/TT/yl/G+D/mTyw
   5.122 +ogfeiuYx1FzMBZPbE8AQk5B02oh848cC/HnueC2P2QepC5lMY2cZ68+hHIu90Q+G
   5.123 +G578amS3VUva4HZUBwl9Dpb0
   5.124 +=s9M4
   5.125 +-----END PGP MESSAGE-----
   5.126 +
   5.127 +--brkfFM15aBvMbvobckVTRXCXObQjHWDW1--
     6.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     6.2 +++ b/test/test_mails/encrypted_w_file_attachment.eml	Wed Sep 13 02:00:36 2017 +0200
     6.3 @@ -0,0 +1,116 @@
     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 058D91C00BC
     6.9 +	for <krista@gnunet.org>; Fri, 30 Jun 2017 09:14:59 +0200 (CEST)
    6.10 +Received: by vmmailrelay1.informatik.tu-muenchen.de (Postfix, from userid 109)
    6.11 +	id 2E18F1C03AE; Fri, 30 Jun 2017 09:14:59 +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 0C7971C0390
    6.14 +	for <krista@gnunet.org>; Fri, 30 Jun 2017 09:14:59 +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 EC7081C0376
    6.17 +	for <krista@gnunet.org>; Fri, 30 Jun 2017 09:14:58 +0200 (CEST)
    6.18 +Received: by vmmaildmz1.informatik.tu-muenchen.de (Postfix, from userid 109)
    6.19 +	id EAB3C1C2D89; Fri, 30 Jun 2017 09:14:58 +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=-2.3 required=7.0 tests=AWL,BAYES_00,BODY_EMPTY,
    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 78B061C2D86
    6.29 +	for <krista@gnunet.org>; Fri, 30 Jun 2017 09:14:57 +0200 (CEST)
    6.30 +Received: from mi4-p00-ob.smtp.rzone.de (mi4-p00-ob.smtp.rzone.de [81.169.146.147])
    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 679AA1C2D80
    6.34 +	for <krista@gnunet.org>; Fri, 30 Jun 2017 09:14:57 +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 41.0) with LMTPA;
    6.38 +	Fri, 30 Jun 2017 09:14:42 +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 41.0 OK)
    6.56 +	with ESMTPS id r0a588t5U7Eg5Gh
    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 +	Fri, 30 Jun 2017 09:14:42 +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 6101910C7ECF4
    6.63 +	for <pep.test.recip@kgrothoff.org>; Fri, 30 Jun 2017 09:14:37 +0200 (CEST)
    6.64 +From: pEp Test Alice <pep.test.alice@pep-project.org>
    6.65 +Subject: Super special test message!
    6.66 +Reply-To: krista@pep-project.org
    6.67 +To: pep.test.recip@kgrothoff.org
    6.68 +Organization: pEp
    6.69 +Message-ID: <51ec222d-9c9f-e383-7af9-cb0233c47093@pep-project.org>
    6.70 +Date: Fri, 30 Jun 2017 09:14:37 +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="nTRJMMuBCENn6a8f5jxeV5GFOBtqDjSC6"
    6.77 +
    6.78 +This is an OpenPGP/MIME encrypted message (RFC 4880 and 3156)
    6.79 +--nTRJMMuBCENn6a8f5jxeV5GFOBtqDjSC6
    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 +--nTRJMMuBCENn6a8f5jxeV5GFOBtqDjSC6
    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 +hQEMA4FHqvEumyRHAQf/RKEIQam+9zsiLGqwleftVpfNy/i4YISz8iyGKOxSDW4Q
    6.93 +RpZUpGWHT/OO1UXPI+02oeV/UiaH6VNX3htam4GTDtDDcKVPXf/Zxv+x4vckNNJm
    6.94 +PofHE+IFj3i9Ews13Ne7iXyoboNd0RCUE/qssg5Kf8rQX+LGtYJygdhfsc65jcoo
    6.95 +RFJr/Mfuopx0bGZkv0fdGtwIFt5ep0keoFqnpIABvz4Dt0bxdIBFwo0MF+o7rMpR
    6.96 +4eClcDczOGDeiL5Mrj3PK0DFOOypJyKq1V/qzUoNfYbBQGcrBs5OLYElgGJIRsih
    6.97 ++PkOjgQ6a7uNZhqRvFv4zgxRZeVGMpwREMz8MvGH1YUBDANaAgXZcwg/TQEIAMl9
    6.98 +KRD9Imh5fcj/yfCW9lrgN2Zy7B2XM/xARwifp/mASTlHj0etVW6T9NEn3cCkqc5r
    6.99 +9Q7JLzMDAWp+r5se52yFvaRNR3u4iH1XZi85rzRQGKa0R7S+53Oh0G89X0H/9I5r
   6.100 ++EPIY8hR0TWLDQUn/w4M3KbHCQwR/41s4jksTpC1I3up97XCNLQDSW/HrebsIw+e
   6.101 +5IOYUsib38OSD6a6ZsimeMyW4O2SLaItDVSP/LdDysHZFMb3BWfS/L64wOj8yJnE
   6.102 +dfE8Y19yaLLqiMWk3HniM9o2Wp2FlePQuT9AphwrtnahMZ/JTCfGuecFEwnwTOBh
   6.103 +0yDp2qAXChcYbrE8yUrS6QG46f6YIN51Q+LbNM4X8Z5qeC8hbk5e1Je1JBLaPrwJ
   6.104 +vZp/GR+vXc6XO6CF46ncOysy2iHwpAovA6l1quIgo9vhfEJXfMtgwLG2ZL/ZxCrM
   6.105 +wpi6QCHHpATfcZHBd1Yee9tPOIQ41J27uNIDl//zlpdhG6T/D3UQDDL7HcxtRXBv
   6.106 +Jj/hSw6UJdR1K+98mGjhYhrt31PMxlSzr8Eym1Fhn2nIdkCBkeePuG/v8hORkafP
   6.107 +7Z5LJXV6QhoNR+rtw7ojiH99qNQPtrjp9vhkjxL2bdwjGci5ZmkqwYmoHsHKQfYC
   6.108 +H+bhluUc+g/6yVxRidRd6cXOk6Nuy+E6ifGB6ngYXPsTS0wYY4GSVYV+c5eJfZrm
   6.109 +oLzkm2vevYgKDOO8P2pqFiadCVmu5BL7h3rRpgcHsO8/vuh+MCXsTuMt0mBpTkfB
   6.110 +IKqJsfSAuKIwX7b3bBe9soahpSecNuboezeAyWzqxuXsRK1PkcpPsfp2erpE9DuU
   6.111 +c2Vt6REfSkMnwALzfCqKPEwnFzMA6w+L86N+qwf8qp0VtMXhfnvbhKpsLwdS8Zw7
   6.112 +Gr5nT1/sBUmreB/S6FIFxBldD3579zL4X7lHZz+4lzSG36Jqgc8kTHeJUtICPtU2
   6.113 +av0nOi7kZzNBQJrDbApjiHBkPG6pdW79cyb5FH9OABbTZMue6dIssxp6T/2dQ5Dr
   6.114 +OGweHLSWqFV/tFP3ihQlH+N/Y3IiyB/tB0K0pLY3qWPf13MiMVp6flG/BvsJhLto
   6.115 +MNo5JVxeHCz9
   6.116 +=mp5s
   6.117 +-----END PGP MESSAGE-----
   6.118 +
   6.119 +--nTRJMMuBCENn6a8f5jxeV5GFOBtqDjSC6--
     7.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     7.2 +++ b/test/test_mails/p3p_encrypted_subject_IS_pEp_3b.eml	Wed Sep 13 02:00:36 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: =?utf-8?Q?p=E2=89=A1p?=
    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 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     8.2 +++ b/test/test_mails/p3p_subject_normal_1b.eml	Wed Sep 13 02:00:36 2017 +0200
     8.3 @@ -0,0 +1,114 @@
     8.4 +Return-Path: <SRS0=ne/EAk=AN=pep-project.org=pep.test.alice@srs.smtpin.rzone.de>
     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 524FF1C00BC
     8.9 +	for <krista@gnunet.org>; Tue, 12 Sep 2017 17:06:56 +0200 (CEST)
    8.10 +Received: by vmmailrelay1.informatik.tu-muenchen.de (Postfix, from userid 109)
    8.11 +	id 68C381C0503; Tue, 12 Sep 2017 17:06:56 +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 45A4A1C04FD
    8.14 +	for <krista@gnunet.org>; Tue, 12 Sep 2017 17:06:56 +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 3162A1C04FC
    8.17 +	for <krista@gnunet.org>; Tue, 12 Sep 2017 17:06:56 +0200 (CEST)
    8.18 +Received: by vmmaildmz1.informatik.tu-muenchen.de (Postfix, from userid 109)
    8.19 +	id 2FBF61C2D66; Tue, 12 Sep 2017 17:06:56 +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=-1.7 required=7.0 tests=AWL,BAYES_00,BODY_EMPTY,
    8.24 +	ENCRYPTED_MESSAGE,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,
    8.25 +	SPF_HELO_PASS,TVD_RCVD_SPACE_BRACKET,UNPARSEABLE_RELAY autolearn=no
    8.26 +	autolearn_force=no version=3.4.0-tuminfo_1
    8.27 +Received: from vmmaildmz1.informatik.tu-muenchen.de (localhost [127.0.0.1])
    8.28 +	by vmmaildmz1.informatik.tu-muenchen.de (Postfix) with ESMTP id 2B7FA1C2D5F
    8.29 +	for <krista@gnunet.org>; Tue, 12 Sep 2017 17:06:52 +0200 (CEST)
    8.30 +Received: from mi4-p00-ob.smtp.rzone.de (mi4-p00-ob.smtp.rzone.de [81.169.146.146])
    8.31 +	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
    8.32 +	(No client certificate requested)
    8.33 +	by vmmaildmz1.informatik.tu-muenchen.de (Postfix) with ESMTPS id 1AEE31C2D48
    8.34 +	for <krista@gnunet.org>; Tue, 12 Sep 2017 17:06:52 +0200 (CEST)
    8.35 +X-RZG-FWD-BY: pep.test.recip@kgrothoff.org
    8.36 +Received: from mailin.rzone.de ([unix socket])
    8.37 +	by mailin.rzone.de (RZmta 41.4) with LMTPA;
    8.38 +	Tue, 12 Sep 2017 17:06:42 +0200 (CEST)
    8.39 +Authentication-Results: strato.com 1;
    8.40 +	spf=none
    8.41 +		smtp.mailfrom="pep.test.alice@pep-project.org";
    8.42 +	dkim=none;
    8.43 +	domainkeys=none;
    8.44 +	dkim-adsp=none
    8.45 +		header.from="pep.test.alice@pep-project.org"
    8.46 +X-Strato-MessageType: email
    8.47 +X-RZG-CLASS-ID: mi00
    8.48 +Received-SPF: none
    8.49 +	client-ip=131.159.0.8;
    8.50 +	helo="mail-out1.informatik.tu-muenchen.de";
    8.51 +	envelope-from="pep.test.alice@pep-project.org";
    8.52 +	receiver=smtpin.rzone.de;
    8.53 +	identity=mailfrom;
    8.54 +Received: from mail-out1.informatik.tu-muenchen.de ([131.159.0.8])
    8.55 +	by smtpin.rzone.de (RZmta 41.4 OK)
    8.56 +	with ESMTPS id f0bb72t8CF6f5Wa
    8.57 +	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (curve secp521r1 with 521 ECDH bits, eq. 15360 bits RSA))
    8.58 +	(Client did not present a certificate)
    8.59 +	for <pep.test.recip@kgrothoff.org>;
    8.60 +	Tue, 12 Sep 2017 17:06:41 +0200 (CEST)
    8.61 +Received: from [192.168.178.22] (ip5f584089.dynamic.kabel-deutschland.de [95.88.64.137])
    8.62 +	by services.sec.in.tum.de (Postfix) with ESMTPSA id B7EF810C74F82
    8.63 +	for <pep.test.recip@kgrothoff.org>; Tue, 12 Sep 2017 17:06:33 +0200 (CEST)
    8.64 +Reply-To: krista@pep-project.org
    8.65 +To: pep.test.recip@kgrothoff.org
    8.66 +From: pEp Test Alice <pep.test.alice@pep-project.org>
    8.67 +Subject: =?UTF-8?B?cOKJoXA=?=
    8.68 +Organization: pEp
    8.69 +Message-ID: <75dd44fb-5c4a-8678-c51b-836fd1f32af1@pep-project.org>
    8.70 +Date: Tue, 12 Sep 2017 17:06:32 +0200
    8.71 +User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101
    8.72 + Thunderbird/45.8.0
    8.73 +MIME-Version: 1.0
    8.74 +Content-Type: multipart/encrypted;
    8.75 + protocol="application/pgp-encrypted";
    8.76 + boundary="IS7QjataASN5CVBdEDLOfqfNX2N4tkoTu"
    8.77 +
    8.78 +This is an OpenPGP/MIME encrypted message (RFC 4880 and 3156)
    8.79 +--IS7QjataASN5CVBdEDLOfqfNX2N4tkoTu
    8.80 +Content-Type: application/pgp-encrypted
    8.81 +Content-Description: PGP/MIME version identification
    8.82 +
    8.83 +Version: 1
    8.84 +
    8.85 +--IS7QjataASN5CVBdEDLOfqfNX2N4tkoTu
    8.86 +Content-Type: application/octet-stream; name="encrypted.asc"
    8.87 +Content-Description: OpenPGP encrypted message
    8.88 +Content-Disposition: inline; filename="encrypted.asc"
    8.89 +
    8.90 +-----BEGIN PGP MESSAGE-----
    8.91 +
    8.92 +hQEMA4FHqvEumyRHAQf8D4hbDivbAhpgIzOrD42OU5UEPax5wdpSub5vZDbGF++U
    8.93 +pt/MLGoTA5CTLCoJLV5iZiMFjy2LbbJPQaotZixHb619QzVOa3DVwWV8XuHTxmmt
    8.94 +EedLl+Ryq/EupLcjrqajUuxV6wCqS2sBfhHV+ykjZkQfGi+R4cGYRtrRERrfzpGY
    8.95 +QM4Nh6Bp9kLMSYVnIVdhpSUiky1VCxQl5MUqrlgkRY3ZDEdF4r53BNdiFx994I8K
    8.96 +OF8DqvWO/Zqx0GAuljKH7PZOU7CQVn/Xuen04L4olZgCeFxNdLBJv8wNNDX4cyUR
    8.97 +WnRU061CKTER27xVCi9AUlDnq3SghbRJvN3PUJSFkYUBDANaAgXZcwg/TQEH/3kn
    8.98 ++qxj3GuvyYOcg74oBcN8RN+E12HYopVEG1CvjqkpekYj3RVcs3Y9MFINTOZpDW4w
    8.99 +eHpNM7/bz3kzp48saoi3dB8i82FpvxG/XoNyphfPkFtz7tSECCMAKUWCeoi5VyS3
   8.100 +N3wwqa6LwpBpn5wkWUwWVQxgby1eJgYe0ZvBK9Nkv/FhTlD+hm3cn+6LRLC1dBp1
   8.101 +WpXP03YwrspCocfpWHFG+/4uHtLOE0GREqjPwGtNRdf59T2jwpyJykUrsARdkyJs
   8.102 +SqCce8739VjbxK3Ma4LGNyytp8g2z/G7C4JbZ/evmCKI7cxlhpLbSLZRzvIoNt/P
   8.103 +71gfkrzXUaUyHrkaheXSwSsB5p+Bu/msz4ByaAtEPJsQoGL6BBOjyKVm7K++xB90
   8.104 +yEQcJKxIMNeNGH5uvuZF2jkaF5HEHzK0V4+tS05pwS2ZFjyVUlowycAtwqQp3sfW
   8.105 +3zeUUUUW3tykR+uF2lBWhyEF2P5wTTV8eZZ53hy0vcUUwBfNoLpUZPvqoNZowEOf
   8.106 +Vw594AxRav4bokdJ1loWTEh1HtZAZuoMAAhdbQUDGkdlBogn98p+ClSCOSMHAlcl
   8.107 +Ip1AYAl3Os5UK2lr2p3bUBIgrqgbbY17MWfOva+LJ7TvLf6p1VyXKv3KeWoaCxy4
   8.108 +tlKb/D86Sjwo59oRayJvcOKhovd4hBechRxak6twovbGvCs5zE0jGapkY0QBYYky
   8.109 +eom5pYn2pGQpOnUrY7G+9pAjjqBywwLe1/bPh1KvTd38t86rfryLTOt2/gCJqHfN
   8.110 +f/kQCSyhR7HGz5LE0tUIq6hag8sClzh1ELht2Avpjt3YuKEVm/IVdfcGk5NkZqIf
   8.111 +5ghwOnC/1KZTEXWWvqywQKWgFkkRp7j9bgKweRvGSqawG0LtDHGgHmn3DjxlMOR8
   8.112 +hR+IBQg2y536xoSIrAQS3Qw8UcY6clnEx2Ga809wX32I7fiVsgx9rXm9+CBFvLQj
   8.113 +1IKzn2lRvqbquAsYClEmxzWXFETqIoISWPIEzw==
   8.114 +=5ntC
   8.115 +-----END PGP MESSAGE-----
   8.116 +
   8.117 +--IS7QjataASN5CVBdEDLOfqfNX2N4tkoTu--
     9.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     9.2 +++ b/test/test_mails/p3p_subject_normal_signed_2b.eml	Wed Sep 13 02:00:36 2017 +0200
     9.3 @@ -0,0 +1,119 @@
     9.4 +Return-Path: <pep.test.alice@pep-project.org>
     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 768301C00BC
     9.9 +	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:26:24 +0200 (CEST)
    9.10 +Received: by vmmailrelay1.informatik.tu-muenchen.de (Postfix, from userid 109)
    9.11 +	id 4DD7D1C0383; Mon, 12 Jun 2017 15:26:25 +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 2AD621C037C
    9.14 +	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:26:25 +0200 (CEST)
    9.15 +Received: from vmmaildmz2.informatik.tu-muenchen.de (vmmaildmz2.informatik.tu-muenchen.de [131.159.0.88])
    9.16 +	by vmmailrelay1.informatik.tu-muenchen.de (Postfix) with ESMTP id 15DA11C037A
    9.17 +	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:26:25 +0200 (CEST)
    9.18 +Received: by vmmaildmz2.informatik.tu-muenchen.de (Postfix, from userid 109)
    9.19 +	id 13FCC1C2AE2; Mon, 12 Jun 2017 15:26:25 +0200 (CEST)
    9.20 +X-Spam-Checker-Version: SpamAssassin 3.4.0-tuminfo_1 (2014-02-07) on
    9.21 +	vmmaildmz2.informatik.tu-muenchen.de
    9.22 +X-Spam-Level: 
    9.23 +X-Spam-Status: No, score=-2.6 required=7.0 tests=AWL,BAYES_00,
    9.24 +	ENCRYPTED_MESSAGE,RCVD_IN_DNSWL_LOW,TVD_RCVD_SPACE_BRACKET,UNPARSEABLE_RELAY
    9.25 +	autolearn=no autolearn_force=no version=3.4.0-tuminfo_1
    9.26 +Received: from vmmaildmz2.informatik.tu-muenchen.de (localhost [127.0.0.1])
    9.27 +	by vmmaildmz2.informatik.tu-muenchen.de (Postfix) with ESMTP id 953971C2AE1
    9.28 +	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:26:23 +0200 (CEST)
    9.29 +Received: from mi4-p00-ob.smtp.rzone.de (mi4-p00-ob.smtp.rzone.de [81.169.146.144])
    9.30 +	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
    9.31 +	(No client certificate requested)
    9.32 +	by vmmaildmz2.informatik.tu-muenchen.de (Postfix) with ESMTPS id 8540A1C2AE0
    9.33 +	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:26:23 +0200 (CEST)
    9.34 +X-RZG-FWD-BY: pep.test.recip@kgrothoff.org
    9.35 +Received: from mailin.rzone.de ([unix socket])
    9.36 +	by mailin.rzone.de (RZmta 40.9) with LMTPA;
    9.37 +	Mon, 12 Jun 2017 15:26:02 +0200 (CEST)
    9.38 +Authentication-Results: strato.com 1;
    9.39 +	spf=none
    9.40 +		smtp.mailfrom="pep.test.alice@pep-project.org";
    9.41 +	dkim=none;
    9.42 +	domainkeys=none;
    9.43 +	dkim-adsp=none
    9.44 +		header.from="pep.test.alice@pep-project.org"
    9.45 +X-Strato-MessageType: email
    9.46 +X-RZG-CLASS-ID: mi00
    9.47 +Received-SPF: none
    9.48 +	client-ip=131.159.0.8;
    9.49 +	helo="mail-out1.informatik.tu-muenchen.de";
    9.50 +	envelope-from="pep.test.alice@pep-project.org";
    9.51 +	receiver=smtpin.rzone.de;
    9.52 +	identity=mailfrom;
    9.53 +Received: from mail-out1.informatik.tu-muenchen.de ([131.159.0.8])
    9.54 +	by smtpin.rzone.de (RZmta 40.9 OK)
    9.55 +	with ESMTPS id v06d9ft5CDQ2Xj1
    9.56 +	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (curve secp521r1 with 521 ECDH bits, eq. 15360 bits RSA))
    9.57 +	(Client did not present a certificate)
    9.58 +	for <pep.test.recip@kgrothoff.org>;
    9.59 +	Mon, 12 Jun 2017 15:26:02 +0200 (CEST)
    9.60 +Received: from [192.168.178.22] (ip5f584089.dynamic.kabel-deutschland.de [95.88.64.137])
    9.61 +	by services.sec.in.tum.de (Postfix) with ESMTPSA id BEAA21013AE47
    9.62 +	for <pep.test.recip@kgrothoff.org>; Mon, 12 Jun 2017 15:25:56 +0200 (CEST)
    9.63 +To: pep.test.recip@kgrothoff.org
    9.64 +Reply-To: krista@pep-project.org
    9.65 +From: pEp Test Alice <pep.test.alice@pep-project.org>
    9.66 +Subject: =?UTF-8?B?cOKJoXA=?=
    9.67 +Organization: pEp
    9.68 +Message-ID: <988e71f4-df80-906e-8bbb-68d48069d4ac@pep-project.org>
    9.69 +Date: Mon, 12 Jun 2017 15:25:56 +0200
    9.70 +User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101
    9.71 + Thunderbird/45.8.0
    9.72 +MIME-Version: 1.0
    9.73 +Content-Type: multipart/encrypted;
    9.74 + protocol="application/pgp-encrypted";
    9.75 + boundary="hcW81WNiFhQC1SNIcls8J07V1b1sXtfCA"
    9.76 +
    9.77 +This is an OpenPGP/MIME encrypted message (RFC 4880 and 3156)
    9.78 +--hcW81WNiFhQC1SNIcls8J07V1b1sXtfCA
    9.79 +Content-Type: application/pgp-encrypted
    9.80 +Content-Description: PGP/MIME version identification
    9.81 +
    9.82 +Version: 1
    9.83 +
    9.84 +--hcW81WNiFhQC1SNIcls8J07V1b1sXtfCA
    9.85 +Content-Type: application/octet-stream; name="encrypted.asc"
    9.86 +Content-Description: OpenPGP encrypted message
    9.87 +Content-Disposition: inline; filename="encrypted.asc"
    9.88 +
    9.89 +-----BEGIN PGP MESSAGE-----
    9.90 +
    9.91 +hQEMA4FHqvEumyRHAQf+OCG4FM0n6pVREVP2kAUzJWy6NAgRYs4cj7pr5hDoUqZY
    9.92 +lBIfVPqNM2rG2xaSpNLfe1iY5mySKL42M+s/QM0cvfnOlS6p3U58EamslElZ9UhD
    9.93 +hBUrX/1NJwdoKyR07Wq3A1UFFYQMYsszPwoC82SCFOhYjEmdZ8/nppViUk3aAUvq
    9.94 +do80ZzvNnlJqgwPEUmMEy9p19XJxQQwG75yHmUsoTvgi9ELvJpEzAjeYFABNzuNE
    9.95 +lh5whuMqmVbEafAYtopB+dwxQxSUdQUHntLU2MrbH8QXGtP98ZaDTHg/Zj24zkUG
    9.96 +Ur/5DZJgzDMrAttorpp/2/NMmakIezy7JaoGQtyYRYUBDANaAgXZcwg/TQEIALLR
    9.97 +7OlIlUYelrktOnrkTy8BrrEuUj95uBM5TkkvWIfR2b3ylC5iWwa/RlIU4RC0VH3j
    9.98 +epwLQNJJKFi/qKwxReE+RMKZW00loUuYnVWeaj58ExTNsdpFJDut35AIp8FNzTmy
    9.99 +C4xv5VVZZnolRd6CW0GUuxEe1zXq1MiyuGHu5AwFgWl728KaRXF2tEVyrQt/okXx
   9.100 +kF7yWkO4oo25VZWCrboUc1FND/7dbfP/PtLKIj05l+xwNaIEt1gb1IM7SxjN+2Tx
   9.101 +Ayp/w1npFhugBkSV3JaIk9dfHpMlLP5URZn30dXElK0an7aB8IwZWwdObo4zlevI
   9.102 +K4nN+UU1Z/kN1guxYDbS6QGOo2Y8829kaOXkBC3HDQEkef631jj1FuVB6VJvhb0u
   9.103 +5EKaxyw8aVxodRQaK9CcKCqwDlnyhHqd4fdMjPk9zTV9xrnqSdC5yKoAhBJ9sFef
   9.104 +Qv5qjYiBUhB+7uGMvRifvO+bT+8q44IS7z/bdXJFjbImgtx57yKvujyvrZlDe6q3
   9.105 +1nzS1jqMQ8NCDP/CKs5WUlaH9LIQ/NWF10EulTjaZ0QZ6iNU0MTqmhs4ZJIsPmBo
   9.106 +g6Qz9x8imV37cC9lHhw/vp99Dal9YulTxdYZnWSfTh289bHqaMEXGYJUsDh3IEYx
   9.107 +UP1bzza+N2dqeiysDmeTNhbZvwk54VmaKMrj/ut/3WIrsulBY7YxE/azle78Ydab
   9.108 +/tKu5YUbVydnVJ6y1s4yASjaOG7ycMIaXggWKUIfWh5Y7BLFHYbcMMltPrspftW7
   9.109 +tjtbL1SUHw0NTfCkBqRv4GpvIAXTCmlxvLw//ee1JZ0nuLnQZBF2GQ0wJVsbunT9
   9.110 +dUschdnIWLfWlueldt+5wOkB6L4quoZ7LWefMQu/b3bg/GWoBtuC3fJDnCsbJO07
   9.111 +nJxZTPxsI3iFUGGtXkg4jGC+yDMlQu3a7LwEkKzx9LT/S1OUndpaBQr6YjyrnET6
   9.112 +w1Hz6jLb5t/2fzrBwkKw1TCu4+pkevIGaGxgQY6TB15jcmWRkUF3sakTrH0UOCSq
   9.113 +wEzFoPF4+WjtXNk/wHw8zkrW7QCe+wbjLjwcUUK/ulKT9/II/k/aUwTt+GzWCGVq
   9.114 +KWq7VLtwa8lrJ74R+XISks9/Hv/nJ8Ay1DfpcQU2HQSnQpSrXupXIA+VoHU/b8xD
   9.115 +YcgqaRKsGYHUANjNs4PpplXlEHp5bpF/ZOpfVAJNnGQ96Cj182DLQgiB0j7Ishjv
   9.116 +XoNDVL45KKW0uWjimZbCauWrD6tjZfBmydymezbPLCB9R+tE68TA/XmpXzInXWML
   9.117 +YDK7tS8TYEkodzSkfDeB7BtXBRIxH4vm2M0E0OdJuLxjrOYeIH4xToUslS9pdog0
   9.118 +z3aqPQbXF4hFc8Fso83dmoc26mQd3H0LrP7yF4HR
   9.119 +=gLhG
   9.120 +-----END PGP MESSAGE-----
   9.121 +
   9.122 +--hcW81WNiFhQC1SNIcls8J07V1b1sXtfCA--
    10.1 --- a/test/test_mails/pEp_encrypted_subject_IS_pEp.eml	Tue Sep 12 19:17:44 2017 +0200
    10.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    10.3 @@ -1,121 +0,0 @@
    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 BE55A1C00BC
    10.9 -	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:27:51 +0200 (CEST)
   10.10 -Received: by vmmailrelay1.informatik.tu-muenchen.de (Postfix, from userid 109)
   10.11 -	id 94D2F1C0394; Mon, 12 Jun 2017 15:27:52 +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 6D2E21C037A
   10.14 -	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:27:52 +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 5876E1C0383
   10.17 -	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:27:52 +0200 (CEST)
   10.18 -Received: by vmmaildmz1.informatik.tu-muenchen.de (Postfix, from userid 109)
   10.19 -	id 56F1F1C2D9D; Mon, 12 Jun 2017 15:27:52 +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.4 required=7.0 tests=AWL,BAYES_00,
   10.24 -	ENCRYPTED_MESSAGE,RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,
   10.25 -	TVD_RCVD_SPACE_BRACKET,UNPARSEABLE_RELAY autolearn=no autolearn_force=no
   10.26 -	version=3.4.0-tuminfo_1
   10.27 -Received: from vmmaildmz1.informatik.tu-muenchen.de (localhost [127.0.0.1])
   10.28 -	by vmmaildmz1.informatik.tu-muenchen.de (Postfix) with ESMTP id DE3C31C2D9E
   10.29 -	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:27:50 +0200 (CEST)
   10.30 -Received: from mi4-p00-ob.smtp.rzone.de (mi4-p00-ob.smtp.rzone.de [81.169.146.149])
   10.31 -	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
   10.32 -	(No client certificate requested)
   10.33 -	by vmmaildmz1.informatik.tu-muenchen.de (Postfix) with ESMTPS id CDD481C2D9B
   10.34 -	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:27:50 +0200 (CEST)
   10.35 -X-RZG-FWD-BY: pep.test.recip@kgrothoff.org
   10.36 -Received: from mailin.rzone.de ([unix socket])
   10.37 -	by mailin.rzone.de (RZmta 40.9) with LMTPA;
   10.38 -	Mon, 12 Jun 2017 15:27:46 +0200 (CEST)
   10.39 -Authentication-Results: strato.com 1;
   10.40 -	spf=none
   10.41 -		smtp.mailfrom="pep.test.alice@pep-project.org";
   10.42 -	dkim=none;
   10.43 -	domainkeys=none;
   10.44 -	dkim-adsp=none
   10.45 -		header.from="pep.test.alice@pep-project.org"
   10.46 -X-Strato-MessageType: email
   10.47 -X-RZG-CLASS-ID: mi00
   10.48 -Received-SPF: none
   10.49 -	client-ip=131.159.0.8;
   10.50 -	helo="mail-out1.informatik.tu-muenchen.de";
   10.51 -	envelope-from="pep.test.alice@pep-project.org";
   10.52 -	receiver=smtpin.rzone.de;
   10.53 -	identity=mailfrom;
   10.54 -Received: from mail-out1.informatik.tu-muenchen.de ([131.159.0.8])
   10.55 -	by smtpin.rzone.de (RZmta 40.9 OK)
   10.56 -	with ESMTPS id w03564t5CDRkYmx
   10.57 -	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (curve secp521r1 with 521 ECDH bits, eq. 15360 bits RSA))
   10.58 -	(Client did not present a certificate)
   10.59 -	for <pep.test.recip@kgrothoff.org>;
   10.60 -	Mon, 12 Jun 2017 15:27:46 +0200 (CEST)
   10.61 -Received: from [192.168.178.22] (ip5f584089.dynamic.kabel-deutschland.de [95.88.64.137])
   10.62 -	by services.sec.in.tum.de (Postfix) with ESMTPSA id A8EC11013AE47
   10.63 -	for <pep.test.recip@kgrothoff.org>; Mon, 12 Jun 2017 15:27:40 +0200 (CEST)
   10.64 -To: pep.test.recip@kgrothoff.org
   10.65 -Reply-To: krista@pep-project.org
   10.66 -From: pEp Test Alice <pep.test.alice@pep-project.org>
   10.67 -Subject: pEp
   10.68 -Organization: pEp
   10.69 -Message-ID: <5d37b6c2-9e5e-7217-c80e-1359da8faa5c@pep-project.org>
   10.70 -Date: Mon, 12 Jun 2017 15:27:40 +0200
   10.71 -User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101
   10.72 - Thunderbird/45.8.0
   10.73 -MIME-Version: 1.0
   10.74 -Content-Type: multipart/encrypted;
   10.75 - protocol="application/pgp-encrypted";
   10.76 - boundary="7vTKNA25GePB6VqgrM1km3gCfpFonmKj3"
   10.77 -
   10.78 -This is an OpenPGP/MIME encrypted message (RFC 4880 and 3156)
   10.79 ---7vTKNA25GePB6VqgrM1km3gCfpFonmKj3
   10.80 -Content-Type: application/pgp-encrypted
   10.81 -Content-Description: PGP/MIME version identification
   10.82 -
   10.83 -Version: 1
   10.84 -
   10.85 ---7vTKNA25GePB6VqgrM1km3gCfpFonmKj3
   10.86 -Content-Type: application/octet-stream; name="encrypted.asc"
   10.87 -Content-Description: OpenPGP encrypted message
   10.88 -Content-Disposition: inline; filename="encrypted.asc"
   10.89 -
   10.90 ------BEGIN PGP MESSAGE-----
   10.91 -
   10.92 -hQEMA4FHqvEumyRHAQf6AkV51E1/uffFSc++oIPAoNCJU71NseNgW3s3XIQ/7TIQ
   10.93 -pDi6a6ksNdN+cJyMhfM7HnO06LjrUDYtgYPkZBHcTDZMWivW/7+5g8z60V3biIpw
   10.94 -mdUqhb+mZb4A0akMk+Ix8paoR8D7y4jmeLHwj/vbQ1J/E64rob9XPDWrLOW63chR
   10.95 -pg+XAo3VbkDKCms8PSuKehzMoTpZUcEVP47TF1OxuKZE0k7yJQ354RlPGxsl/6zM
   10.96 -O1+cJ7XdclkZj9gdeJAWzqCx6kTmDy2DA4e80BwMXXJnQtFIp4B55gTHvfbmxBRL
   10.97 -V8KDHOlvY/YSFV9sikjyaXbiweuqgiycsLb+qRziG4UBDANaAgXZcwg/TQEIAMg9
   10.98 -CVCJiYqS+ke1Zw0VNbb4BccrSBWL5iiQsPPUFOBld8jCFCGFZVBiik7O/XzRGWQh
   10.99 -qsYb2BNb0267viJS+IhTvihFybvR/l/gkzRLRfznFxbsRKgYAI6ipPr4wdAxvRkE
  10.100 -k0LvL3ckRgKtc2UORvfmhKRXu8Hj8dkYD0Asewnx7+p+s685MpyJ3zhhyifPzqKw
  10.101 -VH/6D7g26t3DjjQkvTvkiIMEvxT3beQN6QspdRtoDhHqAH0JhrZjEZyenneXE/AB
  10.102 -2CrnIfEU6V7S1EWP4Ond647K/F89ZG9LfTBpfmYuTXMKM39hmQaNcIsr8dr+mBif
  10.103 -nO2xRkyTMHAtyEk1dQnS6QFdLynwNLfsOvecztOBNBE/j6gH3dqKgZMg2e7ojK/Z
  10.104 -rNohpLMfZqzN37sfopm8htzK0Wg/l0CcgR8S4cUln06UzUm89GF9pokHYTnXYNYb
  10.105 -S2BMMVQ7gTpGDBfBFHVCK8xtCSFJJmxoxIzC9Ojl4JYfqJycip1QdWCWhXJDo0m9
  10.106 -4S+57m1UHAeyfT8v4ggEffVg2fgHF5VF58S3FC3HCtASAqljtmYVlHQSK0hSY00U
  10.107 -t9y/McqDXYuXXtT5O056q2VoYkWjTpvbvuk/TI3IU2np9owZwgHJwiA8I+BMQitd
  10.108 -LWRmSmoRBBHNsaORuEUZYMugZzcTD81C2v5PNDvawB7mcSFqrtI6K30TnZ5iu8DI
  10.109 -qJ9BdP7Htphqk9nusLT7XTYve/6/NC6rmnnEpQhrdXdzPDsyGe0H/s24xU3wFKBY
  10.110 -JdKyfKSJUkXjmCrqJrkq0wAHCaZYK5hLiobhYLGfxxjPpx2UFk33lYXL5R659Gjh
  10.111 -oIgZW5NWOxNRE1GRd2js+WaZy2dwvxeqNGEdEHgi6UN6JRf588lSYjbz+8u2TW21
  10.112 -whH5x5VfDpIqimPdknQwM/w8N2fYEhI4bWv0rp+D0m27hZaVXjInShEQq6YsjAs5
  10.113 -aP19C7WT+VK+FuvOEQ3nxPl+/fGOF5EoceuscxjCxkVu8Ijq4+xdu7Hl6ycJUu40
  10.114 -wGTKOy/rGg0TZ232SyUE83VyxAPtU0fTLvbZAcQaT+YTHqk/c4hdzPW/Ho8L1aZ0
  10.115 -Ax9PpkUHmm7+JS3sbfxyLMQ9Zz2GcE+SCIEyGuFTqO/ESmJUXTNQjDRmLuleOhZt
  10.116 -VmOezek2BEcvWZd5/0w6pd6UBjzXdSdTJA38nBr8Ao217xDMZiLoxg6xZbsG12et
  10.117 -mqWG9m/5dQRECrcN0lRdQqFovSkw7/Az7jOIm0v4ey+i6wmEblg3M0vm7Ky19l7Z
  10.118 -lm0+nC5XwR56n4VPtyRbGgLkI8w//NChYZJJOVpyVpfP57pKPhvhLNcaOk2d5gNU
  10.119 -KDg2bKXilzkMflVqw5eYN2EKCMlLx+hW5U1oSJJlQKqKXQ0qglUfSEzPmBt9Y0g1
  10.120 -DN+blh+m
  10.121 -=UZkH
  10.122 ------END PGP MESSAGE-----
  10.123 -
  10.124 ---7vTKNA25GePB6VqgrM1km3gCfpFonmKj3--
    11.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    11.2 +++ b/test/test_mails/pEp_encrypted_subject_IS_pEp_3a.eml	Wed Sep 13 02:00:36 2017 +0200
    11.3 @@ -0,0 +1,121 @@
    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 BE55A1C00BC
    11.9 +	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:27:51 +0200 (CEST)
   11.10 +Received: by vmmailrelay1.informatik.tu-muenchen.de (Postfix, from userid 109)
   11.11 +	id 94D2F1C0394; Mon, 12 Jun 2017 15:27:52 +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 6D2E21C037A
   11.14 +	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:27:52 +0200 (CEST)
   11.15 +Received: from vmmaildmz1.informatik.tu-muenchen.de (vmmaildmz1.informatik.tu-muenchen.de [131.159.0.87])
   11.16 +	by vmmailrelay1.informatik.tu-muenchen.de (Postfix) with ESMTP id 5876E1C0383
   11.17 +	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:27:52 +0200 (CEST)
   11.18 +Received: by vmmaildmz1.informatik.tu-muenchen.de (Postfix, from userid 109)
   11.19 +	id 56F1F1C2D9D; Mon, 12 Jun 2017 15:27:52 +0200 (CEST)
   11.20 +X-Spam-Checker-Version: SpamAssassin 3.4.0-tuminfo_1 (2014-02-07) on
   11.21 +	vmmaildmz1.informatik.tu-muenchen.de
   11.22 +X-Spam-Level: 
   11.23 +X-Spam-Status: No, score=-3.4 required=7.0 tests=AWL,BAYES_00,
   11.24 +	ENCRYPTED_MESSAGE,RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,
   11.25 +	TVD_RCVD_SPACE_BRACKET,UNPARSEABLE_RELAY autolearn=no autolearn_force=no
   11.26 +	version=3.4.0-tuminfo_1
   11.27 +Received: from vmmaildmz1.informatik.tu-muenchen.de (localhost [127.0.0.1])
   11.28 +	by vmmaildmz1.informatik.tu-muenchen.de (Postfix) with ESMTP id DE3C31C2D9E
   11.29 +	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:27:50 +0200 (CEST)
   11.30 +Received: from mi4-p00-ob.smtp.rzone.de (mi4-p00-ob.smtp.rzone.de [81.169.146.149])
   11.31 +	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
   11.32 +	(No client certificate requested)
   11.33 +	by vmmaildmz1.informatik.tu-muenchen.de (Postfix) with ESMTPS id CDD481C2D9B
   11.34 +	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:27:50 +0200 (CEST)
   11.35 +X-RZG-FWD-BY: pep.test.recip@kgrothoff.org
   11.36 +Received: from mailin.rzone.de ([unix socket])
   11.37 +	by mailin.rzone.de (RZmta 40.9) with LMTPA;
   11.38 +	Mon, 12 Jun 2017 15:27:46 +0200 (CEST)
   11.39 +Authentication-Results: strato.com 1;
   11.40 +	spf=none
   11.41 +		smtp.mailfrom="pep.test.alice@pep-project.org";
   11.42 +	dkim=none;
   11.43 +	domainkeys=none;
   11.44 +	dkim-adsp=none
   11.45 +		header.from="pep.test.alice@pep-project.org"
   11.46 +X-Strato-MessageType: email
   11.47 +X-RZG-CLASS-ID: mi00
   11.48 +Received-SPF: none
   11.49 +	client-ip=131.159.0.8;
   11.50 +	helo="mail-out1.informatik.tu-muenchen.de";
   11.51 +	envelope-from="pep.test.alice@pep-project.org";
   11.52 +	receiver=smtpin.rzone.de;
   11.53 +	identity=mailfrom;
   11.54 +Received: from mail-out1.informatik.tu-muenchen.de ([131.159.0.8])
   11.55 +	by smtpin.rzone.de (RZmta 40.9 OK)
   11.56 +	with ESMTPS id w03564t5CDRkYmx
   11.57 +	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (curve secp521r1 with 521 ECDH bits, eq. 15360 bits RSA))
   11.58 +	(Client did not present a certificate)
   11.59 +	for <pep.test.recip@kgrothoff.org>;
   11.60 +	Mon, 12 Jun 2017 15:27:46 +0200 (CEST)
   11.61 +Received: from [192.168.178.22] (ip5f584089.dynamic.kabel-deutschland.de [95.88.64.137])
   11.62 +	by services.sec.in.tum.de (Postfix) with ESMTPSA id A8EC11013AE47
   11.63 +	for <pep.test.recip@kgrothoff.org>; Mon, 12 Jun 2017 15:27:40 +0200 (CEST)
   11.64 +To: pep.test.recip@kgrothoff.org
   11.65 +Reply-To: krista@pep-project.org
   11.66 +From: pEp Test Alice <pep.test.alice@pep-project.org>
   11.67 +Subject: pEp
   11.68 +Organization: pEp
   11.69 +Message-ID: <5d37b6c2-9e5e-7217-c80e-1359da8faa5c@pep-project.org>
   11.70 +Date: Mon, 12 Jun 2017 15:27:40 +0200
   11.71 +User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101
   11.72 + Thunderbird/45.8.0
   11.73 +MIME-Version: 1.0
   11.74 +Content-Type: multipart/encrypted;
   11.75 + protocol="application/pgp-encrypted";
   11.76 + boundary="7vTKNA25GePB6VqgrM1km3gCfpFonmKj3"
   11.77 +
   11.78 +This is an OpenPGP/MIME encrypted message (RFC 4880 and 3156)
   11.79 +--7vTKNA25GePB6VqgrM1km3gCfpFonmKj3
   11.80 +Content-Type: application/pgp-encrypted
   11.81 +Content-Description: PGP/MIME version identification
   11.82 +
   11.83 +Version: 1
   11.84 +
   11.85 +--7vTKNA25GePB6VqgrM1km3gCfpFonmKj3
   11.86 +Content-Type: application/octet-stream; name="encrypted.asc"
   11.87 +Content-Description: OpenPGP encrypted message
   11.88 +Content-Disposition: inline; filename="encrypted.asc"
   11.89 +
   11.90 +-----BEGIN PGP MESSAGE-----
   11.91 +
   11.92 +hQEMA4FHqvEumyRHAQf6AkV51E1/uffFSc++oIPAoNCJU71NseNgW3s3XIQ/7TIQ
   11.93 +pDi6a6ksNdN+cJyMhfM7HnO06LjrUDYtgYPkZBHcTDZMWivW/7+5g8z60V3biIpw
   11.94 +mdUqhb+mZb4A0akMk+Ix8paoR8D7y4jmeLHwj/vbQ1J/E64rob9XPDWrLOW63chR
   11.95 +pg+XAo3VbkDKCms8PSuKehzMoTpZUcEVP47TF1OxuKZE0k7yJQ354RlPGxsl/6zM
   11.96 +O1+cJ7XdclkZj9gdeJAWzqCx6kTmDy2DA4e80BwMXXJnQtFIp4B55gTHvfbmxBRL
   11.97 +V8KDHOlvY/YSFV9sikjyaXbiweuqgiycsLb+qRziG4UBDANaAgXZcwg/TQEIAMg9
   11.98 +CVCJiYqS+ke1Zw0VNbb4BccrSBWL5iiQsPPUFOBld8jCFCGFZVBiik7O/XzRGWQh
   11.99 +qsYb2BNb0267viJS+IhTvihFybvR/l/gkzRLRfznFxbsRKgYAI6ipPr4wdAxvRkE
  11.100 +k0LvL3ckRgKtc2UORvfmhKRXu8Hj8dkYD0Asewnx7+p+s685MpyJ3zhhyifPzqKw
  11.101 +VH/6D7g26t3DjjQkvTvkiIMEvxT3beQN6QspdRtoDhHqAH0JhrZjEZyenneXE/AB
  11.102 +2CrnIfEU6V7S1EWP4Ond647K/F89ZG9LfTBpfmYuTXMKM39hmQaNcIsr8dr+mBif
  11.103 +nO2xRkyTMHAtyEk1dQnS6QFdLynwNLfsOvecztOBNBE/j6gH3dqKgZMg2e7ojK/Z
  11.104 +rNohpLMfZqzN37sfopm8htzK0Wg/l0CcgR8S4cUln06UzUm89GF9pokHYTnXYNYb
  11.105 +S2BMMVQ7gTpGDBfBFHVCK8xtCSFJJmxoxIzC9Ojl4JYfqJycip1QdWCWhXJDo0m9
  11.106 +4S+57m1UHAeyfT8v4ggEffVg2fgHF5VF58S3FC3HCtASAqljtmYVlHQSK0hSY00U
  11.107 +t9y/McqDXYuXXtT5O056q2VoYkWjTpvbvuk/TI3IU2np9owZwgHJwiA8I+BMQitd
  11.108 +LWRmSmoRBBHNsaORuEUZYMugZzcTD81C2v5PNDvawB7mcSFqrtI6K30TnZ5iu8DI
  11.109 +qJ9BdP7Htphqk9nusLT7XTYve/6/NC6rmnnEpQhrdXdzPDsyGe0H/s24xU3wFKBY
  11.110 +JdKyfKSJUkXjmCrqJrkq0wAHCaZYK5hLiobhYLGfxxjPpx2UFk33lYXL5R659Gjh
  11.111 +oIgZW5NWOxNRE1GRd2js+WaZy2dwvxeqNGEdEHgi6UN6JRf588lSYjbz+8u2TW21
  11.112 +whH5x5VfDpIqimPdknQwM/w8N2fYEhI4bWv0rp+D0m27hZaVXjInShEQq6YsjAs5
  11.113 +aP19C7WT+VK+FuvOEQ3nxPl+/fGOF5EoceuscxjCxkVu8Ijq4+xdu7Hl6ycJUu40
  11.114 +wGTKOy/rGg0TZ232SyUE83VyxAPtU0fTLvbZAcQaT+YTHqk/c4hdzPW/Ho8L1aZ0
  11.115 +Ax9PpkUHmm7+JS3sbfxyLMQ9Zz2GcE+SCIEyGuFTqO/ESmJUXTNQjDRmLuleOhZt
  11.116 +VmOezek2BEcvWZd5/0w6pd6UBjzXdSdTJA38nBr8Ao217xDMZiLoxg6xZbsG12et
  11.117 +mqWG9m/5dQRECrcN0lRdQqFovSkw7/Az7jOIm0v4ey+i6wmEblg3M0vm7Ky19l7Z
  11.118 +lm0+nC5XwR56n4VPtyRbGgLkI8w//NChYZJJOVpyVpfP57pKPhvhLNcaOk2d5gNU
  11.119 +KDg2bKXilzkMflVqw5eYN2EKCMlLx+hW5U1oSJJlQKqKXQ0qglUfSEzPmBt9Y0g1
  11.120 +DN+blh+m
  11.121 +=UZkH
  11.122 +-----END PGP MESSAGE-----
  11.123 +
  11.124 +--7vTKNA25GePB6VqgrM1km3gCfpFonmKj3--
    12.1 --- a/test/test_mails/pEp_subject_normal.eml	Tue Sep 12 19:17:44 2017 +0200
    12.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    12.3 @@ -1,112 +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 98B571C00BC
    12.9 -	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:25:44 +0200 (CEST)
   12.10 -Received: by vmmailrelay1.informatik.tu-muenchen.de (Postfix, from userid 109)
   12.11 -	id 620431C0383; Mon, 12 Jun 2017 15:25:45 +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 3F4961C037C
   12.14 -	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:25:45 +0200 (CEST)
   12.15 -Received: from vmmaildmz1.informatik.tu-muenchen.de (vmmaildmz1.informatik.tu-muenchen.de [131.159.0.87])
   12.16 -	by vmmailrelay1.informatik.tu-muenchen.de (Postfix) with ESMTP id 2BCE31C037A
   12.17 -	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:25:45 +0200 (CEST)
   12.18 -Received: by vmmaildmz1.informatik.tu-muenchen.de (Postfix, from userid 109)
   12.19 -	id 2A4741C2D9D; Mon, 12 Jun 2017 15:25:45 +0200 (CEST)
   12.20 -X-Spam-Checker-Version: SpamAssassin 3.4.0-tuminfo_1 (2014-02-07) on
   12.21 -	vmmaildmz1.informatik.tu-muenchen.de
   12.22 -X-Spam-Level: 
   12.23 -X-Spam-Status: No, score=-3.6 required=7.0 tests=BAYES_00,ENCRYPTED_MESSAGE,
   12.24 -	RCVD_IN_DNSWL_LOW,TVD_RCVD_SPACE_BRACKET,UNPARSEABLE_RELAY autolearn=no
   12.25 -	autolearn_force=no version=3.4.0-tuminfo_1
   12.26 -Received: from vmmaildmz1.informatik.tu-muenchen.de (localhost [127.0.0.1])
   12.27 -	by vmmaildmz1.informatik.tu-muenchen.de (Postfix) with ESMTP id 6EF791C2D9E
   12.28 -	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:25:43 +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 vmmaildmz1.informatik.tu-muenchen.de (Postfix) with ESMTPS id 5E75D1C2D9B
   12.33 -	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:25:43 +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:25:24 +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 v06d9ft5CDPHXhF
   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:25:17 +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 4697F1013AE47
   12.62 -	for <pep.test.recip@kgrothoff.org>; Mon, 12 Jun 2017 15:25:11 +0200 (CEST)
   12.63 -Reply-To: krista@pep-project.org
   12.64 -To: pep.test.recip@kgrothoff.org
   12.65 -From: pEp Test Alice <pep.test.alice@pep-project.org>
   12.66 -Subject: pEp
   12.67 -Organization: pEp
   12.68 -Message-ID: <92ee4ca2-17cd-bcf1-377c-3367470bb571@pep-project.org>
   12.69 -Date: Mon, 12 Jun 2017 15:25:10 +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="e7R73MXx31oWAX8HMqNvMDNt9cAMWtSTV"
   12.76 -
   12.77 -This is an OpenPGP/MIME encrypted message (RFC 4880 and 3156)
   12.78 ---e7R73MXx31oWAX8HMqNvMDNt9cAMWtSTV
   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 ---e7R73MXx31oWAX8HMqNvMDNt9cAMWtSTV
   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+KW54G6f25yDJs6MdhWSs/766uFEIy8pq+j49AykOBsh2
   12.92 -W8BeB7yBqwjVFsBYPwGFNza187QHQVQlOHGRtxkXSX/iSym/O82YPvSwZj7GkKS9
   12.93 -sMgX2/dOMaEoTitn72f26ww5PvAqltJLD5TGhSM0RxK+0OemSrI0wDZxUb2Ll8DT
   12.94 -aVwpuKnLYFMcnk8SQLa3eZ/YpFV3TCMDFUgtIEqmHoh74dwemQjpP+qhbExZvY/k
   12.95 -rSZuJoU8siuLJ72vbEn8n2x8UCCfyTpacBZkC6Ukhsm/XrSg2GjqqzjSeR0T0Nbr
   12.96 -y/sFblbE8fbmouAf5k670oUot+j5aoHV79Rntcdm1oUBDANaAgXZcwg/TQEH/jhF
   12.97 -1ayYCROI8xEhj01Qbn60OtG+iKO+3B5/+uwizYgyW5mhKjrdgA/wsKMTMXj1BG+J
   12.98 -JJJ1TdEbxbL2UCai6nuHd0CbqJWSuTAicteKudUclAJHnpm2Qv+Yq2t/8JwJllMR
   12.99 -Wum8Cj4WuD0K3te5uHDZuu7Vfj9r3+7WYJ7FUkSYp2DUIFMM+hG+8OJtdjKd6kAA
  12.100 -FtAOijws+1r4jYFGYkCMRfnQatiFXf0n6Nr8qjSskkMtNQk41AG4LauYFTphR/G+
  12.101 -ayXPd8buDyBh3XuyoMcg5vLMJfWVTfiKM/wxv1jBBrQwFd5JpqCNr9dHYWMJ0gg9
  12.102 -aMdvaDEEd7I4VlwU+4DSwQMBF7R9V3cYj1XOxHjX2EikIxR/kviUrB8vDE4LAYJE
  12.103 -UFvoXgKRe4lQbQlLwoBp6R8L6mPTytLzlQnjQ4AJhPWhXkJUeCetURr5BzNCEfOy
  12.104 -+2Nq+9XLGM0wSCY09BOsGAQSL56kIGL61AnhvhpPUi9w9SOVjLHge6pzSzAW3h5E
  12.105 -vf8a8oGyLjyHR9VWBUqrMQ0tTWdHkoeHenXpwA+rckr0kzJXW1RJt2oQJEE0LI2I
  12.106 -0p9j7o6imaYWdtbHS7Kcbg2DxbT63QVOoO4OTPLHjYj0eqf1NDlwKBzQYaknNScI
  12.107 -LHnXrzMqqylU3ki8hUIh0K1ULernaA8LEIuegKMuguHCs2B/Xgee+Hor6l4XBRzD
  12.108 -V/8WFIU1lxthnYEceik/OD2U+LDKT4i+AogJAA+rCw0WbUC8f1HXQeV/8CVarcUn
  12.109 -GrS7AjjZlwQfiE8R/CtKdNaiJa4Z8GuQZJD/AqOe5zH0HLBykaheHS6ynw9yuNb7
  12.110 -d6lArIYdW5S8D0RDYRwu7z/lI3sgVgwiuoAk1OiYtrYUUNiXcpO59aE59iXjMW61
  12.111 -EvUAZzgfRyuzYdZtYNaM3FvUSm2aAsQRP+NJFW3YkqkbLvyo
  12.112 -=VpGy
  12.113 ------END PGP MESSAGE-----
  12.114 -
  12.115 ---e7R73MXx31oWAX8HMqNvMDNt9cAMWtSTV--
    13.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    13.2 +++ b/test/test_mails/pEp_subject_normal_1a.eml	Wed Sep 13 02:00:36 2017 +0200
    13.3 @@ -0,0 +1,112 @@
    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 98B571C00BC
    13.9 +	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:25:44 +0200 (CEST)
   13.10 +Received: by vmmailrelay1.informatik.tu-muenchen.de (Postfix, from userid 109)
   13.11 +	id 620431C0383; Mon, 12 Jun 2017 15:25:45 +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 3F4961C037C
   13.14 +	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:25:45 +0200 (CEST)
   13.15 +Received: from vmmaildmz1.informatik.tu-muenchen.de (vmmaildmz1.informatik.tu-muenchen.de [131.159.0.87])
   13.16 +	by vmmailrelay1.informatik.tu-muenchen.de (Postfix) with ESMTP id 2BCE31C037A
   13.17 +	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:25:45 +0200 (CEST)
   13.18 +Received: by vmmaildmz1.informatik.tu-muenchen.de (Postfix, from userid 109)
   13.19 +	id 2A4741C2D9D; Mon, 12 Jun 2017 15:25:45 +0200 (CEST)
   13.20 +X-Spam-Checker-Version: SpamAssassin 3.4.0-tuminfo_1 (2014-02-07) on
   13.21 +	vmmaildmz1.informatik.tu-muenchen.de
   13.22 +X-Spam-Level: 
   13.23 +X-Spam-Status: No, score=-3.6 required=7.0 tests=BAYES_00,ENCRYPTED_MESSAGE,
   13.24 +	RCVD_IN_DNSWL_LOW,TVD_RCVD_SPACE_BRACKET,UNPARSEABLE_RELAY autolearn=no
   13.25 +	autolearn_force=no version=3.4.0-tuminfo_1
   13.26 +Received: from vmmaildmz1.informatik.tu-muenchen.de (localhost [127.0.0.1])
   13.27 +	by vmmaildmz1.informatik.tu-muenchen.de (Postfix) with ESMTP id 6EF791C2D9E
   13.28 +	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:25:43 +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 vmmaildmz1.informatik.tu-muenchen.de (Postfix) with ESMTPS id 5E75D1C2D9B
   13.33 +	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:25:43 +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:25:24 +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 v06d9ft5CDPHXhF
   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:25:17 +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 4697F1013AE47
   13.62 +	for <pep.test.recip@kgrothoff.org>; Mon, 12 Jun 2017 15:25:11 +0200 (CEST)
   13.63 +Reply-To: krista@pep-project.org
   13.64 +To: pep.test.recip@kgrothoff.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: <92ee4ca2-17cd-bcf1-377c-3367470bb571@pep-project.org>
   13.69 +Date: Mon, 12 Jun 2017 15:25:10 +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="e7R73MXx31oWAX8HMqNvMDNt9cAMWtSTV"
   13.76 +
   13.77 +This is an OpenPGP/MIME encrypted message (RFC 4880 and 3156)
   13.78 +--e7R73MXx31oWAX8HMqNvMDNt9cAMWtSTV
   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 +--e7R73MXx31oWAX8HMqNvMDNt9cAMWtSTV
   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+KW54G6f25yDJs6MdhWSs/766uFEIy8pq+j49AykOBsh2
   13.92 +W8BeB7yBqwjVFsBYPwGFNza187QHQVQlOHGRtxkXSX/iSym/O82YPvSwZj7GkKS9
   13.93 +sMgX2/dOMaEoTitn72f26ww5PvAqltJLD5TGhSM0RxK+0OemSrI0wDZxUb2Ll8DT
   13.94 +aVwpuKnLYFMcnk8SQLa3eZ/YpFV3TCMDFUgtIEqmHoh74dwemQjpP+qhbExZvY/k
   13.95 +rSZuJoU8siuLJ72vbEn8n2x8UCCfyTpacBZkC6Ukhsm/XrSg2GjqqzjSeR0T0Nbr
   13.96 +y/sFblbE8fbmouAf5k670oUot+j5aoHV79Rntcdm1oUBDANaAgXZcwg/TQEH/jhF
   13.97 +1ayYCROI8xEhj01Qbn60OtG+iKO+3B5/+uwizYgyW5mhKjrdgA/wsKMTMXj1BG+J
   13.98 +JJJ1TdEbxbL2UCai6nuHd0CbqJWSuTAicteKudUclAJHnpm2Qv+Yq2t/8JwJllMR
   13.99 +Wum8Cj4WuD0K3te5uHDZuu7Vfj9r3+7WYJ7FUkSYp2DUIFMM+hG+8OJtdjKd6kAA
  13.100 +FtAOijws+1r4jYFGYkCMRfnQatiFXf0n6Nr8qjSskkMtNQk41AG4LauYFTphR/G+
  13.101 +ayXPd8buDyBh3XuyoMcg5vLMJfWVTfiKM/wxv1jBBrQwFd5JpqCNr9dHYWMJ0gg9
  13.102 +aMdvaDEEd7I4VlwU+4DSwQMBF7R9V3cYj1XOxHjX2EikIxR/kviUrB8vDE4LAYJE
  13.103 +UFvoXgKRe4lQbQlLwoBp6R8L6mPTytLzlQnjQ4AJhPWhXkJUeCetURr5BzNCEfOy
  13.104 ++2Nq+9XLGM0wSCY09BOsGAQSL56kIGL61AnhvhpPUi9w9SOVjLHge6pzSzAW3h5E
  13.105 +vf8a8oGyLjyHR9VWBUqrMQ0tTWdHkoeHenXpwA+rckr0kzJXW1RJt2oQJEE0LI2I
  13.106 +0p9j7o6imaYWdtbHS7Kcbg2DxbT63QVOoO4OTPLHjYj0eqf1NDlwKBzQYaknNScI
  13.107 +LHnXrzMqqylU3ki8hUIh0K1ULernaA8LEIuegKMuguHCs2B/Xgee+Hor6l4XBRzD
  13.108 +V/8WFIU1lxthnYEceik/OD2U+LDKT4i+AogJAA+rCw0WbUC8f1HXQeV/8CVarcUn
  13.109 +GrS7AjjZlwQfiE8R/CtKdNaiJa4Z8GuQZJD/AqOe5zH0HLBykaheHS6ynw9yuNb7
  13.110 +d6lArIYdW5S8D0RDYRwu7z/lI3sgVgwiuoAk1OiYtrYUUNiXcpO59aE59iXjMW61
  13.111 +EvUAZzgfRyuzYdZtYNaM3FvUSm2aAsQRP+NJFW3YkqkbLvyo
  13.112 +=VpGy
  13.113 +-----END PGP MESSAGE-----
  13.114 +
  13.115 +--e7R73MXx31oWAX8HMqNvMDNt9cAMWtSTV--
    14.1 --- a/test/test_mails/pEp_subject_normal_signed.eml	Tue Sep 12 19:17:44 2017 +0200
    14.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    14.3 @@ -1,119 +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 768301C00BC
    14.9 -	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:26:24 +0200 (CEST)
   14.10 -Received: by vmmailrelay1.informatik.tu-muenchen.de (Postfix, from userid 109)
   14.11 -	id 4DD7D1C0383; Mon, 12 Jun 2017 15:26:25 +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 2AD621C037C
   14.14 -	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:26:25 +0200 (CEST)
   14.15 -Received: from vmmaildmz2.informatik.tu-muenchen.de (vmmaildmz2.informatik.tu-muenchen.de [131.159.0.88])
   14.16 -	by vmmailrelay1.informatik.tu-muenchen.de (Postfix) with ESMTP id 15DA11C037A
   14.17 -	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:26:25 +0200 (CEST)
   14.18 -Received: by vmmaildmz2.informatik.tu-muenchen.de (Postfix, from userid 109)
   14.19 -	id 13FCC1C2AE2; Mon, 12 Jun 2017 15:26:25 +0200 (CEST)
   14.20 -X-Spam-Checker-Version: SpamAssassin 3.4.0-tuminfo_1 (2014-02-07) on
   14.21 -	vmmaildmz2.informatik.tu-muenchen.de
   14.22 -X-Spam-Level: 
   14.23 -X-Spam-Status: No, score=-2.6 required=7.0 tests=AWL,BAYES_00,
   14.24 -	ENCRYPTED_MESSAGE,RCVD_IN_DNSWL_LOW,TVD_RCVD_SPACE_BRACKET,UNPARSEABLE_RELAY
   14.25 -	autolearn=no autolearn_force=no version=3.4.0-tuminfo_1
   14.26 -Received: from vmmaildmz2.informatik.tu-muenchen.de (localhost [127.0.0.1])
   14.27 -	by vmmaildmz2.informatik.tu-muenchen.de (Postfix) with ESMTP id 953971C2AE1
   14.28 -	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:26:23 +0200 (CEST)
   14.29 -Received: from mi4-p00-ob.smtp.rzone.de (mi4-p00-ob.smtp.rzone.de [81.169.146.144])
   14.30 -	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
   14.31 -	(No client certificate requested)
   14.32 -	by vmmaildmz2.informatik.tu-muenchen.de (Postfix) with ESMTPS id 8540A1C2AE0
   14.33 -	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:26:23 +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:26:02 +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 v06d9ft5CDQ2Xj1
   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:26:02 +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 BEAA21013AE47
   14.62 -	for <pep.test.recip@kgrothoff.org>; Mon, 12 Jun 2017 15:25:56 +0200 (CEST)
   14.63 -To: pep.test.recip@kgrothoff.org
   14.64 -Reply-To: krista@pep-project.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: <988e71f4-df80-906e-8bbb-68d48069d4ac@pep-project.org>
   14.69 -Date: Mon, 12 Jun 2017 15:25:56 +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: multipart/encrypted;
   14.74 - protocol="application/pgp-encrypted";
   14.75 - boundary="hcW81WNiFhQC1SNIcls8J07V1b1sXtfCA"
   14.76 -
   14.77 -This is an OpenPGP/MIME encrypted message (RFC 4880 and 3156)
   14.78 ---hcW81WNiFhQC1SNIcls8J07V1b1sXtfCA
   14.79 -Content-Type: application/pgp-encrypted
   14.80 -Content-Description: PGP/MIME version identification
   14.81 -
   14.82 -Version: 1
   14.83 -
   14.84 ---hcW81WNiFhQC1SNIcls8J07V1b1sXtfCA
   14.85 -Content-Type: application/octet-stream; name="encrypted.asc"
   14.86 -Content-Description: OpenPGP encrypted message
   14.87 -Content-Disposition: inline; filename="encrypted.asc"
   14.88 -
   14.89 ------BEGIN PGP MESSAGE-----
   14.90 -
   14.91 -hQEMA4FHqvEumyRHAQf+OCG4FM0n6pVREVP2kAUzJWy6NAgRYs4cj7pr5hDoUqZY
   14.92 -lBIfVPqNM2rG2xaSpNLfe1iY5mySKL42M+s/QM0cvfnOlS6p3U58EamslElZ9UhD
   14.93 -hBUrX/1NJwdoKyR07Wq3A1UFFYQMYsszPwoC82SCFOhYjEmdZ8/nppViUk3aAUvq
   14.94 -do80ZzvNnlJqgwPEUmMEy9p19XJxQQwG75yHmUsoTvgi9ELvJpEzAjeYFABNzuNE
   14.95 -lh5whuMqmVbEafAYtopB+dwxQxSUdQUHntLU2MrbH8QXGtP98ZaDTHg/Zj24zkUG
   14.96 -Ur/5DZJgzDMrAttorpp/2/NMmakIezy7JaoGQtyYRYUBDANaAgXZcwg/TQEIALLR
   14.97 -7OlIlUYelrktOnrkTy8BrrEuUj95uBM5TkkvWIfR2b3ylC5iWwa/RlIU4RC0VH3j
   14.98 -epwLQNJJKFi/qKwxReE+RMKZW00loUuYnVWeaj58ExTNsdpFJDut35AIp8FNzTmy
   14.99 -C4xv5VVZZnolRd6CW0GUuxEe1zXq1MiyuGHu5AwFgWl728KaRXF2tEVyrQt/okXx
  14.100 -kF7yWkO4oo25VZWCrboUc1FND/7dbfP/PtLKIj05l+xwNaIEt1gb1IM7SxjN+2Tx
  14.101 -Ayp/w1npFhugBkSV3JaIk9dfHpMlLP5URZn30dXElK0an7aB8IwZWwdObo4zlevI
  14.102 -K4nN+UU1Z/kN1guxYDbS6QGOo2Y8829kaOXkBC3HDQEkef631jj1FuVB6VJvhb0u
  14.103 -5EKaxyw8aVxodRQaK9CcKCqwDlnyhHqd4fdMjPk9zTV9xrnqSdC5yKoAhBJ9sFef
  14.104 -Qv5qjYiBUhB+7uGMvRifvO+bT+8q44IS7z/bdXJFjbImgtx57yKvujyvrZlDe6q3
  14.105 -1nzS1jqMQ8NCDP/CKs5WUlaH9LIQ/NWF10EulTjaZ0QZ6iNU0MTqmhs4ZJIsPmBo
  14.106 -g6Qz9x8imV37cC9lHhw/vp99Dal9YulTxdYZnWSfTh289bHqaMEXGYJUsDh3IEYx
  14.107 -UP1bzza+N2dqeiysDmeTNhbZvwk54VmaKMrj/ut/3WIrsulBY7YxE/azle78Ydab
  14.108 -/tKu5YUbVydnVJ6y1s4yASjaOG7ycMIaXggWKUIfWh5Y7BLFHYbcMMltPrspftW7
  14.109 -tjtbL1SUHw0NTfCkBqRv4GpvIAXTCmlxvLw//ee1JZ0nuLnQZBF2GQ0wJVsbunT9
  14.110 -dUschdnIWLfWlueldt+5wOkB6L4quoZ7LWefMQu/b3bg/GWoBtuC3fJDnCsbJO07
  14.111 -nJxZTPxsI3iFUGGtXkg4jGC+yDMlQu3a7LwEkKzx9LT/S1OUndpaBQr6YjyrnET6
  14.112 -w1Hz6jLb5t/2fzrBwkKw1TCu4+pkevIGaGxgQY6TB15jcmWRkUF3sakTrH0UOCSq
  14.113 -wEzFoPF4+WjtXNk/wHw8zkrW7QCe+wbjLjwcUUK/ulKT9/II/k/aUwTt+GzWCGVq
  14.114 -KWq7VLtwa8lrJ74R+XISks9/Hv/nJ8Ay1DfpcQU2HQSnQpSrXupXIA+VoHU/b8xD
  14.115 -YcgqaRKsGYHUANjNs4PpplXlEHp5bpF/ZOpfVAJNnGQ96Cj182DLQgiB0j7Ishjv
  14.116 -XoNDVL45KKW0uWjimZbCauWrD6tjZfBmydymezbPLCB9R+tE68TA/XmpXzInXWML
  14.117 -YDK7tS8TYEkodzSkfDeB7BtXBRIxH4vm2M0E0OdJuLxjrOYeIH4xToUslS9pdog0
  14.118 -z3aqPQbXF4hFc8Fso83dmoc26mQd3H0LrP7yF4HR
  14.119 -=gLhG
  14.120 ------END PGP MESSAGE-----
  14.121 -
  14.122 ---hcW81WNiFhQC1SNIcls8J07V1b1sXtfCA--
    15.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    15.2 +++ b/test/test_mails/pEp_subject_normal_signed_2a.eml	Wed Sep 13 02:00:36 2017 +0200
    15.3 @@ -0,0 +1,119 @@
    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 768301C00BC
    15.9 +	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:26:24 +0200 (CEST)
   15.10 +Received: by vmmailrelay1.informatik.tu-muenchen.de (Postfix, from userid 109)
   15.11 +	id 4DD7D1C0383; Mon, 12 Jun 2017 15:26:25 +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 2AD621C037C
   15.14 +	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:26:25 +0200 (CEST)
   15.15 +Received: from vmmaildmz2.informatik.tu-muenchen.de (vmmaildmz2.informatik.tu-muenchen.de [131.159.0.88])
   15.16 +	by vmmailrelay1.informatik.tu-muenchen.de (Postfix) with ESMTP id 15DA11C037A
   15.17 +	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:26:25 +0200 (CEST)
   15.18 +Received: by vmmaildmz2.informatik.tu-muenchen.de (Postfix, from userid 109)
   15.19 +	id 13FCC1C2AE2; Mon, 12 Jun 2017 15:26:25 +0200 (CEST)
   15.20 +X-Spam-Checker-Version: SpamAssassin 3.4.0-tuminfo_1 (2014-02-07) on
   15.21 +	vmmaildmz2.informatik.tu-muenchen.de
   15.22 +X-Spam-Level: 
   15.23 +X-Spam-Status: No, score=-2.6 required=7.0 tests=AWL,BAYES_00,
   15.24 +	ENCRYPTED_MESSAGE,RCVD_IN_DNSWL_LOW,TVD_RCVD_SPACE_BRACKET,UNPARSEABLE_RELAY
   15.25 +	autolearn=no autolearn_force=no version=3.4.0-tuminfo_1
   15.26 +Received: from vmmaildmz2.informatik.tu-muenchen.de (localhost [127.0.0.1])
   15.27 +	by vmmaildmz2.informatik.tu-muenchen.de (Postfix) with ESMTP id 953971C2AE1
   15.28 +	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:26:23 +0200 (CEST)
   15.29 +Received: from mi4-p00-ob.smtp.rzone.de (mi4-p00-ob.smtp.rzone.de [81.169.146.144])
   15.30 +	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
   15.31 +	(No client certificate requested)
   15.32 +	by vmmaildmz2.informatik.tu-muenchen.de (Postfix) with ESMTPS id 8540A1C2AE0
   15.33 +	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:26:23 +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:26:02 +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 v06d9ft5CDQ2Xj1
   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:26:02 +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 BEAA21013AE47
   15.62 +	for <pep.test.recip@kgrothoff.org>; Mon, 12 Jun 2017 15:25:56 +0200 (CEST)
   15.63 +To: pep.test.recip@kgrothoff.org
   15.64 +Reply-To: krista@pep-project.org
   15.65 +From: pEp Test Alice <pep.test.alice@pep-project.org>
   15.66 +Subject: pEp
   15.67 +Organization: pEp
   15.68 +Message-ID: <988e71f4-df80-906e-8bbb-68d48069d4ac@pep-project.org>
   15.69 +Date: Mon, 12 Jun 2017 15:25:56 +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: multipart/encrypted;
   15.74 + protocol="application/pgp-encrypted";
   15.75 + boundary="hcW81WNiFhQC1SNIcls8J07V1b1sXtfCA"
   15.76 +
   15.77 +This is an OpenPGP/MIME encrypted message (RFC 4880 and 3156)
   15.78 +--hcW81WNiFhQC1SNIcls8J07V1b1sXtfCA
   15.79 +Content-Type: application/pgp-encrypted
   15.80 +Content-Description: PGP/MIME version identification
   15.81 +
   15.82 +Version: 1
   15.83 +
   15.84 +--hcW81WNiFhQC1SNIcls8J07V1b1sXtfCA
   15.85 +Content-Type: application/octet-stream; name="encrypted.asc"
   15.86 +Content-Description: OpenPGP encrypted message
   15.87 +Content-Disposition: inline; filename="encrypted.asc"
   15.88 +
   15.89 +-----BEGIN PGP MESSAGE-----
   15.90 +
   15.91 +hQEMA4FHqvEumyRHAQf+OCG4FM0n6pVREVP2kAUzJWy6NAgRYs4cj7pr5hDoUqZY
   15.92 +lBIfVPqNM2rG2xaSpNLfe1iY5mySKL42M+s/QM0cvfnOlS6p3U58EamslElZ9UhD
   15.93 +hBUrX/1NJwdoKyR07Wq3A1UFFYQMYsszPwoC82SCFOhYjEmdZ8/nppViUk3aAUvq
   15.94 +do80ZzvNnlJqgwPEUmMEy9p19XJxQQwG75yHmUsoTvgi9ELvJpEzAjeYFABNzuNE
   15.95 +lh5whuMqmVbEafAYtopB+dwxQxSUdQUHntLU2MrbH8QXGtP98ZaDTHg/Zj24zkUG
   15.96 +Ur/5DZJgzDMrAttorpp/2/NMmakIezy7JaoGQtyYRYUBDANaAgXZcwg/TQEIALLR
   15.97 +7OlIlUYelrktOnrkTy8BrrEuUj95uBM5TkkvWIfR2b3ylC5iWwa/RlIU4RC0VH3j
   15.98 +epwLQNJJKFi/qKwxReE+RMKZW00loUuYnVWeaj58ExTNsdpFJDut35AIp8FNzTmy
   15.99 +C4xv5VVZZnolRd6CW0GUuxEe1zXq1MiyuGHu5AwFgWl728KaRXF2tEVyrQt/okXx
  15.100 +kF7yWkO4oo25VZWCrboUc1FND/7dbfP/PtLKIj05l+xwNaIEt1gb1IM7SxjN+2Tx
  15.101 +Ayp/w1npFhugBkSV3JaIk9dfHpMlLP5URZn30dXElK0an7aB8IwZWwdObo4zlevI
  15.102 +K4nN+UU1Z/kN1guxYDbS6QGOo2Y8829kaOXkBC3HDQEkef631jj1FuVB6VJvhb0u
  15.103 +5EKaxyw8aVxodRQaK9CcKCqwDlnyhHqd4fdMjPk9zTV9xrnqSdC5yKoAhBJ9sFef
  15.104 +Qv5qjYiBUhB+7uGMvRifvO+bT+8q44IS7z/bdXJFjbImgtx57yKvujyvrZlDe6q3
  15.105 +1nzS1jqMQ8NCDP/CKs5WUlaH9LIQ/NWF10EulTjaZ0QZ6iNU0MTqmhs4ZJIsPmBo
  15.106 +g6Qz9x8imV37cC9lHhw/vp99Dal9YulTxdYZnWSfTh289bHqaMEXGYJUsDh3IEYx
  15.107 +UP1bzza+N2dqeiysDmeTNhbZvwk54VmaKMrj/ut/3WIrsulBY7YxE/azle78Ydab
  15.108 +/tKu5YUbVydnVJ6y1s4yASjaOG7ycMIaXggWKUIfWh5Y7BLFHYbcMMltPrspftW7
  15.109 +tjtbL1SUHw0NTfCkBqRv4GpvIAXTCmlxvLw//ee1JZ0nuLnQZBF2GQ0wJVsbunT9
  15.110 +dUschdnIWLfWlueldt+5wOkB6L4quoZ7LWefMQu/b3bg/GWoBtuC3fJDnCsbJO07
  15.111 +nJxZTPxsI3iFUGGtXkg4jGC+yDMlQu3a7LwEkKzx9LT/S1OUndpaBQr6YjyrnET6
  15.112 +w1Hz6jLb5t/2fzrBwkKw1TCu4+pkevIGaGxgQY6TB15jcmWRkUF3sakTrH0UOCSq
  15.113 +wEzFoPF4+WjtXNk/wHw8zkrW7QCe+wbjLjwcUUK/ulKT9/II/k/aUwTt+GzWCGVq
  15.114 +KWq7VLtwa8lrJ74R+XISks9/Hv/nJ8Ay1DfpcQU2HQSnQpSrXupXIA+VoHU/b8xD
  15.115 +YcgqaRKsGYHUANjNs4PpplXlEHp5bpF/ZOpfVAJNnGQ96Cj182DLQgiB0j7Ishjv
  15.116 +XoNDVL45KKW0uWjimZbCauWrD6tjZfBmydymezbPLCB9R+tE68TA/XmpXzInXWML
  15.117 +YDK7tS8TYEkodzSkfDeB7BtXBRIxH4vm2M0E0OdJuLxjrOYeIH4xToUslS9pdog0
  15.118 +z3aqPQbXF4hFc8Fso83dmoc26mQd3H0LrP7yF4HR
  15.119 +=gLhG
  15.120 +-----END PGP MESSAGE-----
  15.121 +
  15.122 +--hcW81WNiFhQC1SNIcls8J07V1b1sXtfCA--
    16.1 --- a/test/test_mails/pEp_subject_normal_unencrypted.eml	Tue Sep 12 19:17:44 2017 +0200
    16.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    16.3 @@ -1,75 +0,0 @@
    16.4 -Return-Path: <pep.test.alice@pep-project.org>
    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 140C01C00BC
    16.9 -	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:27:21 +0200 (CEST)
   16.10 -Received: by vmmailrelay1.informatik.tu-muenchen.de (Postfix, from userid 109)
   16.11 -	id DAE901C0390; Mon, 12 Jun 2017 15:27:21 +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 B86091C0383
   16.14 -	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:27:21 +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 AE13F1C037A
   16.17 -	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:27:21 +0200 (CEST)
   16.18 -Received: by vmmaildmz1.informatik.tu-muenchen.de (Postfix, from userid 109)
   16.19 -	id AC51F1C2D9F; Mon, 12 Jun 2017 15:27:21 +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=-3.1 required=7.0 tests=AWL,BAYES_00,
   16.24 -	RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,TVD_RCVD_SPACE_BRACKET,
   16.25 -	UNPARSEABLE_RELAY autolearn=no autolearn_force=no version=3.4.0-tuminfo_1
   16.26 -Received: from vmmaildmz1.informatik.tu-muenchen.de (localhost [127.0.0.1])
   16.27 -	by vmmaildmz1.informatik.tu-muenchen.de (Postfix) with ESMTP id 3B30C1C2D9E
   16.28 -	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:27:20 +0200 (CEST)
   16.29 -Received: from mi4-p00-ob.smtp.rzone.de (mi4-p00-ob.smtp.rzone.de [81.169.146.148])
   16.30 -	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
   16.31 -	(No client certificate requested)
   16.32 -	by vmmaildmz1.informatik.tu-muenchen.de (Postfix) with ESMTPS id 2AEF61C2D9B
   16.33 -	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:27:20 +0200 (CEST)
   16.34 -X-RZG-FWD-BY: pep.test.recip@kgrothoff.org
   16.35 -Received: from mailin.rzone.de ([unix socket])
   16.36 -	by mailin.rzone.de (RZmta 40.9) with LMTPA;
   16.37 -	Mon, 12 Jun 2017 15:27:00 +0200 (CEST)
   16.38 -Authentication-Results: strato.com 1;
   16.39 -	spf=none
   16.40 -		smtp.mailfrom="pep.test.alice@pep-project.org";
   16.41 -	dkim=none;
   16.42 -	domainkeys=none;
   16.43 -	dkim-adsp=none
   16.44 -		header.from="pep.test.alice@pep-project.org"
   16.45 -X-Strato-MessageType: email
   16.46 -X-RZG-CLASS-ID: mi00
   16.47 -Received-SPF: none
   16.48 -	client-ip=131.159.0.8;
   16.49 -	helo="mail-out1.informatik.tu-muenchen.de";
   16.50 -	envelope-from="pep.test.alice@pep-project.org";
   16.51 -	receiver=smtpin.rzone.de;
   16.52 -	identity=mailfrom;
   16.53 -Received: from mail-out1.informatik.tu-muenchen.de ([131.159.0.8])
   16.54 -	by smtpin.rzone.de (RZmta 40.9 OK)
   16.55 -	with ESMTPS id T01d0bt5CDR0XKI
   16.56 -	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (curve secp521r1 with 521 ECDH bits, eq. 15360 bits RSA))
   16.57 -	(Client did not present a certificate)
   16.58 -	for <pep.test.recip@kgrothoff.org>;
   16.59 -	Mon, 12 Jun 2017 15:27:00 +0200 (CEST)
   16.60 -Received: from [192.168.178.22] (ip5f584089.dynamic.kabel-deutschland.de [95.88.64.137])
   16.61 -	by services.sec.in.tum.de (Postfix) with ESMTPSA id 1DF211013AE47
   16.62 -	for <pep.test.recip@kgrothoff.org>; Mon, 12 Jun 2017 15:26:55 +0200 (CEST)
   16.63 -Reply-To: krista@pep-project.org
   16.64 -To: pep.test.recip@kgrothoff.org
   16.65 -From: pEp Test Alice <pep.test.alice@pep-project.org>
   16.66 -Subject: pEp
   16.67 -Organization: pEp
   16.68 -Message-ID: <6205efbe-684d-9f21-8a2e-887d46a145e6@pep-project.org>
   16.69 -Date: Mon, 12 Jun 2017 15:26:54 +0200
   16.70 -User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101
   16.71 - Thunderbird/45.8.0
   16.72 -MIME-Version: 1.0
   16.73 -Content-Type: text/plain; charset=utf-8
   16.74 -Content-Transfer-Encoding: 7bit
   16.75 -
   16.76 -Subject: Unencrypted try...
   16.77 -
   16.78 -La la la...
    17.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    17.2 +++ b/test/test_mails/pEp_subject_normal_unencrypted_6.eml	Wed Sep 13 02:00:36 2017 +0200
    17.3 @@ -0,0 +1,75 @@
    17.4 +Return-Path: <pep.test.alice@pep-project.org>
    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 140C01C00BC
    17.9 +	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:27:21 +0200 (CEST)
   17.10 +Received: by vmmailrelay1.informatik.tu-muenchen.de (Postfix, from userid 109)
   17.11 +	id DAE901C0390; Mon, 12 Jun 2017 15:27:21 +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 B86091C0383
   17.14 +	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:27:21 +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 AE13F1C037A
   17.17 +	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:27:21 +0200 (CEST)
   17.18 +Received: by vmmaildmz1.informatik.tu-muenchen.de (Postfix, from userid 109)
   17.19 +	id AC51F1C2D9F; Mon, 12 Jun 2017 15:27:21 +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=-3.1 required=7.0 tests=AWL,BAYES_00,
   17.24 +	RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,TVD_RCVD_SPACE_BRACKET,
   17.25 +	UNPARSEABLE_RELAY autolearn=no autolearn_force=no version=3.4.0-tuminfo_1
   17.26 +Received: from vmmaildmz1.informatik.tu-muenchen.de (localhost [127.0.0.1])
   17.27 +	by vmmaildmz1.informatik.tu-muenchen.de (Postfix) with ESMTP id 3B30C1C2D9E
   17.28 +	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:27:20 +0200 (CEST)
   17.29 +Received: from mi4-p00-ob.smtp.rzone.de (mi4-p00-ob.smtp.rzone.de [81.169.146.148])
   17.30 +	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
   17.31 +	(No client certificate requested)
   17.32 +	by vmmaildmz1.informatik.tu-muenchen.de (Postfix) with ESMTPS id 2AEF61C2D9B
   17.33 +	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:27:20 +0200 (CEST)
   17.34 +X-RZG-FWD-BY: pep.test.recip@kgrothoff.org
   17.35 +Received: from mailin.rzone.de ([unix socket])
   17.36 +	by mailin.rzone.de (RZmta 40.9) with LMTPA;
   17.37 +	Mon, 12 Jun 2017 15:27:00 +0200 (CEST)
   17.38 +Authentication-Results: strato.com 1;
   17.39 +	spf=none
   17.40 +		smtp.mailfrom="pep.test.alice@pep-project.org";
   17.41 +	dkim=none;
   17.42 +	domainkeys=none;
   17.43 +	dkim-adsp=none
   17.44 +		header.from="pep.test.alice@pep-project.org"
   17.45 +X-Strato-MessageType: email
   17.46 +X-RZG-CLASS-ID: mi00
   17.47 +Received-SPF: none
   17.48 +	client-ip=131.159.0.8;
   17.49 +	helo="mail-out1.informatik.tu-muenchen.de";
   17.50 +	envelope-from="pep.test.alice@pep-project.org";
   17.51 +	receiver=smtpin.rzone.de;
   17.52 +	identity=mailfrom;
   17.53 +Received: from mail-out1.informatik.tu-muenchen.de ([131.159.0.8])
   17.54 +	by smtpin.rzone.de (RZmta 40.9 OK)
   17.55 +	with ESMTPS id T01d0bt5CDR0XKI
   17.56 +	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (curve secp521r1 with 521 ECDH bits, eq. 15360 bits RSA))
   17.57 +	(Client did not present a certificate)
   17.58 +	for <pep.test.recip@kgrothoff.org>;
   17.59 +	Mon, 12 Jun 2017 15:27:00 +0200 (CEST)
   17.60 +Received: from [192.168.178.22] (ip5f584089.dynamic.kabel-deutschland.de [95.88.64.137])
   17.61 +	by services.sec.in.tum.de (Postfix) with ESMTPSA id 1DF211013AE47
   17.62 +	for <pep.test.recip@kgrothoff.org>; Mon, 12 Jun 2017 15:26:55 +0200 (CEST)
   17.63 +Reply-To: krista@pep-project.org
   17.64 +To: pep.test.recip@kgrothoff.org
   17.65 +From: pEp Test Alice <pep.test.alice@pep-project.org>
   17.66 +Subject: This is just a normal subject, really
   17.67 +Organization: pEp
   17.68 +Message-ID: <6205efbe-684d-9f21-8a2e-887d46a145e6@pep-project.org>
   17.69 +Date: Mon, 12 Jun 2017 15:26:54 +0200
   17.70 +User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101
   17.71 + Thunderbird/45.8.0
   17.72 +MIME-Version: 1.0
   17.73 +Content-Type: text/plain; charset=utf-8
   17.74 +Content-Transfer-Encoding: 7bit
   17.75 +
   17.76 +Subject: Unencrypted try...
   17.77 +
   17.78 +La la la...
    18.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    18.2 +++ b/test/test_mails/pEp_subject_p3p_replaced_w_p3p_4d.eml	Wed Sep 13 02:00:36 2017 +0200
    18.3 @@ -0,0 +1,113 @@
    18.4 +Return-Path: <SRS0=ne/EAk=AN=pep-project.org=pep.test.alice@srs.smtpin.rzone.de>
    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 1FEF71C00BC
    18.9 +	for <krista@gnunet.org>; Tue, 12 Sep 2017 17:29:07 +0200 (CEST)
   18.10 +Received: by vmmailrelay1.informatik.tu-muenchen.de (Postfix, from userid 109)
   18.11 +	id 3444A1C1133; Tue, 12 Sep 2017 17:29:07 +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 11D9E1C089D
   18.14 +	for <krista@gnunet.org>; Tue, 12 Sep 2017 17:29:07 +0200 (CEST)
   18.15 +Received: from vmmaildmz1.informatik.tu-muenchen.de (vmmaildmz1.informatik.tu-muenchen.de [131.159.0.87])
   18.16 +	by vmmailrelay1.informatik.tu-muenchen.de (Postfix) with ESMTP id F14C51C0E06
   18.17 +	for <krista@gnunet.org>; Tue, 12 Sep 2017 17:29:06 +0200 (CEST)
   18.18 +Received: by vmmaildmz1.informatik.tu-muenchen.de (Postfix, from userid 109)
   18.19 +	id EFDB11C2DCE; Tue, 12 Sep 2017 17:29:06 +0200 (CEST)
   18.20 +X-Spam-Checker-Version: SpamAssassin 3.4.0-tuminfo_1 (2014-02-07) on
   18.21 +	vmmaildmz1.informatik.tu-muenchen.de
   18.22 +X-Spam-Level: 
   18.23 +X-Spam-Status: No, score=-2.0 required=7.0 tests=AWL,BAYES_00,BODY_EMPTY,
   18.24 +	ENCRYPTED_MESSAGE,RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,
   18.25 +	SPF_HELO_PASS,TVD_RCVD_SPACE_BRACKET,UNPARSEABLE_RELAY autolearn=no
   18.26 +	autolearn_force=no version=3.4.0-tuminfo_1
   18.27 +Received: from vmmaildmz1.informatik.tu-muenchen.de (localhost [127.0.0.1])
   18.28 +	by vmmaildmz1.informatik.tu-muenchen.de (Postfix) with ESMTP id 0C4521C2DCE
   18.29 +	for <krista@gnunet.org>; Tue, 12 Sep 2017 17:29:05 +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 vmmaildmz1.informatik.tu-muenchen.de (Postfix) with ESMTPS id EF5321C2D88
   18.34 +	for <krista@gnunet.org>; Tue, 12 Sep 2017 17:29:04 +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 41.4) with LMTPA;
   18.38 +	Tue, 12 Sep 2017 17:28:41 +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 41.4 OK)
   18.56 +	with ESMTPS id v031a7t8CFSf6GR
   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 +	Tue, 12 Sep 2017 17:28:41 +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 E252F10C75356
   18.63 +	for <pep.test.recip@kgrothoff.org>; Tue, 12 Sep 2017 17:28:35 +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: =?utf-8?Q?p=E2=89=A1p?=
   18.68 +Organization: pEp
   18.69 +Message-ID: <f80baf8e-0323-8be7-be21-b3ecaade6a2a@pep-project.org>
   18.70 +Date: Tue, 12 Sep 2017 17:28:35 +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="k1bsDcHaNcB6liQG9AJTIgqMMmV6ukLr4"
   18.77 +
   18.78 +This is an OpenPGP/MIME encrypted message (RFC 4880 and 3156)
   18.79 +--k1bsDcHaNcB6liQG9AJTIgqMMmV6ukLr4
   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 +--k1bsDcHaNcB6liQG9AJTIgqMMmV6ukLr4
   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 +hQEMA4FHqvEumyRHAQf/UgdO9gLH0rwZZWqiy40V0pOlgI8+DCBpL8CvSROeEBcS
   18.93 +ELmLjpUb2tO58upJ8XYIFCbOGEufnEvaa0XcHnQSw0F8Rsenjs8MstSNKu2/1Snm
   18.94 +1qD5ephHgBTCPW6NbXY69e30HpbtHwf1Eh+NWIzrzy74i96pFfeXcRWQX5ykOM0U
   18.95 +zW+82/Ztt9CgB23PtDuRQ8gh2Y9Hq91MB0DbtwzL+KZDAWHEVRPqSSfc6e9VzHP8
   18.96 +rkzyfx+BF9nE/oJYwSevQ5R797cnpwHOIVpcmMJjtR+yA+7EVQd0FlSHGnXMjMY/
   18.97 +Qkp/zLCuEfAHVN/P91GKjtVO1CrcRjqbOdcIkh57FYUBDANaAgXZcwg/TQEH/AgN
   18.98 +CSYGTPZSoSLqcog+jTzZACeuy/a5SvuDPBTklqaaFolutvEj4mprHzUASLYSIJW2
   18.99 +P3o2sv+F1SoqCYgfi/77LAGaztXQECsH2zTvTG5Ax7tM97VMZpIc405btPGAGaxc
  18.100 +MUZ2SwivrPDWPFZgEU05gc8UOasKjxX7C9+hxNTppEgtJsM+bZHYnvjbaeZz/kGZ
  18.101 +P17qhHDVrtWVdsF9qGRQY5CMe/hByKTRVL2T1/FimVX/f1EbN/FB/bxX44rmKROc
  18.102 +r8TsOBamW50xMthspZl/w5G81XwtWIDc4XUx8lgtcKo3yLrcbq2Za2LDixT23J3f
  18.103 +bnH17pLOTOlZyKAdZ5zSwQwBvycuQ1nTUkXqhWKB8++wvhp77ILbxp0n/F+BiIHv
  18.104 +SRTT5YIZH8tVnPftmlMcANoUhW0fJOAfVexErO/QjJubXy7Ofc5QAjmsfnU2gX0f
  18.105 +A0+nN9zH2x7X+QbtxNTw0/3r2zE28VhZAZYblHqcVvtDXPuylM3/N0+gDIk8WDyb
  18.106 +KzdwH3TWefvG3Ec4+s7heZpQ+ZHHXolmwYRsGqT+TKeJoZ+cjFEOl4kJsd/K7nCs
  18.107 +v75BjqAl3ebZbncYlCNdLkjyrPifnjBJFURQP4aj3lhRNnMQfyS1dAxPcyq/eCjA
  18.108 +MFuixwFbAQbN63M/rT0ISYtf1KTO14ov7JSVUHZJZPFLU9tuewOMukLybAsXAf1h
  18.109 +YyMUsdvsWVdjzGA4MA652hYcQ4nypwyYfaojIm6so5VNlHu0IUPIN5mcNGkhFve2
  18.110 +VgvDC3/T9pwz7Y8iiLtgWbJQAUOCSpxuV06URG2vvZuUrK8fB4LfNdJk+leVHirh
  18.111 +3L5DehtOnhl/P76mYmQ7V/U1revhDmkDJ5qQ3k9mnhwdUqsJ9w5mBh+DTUrS5ZOl
  18.112 +1PjiqosaRnygOlYV6TGm7JA52QBl7bkvofb96aG7VHIg4/z30VI24QhBrHWq
  18.113 +=O8A4
  18.114 +-----END PGP MESSAGE-----
  18.115 +
  18.116 +--k1bsDcHaNcB6liQG9AJTIgqMMmV6ukLr4--
    19.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    19.2 +++ b/test/test_mails/pEp_subject_p3p_replaced_w_pEp_4c.eml	Wed Sep 13 02:00:36 2017 +0200
    19.3 @@ -0,0 +1,113 @@
    19.4 +Return-Path: <SRS0=ne/EAk=AN=pep-project.org=pep.test.alice@srs.smtpin.rzone.de>
    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 1FEF71C00BC
    19.9 +	for <krista@gnunet.org>; Tue, 12 Sep 2017 17:29:07 +0200 (CEST)
   19.10 +Received: by vmmailrelay1.informatik.tu-muenchen.de (Postfix, from userid 109)
   19.11 +	id 3444A1C1133; Tue, 12 Sep 2017 17:29:07 +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 11D9E1C089D
   19.14 +	for <krista@gnunet.org>; Tue, 12 Sep 2017 17:29:07 +0200 (CEST)
   19.15 +Received: from vmmaildmz1.informatik.tu-muenchen.de (vmmaildmz1.informatik.tu-muenchen.de [131.159.0.87])
   19.16 +	by vmmailrelay1.informatik.tu-muenchen.de (Postfix) with ESMTP id F14C51C0E06
   19.17 +	for <krista@gnunet.org>; Tue, 12 Sep 2017 17:29:06 +0200 (CEST)
   19.18 +Received: by vmmaildmz1.informatik.tu-muenchen.de (Postfix, from userid 109)
   19.19 +	id EFDB11C2DCE; Tue, 12 Sep 2017 17:29:06 +0200 (CEST)
   19.20 +X-Spam-Checker-Version: SpamAssassin 3.4.0-tuminfo_1 (2014-02-07) on
   19.21 +	vmmaildmz1.informatik.tu-muenchen.de
   19.22 +X-Spam-Level: 
   19.23 +X-Spam-Status: No, score=-2.0 required=7.0 tests=AWL,BAYES_00,BODY_EMPTY,
   19.24 +	ENCRYPTED_MESSAGE,RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,
   19.25 +	SPF_HELO_PASS,TVD_RCVD_SPACE_BRACKET,UNPARSEABLE_RELAY autolearn=no
   19.26 +	autolearn_force=no version=3.4.0-tuminfo_1
   19.27 +Received: from vmmaildmz1.informatik.tu-muenchen.de (localhost [127.0.0.1])
   19.28 +	by vmmaildmz1.informatik.tu-muenchen.de (Postfix) with ESMTP id 0C4521C2DCE
   19.29 +	for <krista@gnunet.org>; Tue, 12 Sep 2017 17:29:05 +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 vmmaildmz1.informatik.tu-muenchen.de (Postfix) with ESMTPS id EF5321C2D88
   19.34 +	for <krista@gnunet.org>; Tue, 12 Sep 2017 17:29:04 +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 41.4) with LMTPA;
   19.38 +	Tue, 12 Sep 2017 17:28:41 +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 41.4 OK)
   19.56 +	with ESMTPS id v031a7t8CFSf6GR
   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 +	Tue, 12 Sep 2017 17:28:41 +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 E252F10C75356
   19.63 +	for <pep.test.recip@kgrothoff.org>; Tue, 12 Sep 2017 17:28:35 +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: pEp
   19.68 +Organization: pEp
   19.69 +Message-ID: <f80baf8e-0323-8be7-be21-b3ecaade6a2a@pep-project.org>
   19.70 +Date: Tue, 12 Sep 2017 17:28:35 +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="k1bsDcHaNcB6liQG9AJTIgqMMmV6ukLr4"
   19.77 +
   19.78 +This is an OpenPGP/MIME encrypted message (RFC 4880 and 3156)
   19.79 +--k1bsDcHaNcB6liQG9AJTIgqMMmV6ukLr4
   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 +--k1bsDcHaNcB6liQG9AJTIgqMMmV6ukLr4
   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 +hQEMA4FHqvEumyRHAQf/UgdO9gLH0rwZZWqiy40V0pOlgI8+DCBpL8CvSROeEBcS
   19.93 +ELmLjpUb2tO58upJ8XYIFCbOGEufnEvaa0XcHnQSw0F8Rsenjs8MstSNKu2/1Snm
   19.94 +1qD5ephHgBTCPW6NbXY69e30HpbtHwf1Eh+NWIzrzy74i96pFfeXcRWQX5ykOM0U
   19.95 +zW+82/Ztt9CgB23PtDuRQ8gh2Y9Hq91MB0DbtwzL+KZDAWHEVRPqSSfc6e9VzHP8
   19.96 +rkzyfx+BF9nE/oJYwSevQ5R797cnpwHOIVpcmMJjtR+yA+7EVQd0FlSHGnXMjMY/
   19.97 +Qkp/zLCuEfAHVN/P91GKjtVO1CrcRjqbOdcIkh57FYUBDANaAgXZcwg/TQEH/AgN
   19.98 +CSYGTPZSoSLqcog+jTzZACeuy/a5SvuDPBTklqaaFolutvEj4mprHzUASLYSIJW2
   19.99 +P3o2sv+F1SoqCYgfi/77LAGaztXQECsH2zTvTG5Ax7tM97VMZpIc405btPGAGaxc
  19.100 +MUZ2SwivrPDWPFZgEU05gc8UOasKjxX7C9+hxNTppEgtJsM+bZHYnvjbaeZz/kGZ
  19.101 +P17qhHDVrtWVdsF9qGRQY5CMe/hByKTRVL2T1/FimVX/f1EbN/FB/bxX44rmKROc
  19.102 +r8TsOBamW50xMthspZl/w5G81XwtWIDc4XUx8lgtcKo3yLrcbq2Za2LDixT23J3f
  19.103 +bnH17pLOTOlZyKAdZ5zSwQwBvycuQ1nTUkXqhWKB8++wvhp77ILbxp0n/F+BiIHv
  19.104 +SRTT5YIZH8tVnPftmlMcANoUhW0fJOAfVexErO/QjJubXy7Ofc5QAjmsfnU2gX0f
  19.105 +A0+nN9zH2x7X+QbtxNTw0/3r2zE28VhZAZYblHqcVvtDXPuylM3/N0+gDIk8WDyb
  19.106 +KzdwH3TWefvG3Ec4+s7heZpQ+ZHHXolmwYRsGqT+TKeJoZ+cjFEOl4kJsd/K7nCs
  19.107 +v75BjqAl3ebZbncYlCNdLkjyrPifnjBJFURQP4aj3lhRNnMQfyS1dAxPcyq/eCjA
  19.108 +MFuixwFbAQbN63M/rT0ISYtf1KTO14ov7JSVUHZJZPFLU9tuewOMukLybAsXAf1h
  19.109 +YyMUsdvsWVdjzGA4MA652hYcQ4nypwyYfaojIm6so5VNlHu0IUPIN5mcNGkhFve2
  19.110 +VgvDC3/T9pwz7Y8iiLtgWbJQAUOCSpxuV06URG2vvZuUrK8fB4LfNdJk+leVHirh
  19.111 +3L5DehtOnhl/P76mYmQ7V/U1revhDmkDJ5qQ3k9mnhwdUqsJ9w5mBh+DTUrS5ZOl
  19.112 +1PjiqosaRnygOlYV6TGm7JA52QBl7bkvofb96aG7VHIg4/z30VI24QhBrHWq
  19.113 +=O8A4
  19.114 +-----END PGP MESSAGE-----
  19.115 +
  19.116 +--k1bsDcHaNcB6liQG9AJTIgqMMmV6ukLr4--
    20.1 --- a/test/test_mails/pEp_subject_pEp.eml	Tue Sep 12 19:17:44 2017 +0200
    20.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    20.3 @@ -1,120 +0,0 @@
    20.4 -Return-Path: <pep.test.alice@pep-project.org>
    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 1C8731C00BC
    20.9 -	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:28:42 +0200 (CEST)
   20.10 -Received: by vmmailrelay1.informatik.tu-muenchen.de (Postfix, from userid 109)
   20.11 -	id E78B01C0383; Mon, 12 Jun 2017 15:28:42 +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 C414C1C037C
   20.14 -	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:28:42 +0200 (CEST)
   20.15 -Received: from vmmaildmz2.informatik.tu-muenchen.de (vmmaildmz2.informatik.tu-muenchen.de [131.159.0.88])
   20.16 -	by vmmailrelay1.informatik.tu-muenchen.de (Postfix) with ESMTP id AFA401C037A
   20.17 -	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:28:42 +0200 (CEST)
   20.18 -Received: by vmmaildmz2.informatik.tu-muenchen.de (Postfix, from userid 109)
   20.19 -	id AE03E1C2AE1; Mon, 12 Jun 2017 15:28:42 +0200 (CEST)
   20.20 -X-Spam-Checker-Version: SpamAssassin 3.4.0-tuminfo_1 (2014-02-07) on
   20.21 -	vmmaildmz2.informatik.tu-muenchen.de
   20.22 -X-Spam-Level: 
   20.23 -X-Spam-Status: No, score=-2.9 required=7.0 tests=AWL,BAYES_00,
   20.24 -	ENCRYPTED_MESSAGE,RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,
   20.25 -	TVD_RCVD_SPACE_BRACKET,UNPARSEABLE_RELAY autolearn=no autolearn_force=no
   20.26 -	version=3.4.0-tuminfo_1
   20.27 -Received: from vmmaildmz2.informatik.tu-muenchen.de (localhost [127.0.0.1])
   20.28 -	by vmmaildmz2.informatik.tu-muenchen.de (Postfix) with ESMTP id 441B11C2AE0
   20.29 -	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:28:41 +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 vmmaildmz2.informatik.tu-muenchen.de (Postfix) with ESMTPS id 3420F1C2ADF
   20.34 -	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:28:41 +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 40.9) with LMTPA;
   20.38 -	Mon, 12 Jun 2017 15:28:27 +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 40.9 OK)
   20.56 -	with ESMTPS id R04db2t5CDSRaBk
   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 -	Mon, 12 Jun 2017 15:28:27 +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 E7A551013AE47
   20.63 -	for <pep.test.recip@kgrothoff.org>; Mon, 12 Jun 2017 15:28:20 +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: <1779982d-d48e-6d8c-2dcb-a2c337c496cb@pep-project.org>
   20.70 -Date: Mon, 12 Jun 2017 15:28:20 +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="xNhsqki3RTDSnTgiBbeAIkT3t5whv1bAM"
   20.77 -
   20.78 -This is an OpenPGP/MIME encrypted message (RFC 4880 and 3156)
   20.79 ---xNhsqki3RTDSnTgiBbeAIkT3t5whv1bAM
   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 ---xNhsqki3RTDSnTgiBbeAIkT3t5whv1bAM
   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 -hQEMA4FHqvEumyRHAQgAjsyn0zCm0jHAp+SshDzqhMFNPuRc8VhDK9DpxiA1jLy8
   20.93 -bH2CKJIZEWApyfmwX5xLEXhfr0wb4BthHDXLzHCDqLSFo5FoavTwNL44kaX83yPv
   20.94 -Ts2WrvOcXGRpNLD94tvyDBqngtk3yKYaSkKKPok4Ou5gHrIDJaNZf/mybmPa0aTX
   20.95 -BEOxgAaRZJoPhgeVF8/twwiDv+ixFtdnPx9gGUXvgc5tPyrIkFkWtwrsoS2RmtJT
   20.96 -QqdsMmPbTFrsZ+d7qhdkcedeoKRg84SlXgtFpXkkbKHB/NU2ZQ2h2xTeUqdkFGN7
   20.97 -vBv17C+5jv8wzYlrlni9P1Mbc+dVBZTal9gYtBGwxIUBDANaAgXZcwg/TQEH/0vs
   20.98 -xQCJEdqbHKLz+xOmrpQEoFLdf2W9B7z2jGQe9F0K+gnPE3E+1wVf/IQgLj4YDXtN
   20.99 -Gkzc6J3UPBN9b1WSTPcJQ47hU5IXO/Sb39dU9X1s01JtCorTKmHlefosg6YaZ8CX
  20.100 -OhTkGYHqcJa9xE8kOMi4xnhP2Z3xaSkPSQvQ4WDWSapOwDkcM2a59Nwbu5PIGZpj
  20.101 -FM9WVLawN1/SVbaKOUEhFKdbl7UYW64JNWE6ZaLa0sfigt4QaXd5GrQcP2vmVVGz
  20.102 -WOuCaEb/HnxgiUvLQI2tCnW8aWluc6PnNk3HwLydvCL0tHSXPJno4Wbs1GzRJ4G7
  20.103 -CleoojpLytgTfIlZ7anS6QEAXXAuWGT3jddP4hcTnsfX40bQnIH1m49RX/4OHuMY
  20.104 -n7RyzSfyVghBQeA3fEQ48ep3WHuFHEn0Kn9rvcr/JZRO2NM4nBv1FjOIBTUMTlX+
  20.105 -hf0F/mYz1ycNg/rt6Taf9xcIP0IzRfQEa/dFqnEnBYCxGvRSr+EnMzg+ETT1p+aa
  20.106 -YAyjsbikhOqmle9G4LFUyblMmIlwFvAklAAlXTUJAEn3pc5mxH6vz0JitDpLdFDM
  20.107 -pW51y0HYgUNKS+9+qoVK2WXhkK/+hCbLzWVwzN5FlsIPucH+L+afquR6W5IKA8uZ
  20.108 -ixDPokbP1H608f/TobwX988nWby54kihoxaMvmEDbqT5Ivi5hHDhj5e79mxhUoZx
  20.109 -wb6fsm+d2vewDRhSIUF6/iioPaQt2AhmHNMBUYS5RrlOY8mc9BP8PwKym5SgkpE4
  20.110 -NKxoMjbQwUi3SHseA1hluMBieV+d7nYHqwBtSgMC/ax/AcDwmoLusXlf3OiBytdL
  20.111 -2v4OtPu6kt/QIlEABEDlqDK70wM6BChzWYrc5ErsixZ9NHunNshAjYsVeNtStOFV
  20.112 -TPGiy7a8rKB3xJhqzZhhLh9ly8JxVNfkb2LVXP/yzBS8LJpCluzyXZZpH2Q2a8lP
  20.113 -t71tjf/R/Uff2ZeF5yWO7zldyoEfx00yQWDyfmM6zHm17moXH5Mql2ZvTI0C0mk6
  20.114 -wDYNVEFe9YIXvxhdu5ym67ba8t5eV2t3c4zdhFy5YHZOC/KvpcZBLcvLY2jgVmNr
  20.115 -UYNqKpGK9m03jHRT2ZuG6F19QrxKqUIvgnYWsenecCvjjOIcWH7KqqNp+d4RyNRr
  20.116 -4VyoJk9nxzlUT/wKQJ6d5OtY5wytCCxpv8ihBFS3R2f0Sk2yXOgKE2sq0DEicWe+
  20.117 -x8Yqg3C/47hrtiUnEwwmp3VEYHfBTaaXMUkpmoRJ066u+8K2Jfo/pQnX6vcyUpvY
  20.118 -tJNqH+SMYKMXVBigU0ayWQFwVcoNEqFNVTm9K3MBQlIQiYqumBptG8rYhzF/eSUC
  20.119 -doDA15Ibgsk=
  20.120 -=P9h8
  20.121 ------END PGP MESSAGE-----
  20.122 -
  20.123 ---xNhsqki3RTDSnTgiBbeAIkT3t5whv1bAM--
    21.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    21.2 +++ b/test/test_mails/pEp_subject_pEp_replaced_w_p3p_4b.eml	Wed Sep 13 02:00:36 2017 +0200
    21.3 @@ -0,0 +1,120 @@
    21.4 +Return-Path: <pep.test.alice@pep-project.org>
    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 1C8731C00BC
    21.9 +	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:28:42 +0200 (CEST)
   21.10 +Received: by vmmailrelay1.informatik.tu-muenchen.de (Postfix, from userid 109)
   21.11 +	id E78B01C0383; Mon, 12 Jun 2017 15:28:42 +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 C414C1C037C
   21.14 +	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:28:42 +0200 (CEST)
   21.15 +Received: from vmmaildmz2.informatik.tu-muenchen.de (vmmaildmz2.informatik.tu-muenchen.de [131.159.0.88])
   21.16 +	by vmmailrelay1.informatik.tu-muenchen.de (Postfix) with ESMTP id AFA401C037A
   21.17 +	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:28:42 +0200 (CEST)
   21.18 +Received: by vmmaildmz2.informatik.tu-muenchen.de (Postfix, from userid 109)
   21.19 +	id AE03E1C2AE1; Mon, 12 Jun 2017 15:28:42 +0200 (CEST)
   21.20 +X-Spam-Checker-Version: SpamAssassin 3.4.0-tuminfo_1 (2014-02-07) on
   21.21 +	vmmaildmz2.informatik.tu-muenchen.de
   21.22 +X-Spam-Level: 
   21.23 +X-Spam-Status: No, score=-2.9 required=7.0 tests=AWL,BAYES_00,
   21.24 +	ENCRYPTED_MESSAGE,RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,
   21.25 +	TVD_RCVD_SPACE_BRACKET,UNPARSEABLE_RELAY autolearn=no autolearn_force=no
   21.26 +	version=3.4.0-tuminfo_1
   21.27 +Received: from vmmaildmz2.informatik.tu-muenchen.de (localhost [127.0.0.1])
   21.28 +	by vmmaildmz2.informatik.tu-muenchen.de (Postfix) with ESMTP id 441B11C2AE0
   21.29 +	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:28:41 +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 vmmaildmz2.informatik.tu-muenchen.de (Postfix) with ESMTPS id 3420F1C2ADF
   21.34 +	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:28:41 +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 40.9) with LMTPA;
   21.38 +	Mon, 12 Jun 2017 15:28:27 +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 40.9 OK)
   21.56 +	with ESMTPS id R04db2t5CDSRaBk
   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 +	Mon, 12 Jun 2017 15:28:27 +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 E7A551013AE47
   21.63 +	for <pep.test.recip@kgrothoff.org>; Mon, 12 Jun 2017 15:28:20 +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: <1779982d-d48e-6d8c-2dcb-a2c337c496cb@pep-project.org>
   21.70 +Date: Mon, 12 Jun 2017 15:28:20 +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="xNhsqki3RTDSnTgiBbeAIkT3t5whv1bAM"
   21.77 +
   21.78 +This is an OpenPGP/MIME encrypted message (RFC 4880 and 3156)
   21.79 +--xNhsqki3RTDSnTgiBbeAIkT3t5whv1bAM
   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 +--xNhsqki3RTDSnTgiBbeAIkT3t5whv1bAM
   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 +hQEMA4FHqvEumyRHAQgAjsyn0zCm0jHAp+SshDzqhMFNPuRc8VhDK9DpxiA1jLy8
   21.93 +bH2CKJIZEWApyfmwX5xLEXhfr0wb4BthHDXLzHCDqLSFo5FoavTwNL44kaX83yPv
   21.94 +Ts2WrvOcXGRpNLD94tvyDBqngtk3yKYaSkKKPok4Ou5gHrIDJaNZf/mybmPa0aTX
   21.95 +BEOxgAaRZJoPhgeVF8/twwiDv+ixFtdnPx9gGUXvgc5tPyrIkFkWtwrsoS2RmtJT
   21.96 +QqdsMmPbTFrsZ+d7qhdkcedeoKRg84SlXgtFpXkkbKHB/NU2ZQ2h2xTeUqdkFGN7
   21.97 +vBv17C+5jv8wzYlrlni9P1Mbc+dVBZTal9gYtBGwxIUBDANaAgXZcwg/TQEH/0vs
   21.98 +xQCJEdqbHKLz+xOmrpQEoFLdf2W9B7z2jGQe9F0K+gnPE3E+1wVf/IQgLj4YDXtN
   21.99 +Gkzc6J3UPBN9b1WSTPcJQ47hU5IXO/Sb39dU9X1s01JtCorTKmHlefosg6YaZ8CX
  21.100 +OhTkGYHqcJa9xE8kOMi4xnhP2Z3xaSkPSQvQ4WDWSapOwDkcM2a59Nwbu5PIGZpj
  21.101 +FM9WVLawN1/SVbaKOUEhFKdbl7UYW64JNWE6ZaLa0sfigt4QaXd5GrQcP2vmVVGz
  21.102 +WOuCaEb/HnxgiUvLQI2tCnW8aWluc6PnNk3HwLydvCL0tHSXPJno4Wbs1GzRJ4G7
  21.103 +CleoojpLytgTfIlZ7anS6QEAXXAuWGT3jddP4hcTnsfX40bQnIH1m49RX/4OHuMY
  21.104 +n7RyzSfyVghBQeA3fEQ48ep3WHuFHEn0Kn9rvcr/JZRO2NM4nBv1FjOIBTUMTlX+
  21.105 +hf0F/mYz1ycNg/rt6Taf9xcIP0IzRfQEa/dFqnEnBYCxGvRSr+EnMzg+ETT1p+aa
  21.106 +YAyjsbikhOqmle9G4LFUyblMmIlwFvAklAAlXTUJAEn3pc5mxH6vz0JitDpLdFDM
  21.107 +pW51y0HYgUNKS+9+qoVK2WXhkK/+hCbLzWVwzN5FlsIPucH+L+afquR6W5IKA8uZ
  21.108 +ixDPokbP1H608f/TobwX988nWby54kihoxaMvmEDbqT5Ivi5hHDhj5e79mxhUoZx
  21.109 +wb6fsm+d2vewDRhSIUF6/iioPaQt2AhmHNMBUYS5RrlOY8mc9BP8PwKym5SgkpE4
  21.110 +NKxoMjbQwUi3SHseA1hluMBieV+d7nYHqwBtSgMC/ax/AcDwmoLusXlf3OiBytdL
  21.111 +2v4OtPu6kt/QIlEABEDlqDK70wM6BChzWYrc5ErsixZ9NHunNshAjYsVeNtStOFV
  21.112 +TPGiy7a8rKB3xJhqzZhhLh9ly8JxVNfkb2LVXP/yzBS8LJpCluzyXZZpH2Q2a8lP
  21.113 +t71tjf/R/Uff2ZeF5yWO7zldyoEfx00yQWDyfmM6zHm17moXH5Mql2ZvTI0C0mk6
  21.114 +wDYNVEFe9YIXvxhdu5ym67ba8t5eV2t3c4zdhFy5YHZOC/KvpcZBLcvLY2jgVmNr
  21.115 +UYNqKpGK9m03jHRT2ZuG6F19QrxKqUIvgnYWsenecCvjjOIcWH7KqqNp+d4RyNRr
  21.116 +4VyoJk9nxzlUT/wKQJ6d5OtY5wytCCxpv8ihBFS3R2f0Sk2yXOgKE2sq0DEicWe+
  21.117 +x8Yqg3C/47hrtiUnEwwmp3VEYHfBTaaXMUkpmoRJ066u+8K2Jfo/pQnX6vcyUpvY
  21.118 +tJNqH+SMYKMXVBigU0ayWQFwVcoNEqFNVTm9K3MBQlIQiYqumBptG8rYhzF/eSUC
  21.119 +doDA15Ibgsk=
  21.120 +=P9h8
  21.121 +-----END PGP MESSAGE-----
  21.122 +
  21.123 +--xNhsqki3RTDSnTgiBbeAIkT3t5whv1bAM--
    22.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    22.2 +++ b/test/test_mails/pEp_subject_pEp_replaced_w_pEp_4a.eml	Wed Sep 13 02:00:36 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: pEp
   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_unencrypted_p3p_subject_5b.eml	Wed Sep 13 02:00:36 2017 +0200
    23.3 @@ -0,0 +1,73 @@
    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 39CD11C00BC
    23.9 +	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:36:35 +0200 (CEST)
   23.10 +Received: by vmmailrelay1.informatik.tu-muenchen.de (Postfix, from userid 109)
   23.11 +	id 0CEA81C0390; Mon, 12 Jun 2017 15:36:36 +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 DE7711C0383
   23.14 +	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:36:35 +0200 (CEST)
   23.15 +Received: from vmmaildmz1.informatik.tu-muenchen.de (vmmaildmz1.informatik.tu-muenchen.de [131.159.0.87])
   23.16 +	by vmmailrelay1.informatik.tu-muenchen.de (Postfix) with ESMTP id D3D7A1C037A
   23.17 +	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:36:35 +0200 (CEST)
   23.18 +Received: by vmmaildmz1.informatik.tu-muenchen.de (Postfix, from userid 109)
   23.19 +	id D22771C2D9E; Mon, 12 Jun 2017 15:36:35 +0200 (CEST)
   23.20 +X-Spam-Checker-Version: SpamAssassin 3.4.0-tuminfo_1 (2014-02-07) on
   23.21 +	vmmaildmz1.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 +	RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,TVD_RCVD_SPACE_BRACKET,
   23.25 +	UNPARSEABLE_RELAY autolearn=no autolearn_force=no version=3.4.0-tuminfo_1
   23.26 +Received: from vmmaildmz1.informatik.tu-muenchen.de (localhost [127.0.0.1])
   23.27 +	by vmmaildmz1.informatik.tu-muenchen.de (Postfix) with ESMTP id 615241C2D9E
   23.28 +	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:36:34 +0200 (CEST)
   23.29 +Received: from mi4-p00-ob.smtp.rzone.de (mi4-p00-ob.smtp.rzone.de [81.169.146.146])
   23.30 +	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
   23.31 +	(No client certificate requested)
   23.32 +	by vmmaildmz1.informatik.tu-muenchen.de (Postfix) with ESMTPS id 50C3E1C2D9B
   23.33 +	for <krista@gnunet.org>; Mon, 12 Jun 2017 15:36:34 +0200 (CEST)
   23.34 +X-RZG-FWD-BY: pep.test.recip@kgrothoff.org
   23.35 +Received: from mailin.rzone.de ([unix socket])
   23.36 +	by mailin.rzone.de (RZmta 40.9) with LMTPA;
   23.37 +	Mon, 12 Jun 2017 15:36:18 +0200 (CEST)
   23.38 +Authentication-Results: strato.com 1;
   23.39 +	spf=none
   23.40 +		smtp.mailfrom="pep.test.alice@pep-project.org";
   23.41 +	dkim=none;
   23.42 +	domainkeys=none;
   23.43 +	dkim-adsp=none
   23.44 +		header.from="pep.test.alice@pep-project.org"
   23.45 +X-Strato-MessageType: email
   23.46 +X-RZG-CLASS-ID: mi00
   23.47 +Received-SPF: none
   23.48 +	client-ip=131.159.0.8;
   23.49 +	helo="mail-out1.informatik.tu-muenchen.de";
   23.50 +	envelope-from="pep.test.alice@pep-project.org";
   23.51 +	receiver=smtpin.rzone.de;
   23.52 +	identity=mailfrom;
   23.53 +Received: from mail-out1.informatik.tu-muenchen.de ([131.159.0.8])
   23.54 +	by smtpin.rzone.de (RZmta 40.9 OK)
   23.55 +	with ESMTPS id p044e9t5CDaIXCz
   23.56 +	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (curve secp521r1 with 521 ECDH bits, eq. 15360 bits RSA))
   23.57 +	(Client did not present a certificate)
   23.58 +	for <pep.test.recip@kgrothoff.org>;
   23.59 +	Mon, 12 Jun 2017 15:36:18 +0200 (CEST)
   23.60 +Received: from [192.168.178.22] (ip5f584089.dynamic.kabel-deutschland.de [95.88.64.137])
   23.61 +	by services.sec.in.tum.de (Postfix) with ESMTPSA id D40EB1013AE4F
   23.62 +	for <pep.test.recip@kgrothoff.org>; Mon, 12 Jun 2017 15:36:12 +0200 (CEST)
   23.63 +To: pep.test.recip@kgrothoff.org
   23.64 +Reply-To: krista@pep-project.org
   23.65 +From: pEp Test Alice <pep.test.alice@pep-project.org>
   23.66 +Subject: =?utf-8?Q?p=E2=89=A1p?=
   23.67 +Organization: pEp
   23.68 +Message-ID: <7b251ab6-f1c0-163b-0891-574d4eb095e1@pep-project.org>
   23.69 +Date: Mon, 12 Jun 2017 15:36:12 +0200
   23.70 +User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101
   23.71 + Thunderbird/45.8.0
   23.72 +MIME-Version: 1.0
   23.73 +Content-Type: text/plain; charset=utf-8
   23.74 +Content-Transfer-Encoding: 7bit
   23.75 +
   23.76 +Unencrypted mail where pEp (using equivalence symbol) is the actual subject.
    24.1 --- a/test/test_mails/pEp_unencrypted_pEp_subject.eml	Tue Sep 12 19:17:44 2017 +0200
    24.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    24.3 @@ -1,73 +0,0 @@
    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: pEp
   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 variable where pEp is the actual subject.
    25.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    25.2 +++ b/test/test_mails/pEp_unencrypted_pEp_subject_5a.eml	Wed Sep 13 02:00:36 2017 +0200
    25.3 @@ -0,0 +1,73 @@
    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 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    26.2 +++ b/test/test_mails/unencrypted_signed_w_file_attachment.eml	Wed Sep 13 02:00:36 2017 +0200
    26.3 @@ -0,0 +1,126 @@
    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 DBDB11C00BC
    26.9 +	for <krista@gnunet.org>; Fri, 30 Jun 2017 09:16:10 +0200 (CEST)
   26.10 +Received: by vmmailrelay1.informatik.tu-muenchen.de (Postfix, from userid 109)
   26.11 +	id 0D3191C03B1; Fri, 30 Jun 2017 09:16:11 +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 DD6FC1C0390
   26.14 +	for <krista@gnunet.org>; Fri, 30 Jun 2017 09:16:10 +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 C99F21C0376
   26.17 +	for <krista@gnunet.org>; Fri, 30 Jun 2017 09:16:10 +0200 (CEST)
   26.18 +Received: by vmmaildmz1.informatik.tu-muenchen.de (Postfix, from userid 109)
   26.19 +	id C7D231C2D89; Fri, 30 Jun 2017 09:16:10 +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.6 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 5489F1C2D8A
   26.28 +	for <krista@gnunet.org>; Fri, 30 Jun 2017 09:16:09 +0200 (CEST)
   26.29 +Received: from mi4-p00-ob.smtp.rzone.de (mi4-p00-ob.smtp.rzone.de [81.169.146.149])
   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 42F8E1C2D86
   26.33 +	for <krista@gnunet.org>; Fri, 30 Jun 2017 09:16:09 +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 41.0) with LMTPA;
   26.37 +	Fri, 30 Jun 2017 09:16:08 +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.36;
   26.49 +	helo="mail-out2.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-out2.informatik.tu-muenchen.de ([131.159.0.36])
   26.54 +	by smtpin.rzone.de (RZmta 41.0 OK)
   26.55 +	with ESMTPS id Q06471t5U7G843J
   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 +	Fri, 30 Jun 2017 09:16:08 +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 443F910C7ECF6
   26.62 +	for <pep.test.recip@kgrothoff.org>; Fri, 30 Jun 2017 09:16:03 +0200 (CEST)
   26.63 +From: pEp Test Alice <pep.test.alice@pep-project.org>
   26.64 +Subject: Super special test message!
   26.65 +Reply-To: krista@pep-project.org
   26.66 +To: pep.test.recip@kgrothoff.org
   26.67 +Organization: pEp
   26.68 +Message-ID: <e8ac743f-ed5d-6b6a-5a6b-166346a2080e@pep-project.org>
   26.69 +Date: Fri, 30 Jun 2017 09:16:02 +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: multipart/signed; micalg=pgp-sha256;
   26.74 + protocol="application/pgp-signature";
   26.75 + boundary="KvKRC3xsd0xdagQGMpU7DfqahCluSsm0d"
   26.76 +
   26.77 +This is an OpenPGP/MIME signed message (RFC 4880 and 3156)
   26.78 +--KvKRC3xsd0xdagQGMpU7DfqahCluSsm0d
   26.79 +Content-Type: multipart/mixed; boundary="gd5PuwEu7xPn5mOnqFUdVoWMlgprIkLWS";
   26.80 + protected-headers="v1"
   26.81 +From: pEp Test Alice <pep.test.alice@pep-project.org>
   26.82 +Reply-To: krista@pep-project.org
   26.83 +To: pep.test.recip@kgrothoff.org
   26.84 +Message-ID: <e8ac743f-ed5d-6b6a-5a6b-166346a2080e@pep-project.org>
   26.85 +Subject: Super special test message!
   26.86 +
   26.87 +--gd5PuwEu7xPn5mOnqFUdVoWMlgprIkLWS
   26.88 +Content-Type: multipart/mixed;
   26.89 + boundary="------------CB0389EA91149C8AB6D7F7B4"
   26.90 +
   26.91 +This is a multi-part message in MIME format.
   26.92 +--------------CB0389EA91149C8AB6D7F7B4
   26.93 +Content-Type: text/plain; charset=utf-8
   26.94 +Content-Transfer-Encoding: quoted-printable
   26.95 +
   26.96 +This is unencrypted and signed.
   26.97 +
   26.98 +This is the main body.
   26.99 +
  26.100 +
  26.101 +--------------CB0389EA91149C8AB6D7F7B4
  26.102 +Content-Type: text/plain; charset=UTF-8;
  26.103 + name="test.txt"
  26.104 +Content-Transfer-Encoding: base64
  26.105 +Content-Disposition: attachment;
  26.106 + filename="test.txt"
  26.107 +
  26.108 +VGhpcyBpcyBhbiBhdHRhY2htZW50IHRleHQuIEl0J3MgdmVyeSBleGNpdGluZy4K
  26.109 +--------------CB0389EA91149C8AB6D7F7B4--
  26.110 +
  26.111 +--gd5PuwEu7xPn5mOnqFUdVoWMlgprIkLWS--
  26.112 +
  26.113 +--KvKRC3xsd0xdagQGMpU7DfqahCluSsm0d
  26.114 +Content-Type: application/pgp-signature; name="signature.asc"
  26.115 +Content-Description: OpenPGP digital signature
  26.116 +Content-Disposition: attachment; filename="signature.asc"
  26.117 +
  26.118 +-----BEGIN PGP SIGNATURE-----
  26.119 +
  26.120 +iQEcBAEBCAAGBQJZVfqyAAoJEKlBHRdv8A6X1qAH/Ayh4VmJCaM9rna9ilS4lDmG
  26.121 +DcBLebCeaPdpky/Na8JmlAW9eo935eHzxaFL13+x/qfjk4ur5joDZuvFuSK4p9LZ
  26.122 +/jIeb9GSA7ePDNgJF9KwLEWVGz78KczEWaarDCl8H/trP6OHmGY42C6D/kXr4B0e
  26.123 +YkBvn4XSQSM9pztvtMIMtryW+oZJ4urHUtIqs2ieBBeHN0dYvuo7uVf8WpOZlHSP
  26.124 +IZg5mtJgOtgLD8KZtqh1Be5DlERc4pSXQk6D8NpP5MFQZZBPwhpghr0nyXEhM2Jg
  26.125 +PXMObwi+4xHjwLH/hgkFz70mAmPcDA7ZXM29x0girN3iSyy34gl1Rc5oU6ukPWk=
  26.126 +=RzMa
  26.127 +-----END PGP SIGNATURE-----
  26.128 +
  26.129 +--KvKRC3xsd0xdagQGMpU7DfqahCluSsm0d--
    27.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    27.2 +++ b/test/test_mails/unencrypted_w_CID_and_fname_attachment.eml	Wed Sep 13 02:00:36 2017 +0200
    27.3 @@ -0,0 +1,91 @@
    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 8F0CD1C00BC
    27.9 +	for <krista@gnunet.org>; Fri, 30 Jun 2017 09:13:54 +0200 (CEST)
   27.10 +Received: by vmmailrelay1.informatik.tu-muenchen.de (Postfix, from userid 109)
   27.11 +	id AC66A1C03AE; Fri, 30 Jun 2017 09:13:54 +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 897B71C0390
   27.14 +	for <krista@gnunet.org>; Fri, 30 Jun 2017 09:13:54 +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 7E5F81C0376
   27.17 +	for <krista@gnunet.org>; Fri, 30 Jun 2017 09:13:54 +0200 (CEST)
   27.18 +Received: by vmmaildmz1.informatik.tu-muenchen.de (Postfix, from userid 109)
   27.19 +	id 7C8761C2D89; Fri, 30 Jun 2017 09:13:54 +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 BF15F1C2D86
   27.28 +	for <krista@gnunet.org>; Fri, 30 Jun 2017 09:13:51 +0200 (CEST)
   27.29 +Received: from mi4-p00-ob.smtp.rzone.de (mi4-p00-ob.smtp.rzone.de [81.169.146.147])
   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 ADC141C2D80
   27.33 +	for <krista@gnunet.org>; Fri, 30 Jun 2017 09:13:51 +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 41.0) with LMTPA;
   27.37 +	Fri, 30 Jun 2017 09:13:28 +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 41.0 OK)
   27.55 +	with ESMTPS id p03852t5U7DR0zS
   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 +	Fri, 30 Jun 2017 09:13:27 +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 ECA9510C7ECF4
   27.62 +	for <pep.test.recip@kgrothoff.org>; Fri, 30 Jun 2017 09:13:17 +0200 (CEST)
   27.63 +Reply-To: krista@pep-project.org
   27.64 +To: pep.test.recip@kgrothoff.org
   27.65 +From: pEp Test Alice <pep.test.alice@pep-project.org>
   27.66 +Subject: Super special test message!
   27.67 +Organization: pEp
   27.68 +Message-ID: <19058947-df3d-13ed-c6da-f0304fbdff26@pep-project.org>
   27.69 +Date: Fri, 30 Jun 2017 09:13:17 +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: multipart/mixed;
   27.74 + boundary="------------649B59876AAB6A69133246EA"
   27.75 +
   27.76 +This is a multi-part message in MIME format.
   27.77 +--------------649B59876AAB6A69133246EA
   27.78 +Content-Type: text/plain; charset=utf-8
   27.79 +Content-Transfer-Encoding: 7bit
   27.80 +
   27.81 +This is unencrypted.
   27.82 +
   27.83 +This is the main body.
   27.84 +
   27.85 +--------------649B59876AAB6A69133246EA
   27.86 +Content-Type: text/plain; charset=UTF-8;
   27.87 + name="test.txt"
   27.88 +Content-Transfer-Encoding: base64
   27.89 +Content-Disposition: attachment;
   27.90 + filename="test.txt"
   27.91 +Content-ID: <thisissomecontent.id@somestuff>
   27.92 +
   27.93 +VGhpcyBpcyBhbiBhdHRhY2htZW50IHRleHQuIEl0J3MgdmVyeSBleGNpdGluZy4K
   27.94 +--------------649B59876AAB6A69133246EA--
    28.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    28.2 +++ b/test/test_mails/unencrypted_w_CID_attachment.eml	Wed Sep 13 02:00:36 2017 +0200
    28.3 @@ -0,0 +1,91 @@
    28.4 +Return-Path: <pep.test.alice@pep-project.org>
    28.5 +X-Original-To: krista@gnunet.org
    28.6 +Delivered-To: krista@gnunet.org
    28.7 +Received: from vmmailrelay1.informatik.tu-muenchen.de (mailrelay1.informatik.tu-muenchen.de [131.159.254.14])
    28.8 +	by sam.net.in.tum.de (Postfix) with ESMTP id 8F0CD1C00BC
    28.9 +	for <krista@gnunet.org>; Fri, 30 Jun 2017 09:13:54 +0200 (CEST)
   28.10 +Received: by vmmailrelay1.informatik.tu-muenchen.de (Postfix, from userid 109)
   28.11 +	id AC66A1C03AE; Fri, 30 Jun 2017 09:13:54 +0200 (CEST)
   28.12 +Received: from vmmailrelay1.informatik.tu-muenchen.de (localhost [127.0.0.1])
   28.13 +	by vmmailrelay1.informatik.tu-muenchen.de (Postfix) with ESMTP id 897B71C0390
   28.14 +	for <krista@gnunet.org>; Fri, 30 Jun 2017 09:13:54 +0200 (CEST)
   28.15 +Received: from vmmaildmz1.informatik.tu-muenchen.de (vmmaildmz1.informatik.tu-muenchen.de [131.159.0.87])
   28.16 +	by vmmailrelay1.informatik.tu-muenchen.de (Postfix) with ESMTP id 7E5F81C0376
   28.17 +	for <krista@gnunet.org>; Fri, 30 Jun 2017 09:13:54 +0200 (CEST)
   28.18 +Received: by vmmaildmz1.informatik.tu-muenchen.de (Postfix, from userid 109)
   28.19 +	id 7C8761C2D89; Fri, 30 Jun 2017 09:13:54 +0200 (CEST)
   28.20 +X-Spam-Checker-Version: SpamAssassin 3.4.0-tuminfo_1 (2014-02-07) on
   28.21 +	vmmaildmz1.informatik.tu-muenchen.de
   28.22 +X-Spam-Level: 
   28.23 +X-Spam-Status: No, score=-2.9 required=7.0 tests=AWL,BAYES_00,
   28.24 +	RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,TVD_RCVD_SPACE_BRACKET,
   28.25 +	UNPARSEABLE_RELAY autolearn=no autolearn_force=no version=3.4.0-tuminfo_1
   28.26 +Received: from vmmaildmz1.informatik.tu-muenchen.de (localhost [127.0.0.1])
   28.27 +	by vmmaildmz1.informatik.tu-muenchen.de (Postfix) with ESMTP id BF15F1C2D86
   28.28 +	for <krista@gnunet.org>; Fri, 30 Jun 2017 09:13:51 +0200 (CEST)
   28.29 +Received: from mi4-p00-ob.smtp.rzone.de (mi4-p00-ob.smtp.rzone.de [81.169.146.147])
   28.30 +	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
   28.31 +	(No client certificate requested)
   28.32 +	by vmmaildmz1.informatik.tu-muenchen.de (Postfix) with ESMTPS id ADC141C2D80
   28.33 +	for <krista@gnunet.org>; Fri, 30 Jun 2017 09:13:51 +0200 (CEST)
   28.34 +X-RZG-FWD-BY: pep.test.recip@kgrothoff.org
   28.35 +Received: from mailin.rzone.de ([unix socket])
   28.36 +	by mailin.rzone.de (RZmta 41.0) with LMTPA;
   28.37 +	Fri, 30 Jun 2017 09:13:28 +0200 (CEST)
   28.38 +Authentication-Results: strato.com 1;
   28.39 +	spf=none
   28.40 +		smtp.mailfrom="pep.test.alice@pep-project.org";
   28.41 +	dkim=none;
   28.42 +	domainkeys=none;
   28.43 +	dkim-adsp=none
   28.44 +		header.from="pep.test.alice@pep-project.org"
   28.45 +X-Strato-MessageType: email
   28.46 +X-RZG-CLASS-ID: mi00
   28.47 +Received-SPF: none
   28.48 +	client-ip=131.159.0.8;
   28.49 +	helo="mail-out1.informatik.tu-muenchen.de";
   28.50 +	envelope-from="pep.test.alice@pep-project.org";
   28.51 +	receiver=smtpin.rzone.de;
   28.52 +	identity=mailfrom;
   28.53 +Received: from mail-out1.informatik.tu-muenchen.de ([131.159.0.8])
   28.54 +	by smtpin.rzone.de (RZmta 41.0 OK)
   28.55 +	with ESMTPS id p03852t5U7DR0zS
   28.56 +	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (curve secp521r1 with 521 ECDH bits, eq. 15360 bits RSA))
   28.57 +	(Client did not present a certificate)
   28.58 +	for <pep.test.recip@kgrothoff.org>;
   28.59 +	Fri, 30 Jun 2017 09:13:27 +0200 (CEST)
   28.60 +Received: from [192.168.178.22] (ip5f584089.dynamic.kabel-deutschland.de [95.88.64.137])
   28.61 +	by services.sec.in.tum.de (Postfix) with ESMTPSA id ECA9510C7ECF4
   28.62 +	for <pep.test.recip@kgrothoff.org>; Fri, 30 Jun 2017 09:13:17 +0200 (CEST)
   28.63 +Reply-To: krista@pep-project.org
   28.64 +To: pep.test.recip@kgrothoff.org
   28.65 +From: pEp Test Alice <pep.test.alice@pep-project.org>
   28.66 +Subject: Super special test message!
   28.67 +Organization: pEp
   28.68 +Message-ID: <19058947-df3d-13ed-c6da-f0304fbdff26@pep-project.org>
   28.69 +Date: Fri, 30 Jun 2017 09:13:17 +0200
   28.70 +User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101
   28.71 + Thunderbird/45.8.0
   28.72 +MIME-Version: 1.0
   28.73 +Content-Type: multipart/mixed;
   28.74 + boundary="------------649B59876AAB6A69133246EA"
   28.75 +
   28.76 +This is a multi-part message in MIME format.
   28.77 +--------------649B59876AAB6A69133246EA
   28.78 +Content-Type: text/plain; charset=utf-8
   28.79 +Content-Transfer-Encoding: 7bit
   28.80 +
   28.81 +This is unencrypted.
   28.82 +
   28.83 +This is the main body.
   28.84 +
   28.85 +--------------649B59876AAB6A69133246EA
   28.86 +Content-Type: text/plain; charset=UTF-8;
   28.87 + name="test.txt"
   28.88 +Content-Transfer-Encoding: base64
   28.89 +Content-Disposition: attachment;
   28.90 + filename="test.txt"
   28.91 +Content-ID: <wtf@isthis>
   28.92 +
   28.93 +VGhpcyBpcyBhbiBhdHRhY2htZW50IHRleHQuIEl0J3MgdmVyeSBleGNpdGluZy4K
   28.94 +--------------649B59876AAB6A69133246EA--
    29.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    29.2 +++ b/test/test_mails/unencrypted_w_file_attachment.eml	Wed Sep 13 02:00:36 2017 +0200
    29.3 @@ -0,0 +1,90 @@
    29.4 +Return-Path: <pep.test.alice@pep-project.org>
    29.5 +X-Original-To: krista@gnunet.org
    29.6 +Delivered-To: krista@gnunet.org
    29.7 +Received: from vmmailrelay1.informatik.tu-muenchen.de (mailrelay1.informatik.tu-muenchen.de [131.159.254.14])
    29.8 +	by sam.net.in.tum.de (Postfix) with ESMTP id 8F0CD1C00BC
    29.9 +	for <krista@gnunet.org>; Fri, 30 Jun 2017 09:13:54 +0200 (CEST)
   29.10 +Received: by vmmailrelay1.informatik.tu-muenchen.de (Postfix, from userid 109)
   29.11 +	id AC66A1C03AE; Fri, 30 Jun 2017 09:13:54 +0200 (CEST)
   29.12 +Received: from vmmailrelay1.informatik.tu-muenchen.de (localhost [127.0.0.1])
   29.13 +	by vmmailrelay1.informatik.tu-muenchen.de (Postfix) with ESMTP id 897B71C0390
   29.14 +	for <krista@gnunet.org>; Fri, 30 Jun 2017 09:13:54 +0200 (CEST)
   29.15 +Received: from vmmaildmz1.informatik.tu-muenchen.de (vmmaildmz1.informatik.tu-muenchen.de [131.159.0.87])
   29.16 +	by vmmailrelay1.informatik.tu-muenchen.de (Postfix) with ESMTP id 7E5F81C0376
   29.17 +	for <krista@gnunet.org>; Fri, 30 Jun 2017 09:13:54 +0200 (CEST)
   29.18 +Received: by vmmaildmz1.informatik.tu-muenchen.de (Postfix, from userid 109)
   29.19 +	id 7C8761C2D89; Fri, 30 Jun 2017 09:13:54 +0200 (CEST)
   29.20 +X-Spam-Checker-Version: SpamAssassin 3.4.0-tuminfo_1 (2014-02-07) on
   29.21 +	vmmaildmz1.informatik.tu-muenchen.de
   29.22 +X-Spam-Level: 
   29.23 +X-Spam-Status: No, score=-2.9 required=7.0 tests=AWL,BAYES_00,
   29.24 +	RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,TVD_RCVD_SPACE_BRACKET,
   29.25 +	UNPARSEABLE_RELAY autolearn=no autolearn_force=no version=3.4.0-tuminfo_1
   29.26 +Received: from vmmaildmz1.informatik.tu-muenchen.de (localhost [127.0.0.1])
   29.27 +	by vmmaildmz1.informatik.tu-muenchen.de (Postfix) with ESMTP id BF15F1C2D86
   29.28 +	for <krista@gnunet.org>; Fri, 30 Jun 2017 09:13:51 +0200 (CEST)
   29.29 +Received: from mi4-p00-ob.smtp.rzone.de (mi4-p00-ob.smtp.rzone.de [81.169.146.147])
   29.30 +	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
   29.31 +	(No client certificate requested)
   29.32 +	by vmmaildmz1.informatik.tu-muenchen.de (Postfix) with ESMTPS id ADC141C2D80
   29.33 +	for <krista@gnunet.org>; Fri, 30 Jun 2017 09:13:51 +0200 (CEST)
   29.34 +X-RZG-FWD-BY: pep.test.recip@kgrothoff.org
   29.35 +Received: from mailin.rzone.de ([unix socket])
   29.36 +	by mailin.rzone.de (RZmta 41.0) with LMTPA;
   29.37 +	Fri, 30 Jun 2017 09:13:28 +0200 (CEST)
   29.38 +Authentication-Results: strato.com 1;
   29.39 +	spf=none
   29.40 +		smtp.mailfrom="pep.test.alice@pep-project.org";
   29.41 +	dkim=none;
   29.42 +	domainkeys=none;
   29.43 +	dkim-adsp=none
   29.44 +		header.from="pep.test.alice@pep-project.org"
   29.45 +X-Strato-MessageType: email
   29.46 +X-RZG-CLASS-ID: mi00
   29.47 +Received-SPF: none
   29.48 +	client-ip=131.159.0.8;
   29.49 +	helo="mail-out1.informatik.tu-muenchen.de";
   29.50 +	envelope-from="pep.test.alice@pep-project.org";
   29.51 +	receiver=smtpin.rzone.de;
   29.52 +	identity=mailfrom;
   29.53 +Received: from mail-out1.informatik.tu-muenchen.de ([131.159.0.8])
   29.54 +	by smtpin.rzone.de (RZmta 41.0 OK)
   29.55 +	with ESMTPS id p03852t5U7DR0zS
   29.56 +	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (curve secp521r1 with 521 ECDH bits, eq. 15360 bits RSA))
   29.57 +	(Client did not present a certificate)
   29.58 +	for <pep.test.recip@kgrothoff.org>;
   29.59 +	Fri, 30 Jun 2017 09:13:27 +0200 (CEST)
   29.60 +Received: from [192.168.178.22] (ip5f584089.dynamic.kabel-deutschland.de [95.88.64.137])
   29.61 +	by services.sec.in.tum.de (Postfix) with ESMTPSA id ECA9510C7ECF4
   29.62 +	for <pep.test.recip@kgrothoff.org>; Fri, 30 Jun 2017 09:13:17 +0200 (CEST)
   29.63 +Reply-To: krista@pep-project.org
   29.64 +To: pep.test.recip@kgrothoff.org
   29.65 +From: pEp Test Alice <pep.test.alice@pep-project.org>
   29.66 +Subject: Super special test message!
   29.67 +Organization: pEp
   29.68 +Message-ID: <19058947-df3d-13ed-c6da-f0304fbdff26@pep-project.org>
   29.69 +Date: Fri, 30 Jun 2017 09:13:17 +0200
   29.70 +User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101
   29.71 + Thunderbird/45.8.0
   29.72 +MIME-Version: 1.0
   29.73 +Content-Type: multipart/mixed;
   29.74 + boundary="------------649B59876AAB6A69133246EA"
   29.75 +
   29.76 +This is a multi-part message in MIME format.
   29.77 +--------------649B59876AAB6A69133246EA
   29.78 +Content-Type: text/plain; charset=utf-8
   29.79 +Content-Transfer-Encoding: 7bit
   29.80 +
   29.81 +This is unencrypted.
   29.82 +
   29.83 +This is the main body.
   29.84 +
   29.85 +--------------649B59876AAB6A69133246EA
   29.86 +Content-Type: text/plain; charset=UTF-8;
   29.87 + name="test.txt"
   29.88 +Content-Transfer-Encoding: base64
   29.89 +Content-Disposition: attachment;
   29.90 + filename="test.txt"
   29.91 +
   29.92 +VGhpcyBpcyBhbiBhdHRhY2htZW50IHRleHQuIEl0J3MgdmVyeSBleGNpdGluZy4K
   29.93 +--------------649B59876AAB6A69133246EA--