diff --git a/components/email/ComposeEmail.tsx b/components/email/ComposeEmail.tsx
index 176b8593..4ed24f26 100644
--- a/components/email/ComposeEmail.tsx
+++ b/components/email/ComposeEmail.tsx
@@ -360,12 +360,12 @@ export default function ComposeEmail(props: ComposeEmailAllProps) {
             {/* Message Body */}
             <div className="flex-1 min-h-[200px] flex flex-col overflow-hidden">
               <Label htmlFor="message" className="flex-none block text-sm font-medium text-gray-700 mb-2">Message</Label>
-              <div className="flex-1 border border-gray-300 rounded-md overflow-hidden">
+              <div className="flex-1 border border-gray-300 rounded-md overflow-hidden bg-white">
                 <RichEmailEditor
                   initialContent={emailContent}
                   onChange={setEmailContent}
                   minHeight="200px"
-                  maxHeight="none"
+                  maxHeight="calc(100vh - 460px)"
                   preserveFormatting={true}
                 />
               </div>
@@ -739,14 +739,18 @@ function LegacyAdapter({
               />
             </div>
 
-            {/* Message content */}
-            <div className="flex-1 p-4 mt-2 border rounded-md relative min-h-[200px] bg-white">
-              <div
-                className="outline-none w-full h-full"
-                contentEditable
-                dangerouslySetInnerHTML={{ __html: composeBody }}
-                onInput={(e) => setComposeBody(e.currentTarget.innerHTML)}
-              />
+            {/* Message Body */}
+            <div className="flex-1 min-h-[200px] flex flex-col overflow-hidden">
+              <Label htmlFor="message" className="flex-none block text-sm font-medium text-gray-700 mb-2">Message</Label>
+              <div className="flex-1 border border-gray-300 rounded-md overflow-hidden bg-white">
+                <RichEmailEditor
+                  initialContent={composeBody}
+                  onChange={setComposeBody}
+                  minHeight="200px"
+                  maxHeight="calc(100vh - 460px)"
+                  preserveFormatting={true}
+                />
+              </div>
             </div>
             
             {/* Attachments */}