diff --git a/addons/mail/static/src/components/message/message.xml b/addons/mail/static/src/components/message/message.xml
index ee53284d449..c53c2a68f66 100644
--- a/addons/mail/static/src/components/message/message.xml
+++ b/addons/mail/static/src/components/message/message.xml
@@ -118,10 +118,10 @@
                         <p class="o_Message_subject mx-2 mb-1">Subject: <t t-esc="message.subject"/></p>
                     </t>
                     <div class="o_Message_content mx-2" t-ref="content">
-                        <t t-if="!message.isEditing or !message.composerInEditing">
+                        <t t-if="message.actionList.showDeleteConfirm or !message.isEditing or !message.composerInEditing">
                             <div class="o_Message_prettyBody" t-ref="prettyBody"/><!-- message.prettyBody is inserted here from _update() -->
                         </t>
-                        <t t-if="message.isEditing and message.composerInEditing" >
+                        <t t-if="!message.actionList.showDeleteConfirm and message.isEditing and message.composerInEditing" >
                             <Composer
                                 class="o_Message_composer mb-1"
                                 composerLocalId="message.composerInEditing.localId"
diff --git a/addons/mail/static/src/models/composer/composer.js b/addons/mail/static/src/models/composer/composer.js
index 8cd9b63c933..573123f257c 100644
--- a/addons/mail/static/src/models/composer/composer.js
+++ b/addons/mail/static/src/models/composer/composer.js
@@ -331,6 +331,10 @@ function factory(dependencies) {
                     this.messageInEditing.originThread.unregisterCurrentPartnerIsTyping({ immediateNotify: true });
                 }
             }
+            if (!this.textInputContent) {
+                this.messageInEditing.actionList.update({ showDeleteConfirm: true });
+                return;
+            }
             const escapedAndCompactContent = escapeAndCompactTextContent(this.textInputContent);
             let body = escapedAndCompactContent.replace(/&nbsp;/g, ' ').trim();
             body = this._generateMentionsLinks(body);
@@ -486,7 +490,7 @@ function factory(dependencies) {
          * @returns {boolean}
          */
         _computeCanPostMessage() {
-            if (!this.textInputContent && this.attachments.length === 0) {
+            if (!this.messageInEditing && !this.textInputContent && this.attachments.length === 0) {
                 return false;
             }
             return !this.hasUploadingAttachment && !this.isPostingMessage;