diff --git a/app/src/main/java/eu/faircode/email/EntityAttachment.java b/app/src/main/java/eu/faircode/email/EntityAttachment.java
index 4373870047..b598850829 100644
--- a/app/src/main/java/eu/faircode/email/EntityAttachment.java
+++ b/app/src/main/java/eu/faircode/email/EntityAttachment.java
@@ -204,7 +204,8 @@ public class EntityAttachment {
         if ("video/jpeg".equals(type))
             return "image/jpeg";
 
-        if ("application/x-pdf".equals(type))
+        if (!TextUtils.isEmpty(type) &&
+                (type.endsWith("/pdf") || type.endsWith("/x-pdf")))
             return "application/pdf";
 
         if ("application/vnd.ms-pps".equals(type))