From c623ca4fe0b095f7cf24b11226a9ba413db1fe16 Mon Sep 17 00:00:00 2001
From: Sina Sadeghi <sina.sadeghi83@gmail.com>
Date: Tue, 5 May 2026 13:40:59 +0330
Subject: [PATCH 1/3] fix rtl & ltr mixed message content direction

---
 src/app/components/message/layout/layout.css.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/app/components/message/layout/layout.css.ts b/src/app/components/message/layout/layout.css.ts
index e30e4c8c3..3d1368d20 100644
--- a/src/app/components/message/layout/layout.css.ts
+++ b/src/app/components/message/layout/layout.css.ts
@@ -229,6 +229,8 @@ export const PronounPill = style({
 
 export const MessageTextBody = recipe({
   base: {
+    unicodeBidi: 'plaintext',
+    alignSelf: 'start',
     wordBreak: 'break-word',
     fontSize: '1rem !important', // Override folds Text component to enable page zoom scaling
   },

From 2cf66f33a908eb89898436b15bf912b65c3ad4b4 Mon Sep 17 00:00:00 2001
From: Sina Sadeghi <sina.sadeghi83@gmail.com>
Date: Tue, 5 May 2026 13:41:09 +0330
Subject: [PATCH 2/3] fix rtl & ltr mixed message reply direction

---
 src/app/components/message/Reply.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/components/message/Reply.tsx b/src/app/components/message/Reply.tsx
index 46537cd4d..c9d7f0398 100644
--- a/src/app/components/message/Reply.tsx
+++ b/src/app/components/message/Reply.tsx
@@ -280,7 +280,7 @@ export const Reply = as<'div', ReplyProps>(
           onClick={replyEvent !== null && !isBlockedSender ? onClick : undefined}
         >
           {replyEvent !== undefined && !isPendingDecrypt ? (
-            <Text size="T300" truncate>
+            <Text size="T300" truncate style={{ unicodeBidi: 'plaintext' }}>
               {replyContent}
             </Text>
           ) : (

From 882515f0e223d9cd80e5bf6633de6c0252471bc6 Mon Sep 17 00:00:00 2001
From: Sina Sadeghi <sina.sadeghi83@gmail.com>
Date: Tue, 5 May 2026 14:09:09 +0330
Subject: [PATCH 3/3] Add dir auto for Base message Text

---
 src/app/components/message/layout/Base.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/app/components/message/layout/Base.tsx b/src/app/components/message/layout/Base.tsx
index 47e7b9372..edcf609a7 100644
--- a/src/app/components/message/layout/Base.tsx
+++ b/src/app/components/message/layout/Base.tsx
@@ -48,6 +48,7 @@ export const MessageTextBody = as<'div', css.MessageTextBodyVariants & { notice?
       className={classNames(css.MessageTextBody({ preWrap, jumboEmoji, emote }), className)}
       {...props}
       ref={ref}
+      dir="auto"
     >
       {children}
     </Text>