diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java
index 7a240a5274..6a0d1d98db 100644
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@@ -926,8 +926,10 @@ public class MessageHelper {
 
                 Log.i("Downloaded attachment size=" + size);
             } catch (FolderClosedIOException ex) {
+                db.attachment().setError(id, Helper.formatThrowable(ex));
                 throw new FolderClosedException(ex.getFolder(), "downloadAttachment", ex);
             } catch (MessageRemovedIOException ex) {
+                db.attachment().setError(id, Helper.formatThrowable(ex));
                 throw new MessagingException("downloadAttachment", ex);
             } catch (Throwable ex) {
                 // Reset progress on failure