diff --git a/addons/mail/static/src/components/message/message.xml b/addons/mail/static/src/components/message/message.xml
index 85344106de4..140c5289ae3 100644
--- a/addons/mail/static/src/components/message/message.xml
+++ b/addons/mail/static/src/components/message/message.xml
@@ -6,7 +6,7 @@
             <div class="o_Message position-relative pt-1"
                 t-att-class="{
                     'o_Message_active': messageView.isActive,
-                    'o-clicked': messageView.isClicked,
+                    'o-clicked': messageView.messagingAsClickedMessageView,
                     'o-discussion': messageView.message.isDiscussionOrNotification,
                     'o-has-message-selection': messageView.threadView and messageView.threadView.replyingToMessageView,
                     'o-highlighted': messageView.message.isHighlighted or messageView.isHighlighted,
diff --git a/addons/mail/static/src/models/message_view.js b/addons/mail/static/src/models/message_view.js
index e70c7b0d71d..90f00ae2ac5 100644
--- a/addons/mail/static/src/models/message_view.js
+++ b/addons/mail/static/src/models/message_view.js
@@ -56,7 +56,11 @@ registerModel({
                 !isEventHandled(ev, 'MessageReactionGroup.Click') &&
                 !isEventHandled(ev, 'MessageInReplyToView.ClickMessageInReplyTo')
             ) {
-                this.update({ isClicked: !this.isClicked });
+                if (this.messagingAsClickedMessageView) {
+                    this.messaging.update({ clickedMessageView: clear() });
+                } else {
+                    this.messaging.update({ clickedMessageView: replace(this) });
+                }
             }
         },
         /**
@@ -110,7 +114,10 @@ registerModel({
             this.update({ isHovered: true });
         },
         onMouseleave() {
-            this.update({ isHovered: false });
+            this.update({
+                isHovered: false,
+                messagingAsClickedMessageView: clear(),
+            });
         },
         /**
          * Action to initiate reply to current messageView.
@@ -235,7 +242,7 @@ registerModel({
         _computeIsActive() {
             return Boolean(
                 this.isHovered ||
-                this.isClicked ||
+                this.messagingAsClickedMessageView ||
                 (
                     this.messageActionList &&
                     (
@@ -371,13 +378,6 @@ registerModel({
         isActive: attr({
             compute: '_computeIsActive',
         }),
-        /**
-         * Determines whether the message is clicked. When message is in
-         * clicked state, it keeps displaying actions even if not hovered.
-         */
-        isClicked: attr({
-            default: false
-        }),
         /**
          * Whether the message should be forced to be isHighlighted. Should only
          * be set through @see highlight()
@@ -435,6 +435,9 @@ registerModel({
             inverse: 'messageViewOwner',
             isCausal: true,
         }),
+        messagingAsClickedMessageView: one('Messaging', {
+            inverse: 'clickedMessageView',
+        }),
         /**
          * States the thread view that is displaying this messages (if any).
          */
diff --git a/addons/mail/static/src/models/messaging.js b/addons/mail/static/src/models/messaging.js
index eecf3fc16f7..c4e55a4d8b3 100644
--- a/addons/mail/static/src/models/messaging.js
+++ b/addons/mail/static/src/models/messaging.js
@@ -297,6 +297,12 @@ registerModel({
             isCausal: true,
             readonly: true,
         }),
+        /**
+         * Determines which message view is currently clicked, if any.
+         */
+        clickedMessageView: one('MessageView', {
+            inverse: 'messagingAsClickedMessageView',
+        }),
         commands: many('ChannelCommand'),
         companyName: attr(),
         currentGuest: one('Guest'),