diff --git a/app/courrier/page.tsx b/app/courrier/page.tsx
index 8898c08a..6779f235 100644
--- a/app/courrier/page.tsx
+++ b/app/courrier/page.tsx
@@ -329,9 +329,9 @@ const initialSidebarItems = [
 ];
 
 function getReplyBody(email: Email, type: 'reply' | 'reply-all' | 'forward'): string {
-  if (!email.raw) return '';
+  if (!email.body) return '';
   
-  const { headers, body } = splitEmailHeadersAndBody(email.raw);
+  const { headers, body } = splitEmailHeadersAndBody(email.body);
   const { contentType, encoding, charset } = parseEmailHeaders(headers);
   
   let content = '';
diff --git a/components/ComposeEmail.tsx b/components/ComposeEmail.tsx
index 6941bc4b..f43644f1 100644
--- a/components/ComposeEmail.tsx
+++ b/components/ComposeEmail.tsx
@@ -216,10 +216,14 @@ export default function ComposeEmail({
               <div
                 ref={composeBodyRef}
                 contentEditable
-                className="h-full p-4 border border-gray-300 rounded-lg focus:outline-none focus:ring-2 focus:ring-blue-500 prose max-w-none bg-white text-gray-900"
-                style={{ cursor: 'text', whiteSpace: 'pre-wrap', wordBreak: 'break-word' }}
+                className="prose max-w-none min-h-[200px] p-4 border border-gray-300 rounded-lg bg-white"
+                style={{
+                  color: '#000000',
+                  cursor: 'text',
+                  whiteSpace: 'pre-wrap',
+                  wordBreak: 'break-word',
+                }}
                 onInput={handleInput}
-                dangerouslySetInnerHTML={{ __html: composeBody }}
               />
             </div>
           </div>