diff --git a/app/src/main/java/eu/faircode/email/AdapterAttachment.java b/app/src/main/java/eu/faircode/email/AdapterAttachment.java
index 15bf62e225..f9ef5b318d 100644
--- a/app/src/main/java/eu/faircode/email/AdapterAttachment.java
+++ b/app/src/main/java/eu/faircode/email/AdapterAttachment.java
@@ -25,6 +25,7 @@ import android.content.SharedPreferences;
 import android.graphics.Bitmap;
 import android.net.Uri;
 import android.os.Bundle;
+import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -32,6 +33,7 @@ import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.ProgressBar;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import androidx.annotation.NonNull;
 import androidx.core.content.FileProvider;
@@ -207,8 +209,11 @@ public class AdapterAttachment extends RecyclerView.Adapter<AdapterAttachment.Vi
                 if (attachment.available)
                     onShare(attachment);
                 else {
-                    if (attachment.progress == null && attachment.subsequence == null)
-                        onDownload(attachment);
+                    if (attachment.progress == null)
+                        if (attachment.subsequence == null)
+                            onDownload(attachment);
+                        else if (!TextUtils.isEmpty(attachment.error))
+                            ToastEx.makeText(context, attachment.error, Toast.LENGTH_LONG).show();
                 }
             }
         }
diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java
index 398a66d01e..eb59b60a02 100644
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
@@ -4745,7 +4745,9 @@ class Core {
             }
 
             for (EntityAttachment attachment : attachments)
-                if (!attachment.available && TextUtils.isEmpty(attachment.error))
+                if (!attachment.available &&
+                        attachment.subsequence == null &&
+                        TextUtils.isEmpty(attachment.error))
                     if (state.getNetworkState().isUnmetered() ||
                             (attachment.size != null && attachment.size < maxSize))
                         try {
diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java
index 086a75ff1e..6c1f83957b 100644
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@@ -3604,8 +3604,13 @@ public class MessageHelper {
                     attachment.disposition = Part.ATTACHMENT;
                     attachment.id = db.attachment().insertAttachment(attachment);
 
-                    Helper.writeText(attachment.getFile(context), subject);
-                    db.attachment().setDownloaded(attachment.id, (long) subject.length());
+                    try {
+                        Helper.writeText(attachment.getFile(context), subject);
+                        db.attachment().setDownloaded(attachment.id, (long) subject.length());
+                    } catch (Throwable ex) {
+                        Log.e(ex);
+                        db.attachment().setError(attachment.id, Log.formatThrowable(ex));
+                    }
                 }
 
                 String body = msg.getBody();
@@ -3629,9 +3634,14 @@ public class MessageHelper {
                         attachment.disposition = Part.ATTACHMENT;
                         attachment.id = db.attachment().insertAttachment(attachment);
 
-                        byte[] data = attr.getData();
-                        Helper.writeText(attachment.getFile(context), new String(data));
-                        db.attachment().setDownloaded(attachment.id, (long) data.length);
+                        try {
+                            byte[] data = attr.getData();
+                            Helper.writeText(attachment.getFile(context), new String(data));
+                            db.attachment().setDownloaded(attachment.id, (long) data.length);
+                        } catch (Throwable ex) {
+                            Log.e(ex);
+                            db.attachment().setError(attachment.id, Log.formatThrowable(ex));
+                        }
                     }
                 } else {
                     EntityAttachment attachment = new EntityAttachment();
@@ -3643,30 +3653,35 @@ public class MessageHelper {
                     attachment.disposition = Part.ATTACHMENT;
                     attachment.id = db.attachment().insertAttachment(attachment);
 
-                    Helper.writeText(attachment.getFile(context), body);
-                    db.attachment().setDownloaded(attachment.id, (long) body.length());
+                    try {
+                        Helper.writeText(attachment.getFile(context), body);
+                        db.attachment().setDownloaded(attachment.id, (long) body.length());
+                    } catch (Throwable ex) {
+                        Log.e(ex);
+                        db.attachment().setError(attachment.id, Log.formatThrowable(ex));
+                    }
                 }
 
-                for (org.apache.poi.hmef.Attachment at : msg.getAttachments())
+                for (org.apache.poi.hmef.Attachment at : msg.getAttachments()) {
+                    String filename = at.getLongFilename();
+                    if (filename == null)
+                        filename = at.getFilename();
+                    if (filename == null) {
+                        String ext = at.getExtension();
+                        if (ext != null)
+                            filename = "document." + ext;
+                    }
+
+                    EntityAttachment attachment = new EntityAttachment();
+                    attachment.message = local.message;
+                    attachment.sequence = local.sequence;
+                    attachment.subsequence = ++subsequence;
+                    attachment.name = filename;
+                    attachment.type = Helper.guessMimeType(attachment.name);
+                    attachment.disposition = Part.ATTACHMENT;
+                    attachment.id = db.attachment().insertAttachment(attachment);
+
                     try {
-                        String filename = at.getLongFilename();
-                        if (filename == null)
-                            filename = at.getFilename();
-                        if (filename == null) {
-                            String ext = at.getExtension();
-                            if (ext != null)
-                                filename = "document." + ext;
-                        }
-
-                        EntityAttachment attachment = new EntityAttachment();
-                        attachment.message = local.message;
-                        attachment.sequence = local.sequence;
-                        attachment.subsequence = ++subsequence;
-                        attachment.name = filename;
-                        attachment.type = Helper.guessMimeType(attachment.name);
-                        attachment.disposition = Part.ATTACHMENT;
-                        attachment.id = db.attachment().insertAttachment(attachment);
-
                         byte[] data = at.getContents();
                         try (OutputStream os = new FileOutputStream(attachment.getFile(context))) {
                             os.write(data);
@@ -3676,7 +3691,9 @@ public class MessageHelper {
                     } catch (Throwable ex) {
                         // java.lang.IllegalArgumentException: Attachment corrupt - no Data section
                         Log.e(ex);
+                        db.attachment().setError(attachment.id, Log.formatThrowable(ex));
                     }
+                }
 
                 StringBuilder sb = new StringBuilder();
                 for (org.apache.poi.hmef.attribute.TNEFAttribute attr : msg.getMessageAttributes())
@@ -3695,8 +3712,13 @@ public class MessageHelper {
                     attachment.disposition = Part.ATTACHMENT;
                     attachment.id = db.attachment().insertAttachment(attachment);
 
-                    Helper.writeText(attachment.getFile(context), sb.toString());
-                    db.attachment().setDownloaded(attachment.id, (long) sb.length());
+                    try {
+                        Helper.writeText(attachment.getFile(context), sb.toString());
+                        db.attachment().setDownloaded(attachment.id, (long) sb.length());
+                    } catch (Throwable ex) {
+                        Log.e(ex);
+                        db.attachment().setError(attachment.id, Log.formatThrowable(ex));
+                    }
                 }
             } catch (Throwable ex) {
                 Log.w(ex);