diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index baf9d98e11..5fe8d860ea 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -989,7 +989,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             List<EntityAttachment> a = new ArrayList<>();
             for (EntityAttachment attachment : attachments) {
                 boolean inline = (TextUtils.isEmpty(attachment.name) ||
-                        (attachment.isInline() && attachment.type.startsWith("image/")));
+                        (attachment.isInline() && attachment.isImage()));
                 if (inline)
                     has_inline = true;
                 if (attachment.progress == null && !attachment.available)
@@ -1026,7 +1026,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
             List<EntityAttachment> images = new ArrayList<>();
             for (EntityAttachment attachment : attachments)
-                if (!attachment.isInline() && attachment.type.startsWith("image/"))
+                if (!attachment.isInline() && attachment.isImage())
                     images.add(attachment);
             adapterImage.set(images);
 
@@ -2955,7 +2955,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                     long id = args.getLong("id");
                     List<EntityAttachment> attachments = DB.getInstance(context).attachment().getAttachments(id);
                     for (EntityAttachment attachment : attachments)
-                        if (!attachment.available && attachment.isInline())
+                        if (!attachment.available && attachment.isInline() && attachment.isImage())
                             return false;
                     return true;
                 }
diff --git a/app/src/main/java/eu/faircode/email/EntityAttachment.java b/app/src/main/java/eu/faircode/email/EntityAttachment.java
index 26dc71bf98..a005d6aee9 100644
--- a/app/src/main/java/eu/faircode/email/EntityAttachment.java
+++ b/app/src/main/java/eu/faircode/email/EntityAttachment.java
@@ -76,6 +76,10 @@ public class EntityAttachment {
         return (disposition != null && disposition.equalsIgnoreCase(Part.INLINE));
     }
 
+    boolean isImage() {
+        return type.startsWith("image/");
+    }
+
     File getFile(Context context) {
         File dir = new File(context.getFilesDir(), "attachments");
         if (!dir.exists())