diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java
index 0285d05117..f33da55a76 100644
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@@ -644,7 +644,13 @@ public class MessageHelper {
             List<EntityAttachment> result = new ArrayList<>();
 
             for (AttachmentPart apart : attachments) {
-                ContentType ct = new ContentType(apart.part.getContentType());
+                ContentType ct;
+                try {
+                    ct = new ContentType(apart.part.getContentType());
+                } catch (ParseException ex) {
+                    Log.w(ex);
+                    ct = new ContentType("application/octet-stream");
+                }
                 String[] cid = apart.part.getHeader("Content-ID");
 
                 EntityAttachment attachment = new EntityAttachment();