diff --git a/app/src/main/java/eu/faircode/email/AdapterAttachment.java b/app/src/main/java/eu/faircode/email/AdapterAttachment.java
index 8971383c58..085623bb98 100644
--- a/app/src/main/java/eu/faircode/email/AdapterAttachment.java
+++ b/app/src/main/java/eu/faircode/email/AdapterAttachment.java
@@ -102,7 +102,7 @@ public class AdapterAttachment extends RecyclerView.Adapter<AdapterAttachment.Vi
         }
 
         private void bindTo(EntityAttachment attachment) {
-            view.setAlpha(attachment.isInline() ? Helper.LOW_LIGHT : 1.0f);
+            view.setAlpha(attachment.isInline() || TextUtils.isEmpty(attachment.name) ? Helper.LOW_LIGHT : 1.0f);
 
             ibDelete.setVisibility(readonly ? View.GONE : attachment.isInline() ? View.INVISIBLE : View.VISIBLE);
             tvName.setText(attachment.name);
diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 7ad4597ed0..9c9f5a61ea 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -1104,8 +1104,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             boolean calendar = false;
             List<EntityAttachment> a = new ArrayList<>();
             for (EntityAttachment attachment : attachments) {
-                boolean inline = (TextUtils.isEmpty(attachment.name) ||
-                        (attachment.isInline() && attachment.isImage()));
+                boolean inline = (attachment.isInline() || TextUtils.isEmpty(attachment.name));
                 if (inline)
                     has_inline = true;
                 if (attachment.progress == null && !attachment.available)
diff --git a/app/src/main/java/eu/faircode/email/EntityAttachment.java b/app/src/main/java/eu/faircode/email/EntityAttachment.java
index 0d7465d289..499a041ef2 100644
--- a/app/src/main/java/eu/faircode/email/EntityAttachment.java
+++ b/app/src/main/java/eu/faircode/email/EntityAttachment.java
@@ -91,7 +91,7 @@ public class EntityAttachment {
     public String error;
 
     boolean isInline() {
-        return (disposition != null && disposition.equalsIgnoreCase(Part.INLINE));
+        return (disposition != null && disposition.equalsIgnoreCase(Part.INLINE) && cid != null);
     }
 
     boolean isImage() {
diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index bffe06a235..91284a07e5 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -2620,7 +2620,7 @@ public class FragmentCompose extends FragmentBase {
                 }
 
                 for (EntityAttachment attachment : new ArrayList<>(attachments))
-                    if (attachment.isInline() && attachment.cid != null && !cids.contains(attachment.cid)) {
+                    if (attachment.isInline() && !cids.contains(attachment.cid)) {
                         Log.i("Removing unused inline attachment cid=" + attachment.cid);
                         db.attachment().deleteAttachment(attachment.id);
                     }