diff --git a/addons/mail/static/src/core_ui/message.js b/addons/mail/static/src/core_ui/message.js
index 8f571ba10b4..8391a2abb4b 100644
--- a/addons/mail/static/src/core_ui/message.js
+++ b/addons/mail/static/src/core_ui/message.js
@@ -147,7 +147,6 @@ export class Message extends Component {
 
     get attClass() {
         return {
-            "o-highlighted-from-mention": this.message.isHighlightedFromMention,
             "o-highlighted bg-view shadow-lg": this.props.highlighted,
             "o-selfAuthored": this.message.isSelfAuthored,
             "o-selected": this.props.messageToReplyTo?.isSelected(
diff --git a/addons/mail/static/src/core_ui/message.xml b/addons/mail/static/src/core_ui/message.xml
index 4d262bed023..e29112f2b5d 100644
--- a/addons/mail/static/src/core_ui/message.xml
+++ b/addons/mail/static/src/core_ui/message.xml
@@ -83,8 +83,9 @@
                                         <div class="position-relative">
                                             <div class="o-mail-Message-bubble rounded-bottom-3 position-absolute top-0 start-0 w-100 h-100" t-att-class="{
                                                 'border': state.isEditing,
-                                                'bg-info-light border border-info opacity-25': !message.isSelfAuthored and !message.isNote,
-                                                'bg-success-light border border-success opacity-25': message.isSelfAuthored and !message.isNote,
+                                                'bg-info-light border border-info opacity-25': !message.isSelfAuthored and !message.isNote and !message.isHighlightedFromMention,
+                                                'bg-success-light border border-success opacity-25': message.isSelfAuthored and !message.isNote and !message.isHighlightedFromMention,
+                                                'bg-warning-light border border-warning opacity-50': message.isHighlightedFromMention,
                                                 }" t-attf-class="{{ isAlignedRight ? 'rounded-start-3' : 'rounded-end-3' }}"/>
                                             <div class="position-relative" t-att-class="{
                                                         'p-1': message.isNote,
diff --git a/addons/mail/static/tests/message/message_tests.js b/addons/mail/static/tests/message/message_tests.js
index cfba345848f..1a4e1c99fd8 100644
--- a/addons/mail/static/tests/message/message_tests.js
+++ b/addons/mail/static/tests/message/message_tests.js
@@ -961,7 +961,7 @@ QUnit.test(
         });
         const { openDiscuss } = await start();
         await openDiscuss(channelId);
-        assert.hasClass($(".o-mail-Message"), "o-highlighted-from-mention");
+        assert.hasClass($(".o-mail-Message-bubble"), "bg-warning-light");
     }
 );
 
@@ -987,7 +987,7 @@ QUnit.test(
         });
         const { openDiscuss } = await start();
         await openDiscuss(channelId);
-        assert.doesNotHaveClass($(".o-mail-Message"), "o-highlighted-from-mention");
+        assert.doesNotHaveClass($(".o-mail-Message-bubble"), "bg-warning-light");
     }
 );