diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index 7900c83959..9342f81a39 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -3543,8 +3543,10 @@ public class FragmentCompose extends FragmentBase {
                     if (attachment.available) {
                         if (!attachment.isEncryption())
                             last_available++;
-                    } else
-                        EntityOperation.queue(context, data.draft, EntityOperation.ATTACHMENT, attachment.id);
+                    } else {
+                        if (attachment.progress == null)
+                            EntityOperation.queue(context, data.draft, EntityOperation.ATTACHMENT, attachment.id);
+                    }
 
                 db.setTransactionSuccessful();
             } finally {