diff --git a/addons/mail/static/src/core/common/message.js b/addons/mail/static/src/core/common/message.js
index 4624b6d8db5..214a6514e98 100644
--- a/addons/mail/static/src/core/common/message.js
+++ b/addons/mail/static/src/core/common/message.js
@@ -103,6 +103,7 @@ export class Message extends Component {
         this.attachmentService = useService("mail.attachment");
         this.user = useService("user");
         this.dialog = useService("dialog");
+        this.ui = useState(useService("ui"));
         this.openReactionMenu = this.openReactionMenu.bind(this);
         useChildSubEnv({
             alignedRight: this.isAlignedRight,
diff --git a/addons/mail/static/src/core/common/message.xml b/addons/mail/static/src/core/common/message.xml
index 7563ddabca7..7814202c2d4 100644
--- a/addons/mail/static/src/core/common/message.xml
+++ b/addons/mail/static/src/core/common/message.xml
@@ -105,9 +105,9 @@
                             <div t-if="props.hasActions and message.hasActions" class="o-mail-Message-actions"
                                 t-att-class="{
                                     'start-0 ms-3': isAlignedRight,
-                                    'end-0 me-3': env.inChatWindow and !isAlignedRight,
-                                    'position-absolute top-0 mt-n3': env.inChatWindow,
-                                    'ms-2': !env.inChatWindow,
+                                    'end-0 me-3': (env.inChatWindow or ui.isSmall) and !isAlignedRight,
+                                    'position-absolute top-0 mt-n3': env.inChatWindow or ui.isSmall,
+                                    'ms-2': !env.inChatWindow and !ui.isSmall,
                                     'invisible': !isActive,
                                     'o-expanded': state.expandOptions
                                 }"