From 3829a3e6a6cf6c4b00da64c09e9377438e388c96 Mon Sep 17 00:00:00 2001
From: EphemeralFog <mohammad87115@gmail.com>
Date: Sun, 21 Jun 2026 00:06:59 +0330
Subject: [PATCH 1/2] fix: reverse message header element order for
 right-aligned bubble messages

---
 src/app/features/room/message/Message.tsx | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/app/features/room/message/Message.tsx b/src/app/features/room/message/Message.tsx
index 02f29381b..045dd6973 100644
--- a/src/app/features/room/message/Message.tsx
+++ b/src/app/features/room/message/Message.tsx
@@ -620,12 +620,25 @@ function MessageInternal(
   const headerJSX = !collapse && (
     <Box
       gap="300"
-      direction={messageLayout === MessageLayout.Compact ? 'RowReverse' : 'Row'}
+      direction={
+        messageLayout === MessageLayout.Compact ||
+        (messageLayout === MessageLayout.Bubble && useRightBubbles && senderId === mx.getUserId())
+          ? 'RowReverse'
+          : 'Row'
+      }
       justifyContent="SpaceBetween"
       alignItems="Baseline"
       grow="Yes"
     >
-      <Box alignItems="Center" gap="100">
+      <Box
+        alignItems="Center"
+        gap="100"
+        direction={
+          messageLayout === MessageLayout.Bubble && useRightBubbles && senderId === mx.getUserId()
+            ? 'RowReverse'
+            : undefined
+        }
+      >
         <Username
           as="button"
           style={{

From c99d0f9f35a9d2391463f9e7d0c08b635961334b Mon Sep 17 00:00:00 2001
From: EphemeralFog <mohammad87115@gmail.com>
Date: Sun, 21 Jun 2026 00:08:04 +0330
Subject: [PATCH 2/2] chore: add changeset for message header element order fix

---
 .changeset/fix-right-aligned-bubbles-message-header-order.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/fix-right-aligned-bubbles-message-header-order.md

diff --git a/.changeset/fix-right-aligned-bubbles-message-header-order.md b/.changeset/fix-right-aligned-bubbles-message-header-order.md
new file mode 100644
index 000000000..107eab991
--- /dev/null
+++ b/.changeset/fix-right-aligned-bubbles-message-header-order.md
@@ -0,0 +1,5 @@
+---
+default: patch
+---
+
+Reverse the order of message header elements in the right aligned bubbles layout.