diff --git a/app/src/main/java/eu/faircode/email/ActivityView.java b/app/src/main/java/eu/faircode/email/ActivityView.java
index c5e2aaf773..4c76f9ce6c 100644
--- a/app/src/main/java/eu/faircode/email/ActivityView.java
+++ b/app/src/main/java/eu/faircode/email/ActivityView.java
@@ -1335,7 +1335,11 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
                                     a.message = id;
                                     a.sequence = ++sequence;
                                     a.id = db.attachment().insertAttachment(a);
-                                    parts.downloadAttachment(context, index, a.id);
+                                    try {
+                                        parts.downloadAttachment(context, index, a.id);
+                                    } catch (Throwable ex) {
+                                        Log.e(ex);
+                                    }
                                 }
 
                                 db.message().setMessageStored(id, new Date().getTime());
diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java
index 3b1ff929bb..5ffb969698 100644
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
@@ -1402,8 +1402,11 @@ class Core {
             for (EntityAttachment attachment : attachments)
                 if (!attachment.available)
                     if (!metered || (attachment.size != null && attachment.size < maxSize))
-                        if (!parts.downloadAttachment(context, attachment.sequence - 1, attachment.id))
-                            break;
+                        try {
+                            parts.downloadAttachment(context, attachment.sequence - 1, attachment.id);
+                        } catch (Throwable ex) {
+                            Log.e(ex);
+                        }
         }
     }
 
diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java
index cce351766e..3fbcd0b881 100644
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@@ -27,6 +27,7 @@ import java.io.BufferedOutputStream;
 import java.io.BufferedReader;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
+import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.FileReader;
 import java.io.IOException;
@@ -697,12 +698,12 @@ public class MessageHelper {
             return result;
         }
 
-        boolean downloadAttachment(Context context, int index, long id) {
+        void downloadAttachment(Context context, int index, long id) throws MessagingException, IOException {
             Log.i("downloading attchment id=" + id + " seq=" + index);
             // Attachments of drafts might not have been uploaded yet
             if (index > attachments.size()) {
                 Log.w("Attachment unavailable sequence=" + index + " size=" + attachments.size());
-                return false;
+                return;
             }
 
             DB db = DB.getInstance(context);
@@ -711,7 +712,7 @@ public class MessageHelper {
             AttachmentPart apart = attachments.get(index);
             EntityAttachment attachment = db.attachment().getAttachment(id);
             if (attachment == null)
-                return false;
+                throw new FileNotFoundException();
             File file = attachment.getFile(context);
 
             // Download attachment
@@ -736,12 +737,10 @@ public class MessageHelper {
                 db.attachment().setDownloaded(id, size);
 
                 Log.i("Downloaded attachment size=" + size);
-                return true;
             } catch (Throwable ex) {
-                Log.w(ex);
                 // Reset progress on failure
                 db.attachment().setError(id, Helper.formatThrowable(ex));
-                return false;
+                throw ex;
             }
         }