diff --git a/iOSTests/A3FC7F0A.asc b/iOSTests/A3FC7F0A.asc
new file mode 100644
index 00000000..8ce89cfe
--- /dev/null
+++ b/iOSTests/A3FC7F0A.asc
@@ -0,0 +1,29 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG/MacGPG2 v2
+
+mQINBFbBrFwBEADl0iNXgdduRcEzCcZx6qx98phzKL4BuACuPKQPcEfrKEK3CVjQ
+GSCrUKJ8C8J3t+G1qNyyCalyJiU9jmSzq1Wh+cDNPpOLxRaZ3L5rcsVJz6VaRYUA
+o2L9sZOCk5vVd7d6conlKYPGhHBbt3yWtMKRtBjgjOlAfVLEd3j2BxwCWS9QQcnr
+7YwPLAgy8XbMEkK/F3t3XPdaJUrKD2xJAN+CFOzVjNIooq8Efln/dBQKjurgC2TA
+3cDpfKwXMkh31Hgto0UEhnp1lsvFhmXznKu1JZu/1hw2F7LtuhEZkeHFyhkO3zIA
+1LuiInYVXtsVD4IY54IYo63BDc6BdD8srPzD8EO59LZ9bS0h3+4310XQi9fvsGJT
+gxaHpNnVxfCsRHCntFPDt0oGuHcC6UP4F3eSwnvrE74zcyWoo4cFYnyvz0zfsIkH
+22N329YJReh5apZE8qtYDsagVjZg4rqMJ4gKlHZlMOqcZVix7gQna9f7oZuDMk0N
+O8cGEPGGULPCkwZJYD8fxG2/3qE7rTKCPquHtakdriuuuMksBuO9gy6EAhoGjLGY
+dBajJq+UsaVIBpmBV8h/7fVqX40nsXK4NSGo6ru+h3ox12UOcvloqYrpNf8+t7S2
+LdqstJ3tF9RTHiegbairHbU4W0uLjKjv0gRxvFfmRbPdBTdOOwoIIKlmzwARAQAB
+tB1UZXN0IDAwMSA8dGVzdDAwMUBwZXB0ZXN0LmNoPokCPQQTAQIAMQUCVsGsXAUJ
+AeEzgAkQxVmGV6P8fwoCGQECGwYGCwkHAwIBBhUIAgkKCwMWAgMCHgEAAKPdD/9G
+hX5iCL87aRisio0yqRqcc8gmUiPBEzFh3iDHJRGdWE4sd7U+ipuCKBkqfqYKtIrJ
+pfVDu0Zooh9ZU9A+jAtnsSuMK4O6UO4H7u202xg1G8jXDYmCSry7I4P0O2dtl+d9
+ye56LGpyNdD65BpN662OUd5sxVQwnT/NgCTWvLjh4cEYoJgrpreKq2gPkDAhT3Ox
+fR3lAVaWXFa+pHWsI8dU2BzkJAWc0vejeQZSF/LY3Qg5CKSt35EmKYxl5CTO68z3
+McPMu+ker7JKJHOQx7mUhYl08YDeloRLx2i/XIsnf7ZW5Mo6XPjSZIC9rgAsWBnr
+AvOebPpELEQP75ZyJLHQwOTGO1UO+MF7ERGs9PzvP+f/IqKahv/0fth9NTNpZY8F
+En4rDM0W3Xq48C2KLq01cu9UZP1T6RmhE2W3l5m+98ChGZ7QU/TlBmkOPVFCi958
+kK84tgJ3itlZTmxsgJSCnjIJ5EYCNtJlpjK6XxMKzGWutBAa4adr78M3s2p18ZUP
+7y83qxM3d9KaUzvyXLgjZGqlIW/VHXonBeaacU+tN0en/0jhqCiW1vc9EZlS0SAa
+krLAW3h6huCu2FOFYOzl/WpRHdAr5w1UMDLwQ6zhhgYnnk613jvrN0n4lenEDdFR
+szj2ytimiWaZd1bX+qDqExWGidxgIu1z12ziXM+mog==
+=l9Kk
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/iOSTests/A3FC7F0A_sec.asc b/iOSTests/A3FC7F0A_sec.asc
new file mode 100644
index 00000000..6fd9992c
--- /dev/null
+++ b/iOSTests/A3FC7F0A_sec.asc
@@ -0,0 +1,56 @@
+-----BEGIN PGP PRIVATE KEY BLOCK-----
+Version: GnuPG/MacGPG2 v2
+
+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
+polmmXdW1/qg6hMVhoncYCLtc9ds4lzPpqI=
+=r9ug
+-----END PGP PRIVATE KEY BLOCK-----
diff --git a/iOSTests/account_A3FC7F0A.ser b/iOSTests/account_A3FC7F0A.ser
new file mode 100644
index 00000000..afc8968e
Binary files /dev/null and b/iOSTests/account_A3FC7F0A.ser differ
diff --git a/iOSTests/iOSTests.m b/iOSTests/iOSTests.m
index f5863d95..e9305a89 100644
--- a/iOSTests/iOSTests.m
+++ b/iOSTests/iOSTests.m
@@ -653,8 +653,10 @@ PEPSession *session;
     // This is the secret key for test001@peptest.ch
     [self importBundledKey:@"A3FC7F0A_sec.asc"];
 
-    // Mail from outlook, already processed into message dict by the app.
+    // Mail from mutt, already processed into message dict by the app.
     NSMutableDictionary *msgDict = [self unarchiveDictionary:@"msg_to_A3FC7F0A_from_mutt.ser"].mutableCopy;
+    [msgDict removeObjectForKey:kPepLongMessage];
+    [msgDict removeObjectForKey:kPepLongMessageFormatted];
 
     // Also extracted "live" from the app.
     NSMutableDictionary *accountDict = [self unarchiveDictionary:@"account_A3FC7F0A.ser"].mutableCopy;
@@ -666,8 +668,8 @@ PEPSession *session;
 
     NSArray* keys;
     NSMutableDictionary *pepDecryptedMail;
-    PEP_color color = [session decryptMessage:msgDict dest:&pepDecryptedMail keys:&keys];
-    XCTAssertEqual(color, PEP_rating_reliable);
+    [session decryptMessage:msgDict dest:&pepDecryptedMail keys:&keys];
+    XCTAssertNotNil(pepDecryptedMail[kPepLongMessage]);
 
     [self pEpCleanUp];
 }
diff --git a/iOSTests/msg_to_A3FC7F0A_from_mutt.ser b/iOSTests/msg_to_A3FC7F0A_from_mutt.ser
new file mode 100644
index 00000000..9242ca51
Binary files /dev/null and b/iOSTests/msg_to_A3FC7F0A_from_mutt.ser differ