diff --git a/components/ComposeEmail.tsx b/components/ComposeEmail.tsx
index acff6e97..5740846e 100644
--- a/components/ComposeEmail.tsx
+++ b/components/ComposeEmail.tsx
@@ -53,13 +53,16 @@ export default function ComposeEmail({
 
   const handleInput = (e: React.FormEvent<HTMLDivElement>) => {
     if (composeBodyRef.current) {
-      setComposeBody(composeBodyRef.current.textContent || '');
+      const content = composeBodyRef.current.textContent || '';
+      setComposeBody(content);
     }
   };
 
   useEffect(() => {
     if (composeBodyRef.current) {
-      composeBodyRef.current.textContent = composeBody;
+      composeBodyRef.current.innerHTML = '';
+      const textNode = document.createTextNode(composeBody);
+      composeBodyRef.current.appendChild(textNode);
     }
   }, [composeBody]);
 
@@ -225,10 +228,11 @@ export default function ComposeEmail({
                   fontFamily: 'inherit',
                   fontSize: 'inherit',
                   lineHeight: 'inherit',
-                  direction: 'ltr',
-                  textAlign: 'left'
+                  unicodeBidi: 'normal',
+                  direction: 'ltr'
                 }}
                 onInput={handleInput}
+                suppressContentEditableWarning
               />
             </div>
           </div>