diff --git a/app/src/main/java/eu/faircode/email/EntityAttachment.java b/app/src/main/java/eu/faircode/email/EntityAttachment.java
index 499a041ef2..30582b4515 100644
--- a/app/src/main/java/eu/faircode/email/EntityAttachment.java
+++ b/app/src/main/java/eu/faircode/email/EntityAttachment.java
@@ -133,7 +133,7 @@ public class EntityAttachment {
                     Helper.copy(source, target);
                 } catch (IOException ex) {
                     Log.e(ex);
-                    db.attachment().setProgress(attachment.id, null);
+                    db.attachment().setError(attachment.id, Helper.formatThrowable(ex, false));
                 }
             }
         }
diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index e471e5fd7a..88cc0339be 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -1893,7 +1893,8 @@ public class FragmentCompose extends FragmentBase {
 
         } catch (IOException ex) {
             // Reset progress on failure
-            db.attachment().setProgress(attachment.id, null);
+            Log.e(ex);
+            db.attachment().setError(attachment.id, Helper.formatThrowable(ex, false));
             throw ex;
         }
 
diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java
index 51bd78abff..9600e29acc 100644
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@@ -923,6 +923,7 @@ public class MessageHelper {
                 throw new MessagingException("downloadAttachment", ex);
             } catch (Throwable ex) {
                 // Reset progress on failure
+                Log.e(ex);
                 db.attachment().setError(local.id, Helper.formatThrowable(ex));
                 throw ex;
             }