diff --git a/app/src/main/java/eu/faircode/email/UriType.java b/app/src/main/java/eu/faircode/email/UriType.java
index 1d4f1c33f3..c2dbcb6b1e 100644
--- a/app/src/main/java/eu/faircode/email/UriType.java
+++ b/app/src/main/java/eu/faircode/email/UriType.java
@@ -63,7 +63,7 @@ public class UriType implements Parcelable {
 
     private void fixMimeType(Context context) {
         if (context != null &&
-                (type == null || type.endsWith("/*"))) {
+                (type == null || type.equals("*/*") || type.endsWith("/*") || type.startsWith("message/"))) {
             Helper.UriInfo info = Helper.getInfo(this, context);
             this.type = EntityAttachment.getMimeType(type, info.name);
         }