diff --git a/app/courrier/page.tsx b/app/courrier/page.tsx
index 41495cc5..15419adb 100644
--- a/app/courrier/page.tsx
+++ b/app/courrier/page.tsx
@@ -391,22 +391,22 @@ function getReplyBody(email: Email, type: 'reply' | 'reply-all' | 'forward'): st
     
     if (type === 'forward') {
       return `
-        <div class="prose max-w-none">
+        <div class="prose max-w-none" dir="ltr">
           <div class="border-l-4 border-gray-300 pl-4 my-4">
             <p class="text-sm text-gray-600 mb-2"><strong>From:</strong> ${email.from}</p>
             <p class="text-sm text-gray-600 mb-2"><strong>Date:</strong> ${date}</p>
             <p class="text-sm text-gray-600 mb-2"><strong>Subject:</strong> ${email.subject}</p>
             <p class="text-sm text-gray-600 mb-2"><strong>To:</strong> ${Array.isArray(email.to) ? email.to.join(', ') : email.to}</p>
-            <div class="mt-4 prose-sm">${content}</div>
+            <div class="mt-4 prose-sm" dir="ltr">${content}</div>
           </div>
         </div>
       `;
     } else {
       return `
-        <div class="prose max-w-none">
+        <div class="prose max-w-none" dir="ltr">
           <div class="border-l-4 border-gray-300 pl-4 my-4">
             <p class="text-sm text-gray-600 mb-2">On ${date}, ${email.from} wrote:</p>
-            <div class="mt-4 prose-sm">${content}</div>
+            <div class="mt-4 prose-sm" dir="ltr">${content}</div>
           </div>
         </div>
       `;
diff --git a/components/ComposeEmail.tsx b/components/ComposeEmail.tsx
index 4e181dc0..17d4153e 100644
--- a/components/ComposeEmail.tsx
+++ b/components/ComposeEmail.tsx
@@ -51,6 +51,12 @@ export default function ComposeEmail({
 }: ComposeEmailProps) {
   const composeBodyRef = useRef<HTMLDivElement>(null);
 
+  useEffect(() => {
+    if (composeBodyRef.current) {
+      composeBodyRef.current.innerHTML = composeBody;
+    }
+  }, [composeBody]);
+
   const handleInput = (e: React.FormEvent<HTMLDivElement>) => {
     if (composeBodyRef.current) {
       setComposeBody(composeBodyRef.current.innerHTML);
@@ -223,7 +229,6 @@ export default function ComposeEmail({
                   unicodeBidi: 'bidi-override'
                 }}
                 dir="ltr"
-                dangerouslySetInnerHTML={{ __html: composeBody }}
                 onInput={handleInput}
               />
             </div>