diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 8ab41317cc..fc51009cec 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -1623,6 +1623,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                 } catch (IOException ex) {
                     Log.e(ex);
                     db.message().setMessageContent(message.id, false, null, null);
+                    db.message().setMessageSize(message.id, null);
                     return null;
                 }
 
diff --git a/app/src/main/java/eu/faircode/email/EntityOperation.java b/app/src/main/java/eu/faircode/email/EntityOperation.java
index 0d93c75d7f..c8c059942b 100644
--- a/app/src/main/java/eu/faircode/email/EntityOperation.java
+++ b/app/src/main/java/eu/faircode/email/EntityOperation.java
@@ -175,6 +175,7 @@ public class EntityOperation {
                         } catch (IOException ex) {
                             Log.e(ex);
                             db.message().setMessageContent(tmpid, false, null, null);
+                            db.message().setMessageSize(message.id, null);
                         }
 
                     EntityAttachment.copy(context, message.id, tmpid);