diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java
index f2634ed072..6d850a086d 100644
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
@@ -2201,11 +2201,12 @@ class Core {
                     Log.i(folder.name + " inline downloaded message id=" + message.id +
                             " size=" + message.size + "/" + (body == null ? null : body.length()));
 
+                    if (!TextUtils.isEmpty(body))
+                        fixAttachments(context, message.id, body);
+
                     Long size = parts.getBodySize();
                     if (TextUtils.isEmpty(body) && size != null && size > 0)
                         reportEmptyMessage(context, account, istore);
-                    else
-                        fixAttachments(context, message.id, body);
                 }
             }
 
@@ -2525,11 +2526,12 @@ class Core {
                     Log.i(folder.name + " downloaded message id=" + message.id +
                             " size=" + message.size + "/" + (body == null ? null : body.length()));
 
+                    if (!TextUtils.isEmpty(body))
+                        fixAttachments(context, message.id, body);
+
                     Long size = parts.getBodySize();
                     if (TextUtils.isEmpty(body) && size != null && size > 0)
                         reportEmptyMessage(context, account, istore);
-                    else
-                        fixAttachments(context, message.id, body);
                 }
             }