diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 662b5219b4..70ad2e66b3 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -793,7 +793,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                     bindAttachments(message, attachments);
                 }
             };
-            liveAttachments = db.attachment().liveAttachments(message.id);
+            liveAttachments = db.attachment().liveAttachments(message.id, true);
             liveAttachments.observe(owner, observerAttachments);
 
             // Setup actions
diff --git a/app/src/main/java/eu/faircode/email/DaoAttachment.java b/app/src/main/java/eu/faircode/email/DaoAttachment.java
index 60a25d6343..e143924f9f 100644
--- a/app/src/main/java/eu/faircode/email/DaoAttachment.java
+++ b/app/src/main/java/eu/faircode/email/DaoAttachment.java
@@ -30,8 +30,9 @@ import androidx.room.Query;
 public interface DaoAttachment {
     @Query("SELECT * FROM attachment" +
             " WHERE message = :message" +
+            " AND (:inline OR disposition <> 'inline')" +
             " ORDER BY sequence")
-    LiveData<List<EntityAttachment>> liveAttachments(long message);
+    LiveData<List<EntityAttachment>> liveAttachments(long message, boolean inline);
 
     @Query("SELECT ifnull(MAX(sequence), 0)" +
             " FROM attachment" +
diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index 1480b4eddd..4a3e432b1a 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -1808,7 +1808,7 @@ public class FragmentCompose extends FragmentBase {
 
             DB db = DB.getInstance(getContext());
 
-            db.attachment().liveAttachments(result.draft.id).observe(getViewLifecycleOwner(),
+            db.attachment().liveAttachments(result.draft.id, false).observe(getViewLifecycleOwner(),
                     new Observer<List<EntityAttachment>>() {
                         private int last_available = 0;