diff --git a/components/ComposeEmail.tsx b/components/ComposeEmail.tsx
index 4dc248a4..3a75284f 100644
--- a/components/ComposeEmail.tsx
+++ b/components/ComposeEmail.tsx
@@ -139,8 +139,8 @@ export default function ComposeEmail({
         </div>
 
         {/* Modal Body */}
-        <div className="flex-1 overflow-y-auto">
-          <div className="p-6 space-y-4">
+        <div className="flex-1 overflow-hidden">
+          <div className="p-6 space-y-4 h-full flex flex-col">
             {/* To Field */}
             <div>
               <Label htmlFor="to" className="block text-sm font-medium text-gray-700">To</Label>
@@ -212,11 +212,11 @@ export default function ComposeEmail({
             </div>
 
             {/* Message Body */}
-            <div className="flex-1 overflow-auto">
+            <div className="flex-1 min-h-[200px] overflow-auto">
               <div
                 ref={composeBodyRef}
                 contentEditable
-                className="flex-1 p-4 border border-gray-300 rounded-lg focus:outline-none focus:ring-2 focus:ring-blue-500 prose max-w-none"
+                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"
                 onInput={handleInput}
                 dangerouslySetInnerHTML={{ __html: composeBody }}
               />