diff --git a/addons/mail/static/src/core/common/message.xml b/addons/mail/static/src/core/common/message.xml
index fc9645fae91..ada261d1e7d 100644
--- a/addons/mail/static/src/core/common/message.xml
+++ b/addons/mail/static/src/core/common/message.xml
@@ -35,6 +35,7 @@
                             <span t-if="(message.author or message.email_from) and shouldDisplayAuthorName" class="o-mail-Message-author">
                                 <strong class="me-1 text-truncate"><t t-if="message.author" t-esc="message.author.name"/><t t-else="" t-esc="message.email_from"/></strong>
                             </span>
+                            <t t-if="!isAlignedRight" t-call="mail.Message.notification"/>
                             <small t-if="!message.isTransient" class="o-mail-Message-date text-muted opacity-50" t-att-class="{ 'me-2': !isAlignedRight }" t-att-title="message.datetimeShort">
                                 <t t-if="shouldDisplayAuthorName">- </t>
                                 <RelativeTime datetime="message.datetime"/>
@@ -57,11 +58,7 @@
                                     <i class="fa fa-calendar-o"/>
                                 </span>
                             </div>
-                            <div t-if="message.originThread?.eq(props.thread) and message.notifications.length > 0" t-att-class="{ 'ms-2': !isAlignedRight }">
-                                <span class="o-mail-Message-notification cursor-pointer" t-att-class="message.failureNotifications.length > 0 ? 'text-danger' : text-600" role="button" tabindex="0" t-on-click="onClickNotification">
-                                    <i t-att-class="message.notifications[0].icon" role="img" aria-label="Delivery failure"/> <span t-if="message.notifications[0].label" t-out="message.notifications[0].label"/>
-                                </span>
-                            </div>
+                            <t t-if="isAlignedRight" t-call="mail.Message.notification"/>
                         </div>
                         <div
                             class="position-relative d-flex"
@@ -161,4 +158,12 @@
     </div>
 </t>
 
+<t t-name="mail.Message.notification">
+    <div t-if="message.originThread?.eq(props.thread) and message.notifications.length > 0" class="mx-1">
+        <span class="o-mail-Message-notification cursor-pointer" t-att-class="message.failureNotifications.length > 0 ? 'text-danger' : text-600" role="button" tabindex="0" t-on-click="onClickNotification">
+            <i t-att-class="message.notifications[0].icon" role="img" aria-label="Delivery failure"/> <span t-if="message.notifications[0].label" t-out="message.notifications[0].label"/>
+        </span>
+    </div>
+</t>
+
 </templates>
diff --git a/addons/mail/static/src/core/common/message_in_reply.xml b/addons/mail/static/src/core/common/message_in_reply.xml
index de290587df9..b572c1d58b7 100644
--- a/addons/mail/static/src/core/common/message_in_reply.xml
+++ b/addons/mail/static/src/core/common/message_in_reply.xml
@@ -12,6 +12,7 @@
                     <img class="o-mail-MessageInReply-avatar me-2 rounded" t-att-src="authorAvatarUrl" t-att-title="message.parentMessage.author?.name ?? message.parentMessage.email_from" alt="Avatar"/>
                     <span class="o-mail-MessageInReply-content overflow-hidden">
                         <b>@<t t-out="message.parentMessage.author?.name ?? message.parentMessage.email_from"/></b>:
+                        <br t-if="env.inChatWindow and !props.alignedRight"/>
                         <span class="o-mail-MessageInReply-message ms-1 text-break">
                             <t t-if="!message.parentMessage.isBodyEmpty">
                                 <t t-out="message.parentMessage.body"/>