diff --git a/components/email/email-viewer.tsx b/components/email/email-viewer.tsx
index e7d9511a..6fcb74ca 100644
--- a/components/email/email-viewer.tsx
+++ b/components/email/email-viewer.tsx
@@ -1822,8 +1822,8 @@ export function EmailViewer({
               </Button>
             )}
             <div className="flex-1 min-w-0">
-              <div className="flex items-center gap-2">
-                <h1 className="text-lg lg:text-2xl font-bold text-foreground tracking-tight truncate">
+              <div className="flex items-start gap-2">
+                <h1 className="text-lg lg:text-2xl font-bold text-foreground tracking-tight break-words min-w-0">
                   {email.subject || t('no_subject')}
                 </h1>
                 {/* Star inline with subject (top toolbar mode) */}
diff --git a/components/email/thread-conversation-view.tsx b/components/email/thread-conversation-view.tsx
index d534eac7..ada54a30 100644
--- a/components/email/thread-conversation-view.tsx
+++ b/components/email/thread-conversation-view.tsx
@@ -149,7 +149,7 @@ export function ThreadConversationView({
           <ArrowLeft className="w-5 h-5" />
         </button>
         <div className="flex-1 min-w-0">
-          <h1 className="font-semibold text-foreground truncate">
+          <h1 className="font-semibold text-foreground break-words">
             {thread.latestEmail.subject || t("email_viewer.no_subject")}
           </h1>
           <p className="text-sm text-muted-foreground">