diff --git a/app/src/main/java/eu/faircode/email/EntityOperation.java b/app/src/main/java/eu/faircode/email/EntityOperation.java
index f9ef983eee..24372d23f6 100644
--- a/app/src/main/java/eu/faircode/email/EntityOperation.java
+++ b/app/src/main/java/eu/faircode/email/EntityOperation.java
@@ -262,7 +262,7 @@ public class EntityOperation {
                 db.message().setMessageUiHide(message.id, true);
 
             else if (ATTACHMENT.equals(name))
-                db.attachment().setProgress(jargs.getLong(0), null);
+                db.attachment().setProgress(jargs.getLong(0), 0);
 
             queue(context, message.account, message.folder, message.id, name, jargs);
 
diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java
index baa40f11f4..eaf3c6bed7 100644
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@@ -1304,7 +1304,7 @@ public class MessageHelper {
 
             // Download attachment
             File file = EntityAttachment.getFile(context, local.id, local.name);
-            db.attachment().setProgress(local.id, null);
+            db.attachment().setProgress(local.id, 0);
 
             if (EntityAttachment.PGP_CONTENT.equals(apart.encrypt) ||
                     EntityAttachment.SMIME_CONTENT.equals(apart.encrypt)) {