diff --git a/components/email/EmailPanel.tsx b/components/email/EmailPanel.tsx
index 43c04e95..5ecf627c 100644
--- a/components/email/EmailPanel.tsx
+++ b/components/email/EmailPanel.tsx
@@ -236,13 +236,19 @@ export default function EmailPanel({
   // Show compose mode or email preview
   return (
     <div className="h-full">
+      {/* Remove ComposeEmail overlay/modal logic. Only show preview or a button to trigger compose in parent. */}
       {isComposing ? (
-        <ComposeEmail
-          initialEmail={email}
-          type={composeType}
-          onClose={handleComposeClose}
-          onSend={onSendEmail}
-        />
+        <div className="h-full flex items-center justify-center">
+          <div className="text-center text-muted-foreground">
+            <p>Compose mode is now handled by the main modal.</p>
+            <button 
+              className="text-primary mt-2 hover:underline"
+              onClick={handleComposeClose}
+            >
+              Close
+            </button>
+          </div>
+        </div>
       ) : (
         <div className="max-w-4xl mx-auto h-full">
           <EmailPreview