diff --git a/apps/web/src/components/ChatMarkdown.tsx b/apps/web/src/components/ChatMarkdown.tsx
index b364a8e3a1..e2a382410e 100644
--- a/apps/web/src/components/ChatMarkdown.tsx
+++ b/apps/web/src/components/ChatMarkdown.tsx
@@ -263,6 +263,15 @@ function ChatMarkdown({ text, cwd, isStreaming = false }: ChatMarkdownProps) {
           />
         );
       },
+      p: ({ node: _node, ...props }) => <p dir="auto" {...props} />,
+      h1: ({ node: _node, ...props }) => <h1 dir="auto" {...props} />,
+      h2: ({ node: _node, ...props }) => <h2 dir="auto" {...props} />,
+      h3: ({ node: _node, ...props }) => <h3 dir="auto" {...props} />,
+      h4: ({ node: _node, ...props }) => <h4 dir="auto" {...props} />,
+      h5: ({ node: _node, ...props }) => <h5 dir="auto" {...props} />,
+      h6: ({ node: _node, ...props }) => <h6 dir="auto" {...props} />,
+      li: ({ node: _node, ...props }) => <li dir="auto" {...props} />,
+      blockquote: ({ node: _node, ...props }) => <blockquote dir="auto" {...props} />,
       pre({ node: _node, children, ...props }) {
         const codeBlock = extractCodeBlock(children);
         if (!codeBlock) {
diff --git a/apps/web/src/components/chat/MessagesTimeline.tsx b/apps/web/src/components/chat/MessagesTimeline.tsx
index f3174030ef..6ef022d2ce 100644
--- a/apps/web/src/components/chat/MessagesTimeline.tsx
+++ b/apps/web/src/components/chat/MessagesTimeline.tsx
@@ -720,7 +720,10 @@ const UserMessageBody = memo(function UserMessageBody(props: {
         }
 
         return (
-          <div className="wrap-break-word whitespace-pre-wrap font-mono text-sm leading-relaxed text-foreground">
+          <div
+            dir="auto"
+            className="wrap-break-word whitespace-pre-wrap font-mono text-sm leading-relaxed text-foreground"
+          >
             {inlineNodes}
           </div>
         );
@@ -748,7 +751,10 @@ const UserMessageBody = memo(function UserMessageBody(props: {
     }
 
     return (
-      <div className="wrap-break-word whitespace-pre-wrap font-mono text-sm leading-relaxed text-foreground">
+      <div
+        dir="auto"
+        className="wrap-break-word whitespace-pre-wrap font-mono text-sm leading-relaxed text-foreground"
+      >
         {inlineNodes}
       </div>
     );
@@ -759,7 +765,10 @@ const UserMessageBody = memo(function UserMessageBody(props: {
   }
 
   return (
-    <pre className="whitespace-pre-wrap wrap-break-word font-mono text-sm leading-relaxed text-foreground">
+    <pre
+      dir="auto"
+      className="whitespace-pre-wrap wrap-break-word font-mono text-sm leading-relaxed text-foreground"
+    >
       {props.text}
     </pre>
   );
diff --git a/apps/web/src/index.css b/apps/web/src/index.css
index ea76f24fac..1f154d066c 100644
--- a/apps/web/src/index.css
+++ b/apps/web/src/index.css
@@ -264,12 +264,12 @@ label:has(> select#reasoning-effort) select {
 }
 
 .chat-markdown ul {
-  padding-left: 1.25rem;
+  padding-inline-start: 1.25rem;
   list-style-type: disc;
 }
 
 .chat-markdown ol {
-  padding-left: 1.25rem;
+  padding-inline-start: 1.25rem;
   list-style-type: decimal;
 }
 
@@ -304,8 +304,8 @@ label:has(> select#reasoning-effort) select {
 }
 
 .chat-markdown blockquote {
-  border-left: 2px solid var(--border);
-  padding-left: 0.8rem;
+  border-inline-start: 2px solid var(--border);
+  padding-inline-start: 0.8rem;
   color: var(--muted-foreground);
 }