diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java
index dd42830484..f4e6684c8e 100644
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@@ -4532,6 +4532,11 @@ public class MessageHelper {
                             subsequence = decodeTNEF(context, epart.attachment, subsequence);
 
                     } catch (Throwable ex) {
+                        Log.w(ex);
+
+                        if (epart.attachment.id == null)
+                            continue;
+
                         db.attachment().setError(epart.attachment.id, Log.formatThrowable(ex));
                         db.attachment().setAvailable(epart.attachment.id, true); // unrecoverable
                     }