diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java
index 06f58706d4..8b4d0e76e1 100644
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@@ -1034,11 +1034,16 @@ public class MessageHelper {
                 for (int i = 0; i < multipart.getCount(); i++)
                     try {
                         Part cpart = multipart.getBodyPart(i);
-                        ContentType ct = new ContentType(cpart.getContentType());
-                        if ("application/pgp-encrypted".equals(ct.getBaseType().toLowerCase()))
-                            pgp = true;
-                        else
-                            getMessageParts(cpart, parts, pgp);
+
+                        try {
+                            ContentType ct = new ContentType(cpart.getContentType());
+                            if ("application/pgp-encrypted".equals(ct.getBaseType().toLowerCase()))
+                                pgp = true;
+                        } catch (ParseException ex) {
+                            Log.w(ex);
+                        }
+
+                        getMessageParts(cpart, parts, pgp);
                     } catch (ParseException ex) {
                         // Nested body: try to continue
                         // ParseException: In parameter list boundary="...">, expected parameter name, got ";"