diff --git a/components/ComposeEmail.tsx b/components/ComposeEmail.tsx
index dddc9296..7fb7e67c 100644
--- a/components/ComposeEmail.tsx
+++ b/components/ComposeEmail.tsx
@@ -224,16 +224,19 @@ export default function ComposeEmail({
             {/* Message Body */}
             <div className="flex-1">
               <Label htmlFor="message" className="block text-sm font-medium text-gray-700">Message</Label>
-              <Textarea
-                id="message"
-                value={composeBody}
-                onChange={(e) => setComposeBody(e.target.value)}
+              <div
+                ref={composeBodyRef}
+                contentEditable
+                onInput={handleInput}
                 className="w-full h-full mt-1 bg-white border border-gray-300 rounded-md p-2 text-gray-900 overflow-y-auto prose max-w-none"
                 style={{ 
                   minHeight: '200px',
                   direction: 'ltr',
-                  textAlign: 'left'
+                  textAlign: 'left',
+                  whiteSpace: 'pre-wrap',
+                  wordBreak: 'break-word'
                 }}
+                dangerouslySetInnerHTML={{ __html: composeBody }}
               />
             </div>
           </div>