diff --git a/addons/mail/static/src/core/common/attachment_service.js b/addons/mail/static/src/core/common/attachment_service.js
index 412768ddc61..463f7e0ed89 100644
--- a/addons/mail/static/src/core/common/attachment_service.js
+++ b/addons/mail/static/src/core/common/attachment_service.js
@@ -38,7 +38,6 @@ export class AttachmentService {
      * @param {Attachment} attachment
      */
     async delete(attachment) {
-        this.remove(attachment);
         if (attachment.id > 0) {
             await this.rpc(
                 "/mail/attachment/delete",
@@ -48,6 +47,7 @@ export class AttachmentService {
                 )
             );
         }
+        this.remove(attachment);
     }
 }
 
diff --git a/addons/mail/static/src/core/common/message_service.js b/addons/mail/static/src/core/common/message_service.js
index 935fcb1ca16..8949bcd647a 100644
--- a/addons/mail/static/src/core/common/message_service.js
+++ b/addons/mail/static/src/core/common/message_service.js
@@ -55,18 +55,18 @@ export class MessageService {
     }
 
     async delete(message) {
-        if (message.isStarred) {
-            this.store.discuss.starred.counter--;
-            this.store.discuss.starred.messages.delete(message);
-        }
-        message.body = "";
-        message.attachments = [];
         await this.rpc("/mail/message/update_content", {
             attachment_ids: [],
             attachment_tokens: [],
             body: "",
             message_id: message.id,
         });
+        if (message.isStarred) {
+            this.store.discuss.starred.counter--;
+            this.store.discuss.starred.messages.delete(message);
+        }
+        message.body = "";
+        message.attachments = [];
     }
 
     /**