diff --git a/app/src/main/java/eu/faircode/email/EntityAttachment.java b/app/src/main/java/eu/faircode/email/EntityAttachment.java
index a7a2dfeb53..712626123c 100644
--- a/app/src/main/java/eu/faircode/email/EntityAttachment.java
+++ b/app/src/main/java/eu/faircode/email/EntityAttachment.java
@@ -187,7 +187,8 @@ public class EntityAttachment {
         if ("text/plain".equals(type) && "ovpn".equals(extension))
             return "application/x-openvpn-profile";
 
-        if ("application/zip".equals(type) || "application/octet-stream".equals(type)) {
+        if (TextUtils.isEmpty(type) || type.endsWith("/unknown") ||
+                "application/octet-stream".equals(type) || "application/zip".equals(type)) {
             if ("log".equalsIgnoreCase(extension))
                 return "text/plain";