diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java
index 63bec86aa4..c2aff61804 100644
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
@@ -710,8 +710,6 @@ class Core {
                 parts.isPlainOnly(),
                 HtmlHelper.getPreview(body),
                 parts.getWarnings(message.warning));
-
-        updateMessageSize(context, message.id);
     }
 
     private static void onAttachment(Context context, JSONArray jargs, EntityFolder folder, EntityMessage message, EntityOperation op, IMAPFolder ifolder) throws JSONException, MessagingException, IOException {
@@ -764,8 +762,6 @@ class Core {
                 throw new IllegalArgumentException("Attachment not found");
             }
         }
-
-        updateMessageSize(context, message.id);
     }
 
     static void onSynchronizeFolders(Context context, EntityAccount account, Store istore, State state) throws MessagingException {
@@ -1688,38 +1684,9 @@ class Core {
                         } catch (Throwable ex) {
                             Log.e(ex);
                         }
-
-            updateMessageSize(context, message.id);
         }
     }
 
-    static void updateMessageSize(Context context, long id) {
-        DB db = DB.getInstance(context);
-
-        EntityMessage message = db.message().getMessage(id);
-        if (message == null || !message.content)
-            return;
-
-        long size = message.getFile(context).length();
-        if (size == 0)
-            return;
-
-        List<EntityAttachment> attachments = db.attachment().getAttachments(message.id);
-        for (EntityAttachment attachment : attachments) {
-            if (!attachment.available)
-                return;
-
-            long asize = attachment.getFile(context).length();
-            if (asize == 0)
-                return;
-
-            size += asize;
-        }
-
-        Log.i("Setting message=" + id + " size=" + message.size + "/" + size);
-        db.message().setMessageSize(message.id, size);
-    }
-
     static void notifyReset(Context context) {
         lastUnseen = -1;
         Widget.update(context, -1);
diff --git a/app/src/main/java/eu/faircode/email/EntityRule.java b/app/src/main/java/eu/faircode/email/EntityRule.java
index 99aefd4129..c811fd0065 100644
--- a/app/src/main/java/eu/faircode/email/EntityRule.java
+++ b/app/src/main/java/eu/faircode/email/EntityRule.java
@@ -298,8 +298,6 @@ public class EntityRule {
                 HtmlHelper.getPreview(body),
                 null);
 
-        Core.updateMessageSize(context, reply.id);
-
         EntityOperation.queue(context, reply, EntityOperation.SEND);
     }
 
diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index e5ca0e44c2..92a9827bda 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -2188,8 +2188,6 @@ public class FragmentCompose extends FragmentBase {
                         ics.renameTo(attachment.getFile(context));
                     }
 
-                    Core.updateMessageSize(context, draft.id);
-
                     // Write reference text
                     if (ref != null && ref.content && !"list".equals(action) && !"receipt".equals(action)) {
                         String refBody = String.format("<p>%s %s:</p>\n<blockquote>%s</blockquote>",
@@ -2583,7 +2581,6 @@ public class FragmentCompose extends FragmentBase {
                                 draft.plain_only, // unchanged
                                 HtmlHelper.getPreview(body),
                                 null);
-                        Core.updateMessageSize(context, draft.id);
                     }
                 } else {
                     String previous = Helper.readText(draft.getFile(context));
@@ -2609,7 +2606,6 @@ public class FragmentCompose extends FragmentBase {
                                 draft.plain_only,
                                 HtmlHelper.getPreview(body),
                                 null);
-                        Core.updateMessageSize(context, draft.id);
                     }
                 }
 
diff --git a/app/src/main/java/eu/faircode/email/Log.java b/app/src/main/java/eu/faircode/email/Log.java
index e260549846..6f095e421e 100644
--- a/app/src/main/java/eu/faircode/email/Log.java
+++ b/app/src/main/java/eu/faircode/email/Log.java
@@ -203,8 +203,6 @@ public class Log {
             attachOperations(context, draft.id, 5);
             attachLogcat(context, draft.id, 6);
 
-            Core.updateMessageSize(context, draft.id);
-
             EntityOperation.queue(context, draft, EntityOperation.ADD);
 
             db.setTransactionSuccessful();