diff --git a/apps/web/components/EmailViewer.tsx b/apps/web/components/EmailViewer.tsx
index 2b6588aa88..44be70633c 100644
--- a/apps/web/components/EmailViewer.tsx
+++ b/apps/web/components/EmailViewer.tsx
@@ -66,6 +66,7 @@ export function ThreadContent({
             autoOpenReplyForMessageId={autoOpenReplyForMessageId}
             topRightComponent={topRightComponent}
             onSendSuccess={onSendSuccess}
+            withHeader
           />
         )}
       </LoadingContent>
diff --git a/apps/web/components/email-list/EmailThread.tsx b/apps/web/components/email-list/EmailThread.tsx
index 3b523b700f..4958d5fcd4 100644
--- a/apps/web/components/email-list/EmailThread.tsx
+++ b/apps/web/components/email-list/EmailThread.tsx
@@ -9,6 +9,7 @@ export function EmailThread({
   autoOpenReplyForMessageId,
   topRightComponent,
   onSendSuccess,
+  withHeader,
 }: {
   messages: ThreadMessage[];
   refetch: () => void;
@@ -16,6 +17,7 @@ export function EmailThread({
   autoOpenReplyForMessageId?: string;
   topRightComponent?: React.ReactNode;
   onSendSuccess?: (messageId: string, threadId: string) => void;
+  withHeader?: boolean;
 }) {
   // Place draft messages as replies to their parent message
   const organizedMessages = useMemo(() => {
@@ -50,14 +52,16 @@ export function EmailThread({
 
   return (
     <div className="flex-1 overflow-auto bg-muted p-4">
-      <div className="flex items-center justify-between">
-        <div className="text-2xl font-semibold text-foreground">
-          {messages[0]?.headers.subject}
+      {withHeader && (
+        <div className="flex items-center justify-between">
+          <div className="text-2xl font-semibold text-foreground">
+            {messages[0]?.headers.subject}
+          </div>
+          {topRightComponent && (
+            <div className="flex items-center gap-2">{topRightComponent}</div>
+          )}
         </div>
-        {topRightComponent && (
-          <div className="flex items-center gap-2">{topRightComponent}</div>
-        )}
-      </div>
+      )}
       <ul className="mt-4 space-y-2 sm:space-y-4">
         {organizedMessages.map(({ message, draftMessage }) => {
           const defaultShowReply =