diff --git a/components/ComposeEmail.tsx b/components/ComposeEmail.tsx
index 61b8ab25..cc8b89a2 100644
--- a/components/ComposeEmail.tsx
+++ b/components/ComposeEmail.tsx
@@ -214,9 +214,9 @@ export default function ComposeEmail({
       // Create the final combined email body
       const finalBody = `
         <div dir="ltr" style="direction: ltr; unicode-bidi: isolate; text-align: left;">
-          ${userMessage}
+          ${userMessage || ''}
         </div>
-        ${quotedContent}
+        ${quotedContent || ''}
       `;
       
       // Set the complete body and send after a brief delay to ensure state is updated
@@ -345,7 +345,7 @@ export default function ComposeEmail({
                       {/* User input area - completely separate from quoted content */}
                       <div
                         ref={contentEditableRef}
-                        contentEditable
+                        contentEditable="true"
                         className="w-full p-3 bg-white min-h-[100px] text-gray-900 email-editor"
                         style={{ 
                           direction: 'ltr',
@@ -354,11 +354,10 @@ export default function ComposeEmail({
                         }}
                         onInput={handleUserMessageChange}
                         dir="ltr"
-                      >
-                        {!userMessage && <p style={{ color: '#718096' }}>Write your message here...</p>}
-                      </div>
+                        dangerouslySetInnerHTML={userMessage ? { __html: userMessage } : { __html: '<p style="color: #718096;">Write your message here...</p>' }}
+                      />
                       
-                      {/* Original email content - completely isolated */}
+                      {/* Original email content - also editable */}
                       {quotedContent && (
                         <div 
                           className="w-full bg-gray-50 border-t border-gray-300 email-content-wrapper"
@@ -368,8 +367,19 @@ export default function ComposeEmail({
                           }}
                         >
                           <div 
-                            className="p-3 opacity-75 text-sm email-content"
+                            className="p-3 opacity-90 text-sm email-content"
+                            contentEditable="true"
+                            dir="ltr"
+                            style={{ 
+                              direction: 'ltr',
+                              unicodeBidi: 'isolate',
+                              textAlign: 'left'
+                            }}
                             dangerouslySetInnerHTML={{ __html: quotedContent }}
+                            onInput={(e) => {
+                              const target = e.currentTarget;
+                              setQuotedContent(target.innerHTML);
+                            }}
                           />
                         </div>
                       )}