diff --git a/components/email/ComposeEmail.tsx b/components/email/ComposeEmail.tsx
index bc470d59..7304d1fd 100644
--- a/components/email/ComposeEmail.tsx
+++ b/components/email/ComposeEmail.tsx
@@ -382,7 +382,7 @@ 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-auto">
                 <RichEmailEditor
                   initialContent={emailContent}
                   onChange={setEmailContent}
@@ -390,15 +390,17 @@ export default function ComposeEmail(props: ComposeEmailAllProps) {
                   maxHeight="none"
                   preserveFormatting={true}
                 />
-                
-                {/* Render quoted content for replies and forwards */}
-                {initialEmail && type !== 'new' && (
+              </div>
+              
+              {/* Render quoted content for replies and forwards */}
+              {initialEmail && type !== 'new' && (
+                <div className="mt-4">
                   <EmailMessageToQuotedContentAdapter
                     email={initialEmail}
                     type={type as 'reply' | 'reply-all' | 'forward'}
                   />
-                )}
-              </div>
+                </div>
+              )}
             </div>
             
             {/* Attachments */}
@@ -696,7 +698,7 @@ function LegacyAdapter({
             {/* 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-auto">
                 <RichEmailEditor
                   initialContent={composeBody}
                   onChange={setComposeBody}
@@ -704,34 +706,34 @@ function LegacyAdapter({
                   maxHeight="none"
                   preserveFormatting={true}
                 />
-                
-                {/* Render original message for replies and forwards */}
-                {(originalEmail || replyTo || forwardFrom) && (
-                  <div className="mt-4">
-                    {replyTo ? (
-                      <QuotedEmailContent
-                        content={originalEmail?.content || ''}
-                        sender={{
-                          name: replyTo.name,
-                          email: replyTo.email
-                        }}
-                        date={new Date()}
-                        type="reply"
-                      />
-                    ) : forwardFrom ? (
-                      <QuotedEmailContent
-                        content={originalEmail?.content || ''}
-                        sender={{
-                          name: forwardFrom.name,
-                          email: forwardFrom.email
-                        }}
-                        date={new Date()}
-                        type="forward"
-                      />
-                    ) : null}
-                  </div>
-                )}
               </div>
+              
+              {/* Render original message for replies and forwards */}
+              {(originalEmail || replyTo || forwardFrom) && (
+                <div className="mt-4">
+                  {replyTo ? (
+                    <QuotedEmailContent
+                      content={originalEmail?.content || ''}
+                      sender={{
+                        name: replyTo.name,
+                        email: replyTo.email
+                      }}
+                      date={new Date()}
+                      type="reply"
+                    />
+                  ) : forwardFrom ? (
+                    <QuotedEmailContent
+                      content={originalEmail?.content || ''}
+                      sender={{
+                        name: forwardFrom.name,
+                        email: forwardFrom.email
+                      }}
+                      date={new Date()}
+                      type="forward"
+                    />
+                  ) : null}
+                </div>
+              )}
             </div>
             
             {/* Attachments */}