From 94bb55765d783f6852f2942f678ca0043a5ad145 Mon Sep 17 00:00:00 2001
From: Linus Rath <139418639+rathlinus@users.noreply.github.com>
Date: Wed, 4 Nov 2026 06:04:28 +0100
Subject: [PATCH 01/34] fix: give pop-out and quick compose windows the main
 composer's layout, with Send bottom right and Discard as a bin

---
 .../composer-windows-layout.test.tsx          | 240 ++++++++++++++++++
 components/email/email-composer.tsx           |  33 +--
 2 files changed, 258 insertions(+), 15 deletions(-)
 create mode 100644 components/email/__tests__/composer-windows-layout.test.tsx

diff --git a/components/email/__tests__/composer-windows-layout.test.tsx b/components/email/__tests__/composer-windows-layout.test.tsx
new file mode 100644
index 000000000..fd1ccd18c
--- /dev/null
+++ b/components/email/__tests__/composer-windows-layout.test.tsx
@@ -0,0 +1,240 @@
+import { render, screen, within } from '@testing-library/react';
+import { describe, it, expect, vi } from 'vitest';
+import React from 'react';
+import { EmailComposer } from '../email-composer';
+
+// One layout in every composer: Send at the bottom end, Discard as a bin left
+// of it, the formatting toolbar showing. A pop-out or quick compose window is
+// narrower than a tablet, and used to get the phone's layout: Send in the
+// header, Discard where Send was, the toolbar behind a button.
+
+vi.mock('@/components/email/rich-text-editor', () => ({
+  RichTextEditor: ({ collapseToolbarOnMobile }: { collapseToolbarOnMobile?: boolean }) =>
+    React.createElement('div', { 'data-testid': 'rich-text-editor', 'data-collapsed': String(!!collapseToolbarOnMobile) }),
+}));
+
+vi.mock('@/components/plugins/plugin-slot', () => ({ PluginSlot: () => null }));
+vi.mock('@/components/ui/avatar', () => ({ Avatar: () => null }));
+vi.mock('@/components/identity/sub-address-helper', () => ({ SubAddressHelper: () => null }));
+vi.mock('@/components/templates/template-picker', () => ({ TemplatePicker: () => null }));
+vi.mock('@/components/templates/template-form', () => ({ TemplateForm: () => null }));
+vi.mock('@/components/files/file-preview-modal', () => ({ FilePreviewModal: () => null }));
+vi.mock('@/hooks/use-focus-trap', () => ({
+  useFocusTrap: () => ({ current: null }),
+}));
+vi.mock('@/hooks/use-pro-multi-account-identities', () => ({
+  useProMultiAccountIdentities: () => ({ enabled: false, groups: [], allIdentities: [] }),
+  stripCrossAccountIdentityPrefix: (id: string) => ({ localAccountId: null, rawId: id }),
+}));
+
+vi.mock('@/stores/auth-store', () => {
+  const state = {
+    client: null,
+    identities: [],
+    primaryIdentity: null,
+    isAuthenticated: false,
+    isDemoMode: false,
+    activeAccountId: null,
+    connectionLost: false,
+    getClientForAccount: () => undefined,
+    getAllConnectedClients: () => new Map(),
+    syncIdentities: () => {},
+    refreshIdentities: async () => {},
+  };
+  const hook = (sel?: (s: typeof state) => unknown) =>
+    typeof sel === 'function' ? sel(state) : state;
+  hook.getState = () => state;
+  hook.setState = (p: Partial<typeof state>) => Object.assign(state, p);
+  return { useAuthStore: hook };
+});
+
+vi.mock('@/stores/identity-store', () => {
+  const state = {
+    identities: [{ id: 'id-me', email: 'me@example.com', name: 'Me' }],
+    defaultIdentityId: 'id-me',
+  };
+  const hook = (sel?: (s: typeof state) => unknown) =>
+    typeof sel === 'function' ? sel(state) : state;
+  hook.getState = () => state;
+  hook.setState = (p: Partial<typeof state>) => Object.assign(state, p);
+  return { useIdentityStore: hook };
+});
+
+vi.mock('@/stores/account-store', () => {
+  const state = { accounts: [], getAccountById: () => undefined };
+  const hook = (sel?: (s: typeof state) => unknown) =>
+    typeof sel === 'function' ? sel(state) : state;
+  hook.getState = () => state;
+  hook.setState = (p: Partial<typeof state>) => Object.assign(state, p);
+  return { useAccountStore: hook };
+});
+
+vi.mock('@/stores/email-store', () => {
+  const state = {
+    draftSaveEnabled: false,
+    sendRawEmail: async () => ({ sent: true }),
+  };
+  const hook = (sel?: (s: typeof state) => unknown) =>
+    typeof sel === 'function' ? sel(state) : state;
+  hook.getState = () => state;
+  hook.setState = (p: Partial<typeof state>) => Object.assign(state, p);
+  return { useEmailStore: hook };
+});
+
+vi.mock('@/stores/settings-store', () => {
+  const state = {
+    timeFormat: '24h',
+    plainTextMode: false,
+    subAddressDelimiter: '+',
+    autoSelectReplyIdentity: true,
+    attachmentReminderEnabled: false,
+    attachmentReminderKeywords: [],
+    emptySubjectWarningEnabled: true,
+    sendDelaySeconds: 0,
+    signaturePosition: 'above_quote',
+    signatureSeparatorEnabled: false,
+    requestReadReceiptDefault: false,
+    addTrustedSender: () => {},
+    trustedSendersAddressBook: null,
+    updateSetting: () => {},
+  };
+  const hook = (sel?: (s: typeof state) => unknown) =>
+    typeof sel === 'function' ? sel(state) : state;
+  hook.getState = () => state;
+  hook.setState = (p: Partial<typeof state>) => Object.assign(state, p);
+  return { useSettingsStore: hook };
+});
+
+vi.mock('@/stores/contact-store', () => {
+  const state = {
+    contacts: [],
+    getAutocomplete: async () => [],
+    addToTrustedSendersBook: async () => {},
+  };
+  const hook = (sel?: (s: typeof state) => unknown) =>
+    typeof sel === 'function' ? sel(state) : state;
+  hook.getState = () => state;
+  hook.setState = (p: Partial<typeof state>) => Object.assign(state, p);
+  return { useContactStore: hook };
+});
+
+vi.mock('@/stores/template-store', () => {
+  const state = { templates: [], addTemplate: async () => {} };
+  const hook = (sel?: (s: typeof state) => unknown) =>
+    typeof sel === 'function' ? sel(state) : state;
+  hook.getState = () => state;
+  hook.setState = (p: Partial<typeof state>) => Object.assign(state, p);
+  return { useTemplateStore: hook };
+});
+
+vi.mock('@/stores/toast-store', () => ({
+  toast: { info: () => {}, error: () => {}, success: () => {}, warning: () => {} },
+}));
+
+vi.mock('@/lib/plugin-hooks', () => ({
+  identityHooks: {
+    onSignatureRender: { size: 0, transform: async (value: unknown) => value },
+    onIdentitySelect: { size: 0, emit: async () => {} },
+  },
+  templateHooks: {
+    onTemplateRender: { size: 0, transform: async (value: unknown) => value },
+    onTemplateApply: { size: 0, emit: async () => {} },
+  },
+  emailHooks: {
+    onComposerOpen: { call: async () => [] },
+    onRecipientChange: { call: async () => [] },
+    getRecipientSuggestions: { call: async () => [] },
+    onRecipientChipsChange: { transform: async (chips: unknown) => chips },
+    onDraftChange: { emit: () => {} },
+    onBeforeDraftAutoSave: { transform: async (draft: unknown) => draft },
+    onBeforeEmailSend: { intercept: async () => true, interceptOutcome: async () => 'allowed' },
+    onComposeSend: { takeOver: async () => 'default' },
+    onTransformOutgoingEmail: { transform: async (email: unknown) => email },
+  },
+  contactHooks: {
+    search: { call: async () => [] },
+    onProvideRecipientSuggestions: { transform: async (initial: unknown) => initial },
+  },
+}));
+
+vi.mock('@/lib/email-sanitization', () => ({
+  sanitizeSignatureHtml: (v: string) => v,
+  sanitizeEmailHtml: (v: string) => v,
+  parseHtmlSafely: (html: string) => new DOMParser().parseFromString(html, 'text/html'),
+}));
+
+vi.mock('@/lib/email-threading', () => ({
+  computeReplyThreadingHeaders: () => ({ inReplyTo: [], references: [] }),
+}));
+vi.mock('@/lib/signature-utils', () => ({
+  appendPlainTextSignature: (body: string) => body,
+  getPlainTextSignature: () => '',
+}));
+vi.mock('@/lib/sub-addressing', () => ({ generateSubAddress: () => '' }));
+vi.mock('@/lib/debug', () => ({ debug: { log: () => {}, warn: () => {}, error: () => {} } }));
+vi.mock('@/components/email/quoted-html', () => ({
+  buildQuotedHtmlBlock: () => '',
+  serializeEditorContent: () => '',
+}));
+vi.mock('@/lib/template-utils', () => ({ substitutePlaceholders: (s: string) => s }));
+
+const DATA = {
+  to: 'bob@example.com',
+  cc: '',
+  bcc: '',
+  subject: 'Lunch',
+  body: '<p>Hello there</p>',
+  showCc: false,
+  showBcc: false,
+  selectedIdentityId: 'id-me',
+  subAddressTag: '',
+  mode: 'compose' as const,
+  draftId: null,
+};
+
+const footer = () => document.querySelector<HTMLElement>('[data-composer-footer]')!;
+const header = () => document.querySelector<HTMLElement>('[data-composer-header]')!;
+
+describe('a composer in a window of its own', () => {
+  it('has one Send, at the bottom end, with Discard as a bin right before it', () => {
+    render(<EmailComposer initialData={DATA} ownWindow={{}} />);
+    const sends = screen.getAllByTestId('composer-send');
+    expect(sends).toHaveLength(1);
+    expect(footer()).toContainElement(sends[0]);
+    expect(sends[0].className).not.toMatch(/(^|\s)hidden(\s|$)/);
+    expect(within(header()).queryByTestId('composer-send')).toBeNull();
+
+    const discard = screen.getByTestId('composer-discard');
+    expect(discard.querySelector('svg')).not.toBeNull();
+    // Right before Send, in the same group.
+    expect(discard.nextElementSibling).toBe(sends[0]);
+  });
+
+  it('shows the formatting toolbar, with no button to fold it away', () => {
+    render(<EmailComposer initialData={DATA} ownWindow={{}} />);
+    expect(screen.getByTestId('rich-text-editor')).toHaveAttribute('data-collapsed', 'false');
+    expect(screen.queryByRole('button', { name: 'formatting' })).toBeNull();
+  });
+
+  it('keeps the close button where the main window has it', () => {
+    render(<EmailComposer initialData={DATA} ownWindow={{}} />);
+    expect(screen.getByTestId('composer-close').className).not.toContain('order-first');
+  });
+});
+
+describe('a composer in the main window', () => {
+  it('keeps the phone layout for a phone: Send in the header there, toolbar folded', () => {
+    render(<EmailComposer initialData={DATA} />);
+    expect(within(header()).getByTestId('composer-send')).toBeInTheDocument();
+    expect(screen.getByTestId('rich-text-editor')).toHaveAttribute('data-collapsed', 'true');
+    expect(screen.getByRole('button', { name: 'formatting' })).toBeInTheDocument();
+  });
+
+  it('shows Discard as a bin too, with its name for screen readers', () => {
+    render(<EmailComposer initialData={DATA} />);
+    const discard = screen.getByTestId('composer-discard');
+    expect(discard).toHaveAccessibleName('discard');
+    expect(discard.querySelector('svg')).not.toBeNull();
+    expect(within(discard).getByText('discard').className).toContain('sr-only');
+  });
+});
diff --git a/components/email/email-composer.tsx b/components/email/email-composer.tsx
index 3409f77db..42a8fb93b 100644
--- a/components/email/email-composer.tsx
+++ b/components/email/email-composer.tsx
@@ -1196,6 +1196,9 @@ export function EmailComposer({
   // bar folded away behind "Aa" until asked for.
   const mvWindow = useMvComposeWindow();
   const [mvShowFormatting, setMvShowFormatting] = useState(false);
+  // A pop-out or quick compose window is narrower than a tablet, but it is a
+  // window on a computer: it keeps the main window's layout, not the phone's.
+  const phoneLayout = !ownWindow;
   // "close" (X, Escape): save or discard. "discard" (the Discard button): the
   // user already chose, so only confirm it.
   const [closeDialogKind, setCloseDialogKind] = useState<'close' | 'discard'>('close');
@@ -4825,25 +4828,25 @@ export function EmailComposer({
             {saveStatus === 'saving' && (
               <div className="flex items-center gap-1 text-xs text-muted-foreground">
                 <Save className="w-3 h-3 animate-pulse" />
-                <span className="hidden md:inline">{t('saving')}</span>
+                <span className={phoneLayout ? "hidden md:inline" : undefined}>{t('saving')}</span>
               </div>
             )}
             {saveStatus === 'saved' && (
               <div className="flex items-center gap-1 text-xs text-emerald-600 dark:text-emerald-400">
                 <Check className="w-3 h-3" />
-                <span className="hidden md:inline">{savedOnDevice ? tOfflineDrafts('saved_on_device') : t('draft_saved')}</span>
+                <span className={phoneLayout ? "hidden md:inline" : undefined}>{savedOnDevice ? tOfflineDrafts('saved_on_device') : t('draft_saved')}</span>
               </div>
             )}
             {saveStatus === 'error' && (
               <div className="flex items-center gap-1 text-xs text-red-600 dark:text-red-400">
                 <X className="w-3 h-3" />
-                <span className="hidden md:inline">{t('save_failed')}</span>
+                <span className={phoneLayout ? "hidden md:inline" : undefined}>{t('save_failed')}</span>
               </div>
             )}
           </div>
         </div>
         {/* Mobile: keep scheduled send reachable without consuming footer space. */}
-        {composerClient?.hasDelayedSend() || hasSendMenuActions ? (
+        {phoneLayout && (composerClient?.hasDelayedSend() || hasSendMenuActions ? (
           <div className="relative inline-flex md:hidden">
             <Button
               onClick={() => handleSend()}
@@ -4883,14 +4886,14 @@ export function EmailComposer({
             <Send className="w-4 h-4 me-1.5" />
             {t('send')}
           </Button>
-        )}
+        ))}
         {rightPanelToggle}
-        {popOutButton("hidden md:grid h-8 w-8 place-items-center rounded-md text-muted-foreground hover:bg-muted hover:text-foreground", "w-4 h-4")}
+        {popOutButton(cn(phoneLayout ? "hidden md:grid" : "grid", "h-8 w-8 place-items-center rounded-md text-muted-foreground hover:bg-muted hover:text-foreground"), "w-4 h-4")}
         {/* Close at the top end (R4). On a phone it moves to the start, as
             the phone's mail apps have it, with Send at the end. */}
         <IconButton
           onClick={() => handleClose()}
-          className="-me-2 max-md:order-first max-md:me-0 max-md:-ms-2 max-md:h-11 max-md:w-11"
+          className={phoneLayout ? "-me-2 max-md:order-first max-md:me-0 max-md:-ms-2 max-md:h-11 max-md:w-11" : "-me-2"}
           label={tCommon('close')}
           data-testid="composer-close"
           data-own-window-close={ownWindow ? "" : undefined}
@@ -5300,7 +5303,7 @@ export function EmailComposer({
               ariaInvalid={validationErrors.body}
               ariaDescribedBy={`${fieldIdBase}-body-error`}
               defaultTextStyle={composeStyle}
-              collapseToolbarOnMobile={!showFormattingOnMobile}
+              collapseToolbarOnMobile={phoneLayout && !showFormattingOnMobile}
               toolbarPlacement={mvWindow ? (mvShowFormatting ? 'bottom' : 'hidden') : 'top'}
               onEditorReady={handleEditorReady}
               mentionCandidates={recipientMentionsEnabled ? mentionCandidates : undefined}
@@ -5565,7 +5568,7 @@ export function EmailComposer({
                 <span className="hidden @[40rem]/composer-bar:inline text-sm">{t('attach')}</span>
               </Button>
             )}
-            {!plainTextMode && (
+            {!plainTextMode && (mvWindow || phoneLayout) && (
               <Button
                 variant="ghost"
                 size="icon"
@@ -5704,15 +5707,15 @@ export function EmailComposer({
                 data-testid="composer-discard"
                 aria-label={t('discard')}
                 title={t('discard')}
-                className="text-muted-foreground hover:text-destructive hover:bg-destructive/10 md:@max-[26rem]/composer-bar:px-2.5 max-md:@max-[23rem]/composer-bar:px-2.5"
+                className="px-2.5 text-muted-foreground hover:text-destructive hover:bg-destructive/10 max-md:h-11 max-md:w-11"
               >
-                {/* Next to Send in a narrow composer the word runs over the tools on the left. */}
-                <Trash2 className="hidden w-4 h-4 max-md:@max-[23rem]/composer-bar:block md:block md:@[26rem]/composer-bar:hidden" aria-hidden="true" />
-                <span className="max-md:@max-[23rem]/composer-bar:hidden md:hidden md:@[26rem]/composer-bar:inline">{t('discard')}</span>
+                {/* A bin left of Send in every composer: the word ran over the tools in a narrow one. */}
+                <Trash2 className="w-4 h-4" aria-hidden="true" />
+                <span className="sr-only">{t('discard')}</span>
               </Button>
             )}
             {composerClient?.hasDelayedSend() || hasSendMenuActions ? (
-              <div data-mv-send={mvWindow ? "" : undefined} className="relative hidden md:inline-flex">
+              <div data-mv-send={mvWindow ? "" : undefined} className={cn("relative", phoneLayout ? "hidden md:inline-flex" : "inline-flex")}>
                 <Button
                   onClick={() => handleSend()}
                   disabled={!canSend || isSending || isSavingAndClosing}
@@ -5744,7 +5747,7 @@ export function EmailComposer({
                 title={getSendTooltip()}
                 data-testid="composer-send"
                 data-mv-send={mvWindow ? "" : undefined}
-                className="hidden md:inline-flex"
+                className={phoneLayout ? "hidden md:inline-flex" : "inline-flex"}
               >
                 <Send className="w-4 h-4 me-2" />
                 {t('send')}

From 8720ab6e1a0a900e677063a629acb4823f3661be Mon Sep 17 00:00:00 2001
From: Linus Rath <139418639+rathlinus@users.noreply.github.com>
Date: Wed, 4 Nov 2026 06:12:23 +0100
Subject: [PATCH 02/34] feat: ask about everything before sending in one
 dialog, and allow sending without text

Tests changed: the "asked once" tests reached the second check through
a second dialog, which no longer exists, so they now stop the send at
"Send this message?" instead. The empty-body test asserted the error
under the editor; an empty body now asks instead of blocking Send.
---
 .../email/__tests__/composer-a11y.test.tsx    |  14 +-
 .../__tests__/empty-subject-warning.test.tsx  |  65 +++-
 .../__tests__/placeholder-warning.test.tsx    |  54 ++-
 components/email/email-composer.tsx           | 337 ++++++------------
 components/email/send-warnings-dialog.tsx     | 146 ++++++++
 locales/ar/common.json                        |  12 +
 locales/ca/common.json                        |  12 +
 locales/cs/common.json                        |  12 +
 locales/da/common.json                        |  12 +
 locales/de/common.json                        |  12 +
 locales/en/common.json                        |  12 +
 locales/es/common.json                        |  12 +
 locales/et/common.json                        |  12 +
 locales/fa/common.json                        |  12 +
 locales/fr/common.json                        |  12 +
 locales/he/common.json                        |  12 +
 locales/hu/common.json                        |  12 +
 locales/it/common.json                        |  12 +
 locales/ja/common.json                        |  12 +
 locales/ko/common.json                        |  12 +
 locales/lv/common.json                        |  12 +
 locales/mn/common.json                        |  12 +
 locales/nb/common.json                        |  12 +
 locales/nl/common.json                        |  12 +
 locales/pl/common.json                        |  12 +
 locales/pt/common.json                        |  12 +
 locales/ro/common.json                        |  12 +
 locales/ru/common.json                        |  12 +
 locales/sk/common.json                        |  12 +
 locales/th/common.json                        |  12 +
 locales/tr/common.json                        |  12 +
 locales/uk/common.json                        |  12 +
 locales/vi/common.json                        |  12 +
 locales/zh-TW/common.json                     |  12 +
 locales/zh/common.json                        |  12 +
 35 files changed, 714 insertions(+), 262 deletions(-)
 create mode 100644 components/email/send-warnings-dialog.tsx

diff --git a/components/email/__tests__/composer-a11y.test.tsx b/components/email/__tests__/composer-a11y.test.tsx
index bdec82551..9e9207abd 100644
--- a/components/email/__tests__/composer-a11y.test.tsx
+++ b/components/email/__tests__/composer-a11y.test.tsx
@@ -370,17 +370,17 @@ describe('message body (SR-07)', () => {
     expect(screen.getByLabelText('body_label').tagName).toBe('TEXTAREA');
   });
 
-  it('marks an empty body invalid and links the error text', async () => {
-    render(<EmailComposer initialData={{ ...DRAFT, to: 'bob@example.com', body: '' }} />);
+  it('asks before sending an empty body instead of marking it invalid', async () => {
+    const onSend = vi.fn();
+    render(<EmailComposer initialData={{ ...DRAFT, to: 'bob@example.com', subject: 'Hi', body: '' }} onSend={onSend} />);
     const editor = screen.getByTestId('rich-text-editor');
-    expect(editor).not.toHaveAttribute('data-invalid');
 
     fireEvent.keyDown(screen.getByTestId('composer-subject'), { key: 'Enter', ctrlKey: true });
-    await act(async () => {});
 
-    expect(editor).toHaveAttribute('data-invalid', 'true');
-    const error = document.getElementById(editor.getAttribute('data-describedby')!);
-    expect(error).toHaveTextContent('validation.body_required');
+    const dialog = await screen.findByRole('alertdialog');
+    expect(dialog).toHaveTextContent('empty_text_title');
+    expect(editor).not.toHaveAttribute('data-invalid');
+    expect(onSend).not.toHaveBeenCalled();
   });
 });
 
diff --git a/components/email/__tests__/empty-subject-warning.test.tsx b/components/email/__tests__/empty-subject-warning.test.tsx
index 4908bc2b9..26b50b734 100644
--- a/components/email/__tests__/empty-subject-warning.test.tsx
+++ b/components/email/__tests__/empty-subject-warning.test.tsx
@@ -263,27 +263,76 @@ describe('composer empty subject warning', () => {
     );
   });
 
-  it('does not ask again after Send anyway and a trip back to add an attachment', async () => {
+  // compose-27: the subject and the attachment used to be two dialogs in a row.
+  it('asks about a missing subject and a missing attachment in one dialog', async () => {
     useSettingsStore.setState({ attachmentReminderEnabled: true, attachmentReminderKeywords: ['hello'] } as never);
     try {
       const onSend = vi.fn();
       render(<EmailComposer initialData={DRAFT_WITHOUT_SUBJECT} onSend={onSend} />);
 
       fireEvent.click(sendButton());
-      fireEvent.click(await screen.findByText('empty_subject.send_anyway'));
-      // The body says "Hello", so the attachment reminder stops the send.
-      fireEvent.click(await screen.findByText('forgot_attachment.back'));
-      await waitFor(() => expect(screen.queryByText('forgot_attachment.title')).not.toBeInTheDocument());
 
-      fireEvent.click(sendButton());
+      const dialog = await screen.findByRole('alertdialog');
+      expect(dialog).toHaveTextContent('warnings_title');
+      expect(dialog).toHaveTextContent('warning_subject');
+      expect(dialog).toHaveTextContent('warning_attachment');
+      // Several warnings: no "don't ask again", which would be unclear.
+      expect(within(dialog).queryByRole('checkbox')).not.toBeInTheDocument();
 
-      expect(await screen.findByText('forgot_attachment.title')).toBeInTheDocument();
-      expect(screen.queryByText('empty_subject.title')).not.toBeInTheDocument();
+      fireEvent.click(within(dialog).getByText('send_anyway'));
+
+      await waitFor(() => expect(onSend).toHaveBeenCalledTimes(1));
+      expect(screen.queryByText('forgot_attachment.title')).not.toBeInTheDocument();
     } finally {
       useSettingsStore.setState({ attachmentReminderEnabled: false, attachmentReminderKeywords: [] } as never);
     }
   });
 
+  it('goes back to editing from the combined dialog without sending', async () => {
+    useSettingsStore.setState({ attachmentReminderEnabled: true, attachmentReminderKeywords: ['hello'] } as never);
+    try {
+      const onSend = vi.fn();
+      render(<EmailComposer initialData={DRAFT_WITHOUT_SUBJECT} onSend={onSend} />);
+
+      fireEvent.click(sendButton());
+      fireEvent.click(await screen.findByText('back'));
+
+      await waitFor(() => expect(screen.queryByRole('alertdialog')).not.toBeInTheDocument());
+      expect(onSend).not.toHaveBeenCalled();
+    } finally {
+      useSettingsStore.setState({ attachmentReminderEnabled: false, attachmentReminderKeywords: [] } as never);
+    }
+  });
+
+  // compose-28: Send works with an empty body and asks first.
+  it('keeps Send enabled with an empty body and asks "Send without text?"', async () => {
+    const onSend = vi.fn();
+    render(<EmailComposer initialData={{ ...DRAFT_WITHOUT_SUBJECT, subject: 'Lunch?', body: '' }} onSend={onSend} />);
+    expect(sendButton()).not.toBeDisabled();
+
+    fireEvent.click(sendButton());
+
+    const dialog = await screen.findByRole('alertdialog');
+    expect(dialog).toHaveTextContent('empty_text_title');
+    expect(onSend).not.toHaveBeenCalled();
+
+    fireEvent.click(within(dialog).getByText('send_anyway'));
+    await waitFor(() => expect(onSend).toHaveBeenCalledTimes(1));
+    expect(onSend.mock.calls[0][0]).toMatchObject({ subject: 'Lunch?' });
+  });
+
+  it('lists no subject and no text together', async () => {
+    const onSend = vi.fn();
+    render(<EmailComposer initialData={{ ...DRAFT_WITHOUT_SUBJECT, body: '' }} onSend={onSend} />);
+
+    fireEvent.click(sendButton());
+
+    const dialog = await screen.findByRole('alertdialog');
+    expect(dialog).toHaveTextContent('warning_subject');
+    expect(dialog).toHaveTextContent('warning_text');
+    expect(onSend).not.toHaveBeenCalled();
+  });
+
   it('goes back to editing without sending', async () => {
     const onSend = vi.fn();
     render(<EmailComposer initialData={DRAFT_WITHOUT_SUBJECT} onSend={onSend} />);
diff --git a/components/email/__tests__/placeholder-warning.test.tsx b/components/email/__tests__/placeholder-warning.test.tsx
index d73fc79c9..2baf32c91 100644
--- a/components/email/__tests__/placeholder-warning.test.tsx
+++ b/components/email/__tests__/placeholder-warning.test.tsx
@@ -235,6 +235,7 @@ describe('composer placeholder warning', () => {
       placeholderWarningEnabled: true,
       attachmentReminderEnabled: false,
       attachmentReminderKeywords: [],
+      sendConfirmation: false,
     } as never);
   });
 
@@ -293,33 +294,36 @@ describe('composer placeholder warning', () => {
     expect(onSend).not.toHaveBeenCalled();
   });
 
-  it('does not ask again after Send anyway and a trip back to add an attachment', async () => {
-    useSettingsStore.setState({ attachmentReminderEnabled: true, attachmentReminderKeywords: ['see you'] } as never);
-    const onSend = vi.fn();
-    render(<EmailComposer initialData={DRAFT_WITH_PLACEHOLDER} onSend={onSend} />);
-
+  // Send anyway, then "Send this message?" answered with Cancel: the
+  // placeholders were confirmed, the message is still here.
+  const confirmThenCancel = async () => {
     fireEvent.click(sendButton());
     fireEvent.click(await screen.findByText('placeholder_warning.send_anyway'));
-    // The body says "See you", so the attachment reminder stops the send.
-    fireEvent.click(await screen.findByText('forgot_attachment.back'));
-    await waitFor(() => expect(screen.queryByText('forgot_attachment.title')).not.toBeInTheDocument());
+    const confirm = await screen.findByRole('alertdialog');
+    expect(confirm).toHaveTextContent('send_confirm.title');
+    fireEvent.click(within(confirm).getByRole('button', { name: 'cancel' }));
+    await waitFor(() => expect(screen.queryByRole('alertdialog')).not.toBeInTheDocument());
+  };
+
+  it('does not ask again after Send anyway and a cancelled send', async () => {
+    useSettingsStore.setState({ sendConfirmation: true } as never);
+    const onSend = vi.fn();
+    render(<EmailComposer initialData={DRAFT_WITH_PLACEHOLDER} onSend={onSend} />);
+    await confirmThenCancel();
 
     fireEvent.click(sendButton());
 
-    expect(await screen.findByText('forgot_attachment.title')).toBeInTheDocument();
+    const dialog = await screen.findByRole('alertdialog');
+    expect(dialog).toHaveTextContent('send_confirm.title');
     expect(screen.queryByText('placeholder_warning.title')).not.toBeInTheDocument();
     expect(onSend).not.toHaveBeenCalled();
   });
 
   it('asks again when a new placeholder shows up', async () => {
-    useSettingsStore.setState({ attachmentReminderEnabled: true, attachmentReminderKeywords: ['see you'] } as never);
+    useSettingsStore.setState({ sendConfirmation: true } as never);
     const onSend = vi.fn();
     render(<EmailComposer initialData={DRAFT_WITH_PLACEHOLDER} onSend={onSend} />);
-
-    fireEvent.click(sendButton());
-    fireEvent.click(await screen.findByText('placeholder_warning.send_anyway'));
-    fireEvent.click(await screen.findByText('forgot_attachment.back'));
-    await waitFor(() => expect(screen.queryByText('forgot_attachment.title')).not.toBeInTheDocument());
+    await confirmThenCancel();
 
     fireEvent.change(screen.getByDisplayValue('Lunch'), { target: { value: 'Lunch with {{name}}' } });
     fireEvent.click(sendButton());
@@ -330,6 +334,26 @@ describe('composer placeholder warning', () => {
     expect(onSend).not.toHaveBeenCalled();
   });
 
+  // compose-27: one question for everything the checks found.
+  it('lists the placeholders and the missing attachment in one dialog', async () => {
+    useSettingsStore.setState({ attachmentReminderEnabled: true, attachmentReminderKeywords: ['see you'] } as never);
+    const onSend = vi.fn();
+    render(<EmailComposer initialData={DRAFT_WITH_PLACEHOLDER} onSend={onSend} />);
+
+    fireEvent.click(sendButton());
+
+    const dialog = await screen.findByRole('alertdialog');
+    expect(dialog).toHaveTextContent('warnings_title');
+    expect(dialog).toHaveTextContent('warning_placeholders');
+    expect(dialog).toHaveTextContent('warning_attachment');
+    expect(within(dialog).getByText('[TIME]')).toBeInTheDocument();
+
+    fireEvent.click(within(dialog).getByText('send_anyway'));
+
+    await waitFor(() => expect(onSend).toHaveBeenCalledTimes(1));
+    expect(screen.queryByRole('alertdialog')).not.toBeInTheDocument();
+  });
+
   it('ignores placeholders in quoted text and in the signature', async () => {
     const onSend = vi.fn();
     const body = '<p>Thanks!</p>'
diff --git a/components/email/email-composer.tsx b/components/email/email-composer.tsx
index 3409f77db..b4d9104a1 100644
--- a/components/email/email-composer.tsx
+++ b/components/email/email-composer.tsx
@@ -52,6 +52,7 @@ import { actionsFor, runAction } from "@/lib/plugin-sandbox/actions";
 import { matchesCombo } from "@/lib/plugin-sandbox/shortcuts";
 import { cn, formatFileSize, formatDateTime, generateUUID } from "@/lib/utils";
 import { ScheduleSendDialog } from "./schedule-send-dialog";
+import { SendWarningsDialog, type SendWarning } from "./send-warnings-dialog";
 import { debug } from "@/lib/debug";
 import { toast } from "@/stores/toast-store";
 import { useContextMenu, isContextMenuKey } from "@/hooks/use-context-menu";
@@ -598,7 +599,6 @@ export function EmailComposer({
   const tViewer = useTranslations('email_viewer');
   const tClassification = useTranslations('classification');
   const tEdit = useTranslations('desktopEdit');
-  const tProofreading = useTranslations('proofreading');
   const tOfflineDrafts = useTranslations('offlineDrafts');
   const tOffline = useTranslations('offline');
   const tOfflineNotes = useTranslations('offlineConflicts');
@@ -1201,19 +1201,11 @@ export function EmailComposer({
   const [closeDialogKind, setCloseDialogKind] = useState<'close' | 'discard'>('close');
   const [showAllAttachments, setShowAllAttachments] = useState(false);
   const [previewAttachment, setPreviewAttachment] = useState<ComposerAttachment | null>(null);
-  const [showAttachmentWarning, setShowAttachmentWarning] = useState(false);
-  const [attachmentWarningKeyword, setAttachmentWarningKeyword] = useState('');
-  const [attachmentWarningDelayedUntil, setAttachmentWarningDelayedUntil] = useState<string | undefined>();
-  const [showEmptySubjectWarning, setShowEmptySubjectWarning] = useState(false);
-  const [emptySubjectDelayedUntil, setEmptySubjectDelayedUntil] = useState<string | undefined>();
-  const [emptySubjectDontAskAgain, setEmptySubjectDontAskAgain] = useState(false);
-  const [showPlaceholderWarning, setShowPlaceholderWarning] = useState(false);
-  // A proofreading checker asked to warn before sending with open issues.
-  const [proofreadingWarning, setProofreadingWarning] = useState<{ count: number; delayedUntil?: string } | null>(null);
+  // What the checks before sending found (no subject, no text, placeholders,
+  // a missing attachment, open proofreading issues), asked about in one dialog.
+  const [sendWarnings, setSendWarnings] = useState<{ items: SendWarning[]; delayedUntil?: string } | null>(null);
+  // Open proofreading issues, once a checker asked to warn about them.
   const proofreadingConfirmedRef = useRef(false);
-  const [placeholderWarningMatches, setPlaceholderWarningMatches] = useState<string[]>([]);
-  const [placeholderWarningDelayedUntil, setPlaceholderWarningDelayedUntil] = useState<string | undefined>();
-  const [placeholderDontAskAgain, setPlaceholderDontAskAgain] = useState(false);
   const [showScheduleDialog, setShowScheduleDialog] = useState(false);
   // Asks before sending at once when the account can't hold a message back.
   const { dialogProps: noDelayDialogProps, confirm: confirmNoDelay } = useConfirmDialog();
@@ -3595,14 +3587,14 @@ export function EmailComposer({
   const bodyPlainText = plainTextMode ? body.trim() : htmlToPlainText(body).trim();
   const hasContent = bodyPlainText || attachments.some(att => att.blobId && !att.uploading);
   // A missing subject no longer blocks Send (#684) - users hit the disabled
-  // button without understanding why. It is confirmed in a dialog instead.
-  const canSend = toAddresses.length > 0 && hasContent;
+  // button without understanding why. It is confirmed in a dialog instead,
+  // and so is a message with no text and no file.
+  const canSend = toAddresses.length > 0;
 
   const getSendTooltip = (): string | undefined => {
     if (isWaitingForUploads) return t('validation.attachments_uploading');
     if (canSend) return undefined;
     if (toAddresses.length === 0) return t('validation.recipient_required');
-    if (!hasContent) return t('validation.body_required');
     return undefined;
   };
 
@@ -3697,6 +3689,8 @@ export function EmailComposer({
   const confirmingSendRef = useRef(false);
   // The user confirmed sending without a subject for this message.
   const emptySubjectConfirmedRef = useRef(false);
+  // ... and without text.
+  const emptyTextConfirmedRef = useRef(false);
   // Placeholders the user chose to send as they are. The warning comes back
   // only for one that is not in here.
   const confirmedPlaceholdersRef = useRef<Set<string>>(new Set());
@@ -3741,9 +3735,9 @@ export function EmailComposer({
     else editor.commands.focus();
   };
 
-  const handleSend = async ({ skipAttachmentCheck = false, skipSubjectCheck = false, delayedUntil }: {
-    skipAttachmentCheck?: boolean;
-    skipSubjectCheck?: boolean;
+  const handleSend = async ({ warningsConfirmed = false, delayedUntil }: {
+    /** "Send anyway" in the warnings dialog: don't check those again. */
+    warningsConfirmed?: boolean;
     delayedUntil?: string;
   } = {}) => {
     if (isSendingRef.current) return;
@@ -3791,7 +3785,6 @@ export function EmailComposer({
     if (!canSend) {
       const errors: { to?: boolean; body?: boolean } = {};
       if (toAddresses.length === 0) errors.to = true;
-      if (!hasContent) errors.body = true;
       setValidationErrors(errors);
 
       if (errors.to) {
@@ -3830,69 +3823,69 @@ export function EmailComposer({
       return;
     }
 
-    // Empty subject confirmation (#684). Asked once per message: after "Send
-    // anyway" and a trip back to add an attachment, it asked again.
-    if (!skipSubjectCheck && !emptySubjectConfirmedRef.current && emptySubjectWarningEnabled && !subject.trim()) {
-      setEmptySubjectDontAskAgain(false);
-      setEmptySubjectDelayedUntil(delayedUntil);
-      setShowEmptySubjectWarning(true);
-      return;
-    }
-
-    // Unfilled placeholders: template fields left as {{name}}, fill-ins like
-    // [TIME] from AI drafts, and markers like TODO. The signature is left
-    // out, or a placeholder in it would stop every message.
-    if (placeholderWarningEnabled) {
-      const authored = plainTextMode
-        ? plainTextBodyWithoutSignature(body, signatureIdentity)
-        : stripEmbeddedSignatureHtml(body);
-      const bodyText = extractUserAuthoredText(authored, {
-        plainTextMode,
-        forwardedSeparator: tQuote('forwarded_separator'),
-      });
-      // The fill-in words of the UI language, and of English: AI drafts and
-      // templates are often English whatever the UI language is.
-      const found = findUnfilledPlaceholders(subject, bodyText, [
-        enMessages.email_composer.placeholder_words,
-        t.raw('placeholder_words'),
-      ]);
-      if (found.some(p => !confirmedPlaceholdersRef.current.has(p))) {
-        setPlaceholderWarningMatches(found);
-        setPlaceholderDontAskAgain(false);
-        setPlaceholderWarningDelayedUntil(delayedUntil);
-        setShowPlaceholderWarning(true);
-        return;
+    // What the user may have missed, asked about in one dialog (two in a
+    // row used to ask about each in turn). Answered with "Send anyway", the
+    // subject, the text, the placeholders listed and the proofreading issues
+    // aren't asked about again for this message.
+    if (!warningsConfirmed) {
+      const warnings: SendWarning[] = [];
+      // Empty subject confirmation (#684).
+      if (!emptySubjectConfirmedRef.current && emptySubjectWarningEnabled && !subject.trim()) {
+        warnings.push({ kind: 'subject' });
+      }
+      // No text and no file: Send stays enabled and asks instead.
+      if (!emptyTextConfirmedRef.current && !hasContent) {
+        warnings.push({ kind: 'text' });
       }
-    }
 
-    // Attachment reminder check
-    if (!skipAttachmentCheck && attachmentReminderEnabled) {
-      const hasAttachments = attachmentsRef.current.some(att => att.blobId && !att.uploading && !att.error);
-      if (!hasAttachments) {
-        // Scan only the user-authored text: the quoted original of a
-        // reply/forward often mentions an attachment itself, which used to fire
-        // the reminder even when the user typed no keyword and added nothing (#570).
-        const bodyText = extractUserAuthoredText(body, {
+      // Unfilled placeholders: template fields left as {{name}}, fill-ins like
+      // [TIME] from AI drafts, and markers like TODO. The signature is left
+      // out, or a placeholder in it would stop every message.
+      if (placeholderWarningEnabled) {
+        const authored = plainTextMode
+          ? plainTextBodyWithoutSignature(body, signatureIdentity)
+          : stripEmbeddedSignatureHtml(body);
+        const bodyText = extractUserAuthoredText(authored, {
           plainTextMode,
           forwardedSeparator: tQuote('forwarded_separator'),
         });
-        const searchText = `${subject} ${bodyText}`.toLowerCase();
-        const matched = attachmentReminderKeywords.find(kw => searchText.includes(kw.toLowerCase()));
-        if (matched) {
-          setAttachmentWarningKeyword(matched);
-          setAttachmentWarningDelayedUntil(delayedUntil);
-          setShowAttachmentWarning(true);
-          return;
+        // The fill-in words of the UI language, and of English: AI drafts and
+        // templates are often English whatever the UI language is.
+        const found = findUnfilledPlaceholders(subject, bodyText, [
+          enMessages.email_composer.placeholder_words,
+          t.raw('placeholder_words'),
+        ]);
+        if (found.some(p => !confirmedPlaceholdersRef.current.has(p))) {
+          warnings.push({ kind: 'placeholders', matches: found });
         }
       }
-    }
 
-    // Open proofreading issues, when a checker asked for the warning (the
-    // LanguageTool plugin's "warn before sending" option). Once per message.
-    if (!proofreadingConfirmedRef.current) {
-      const open = proofreading.sendWarningIssues().length;
-      if (open > 0) {
-        setProofreadingWarning({ count: open, delayedUntil });
+      // Attachment reminder check
+      if (attachmentReminderEnabled) {
+        const hasAttachments = attachmentsRef.current.some(att => att.blobId && !att.uploading && !att.error);
+        if (!hasAttachments) {
+          // Scan only the user-authored text: the quoted original of a
+          // reply/forward often mentions an attachment itself, which used to fire
+          // the reminder even when the user typed no keyword and added nothing (#570).
+          const bodyText = extractUserAuthoredText(body, {
+            plainTextMode,
+            forwardedSeparator: tQuote('forwarded_separator'),
+          });
+          const searchText = `${subject} ${bodyText}`.toLowerCase();
+          const matched = attachmentReminderKeywords.find(kw => searchText.includes(kw.toLowerCase()));
+          if (matched) warnings.push({ kind: 'attachment', keyword: matched });
+        }
+      }
+
+      // Open proofreading issues, when a checker asked for the warning (the
+      // LanguageTool plugin's "warn before sending" option).
+      if (!proofreadingConfirmedRef.current) {
+        const open = proofreading.sendWarningIssues().length;
+        if (open > 0) warnings.push({ kind: 'proofreading', count: open });
+      }
+
+      if (warnings.length > 0) {
+        setSendWarnings({ items: warnings, delayedUntil });
         return;
       }
     }
@@ -4651,9 +4644,7 @@ export function EmailComposer({
       filesPicker ||
       showSaveAsTemplate ||
       showScheduleDialog ||
-      showAttachmentWarning ||
-      showEmptySubjectWarning ||
-      showPlaceholderWarning ||
+      sendWarnings ||
       showCloseDialog
     ) return;
 
@@ -5832,163 +5823,45 @@ export function EmailComposer({
         disabled={!canSend || isSending || isSavingAndClosing}
       />
 
-      <Dialog
-        isOpen={showAttachmentWarning}
-        onClose={() => setShowAttachmentWarning(false)}
-        role="alertdialog"
-        showClose={false}
-        title={t('forgot_attachment.title')}
-        description={t('forgot_attachment.message', { keyword: attachmentWarningKeyword })}
-        footer={
-          <>
-            <Button variant="outline" onClick={() => setShowAttachmentWarning(false)}>
-              {t('forgot_attachment.back')}
-            </Button>
-            <Button onClick={() => { setShowAttachmentWarning(false); handleSend({ skipAttachmentCheck: true, skipSubjectCheck: true, delayedUntil: attachmentWarningDelayedUntil }); setAttachmentWarningDelayedUntil(undefined); }}>
-              {t('forgot_attachment.send_anyway')}
-            </Button>
-          </>
-        }
-      />
-
-      <Dialog
-        isOpen={showEmptySubjectWarning}
-        onClose={() => setShowEmptySubjectWarning(false)}
-        role="alertdialog"
-        showClose={false}
-        title={t('empty_subject.title')}
-        description={t('empty_subject.message')}
-        footer={
-            <>
-              <Button
-                variant="outline"
-                onClick={() => {
-                  setShowEmptySubjectWarning(false);
-                  setEmptySubjectDelayedUntil(undefined);
-                  // After the focus trap tears down it restores focus to the
-                  // Send button, so claim the subject field on the next tick.
-                  setTimeout(() => subjectInputRef.current?.focus(), 0);
-                }}
-              >
-                {t('empty_subject.back')}
-              </Button>
-              <Button
-                onClick={() => {
-                  if (emptySubjectDontAskAgain) updateSetting('emptySubjectWarningEnabled', false);
-                  emptySubjectConfirmedRef.current = true;
-                  setShowEmptySubjectWarning(false);
-                  handleSend({ skipSubjectCheck: true, delayedUntil: emptySubjectDelayedUntil });
-                  setEmptySubjectDelayedUntil(undefined);
-                }}
-              >
-                {t('empty_subject.send_anyway')}
-              </Button>
-            </>
-        }
-      >
-        <label className="mt-4 flex items-center gap-2 text-sm text-muted-foreground cursor-pointer">
-          <input
-            type="checkbox"
-            checked={emptySubjectDontAskAgain}
-            onChange={(e) => setEmptySubjectDontAskAgain(e.target.checked)}
-            className="rounded border-input"
-          />
-          {t('empty_subject.dont_ask_again')}
-        </label>
-      </Dialog>
-
       <ConfirmDialog {...noDelayDialogProps} />
       <ConfirmDialog {...sendConfirmDialogProps} />
 
-      <Dialog
-        isOpen={showPlaceholderWarning}
-        onClose={() => setShowPlaceholderWarning(false)}
-        role="alertdialog"
-        showClose={false}
-        title={t('placeholder_warning.title')}
-        description={t('placeholder_warning.message')}
-        footer={
-            <>
-              <Button
-                variant="outline"
-                onClick={() => {
-                  setShowPlaceholderWarning(false);
-                  setPlaceholderWarningDelayedUntil(undefined);
-                  // The focus trap hands focus back to the Send button as it
-                  // tears down, so select on the next tick.
-                  const first = placeholderWarningMatches[0];
-                  setTimeout(() => { if (first) selectPlaceholder(first); }, 0);
-                }}
-              >
-                {t('placeholder_warning.back')}
-              </Button>
-              <Button
-                onClick={() => {
-                  if (placeholderDontAskAgain) updateSetting('placeholderWarningEnabled', false);
-                  placeholderWarningMatches.forEach((p) => confirmedPlaceholdersRef.current.add(p));
-                  setShowPlaceholderWarning(false);
-                  handleSend({ skipSubjectCheck: true, delayedUntil: placeholderWarningDelayedUntil });
-                  setPlaceholderWarningDelayedUntil(undefined);
-                }}
-              >
-                {t('placeholder_warning.send_anyway')}
-              </Button>
-            </>
-        }
-      >
-        <ul className="mt-3 flex flex-wrap items-center gap-1.5" aria-label={t('placeholder_warning.found')}>
-          {placeholderWarningMatches.slice(0, 5).map((p) => (
-            <li key={p} className="max-w-full truncate rounded bg-muted px-2 py-0.5 font-mono text-xs text-foreground">{p}</li>
-          ))}
-          {placeholderWarningMatches.length > 5 && (
-            <li className="text-xs text-muted-foreground">
-              {t('placeholder_warning.more', { count: placeholderWarningMatches.length - 5 })}
-            </li>
-          )}
-        </ul>
-        <label className="mt-4 flex items-center gap-2 text-sm text-muted-foreground cursor-pointer">
-          <input
-            type="checkbox"
-            checked={placeholderDontAskAgain}
-            onChange={(e) => setPlaceholderDontAskAgain(e.target.checked)}
-            className="rounded border-input"
-          />
-          {t('placeholder_warning.dont_ask_again')}
-        </label>
-      </Dialog>
-
-      <Dialog
-        isOpen={proofreadingWarning !== null}
-        onClose={() => setProofreadingWarning(null)}
-        role="alertdialog"
-        showClose={false}
-        title={tProofreading('send_warning.title')}
-        description={tProofreading('send_warning.body', { count: proofreadingWarning?.count ?? 0 })}
-        footer={
-          <>
-            <Button
-              variant="outline"
-              onClick={() => {
-                setProofreadingWarning(null);
-                // After the focus trap hands focus back, go to the first issue.
-                setTimeout(() => proofreading.navigate(1), 0);
-              }}
-            >
-              {tProofreading('send_warning.review')}
-            </Button>
-            <Button
-              data-testid="proofreading-send-anyway"
-              onClick={() => {
-                const delayed = proofreadingWarning?.delayedUntil;
-                proofreadingConfirmedRef.current = true;
-                setProofreadingWarning(null);
-                handleSend({ skipSubjectCheck: true, skipAttachmentCheck: true, delayedUntil: delayed });
-              }}
-            >
-              {tProofreading('send_warning.send')}
-            </Button>
-          </>
-        }
+      <SendWarningsDialog
+        warnings={sendWarnings?.items ?? null}
+        onBack={() => {
+          const first = sendWarnings?.items[0];
+          setSendWarnings(null);
+          // The focus trap hands focus back to the Send button as it tears
+          // down: go to what the first warning is about on the next tick.
+          setTimeout(() => {
+            if (first?.kind === 'subject') subjectInputRef.current?.focus();
+            else if (first?.kind === 'placeholders') selectPlaceholder(first.matches[0]);
+            else if (first?.kind === 'proofreading') proofreading.navigate(1);
+            else if (first?.kind === 'text') {
+              if (plainTextModeRef.current) bodyRef.current?.focus();
+              else editorRef.current?.commands.focus();
+            }
+          }, 0);
+        }}
+        onSendAnyway={(dontAskAgain) => {
+          if (!sendWarnings) return;
+          const { items, delayedUntil } = sendWarnings;
+          for (const warning of items) {
+            if (warning.kind === 'subject') {
+              emptySubjectConfirmedRef.current = true;
+              if (dontAskAgain) updateSetting('emptySubjectWarningEnabled', false);
+            } else if (warning.kind === 'text') {
+              emptyTextConfirmedRef.current = true;
+            } else if (warning.kind === 'placeholders') {
+              warning.matches.forEach((p) => confirmedPlaceholdersRef.current.add(p));
+              if (dontAskAgain) updateSetting('placeholderWarningEnabled', false);
+            } else if (warning.kind === 'proofreading') {
+              proofreadingConfirmedRef.current = true;
+            }
+          }
+          setSendWarnings(null);
+          handleSend({ warningsConfirmed: true, delayedUntil });
+        }}
       />
 
       <Dialog
diff --git a/components/email/send-warnings-dialog.tsx b/components/email/send-warnings-dialog.tsx
new file mode 100644
index 000000000..a29709903
--- /dev/null
+++ b/components/email/send-warnings-dialog.tsx
@@ -0,0 +1,146 @@
+"use client";
+
+import { useState } from "react";
+import { useTranslations } from "next-intl";
+import { Button } from "@/components/ui/button";
+import { Dialog } from "@/components/ui/dialog";
+
+/** Something the composer asks about before a message goes out. */
+export type SendWarning =
+  | { kind: "subject" }
+  | { kind: "text" }
+  | { kind: "placeholders"; matches: string[] }
+  | { kind: "attachment"; keyword: string }
+  | { kind: "proofreading"; count: number };
+
+interface SendWarningsDialogProps {
+  /** What to ask about, in the order the composer checks it. Closed when null. */
+  warnings: SendWarning[] | null;
+  /** "Back to editing", Escape or a click outside. */
+  onBack: () => void;
+  /** "Send anyway". `dontAskAgain`: the box under a single warning that has a setting. */
+  onSendAnyway: (dontAskAgain: boolean) => void;
+}
+
+/** The warnings that can be switched off in Settings (subject and placeholders). */
+const HAS_SETTING = new Set<SendWarning["kind"]>(["subject", "placeholders"]);
+
+/**
+ * One question before sending, whatever it found: a single warning keeps its
+ * own title and text, several are listed in one dialog with one "Send anyway"
+ * (two dialogs in a row asked about each in turn).
+ */
+export function SendWarningsDialog({ warnings, onBack, onSendAnyway }: SendWarningsDialogProps) {
+  const t = useTranslations("email_composer");
+  const tSend = useTranslations("compose_send");
+  const tProofreading = useTranslations("proofreading");
+  const [dontAskAgain, setDontAskAgain] = useState(false);
+  const [shownFor, setShownFor] = useState<SendWarning[] | null>(null);
+  // A new question starts with the box unticked.
+  if (warnings !== shownFor) {
+    setShownFor(warnings);
+    setDontAskAgain(false);
+  }
+
+  const items = warnings ?? [];
+  const single = items.length === 1 ? items[0] : null;
+
+  const placeholderChips = (matches: string[]) => (
+    <ul className="mt-3 flex flex-wrap items-center gap-1.5" aria-label={t("placeholder_warning.found")}>
+      {matches.slice(0, 5).map((p) => (
+        <li key={p} className="max-w-full truncate rounded bg-muted px-2 py-0.5 font-mono text-xs text-foreground">{p}</li>
+      ))}
+      {matches.length > 5 && (
+        <li className="text-xs text-muted-foreground">
+          {t("placeholder_warning.more", { count: matches.length - 5 })}
+        </li>
+      )}
+    </ul>
+  );
+
+  let title: string;
+  let description: string | undefined;
+  let backLabel = tSend("back");
+  let sendLabel = tSend("send_anyway");
+  let body: React.ReactNode = null;
+
+  if (single?.kind === "subject") {
+    title = t("empty_subject.title");
+    description = t("empty_subject.message");
+    backLabel = t("empty_subject.back");
+    sendLabel = t("empty_subject.send_anyway");
+  } else if (single?.kind === "text") {
+    title = tSend("empty_text_title");
+    description = tSend("empty_text_message");
+  } else if (single?.kind === "placeholders") {
+    title = t("placeholder_warning.title");
+    description = t("placeholder_warning.message");
+    backLabel = t("placeholder_warning.back");
+    sendLabel = t("placeholder_warning.send_anyway");
+    body = placeholderChips(single.matches);
+  } else if (single?.kind === "attachment") {
+    title = t("forgot_attachment.title");
+    description = t("forgot_attachment.message", { keyword: single.keyword });
+    backLabel = t("forgot_attachment.back");
+    sendLabel = t("forgot_attachment.send_anyway");
+  } else if (single?.kind === "proofreading") {
+    title = tProofreading("send_warning.title");
+    description = tProofreading("send_warning.body", { count: single.count });
+    backLabel = tProofreading("send_warning.review");
+    sendLabel = tProofreading("send_warning.send");
+  } else {
+    title = tSend("warnings_title");
+    body = (
+      <ul className="mt-3 space-y-2 text-sm text-foreground" data-testid="send-warnings-list">
+        {items.map((w) => (
+          <li key={w.kind} className="flex gap-2">
+            <span aria-hidden="true" className="text-muted-foreground">•</span>
+            <div className="min-w-0">
+              {w.kind === "subject" && tSend("warning_subject")}
+              {w.kind === "text" && tSend("warning_text")}
+              {w.kind === "attachment" && tSend("warning_attachment", { keyword: w.keyword })}
+              {w.kind === "proofreading" && tSend("warning_proofreading", { count: w.count })}
+              {w.kind === "placeholders" && (
+                <>
+                  {tSend("warning_placeholders")}
+                  {placeholderChips(w.matches)}
+                </>
+              )}
+            </div>
+          </li>
+        ))}
+      </ul>
+    );
+  }
+
+  return (
+    <Dialog
+      isOpen={items.length > 0}
+      onClose={onBack}
+      role="alertdialog"
+      showClose={false}
+      title={title}
+      description={description}
+      testId="send-warnings"
+      footer={
+        <>
+          <Button variant="outline" onClick={onBack}>{backLabel}</Button>
+          <Button data-testid={single?.kind === "proofreading" ? "proofreading-send-anyway" : "send-warnings-send"} onClick={() => onSendAnyway(dontAskAgain)}>{sendLabel}</Button>
+        </>
+      }
+    >
+      {body}
+      {single && HAS_SETTING.has(single.kind) && (
+        <label className="mt-4 flex items-center gap-2 text-sm text-muted-foreground cursor-pointer">
+          <input
+            type="checkbox"
+            checked={dontAskAgain}
+            onChange={(e) => setDontAskAgain(e.target.checked)}
+            className="rounded border-input"
+          />
+          {single.kind === "subject" ? t("empty_subject.dont_ask_again") : t("placeholder_warning.dont_ask_again")}
+        </label>
+      )}
+    </Dialog>
+  );
+}
diff --git a/locales/ar/common.json b/locales/ar/common.json
index 5bf41a9d5..053453a2a 100644
--- a/locales/ar/common.json
+++ b/locales/ar/common.json
@@ -3896,6 +3896,18 @@
       }
     }
   },
+  "compose_send": {
+    "back": "العودة إلى التعديل",
+    "send_anyway": "الإرسال على أي حال",
+    "warnings_title": "هل تريد إرسال هذه الرسالة على أي حال؟",
+    "warning_subject": "بلا موضوع",
+    "warning_text": "بلا نص",
+    "warning_attachment": "تذكر \"{keyword}\" لكن لا يوجد ملف مرفق",
+    "warning_placeholders": "نص مؤقت سيراه المستلمون:",
+    "warning_proofreading": "مشكلات إملائية أو نحوية مفتوحة: {count}",
+    "empty_text_title": "هل تريد الإرسال بدون نص؟",
+    "empty_text_message": "لا تحتوي هذه الرسالة على نص ولا على مرفق. هل تريد إرسالها على أي حال؟"
+  },
   "org_templates": {
     "section_personal": "قوالبي",
     "section_organisation": "المؤسسة",
diff --git a/locales/ca/common.json b/locales/ca/common.json
index eca36135b..7f4471792 100644
--- a/locales/ca/common.json
+++ b/locales/ca/common.json
@@ -3896,6 +3896,18 @@
       }
     }
   },
+  "compose_send": {
+    "back": "Torna a l'edició",
+    "send_anyway": "Envia igualment",
+    "warnings_title": "Vols enviar aquest missatge igualment?",
+    "warning_subject": "Sense assumpte",
+    "warning_text": "Sense text",
+    "warning_attachment": "Esmenta «{keyword}», però no hi ha cap fitxer adjunt",
+    "warning_placeholders": "Text de mostra que veuran els destinataris:",
+    "warning_proofreading": "Errors d'ortografia o gramàtica pendents: {count}",
+    "empty_text_title": "Vols enviar-lo sense text?",
+    "empty_text_message": "Aquest missatge no té text ni cap fitxer adjunt. Vols enviar-lo igualment?"
+  },
   "org_templates": {
     "section_personal": "Les meves plantilles",
     "section_organisation": "Organització",
diff --git a/locales/cs/common.json b/locales/cs/common.json
index f1f5076dd..c20188847 100644
--- a/locales/cs/common.json
+++ b/locales/cs/common.json
@@ -3896,6 +3896,18 @@
       }
     }
   },
+  "compose_send": {
+    "back": "Zpět k úpravám",
+    "send_anyway": "Přesto odeslat",
+    "warnings_title": "Přesto tuto zprávu odeslat?",
+    "warning_subject": "Bez předmětu",
+    "warning_text": "Bez textu",
+    "warning_attachment": "Zmiňuje „{keyword}“, ale není připojen žádný soubor",
+    "warning_placeholders": "Zástupný text, který příjemci uvidí:",
+    "warning_proofreading": "Nevyřešené pravopisné či gramatické chyby: {count}",
+    "empty_text_title": "Odeslat bez textu?",
+    "empty_text_message": "Tato zpráva nemá text ani přílohu. Přesto ji odeslat?"
+  },
   "org_templates": {
     "section_personal": "Moje šablony",
     "section_organisation": "Organizace",
diff --git a/locales/da/common.json b/locales/da/common.json
index 7461d652b..9c99fd35c 100644
--- a/locales/da/common.json
+++ b/locales/da/common.json
@@ -3896,6 +3896,18 @@
       }
     }
   },
+  "compose_send": {
+    "back": "Tilbage til redigering",
+    "send_anyway": "Send alligevel",
+    "warnings_title": "Send denne besked alligevel?",
+    "warning_subject": "Intet emne",
+    "warning_text": "Ingen tekst",
+    "warning_attachment": "Nævner \"{keyword}\", men ingen fil er vedhæftet",
+    "warning_placeholders": "Pladsholdertekst, som modtagerne vil se:",
+    "warning_proofreading": "Åbne stave- eller grammatikfejl: {count}",
+    "empty_text_title": "Send uden tekst?",
+    "empty_text_message": "Denne besked har ingen tekst og ingen vedhæftet fil. Send den alligevel?"
+  },
   "org_templates": {
     "section_personal": "Mine skabeloner",
     "section_organisation": "Organisation",
diff --git a/locales/de/common.json b/locales/de/common.json
index 31d15c0ed..a45ec38e1 100644
--- a/locales/de/common.json
+++ b/locales/de/common.json
@@ -3896,6 +3896,18 @@
       }
     }
   },
+  "compose_send": {
+    "back": "Zurück zur Bearbeitung",
+    "send_anyway": "Trotzdem senden",
+    "warnings_title": "Diese Nachricht trotzdem senden?",
+    "warning_subject": "Kein Betreff",
+    "warning_text": "Kein Text",
+    "warning_attachment": "Erwähnt „{keyword}“, aber keine Datei ist angehängt",
+    "warning_placeholders": "Platzhaltertext, den die Empfänger sehen:",
+    "warning_proofreading": "Offene Rechtschreib- oder Grammatikfehler: {count}",
+    "empty_text_title": "Ohne Text senden?",
+    "empty_text_message": "Diese Nachricht hat keinen Text und keinen Anhang. Trotzdem senden?"
+  },
   "org_templates": {
     "section_personal": "Meine Vorlagen",
     "section_organisation": "Organisation",
diff --git a/locales/en/common.json b/locales/en/common.json
index e0491ee32..26fa9449a 100644
--- a/locales/en/common.json
+++ b/locales/en/common.json
@@ -3896,6 +3896,18 @@
       }
     }
   },
+  "compose_send": {
+    "back": "Back to editing",
+    "send_anyway": "Send anyway",
+    "warnings_title": "Send this message anyway?",
+    "warning_subject": "No subject",
+    "warning_text": "No text",
+    "warning_attachment": "Mentions \"{keyword}\", but no file is attached",
+    "warning_placeholders": "Placeholder text that recipients will see:",
+    "warning_proofreading": "Open spelling or grammar issues: {count}",
+    "empty_text_title": "Send without text?",
+    "empty_text_message": "This message has no text and no attachment. Send it anyway?"
+  },
   "org_templates": {
     "section_personal": "My templates",
     "section_organisation": "Organisation",
diff --git a/locales/es/common.json b/locales/es/common.json
index 1050f0f56..3fb63b84d 100644
--- a/locales/es/common.json
+++ b/locales/es/common.json
@@ -3896,6 +3896,18 @@
       }
     }
   },
+  "compose_send": {
+    "back": "Volver a editar",
+    "send_anyway": "Enviar de todos modos",
+    "warnings_title": "¿Enviar este mensaje de todos modos?",
+    "warning_subject": "Sin asunto",
+    "warning_text": "Sin texto",
+    "warning_attachment": "Menciona «{keyword}», pero no hay ningún archivo adjunto",
+    "warning_placeholders": "Texto de marcador que verán los destinatarios:",
+    "warning_proofreading": "Errores de ortografía o gramática pendientes: {count}",
+    "empty_text_title": "¿Enviar sin texto?",
+    "empty_text_message": "Este mensaje no tiene texto ni archivos adjuntos. ¿Enviarlo de todos modos?"
+  },
   "org_templates": {
     "section_personal": "Mis plantillas",
     "section_organisation": "Organización",
diff --git a/locales/et/common.json b/locales/et/common.json
index df425b8bd..76ac8af66 100644
--- a/locales/et/common.json
+++ b/locales/et/common.json
@@ -3896,6 +3896,18 @@
       }
     }
   },
+  "compose_send": {
+    "back": "Tagasi muutmise juurde",
+    "send_anyway": "Saada ikkagi",
+    "warnings_title": "Kas saata see kiri ikkagi?",
+    "warning_subject": "Teema puudub",
+    "warning_text": "Tekst puudub",
+    "warning_attachment": "Mainib sõna „{keyword}“, kuid ühtegi faili pole lisatud",
+    "warning_placeholders": "Kohatäitetekst, mida saajad näevad:",
+    "warning_proofreading": "Lahendamata õigekirja- või grammatikavead: {count}",
+    "empty_text_title": "Kas saata ilma tekstita?",
+    "empty_text_message": "Selles kirjas pole teksti ega manust. Kas saata see ikkagi?"
+  },
   "org_templates": {
     "section_personal": "Minu mallid",
     "section_organisation": "Organisatsioon",
diff --git a/locales/fa/common.json b/locales/fa/common.json
index bf242d98d..40122d82c 100644
--- a/locales/fa/common.json
+++ b/locales/fa/common.json
@@ -3896,6 +3896,18 @@
       }
     }
   },
+  "compose_send": {
+    "back": "بازگشت به ویرایش",
+    "send_anyway": "ارسال به هر حال",
+    "warnings_title": "این پیام به هر حال ارسال شود؟",
+    "warning_subject": "بدون موضوع",
+    "warning_text": "بدون متن",
+    "warning_attachment": "به «{keyword}» اشاره می‌کند، اما هیچ فایلی پیوست نشده است",
+    "warning_placeholders": "متن جایگزینی که گیرندگان خواهند دید:",
+    "warning_proofreading": "خطاهای املایی یا دستوری باز: {count}",
+    "empty_text_title": "بدون متن ارسال شود؟",
+    "empty_text_message": "این پیام متن و پیوست ندارد. به هر حال ارسال شود؟"
+  },
   "org_templates": {
     "section_personal": "قالب‌های من",
     "section_organisation": "سازمان",
diff --git a/locales/fr/common.json b/locales/fr/common.json
index 03545491c..fb6acde3b 100644
--- a/locales/fr/common.json
+++ b/locales/fr/common.json
@@ -3896,6 +3896,18 @@
       }
     }
   },
+  "compose_send": {
+    "back": "Retour à l'édition",
+    "send_anyway": "Envoyer quand même",
+    "warnings_title": "Envoyer ce message quand même ?",
+    "warning_subject": "Pas d'objet",
+    "warning_text": "Pas de texte",
+    "warning_attachment": "Mentionne « {keyword} », mais aucun fichier n'est joint",
+    "warning_placeholders": "Texte de remplacement que les destinataires verront :",
+    "warning_proofreading": "Fautes d'orthographe ou de grammaire restantes : {count}",
+    "empty_text_title": "Envoyer sans texte ?",
+    "empty_text_message": "Ce message n'a ni texte ni pièce jointe. L'envoyer quand même ?"
+  },
   "org_templates": {
     "section_personal": "Mes modèles",
     "section_organisation": "Organisation",
diff --git a/locales/he/common.json b/locales/he/common.json
index f8258a747..411fd5d51 100644
--- a/locales/he/common.json
+++ b/locales/he/common.json
@@ -3793,6 +3793,18 @@
       }
     }
   },
+  "compose_send": {
+    "back": "חזור לעריכה",
+    "send_anyway": "שלח בכל זאת",
+    "warnings_title": "לשלוח את ההודעה בכל זאת?",
+    "warning_subject": "אין נושא",
+    "warning_text": "אין טקסט",
+    "warning_attachment": "מוזכר \"{keyword}\", אבל לא צורף קובץ",
+    "warning_placeholders": "טקסט ממלא מקום שהנמענים יראו:",
+    "warning_proofreading": "שגיאות כתיב או דקדוק פתוחות: {count}",
+    "empty_text_title": "לשלוח ללא טקסט?",
+    "empty_text_message": "להודעה הזו אין טקסט ואין קובץ מצורף. לשלוח אותה בכל זאת?"
+  },
   "org_templates": {
     "section_personal": "התבניות שלי",
     "section_organisation": "ארגון",
diff --git a/locales/hu/common.json b/locales/hu/common.json
index bd65a8ec0..ec24d247c 100644
--- a/locales/hu/common.json
+++ b/locales/hu/common.json
@@ -3896,6 +3896,18 @@
       }
     }
   },
+  "compose_send": {
+    "back": "Vissza a szerkesztéshez",
+    "send_anyway": "Küldés így is",
+    "warnings_title": "Elküldi így is ezt az üzenetet?",
+    "warning_subject": "Nincs tárgy",
+    "warning_text": "Nincs szöveg",
+    "warning_attachment": "Említi ezt: „{keyword}”, de nincs csatolt fájl",
+    "warning_placeholders": "Helykitöltő szöveg, amelyet a címzettek látni fognak:",
+    "warning_proofreading": "Nyitott helyesírási vagy nyelvtani hibák: {count}",
+    "empty_text_title": "Küldés szöveg nélkül?",
+    "empty_text_message": "Ennek az üzenetnek nincs szövege és melléklete. Elküldi így is?"
+  },
   "org_templates": {
     "section_personal": "Saját sablonok",
     "section_organisation": "Szervezet",
diff --git a/locales/it/common.json b/locales/it/common.json
index b79013a3a..6198c7e9a 100644
--- a/locales/it/common.json
+++ b/locales/it/common.json
@@ -3896,6 +3896,18 @@
       }
     }
   },
+  "compose_send": {
+    "back": "Torna alla modifica",
+    "send_anyway": "Invia comunque",
+    "warnings_title": "Inviare comunque questo messaggio?",
+    "warning_subject": "Nessun oggetto",
+    "warning_text": "Nessun testo",
+    "warning_attachment": "Menziona \"{keyword}\", ma non c'è nessun file allegato",
+    "warning_placeholders": "Testo segnaposto che i destinatari vedranno:",
+    "warning_proofreading": "Errori di ortografia o grammatica aperti: {count}",
+    "empty_text_title": "Inviare senza testo?",
+    "empty_text_message": "Questo messaggio non ha testo né allegati. Inviarlo comunque?"
+  },
   "org_templates": {
     "section_personal": "I miei modelli",
     "section_organisation": "Organizzazione",
diff --git a/locales/ja/common.json b/locales/ja/common.json
index 0fc511808..374b5b7e2 100644
--- a/locales/ja/common.json
+++ b/locales/ja/common.json
@@ -3896,6 +3896,18 @@
       }
     }
   },
+  "compose_send": {
+    "back": "編集に戻る",
+    "send_anyway": "そのまま送信",
+    "warnings_title": "このメッセージをそのまま送信しますか？",
+    "warning_subject": "件名がありません",
+    "warning_text": "本文がありません",
+    "warning_attachment": "「{keyword}」とありますが、ファイルが添付されていません",
+    "warning_placeholders": "受信者に表示されるプレースホルダー:",
+    "warning_proofreading": "未解決のスペル・文法の問題: {count}",
+    "empty_text_title": "本文なしで送信しますか？",
+    "empty_text_message": "このメッセージには本文も添付ファイルもありません。そのまま送信しますか？"
+  },
   "org_templates": {
     "section_personal": "マイテンプレート",
     "section_organisation": "組織",
diff --git a/locales/ko/common.json b/locales/ko/common.json
index 21bc7b936..cf92bbb07 100644
--- a/locales/ko/common.json
+++ b/locales/ko/common.json
@@ -3896,6 +3896,18 @@
       }
     }
   },
+  "compose_send": {
+    "back": "편집으로 돌아가기",
+    "send_anyway": "그래도 보내기",
+    "warnings_title": "이 메일을 그래도 보낼까요?",
+    "warning_subject": "제목 없음",
+    "warning_text": "본문 없음",
+    "warning_attachment": "\"{keyword}\"라고 적혀 있지만 첨부된 파일이 없어요",
+    "warning_placeholders": "받는 사람에게 보이는 자리 표시 텍스트:",
+    "warning_proofreading": "남은 맞춤법 또는 문법 문제: {count}",
+    "empty_text_title": "본문 없이 보낼까요?",
+    "empty_text_message": "이 메일에는 본문도 첨부 파일도 없어요. 그래도 보낼까요?"
+  },
   "org_templates": {
     "section_personal": "내 템플릿",
     "section_organisation": "조직",
diff --git a/locales/lv/common.json b/locales/lv/common.json
index 2958f811c..ce05b0de3 100644
--- a/locales/lv/common.json
+++ b/locales/lv/common.json
@@ -3896,6 +3896,18 @@
       }
     }
   },
+  "compose_send": {
+    "back": "Atpakaļ pie rediģēšanas",
+    "send_anyway": "Sūtīt tik un tā",
+    "warnings_title": "Vai tomēr sūtīt šo vēstuli?",
+    "warning_subject": "Nav temata",
+    "warning_text": "Nav teksta",
+    "warning_attachment": "Piemin “{keyword}”, bet neviens fails nav pievienots",
+    "warning_placeholders": "Vietturu teksts, ko redzēs saņēmēji:",
+    "warning_proofreading": "Neatrisinātas pareizrakstības vai gramatikas kļūdas: {count}",
+    "empty_text_title": "Sūtīt bez teksta?",
+    "empty_text_message": "Šai vēstulei nav ne teksta, ne pielikuma. Vai tomēr to sūtīt?"
+  },
   "org_templates": {
     "section_personal": "Manas veidnes",
     "section_organisation": "Organizācija",
diff --git a/locales/mn/common.json b/locales/mn/common.json
index 57128748e..8c6d231f2 100644
--- a/locales/mn/common.json
+++ b/locales/mn/common.json
@@ -3896,6 +3896,18 @@
       }
     }
   },
+  "compose_send": {
+    "back": "Засварлах руу буцах",
+    "send_anyway": "Ямар ч байсан илгээх",
+    "warnings_title": "Энэ захиаг ямар ч байсан илгээх үү?",
+    "warning_subject": "Гарчиггүй",
+    "warning_text": "Текстгүй",
+    "warning_attachment": "\"{keyword}\" гэж дурдсан ч файл хавсаргаагүй",
+    "warning_placeholders": "Хүлээн авагчид харах орлуулах текст:",
+    "warning_proofreading": "Засаагүй зөв бичгийн болон дүрмийн алдаа: {count}",
+    "empty_text_title": "Текстгүй илгээх үү?",
+    "empty_text_message": "Энэ захиад текст ч, хавсралт ч алга. Ямар ч байсан илгээх үү?"
+  },
   "org_templates": {
     "section_personal": "Миний загварууд",
     "section_organisation": "Байгууллага",
diff --git a/locales/nb/common.json b/locales/nb/common.json
index 27c9f7642..ab96e67a2 100644
--- a/locales/nb/common.json
+++ b/locales/nb/common.json
@@ -3896,6 +3896,18 @@
       }
     }
   },
+  "compose_send": {
+    "back": "Tilbake til redigering",
+    "send_anyway": "Send likevel",
+    "warnings_title": "Sende denne meldingen likevel?",
+    "warning_subject": "Ingen emne",
+    "warning_text": "Ingen tekst",
+    "warning_attachment": "Nevner «{keyword}», men ingen fil er lagt ved",
+    "warning_placeholders": "Plassholdertekst som mottakerne vil se:",
+    "warning_proofreading": "Åpne stave- eller grammatikkfeil: {count}",
+    "empty_text_title": "Sende uten tekst?",
+    "empty_text_message": "Denne meldingen har verken tekst eller vedlegg. Sende den likevel?"
+  },
   "org_templates": {
     "section_personal": "Mine maler",
     "section_organisation": "Organisasjon",
diff --git a/locales/nl/common.json b/locales/nl/common.json
index 69e5afbcc..bccdc4a88 100644
--- a/locales/nl/common.json
+++ b/locales/nl/common.json
@@ -3896,6 +3896,18 @@
       }
     }
   },
+  "compose_send": {
+    "back": "Terug naar bewerken",
+    "send_anyway": "Toch verzenden",
+    "warnings_title": "Dit bericht toch verzenden?",
+    "warning_subject": "Geen onderwerp",
+    "warning_text": "Geen tekst",
+    "warning_attachment": "Noemt ‘{keyword}’, maar er is geen bestand bijgevoegd",
+    "warning_placeholders": "Tijdelijke tekst die ontvangers zien:",
+    "warning_proofreading": "Openstaande spel- of grammaticafouten: {count}",
+    "empty_text_title": "Verzenden zonder tekst?",
+    "empty_text_message": "Dit bericht heeft geen tekst en geen bijlage. Toch verzenden?"
+  },
   "org_templates": {
     "section_personal": "Mijn sjablonen",
     "section_organisation": "Organisatie",
diff --git a/locales/pl/common.json b/locales/pl/common.json
index 35e69ac26..c011ba2f6 100644
--- a/locales/pl/common.json
+++ b/locales/pl/common.json
@@ -3896,6 +3896,18 @@
       }
     }
   },
+  "compose_send": {
+    "back": "Wróć do edycji",
+    "send_anyway": "Wyślij mimo to",
+    "warnings_title": "Wysłać tę wiadomość mimo to?",
+    "warning_subject": "Brak tematu",
+    "warning_text": "Brak treści",
+    "warning_attachment": "Wspomina „{keyword}”, ale nie dołączono pliku",
+    "warning_placeholders": "Tekst zastępczy, który zobaczą odbiorcy:",
+    "warning_proofreading": "Nierozwiązane błędy pisowni lub gramatyki: {count}",
+    "empty_text_title": "Wysłać bez treści?",
+    "empty_text_message": "Ta wiadomość nie ma treści ani załącznika. Wysłać ją mimo to?"
+  },
   "org_templates": {
     "section_personal": "Moje szablony",
     "section_organisation": "Organizacja",
diff --git a/locales/pt/common.json b/locales/pt/common.json
index 7a094b8ea..a10b6f2b4 100644
--- a/locales/pt/common.json
+++ b/locales/pt/common.json
@@ -3896,6 +3896,18 @@
       }
     }
   },
+  "compose_send": {
+    "back": "Voltar à edição",
+    "send_anyway": "Enviar mesmo assim",
+    "warnings_title": "Enviar esta mensagem mesmo assim?",
+    "warning_subject": "Sem assunto",
+    "warning_text": "Sem texto",
+    "warning_attachment": "Menciona \"{keyword}\", mas nenhum arquivo foi anexado",
+    "warning_placeholders": "Texto de espaço reservado que os destinatários verão:",
+    "warning_proofreading": "Erros de ortografia ou gramática em aberto: {count}",
+    "empty_text_title": "Enviar sem texto?",
+    "empty_text_message": "Esta mensagem não tem texto nem anexo. Enviar mesmo assim?"
+  },
   "org_templates": {
     "section_personal": "Meus modelos",
     "section_organisation": "Organização",
diff --git a/locales/ro/common.json b/locales/ro/common.json
index 1c3d817ce..8a994a38f 100644
--- a/locales/ro/common.json
+++ b/locales/ro/common.json
@@ -3896,6 +3896,18 @@
       }
     }
   },
+  "compose_send": {
+    "back": "Înapoi la editare",
+    "send_anyway": "Trimite oricum",
+    "warnings_title": "Trimiteți totuși acest mesaj?",
+    "warning_subject": "Fără subiect",
+    "warning_text": "Fără text",
+    "warning_attachment": "Menționează „{keyword}”, dar niciun fișier nu este atașat",
+    "warning_placeholders": "Text substituent pe care îl vor vedea destinatarii:",
+    "warning_proofreading": "Greșeli de ortografie sau gramatică nerezolvate: {count}",
+    "empty_text_title": "Trimiteți fără text?",
+    "empty_text_message": "Acest mesaj nu are text și nici atașament. Îl trimiteți totuși?"
+  },
   "org_templates": {
     "section_personal": "Șabloanele mele",
     "section_organisation": "Organizație",
diff --git a/locales/ru/common.json b/locales/ru/common.json
index c5c112ea2..7fa2dfdb0 100644
--- a/locales/ru/common.json
+++ b/locales/ru/common.json
@@ -3896,6 +3896,18 @@
       }
     }
   },
+  "compose_send": {
+    "back": "Вернуться к редактированию",
+    "send_anyway": "Отправить всё равно",
+    "warnings_title": "Всё равно отправить это письмо?",
+    "warning_subject": "Нет темы",
+    "warning_text": "Нет текста",
+    "warning_attachment": "Упоминается «{keyword}», но файл не прикреплён",
+    "warning_placeholders": "Текст-заполнитель, который увидят получатели:",
+    "warning_proofreading": "Неисправленные орфографические или грамматические ошибки: {count}",
+    "empty_text_title": "Отправить без текста?",
+    "empty_text_message": "В этом письме нет ни текста, ни вложений. Всё равно отправить?"
+  },
   "org_templates": {
     "section_personal": "Мои шаблоны",
     "section_organisation": "Организация",
diff --git a/locales/sk/common.json b/locales/sk/common.json
index 81d50e05d..14519e009 100644
--- a/locales/sk/common.json
+++ b/locales/sk/common.json
@@ -3896,6 +3896,18 @@
       }
     }
   },
+  "compose_send": {
+    "back": "Späť na úpravu",
+    "send_anyway": "Odoslať aj tak",
+    "warnings_title": "Odoslať túto správu aj tak?",
+    "warning_subject": "Bez predmetu",
+    "warning_text": "Bez textu",
+    "warning_attachment": "Spomína „{keyword}“, ale nie je pripojený žiadny súbor",
+    "warning_placeholders": "Zástupný text, ktorý uvidia príjemcovia:",
+    "warning_proofreading": "Neopravené pravopisné alebo gramatické chyby: {count}",
+    "empty_text_title": "Odoslať bez textu?",
+    "empty_text_message": "Táto správa nemá text ani prílohu. Odoslať ju aj tak?"
+  },
   "org_templates": {
     "section_personal": "Moje šablóny",
     "section_organisation": "Organizácia",
diff --git a/locales/th/common.json b/locales/th/common.json
index c34c371f1..2aa2198ea 100644
--- a/locales/th/common.json
+++ b/locales/th/common.json
@@ -1147,6 +1147,18 @@
       }
     }
   },
+  "compose_send": {
+    "back": "กลับไปแก้ไข",
+    "send_anyway": "ส่งต่อไป",
+    "warnings_title": "ส่งข้อความนี้ต่อไปหรือไม่",
+    "warning_subject": "ไม่มีหัวเรื่อง",
+    "warning_text": "ไม่มีข้อความ",
+    "warning_attachment": "มีคำว่า \"{keyword}\" แต่ไม่ได้แนบไฟล์",
+    "warning_placeholders": "ข้อความตัวยึดตำแหน่งที่ผู้รับจะเห็น:",
+    "warning_proofreading": "ปัญหาการสะกดหรือไวยากรณ์ที่ยังค้างอยู่: {count}",
+    "empty_text_title": "ส่งโดยไม่มีข้อความหรือไม่",
+    "empty_text_message": "ข้อความนี้ไม่มีเนื้อหาและไม่มีไฟล์แนบ ส่งต่อไปหรือไม่"
+  },
   "org_templates": {
     "section_personal": "แม่แบบของฉัน",
     "section_organisation": "องค์กร",
diff --git a/locales/tr/common.json b/locales/tr/common.json
index 43380e45c..12f69457d 100644
--- a/locales/tr/common.json
+++ b/locales/tr/common.json
@@ -3896,6 +3896,18 @@
       }
     }
   },
+  "compose_send": {
+    "back": "Düzenlemeye dön",
+    "send_anyway": "Yine de gönder",
+    "warnings_title": "Bu ileti yine de gönderilsin mi?",
+    "warning_subject": "Konu yok",
+    "warning_text": "Metin yok",
+    "warning_attachment": "\"{keyword}\" geçiyor ama hiç dosya eklenmemiş",
+    "warning_placeholders": "Alıcıların göreceği yer tutucu metin:",
+    "warning_proofreading": "Açık yazım veya dilbilgisi sorunları: {count}",
+    "empty_text_title": "Metin olmadan gönderilsin mi?",
+    "empty_text_message": "Bu iletide metin ve ek yok. Yine de gönderilsin mi?"
+  },
   "org_templates": {
     "section_personal": "Şablonlarım",
     "section_organisation": "Kuruluş",
diff --git a/locales/uk/common.json b/locales/uk/common.json
index d8d7ecf49..d7933e370 100644
--- a/locales/uk/common.json
+++ b/locales/uk/common.json
@@ -3896,6 +3896,18 @@
       }
     }
   },
+  "compose_send": {
+    "back": "Назад до редагування",
+    "send_anyway": "Усе одно надіслати",
+    "warnings_title": "Усе одно надіслати цей лист?",
+    "warning_subject": "Без теми",
+    "warning_text": "Без тексту",
+    "warning_attachment": "Згадується «{keyword}», але файл не прикріплено",
+    "warning_placeholders": "Текст-заповнювач, який побачать одержувачі:",
+    "warning_proofreading": "Невиправлені орфографічні чи граматичні помилки: {count}",
+    "empty_text_title": "Надіслати без тексту?",
+    "empty_text_message": "У цьому листі немає ні тексту, ні вкладень. Усе одно надіслати?"
+  },
   "org_templates": {
     "section_personal": "Мої шаблони",
     "section_organisation": "Організація",
diff --git a/locales/vi/common.json b/locales/vi/common.json
index ccb97537d..2bdd89e99 100644
--- a/locales/vi/common.json
+++ b/locales/vi/common.json
@@ -3908,6 +3908,18 @@
       }
     }
   },
+  "compose_send": {
+    "back": "Quay lại chỉnh sửa",
+    "send_anyway": "Vẫn gửi",
+    "warnings_title": "Vẫn gửi thư này?",
+    "warning_subject": "Không có tiêu đề",
+    "warning_text": "Không có nội dung",
+    "warning_attachment": "Có nhắc đến \"{keyword}\" nhưng chưa đính kèm tệp nào",
+    "warning_placeholders": "Văn bản giữ chỗ mà người nhận sẽ thấy:",
+    "warning_proofreading": "Lỗi chính tả hoặc ngữ pháp chưa sửa: {count}",
+    "empty_text_title": "Gửi mà không có nội dung?",
+    "empty_text_message": "Thư này không có nội dung và không có tệp đính kèm. Vẫn gửi?"
+  },
   "org_templates": {
     "section_personal": "Mẫu của tôi",
     "section_organisation": "Tổ chức",
diff --git a/locales/zh-TW/common.json b/locales/zh-TW/common.json
index 3bc47f02b..8650ef97c 100644
--- a/locales/zh-TW/common.json
+++ b/locales/zh-TW/common.json
@@ -3896,6 +3896,18 @@
       }
     }
   },
+  "compose_send": {
+    "back": "繼續編輯",
+    "send_anyway": "仍然傳送",
+    "warnings_title": "仍然傳送這封郵件？",
+    "warning_subject": "沒有主旨",
+    "warning_text": "沒有內文",
+    "warning_attachment": "提到了「{keyword}」，但沒有附加檔案",
+    "warning_placeholders": "收件者會看到的預留位置文字：",
+    "warning_proofreading": "未處理的拼字或文法問題：{count}",
+    "empty_text_title": "不寫內文就傳送？",
+    "empty_text_message": "這封郵件沒有內文，也沒有附件。仍然傳送？"
+  },
   "org_templates": {
     "section_personal": "我的範本",
     "section_organisation": "組織",
diff --git a/locales/zh/common.json b/locales/zh/common.json
index d4646cf11..500507321 100644
--- a/locales/zh/common.json
+++ b/locales/zh/common.json
@@ -3896,6 +3896,18 @@
       }
     }
   },
+  "compose_send": {
+    "back": "返回编辑",
+    "send_anyway": "仍然发送",
+    "warnings_title": "仍然发送这封邮件？",
+    "warning_subject": "没有主题",
+    "warning_text": "没有正文",
+    "warning_attachment": "提到了“{keyword}”，但没有附加文件",
+    "warning_placeholders": "收件人会看到的占位文本：",
+    "warning_proofreading": "未处理的拼写或语法问题：{count}",
+    "empty_text_title": "不写正文就发送？",
+    "empty_text_message": "这封邮件没有正文，也没有附件。仍然发送？"
+  },
   "org_templates": {
     "section_personal": "我的模板",
     "section_organisation": "组织",

From b425f4b21149344399921bb24fe888fad7ba16e2 Mon Sep 17 00:00:00 2001
From: Linus Rath <139418639+rathlinus@users.noreply.github.com>
Date: Wed, 4 Nov 2026 06:18:29 +0100
Subject: [PATCH 03/34] feat: turn undo send on by default with 5 seconds

The policy-defaults test now expects the new build default of 5 seconds
for an invalid admin value, and the settings-search tests look for the
row under its new label "Undo send".
---
 .../settings/accessibility-settings.tsx       | 15 +++--
 components/settings/composing-settings.tsx    | 15 +++--
 .../plugin-host-api-app-info.test.ts          |  4 +-
 lib/__tests__/settings-search.test.ts         |  4 +-
 lib/settings-schema.ts                        |  6 +-
 lib/settings-search.ts                        |  4 +-
 locales/ar/common.json                        |  6 ++
 locales/ca/common.json                        |  6 ++
 locales/cs/common.json                        |  6 ++
 locales/da/common.json                        |  6 ++
 locales/de/common.json                        |  6 ++
 locales/en/common.json                        |  6 ++
 locales/es/common.json                        |  6 ++
 locales/et/common.json                        |  6 ++
 locales/fa/common.json                        |  6 ++
 locales/fr/common.json                        |  6 ++
 locales/he/common.json                        |  6 ++
 locales/hu/common.json                        |  6 ++
 locales/it/common.json                        |  6 ++
 locales/ja/common.json                        |  6 ++
 locales/ko/common.json                        |  6 ++
 locales/lv/common.json                        |  6 ++
 locales/mn/common.json                        |  6 ++
 locales/nb/common.json                        |  6 ++
 locales/nl/common.json                        |  6 ++
 locales/pl/common.json                        |  6 ++
 locales/pt/common.json                        |  6 ++
 locales/ro/common.json                        |  6 ++
 locales/ru/common.json                        |  6 ++
 locales/sk/common.json                        |  6 ++
 locales/th/common.json                        |  6 ++
 locales/tr/common.json                        |  6 ++
 locales/uk/common.json                        |  6 ++
 locales/vi/common.json                        |  6 ++
 locales/zh-TW/common.json                     |  6 ++
 locales/zh/common.json                        |  6 ++
 .../settings-store-policy-defaults.test.ts    |  2 +-
 .../settings-undo-send-default.test.ts        | 58 +++++++++++++++++++
 stores/settings-store.ts                      | 38 ++++++++++--
 39 files changed, 294 insertions(+), 32 deletions(-)
 create mode 100644 stores/__tests__/settings-undo-send-default.test.ts

diff --git a/components/settings/accessibility-settings.tsx b/components/settings/accessibility-settings.tsx
index 3f6f606e2..80dd75506 100644
--- a/components/settings/accessibility-settings.tsx
+++ b/components/settings/accessibility-settings.tsx
@@ -2,7 +2,7 @@
 
 import { useState } from 'react';
 import { useLocale, useTranslations } from 'next-intl';
-import { useSettingsStore } from '@/stores/settings-store';
+import { useSettingsStore, undoSendOptions } from '@/stores/settings-store';
 import { usePolicyStore } from '@/stores/policy-store';
 import { SettingsSection, SettingItem, RadioGroup, Select, ToggleSwitch } from './settings-section';
 import { Button } from '@/components/ui/button';
@@ -62,6 +62,7 @@ export function AccessibilitySettings() {
   const t = useTranslations('settings.accessibility');
   const tRoot = useTranslations();
   const tEmail = useTranslations('settings.email_behavior');
+  const tWords = useTranslations('compose_words');
   const tAppearance = useTranslations('settings.appearance');
   const tNotifications = useTranslations('settings.notifications');
   const tCalendar = useTranslations('calendar.settings');
@@ -514,16 +515,14 @@ export function AccessibilitySettings() {
             options={toastOptions}
           />
         </SettingItem>
-        <SettingItem label={tEmail('send_delay.label')} description={tEmail('send_delay.description')}>
+        <SettingItem label={tWords('undo_send.label')} description={tWords('undo_send.description')}>
           <Select
             value={String(settings.sendDelaySeconds)}
             onChange={(value) => set('sendDelaySeconds', Number(value) as SendDelaySeconds)}
-            options={[
-              { value: '0', label: tEmail('send_delay.off') },
-              { value: '10', label: tEmail('send_delay.seconds', { seconds: 10 }) },
-              { value: '30', label: tEmail('send_delay.seconds', { seconds: 30 }) },
-              { value: '60', label: tEmail('send_delay.seconds', { seconds: 60 }) },
-            ]}
+            options={undoSendOptions(settings.sendDelaySeconds).map((seconds) => ({
+              value: String(seconds),
+              label: seconds === 0 ? tEmail('send_delay.off') : tEmail('send_delay.seconds', { seconds }),
+            }))}
           />
         </SettingItem>
         {!isSettingHidden('sendConfirmation') && (
diff --git a/components/settings/composing-settings.tsx b/components/settings/composing-settings.tsx
index aea6b724b..b4be22dc7 100644
--- a/components/settings/composing-settings.tsx
+++ b/components/settings/composing-settings.tsx
@@ -2,7 +2,7 @@
 
 import { useState } from 'react';
 import { useTranslations } from 'next-intl';
-import { useSettingsStore } from '@/stores/settings-store';
+import { useSettingsStore, undoSendOptions } from '@/stores/settings-store';
 import type { MentionAddsRecipientTo, ReplyIdentityMatch, SendDelaySeconds } from '@/stores/settings-store';
 import { useAuthStore } from '@/stores/auth-store';
 import { usePolicyStore } from '@/stores/policy-store';
@@ -20,6 +20,7 @@ import { X, ChevronRight } from '@/components/icons';
 export function ComposingSettings() {
   const t = useTranslations('settings.email_behavior');
   const tPage = useTranslations('settings.composing_page');
+  const tWords = useTranslations('compose_words');
   const templatesEnabled = usePolicyStore((s) => s.isFeatureEnabled('templatesEnabled'));
   // The admin panel can lock or hide these three (restriction-keys.ts).
   const { isSettingLocked, isSettingHidden } = usePolicyStore();
@@ -158,17 +159,15 @@ export function ComposingSettings() {
       </SettingsSection>
 
       <SettingsSection id="sending" title={tPage('sections.sending')}>
-        <SettingItem label={t('send_delay.label')} description={t('send_delay.description')}>
+        <SettingItem label={tWords('undo_send.label')} description={tWords('undo_send.description')}>
           <div className="flex flex-col items-end gap-1">
             <Select
               value={String(sendDelaySeconds)}
               onChange={(value) => updateSetting('sendDelaySeconds', Number(value) as SendDelaySeconds)}
-              options={[
-                { value: '0', label: t('send_delay.off') },
-                { value: '10', label: t('send_delay.seconds', { seconds: 10 }) },
-                { value: '30', label: t('send_delay.seconds', { seconds: 30 }) },
-                { value: '60', label: t('send_delay.seconds', { seconds: 60 }) },
-              ]}
+              options={undoSendOptions(sendDelaySeconds).map((seconds) => ({
+                value: String(seconds),
+                label: seconds === 0 ? t('send_delay.off') : t('send_delay.seconds', { seconds }),
+              }))}
             />
             {sendDelaySeconds > 0 && !delayedSendSupported && (
               <p className="max-w-64 text-end text-xs text-amber-600 dark:text-amber-400">{t('send_delay.unsupported')}</p>
diff --git a/lib/__tests__/plugin-host-api-app-info.test.ts b/lib/__tests__/plugin-host-api-app-info.test.ts
index 94c79dad8..b7a8ea269 100644
--- a/lib/__tests__/plugin-host-api-app-info.test.ts
+++ b/lib/__tests__/plugin-host-api-app-info.test.ts
@@ -57,8 +57,8 @@ describe('api.app.searchSettings', () => {
     expect(results.length).toBeGreaterThan(0);
     expect(results[0].pageId).toBe('composing');
     expect(results[0].page).toBe('Verfassen');
-    const de = (await import('@/locales/de/common.json')).default as unknown as { settings: { email_behavior: { send_delay: { label: string } } } };
-    expect(results.map((r) => r.label)).toContain(de.settings.email_behavior.send_delay.label);
+    const de = (await import('@/locales/de/common.json')).default as unknown as { compose_words: { undo_send: { label: string } } };
+    expect(results.map((r) => r.label)).toContain(de.compose_words.undo_send.label);
   });
 
   it('leaves out pages the server does not offer', async () => {
diff --git a/lib/__tests__/settings-search.test.ts b/lib/__tests__/settings-search.test.ts
index c4728bd46..e593b052a 100644
--- a/lib/__tests__/settings-search.test.ts
+++ b/lib/__tests__/settings-search.test.ts
@@ -40,7 +40,7 @@ describe('settings search index (English messages)', () => {
     expect(labelsFor('message_list')).toContain('Sender favicons');
     expect(labelsFor('message_list')).toContain('Clear search when switching folders');
     expect(labelsFor('reading')).toContain('Trusted senders');
-    expect(labelsFor('composing')).toContain('Undo send / send delay');
+    expect(labelsFor('composing')).toContain('Undo send');
     expect(labelsFor('general')).toContain('Time zone');
     expect(labelsFor('organize')).toContain('Nested tags');
   });
@@ -80,7 +80,7 @@ describe('settings search index (English messages)', () => {
   it('finds the newer signature settings on their tabs', () => {
     expect(labelsFor('composing')).toContain('Signature on new mail');
     expect(labelsFor('composing')).toContain('Signature on replies & forwards');
-    expect(labelsFor('composing')).toContain('Undo send / send delay');
+    expect(labelsFor('composing')).toContain('Undo send');
   });
 
   it('marks the rows the Advanced switch hides', () => {
diff --git a/lib/settings-schema.ts b/lib/settings-schema.ts
index 995bb4e41..5773e2048 100644
--- a/lib/settings-schema.ts
+++ b/lib/settings-schema.ts
@@ -281,12 +281,12 @@ const ENTRIES: SettingSchemaEntry[] = [
   bool('signatureNewMailEnabled', 'composing', `${EB}signature_new_mail.label`),
   bool('signatureReplyForwardEnabled', 'composing', `${EB}signature_reply_forward.label`),
   bool('signatureSeparatorEnabled', 'composing', `${EB}signature_separator.label`),
-  // 10/30/60 read "{seconds} seconds" (send_delay.seconds): formatted.
-  choice('sendDelaySeconds', 'composing', `${EB}send_delay.label`, [
+  // 5/10/30 read "{seconds} seconds" (send_delay.seconds): formatted.
+  choice('sendDelaySeconds', 'composing', 'compose_words.undo_send.label', [
     { value: 0, label: `${EB}send_delay.off` },
+    { value: 5, label: null },
     { value: 10, label: null },
     { value: 30, label: null },
-    { value: 60, label: null },
   ]),
   bool('sendConfirmation', 'accessibility', `${A}confirm_send.label`),
   bool('attachmentReminderEnabled', 'composing', `${EB}attachment_reminder.label`),
diff --git a/lib/settings-search.ts b/lib/settings-search.ts
index 982b15062..b1d8ea701 100644
--- a/lib/settings-search.ts
+++ b/lib/settings-search.ts
@@ -167,7 +167,7 @@ export const tabSearchEntries: Record<Tab, SettingsSearchEntry[]> = {
     { label: 'settings.email_behavior.return_to_list_after_action.label' },
     { label: 'settings.accessibility.sections.timing' },
     { label: 'settings.accessibility.toast_duration.label' },
-    { label: 'settings.email_behavior.send_delay.label' },
+    { label: 'compose_words.undo_send.label' },
     { label: 'settings.accessibility.confirm_send.label' },
     { label: 'settings.accessibility.confirm_delete.label' },
     { label: 'settings.accessibility.confirm_archive.label' },
@@ -256,7 +256,7 @@ export const tabSearchEntries: Record<Tab, SettingsSearchEntry[]> = {
     { label: 'settings.email_behavior.signature_reply_forward.label' },
     { label: 'settings.email_behavior.signature_separator.label', advanced: true },
     { label: 'settings.composing_page.sections.sending' },
-    { label: 'settings.email_behavior.send_delay.label' },
+    { label: 'compose_words.undo_send.label' },
     { label: 'settings.email_behavior.attachment_reminder.label' },
     { label: 'settings.email_behavior.empty_subject_warning.label' },
     { label: 'settings.email_behavior.placeholder_warning.label' },
diff --git a/locales/ar/common.json b/locales/ar/common.json
index 5bf41a9d5..aa4b6e34b 100644
--- a/locales/ar/common.json
+++ b/locales/ar/common.json
@@ -6384,6 +6384,12 @@
     "not_running": "لم تُرسل. هناك فحص تشترطه مؤسستك لا يعمل حاليًا. حاول مرة أخرى بعد قليل.",
     "stopped_working": "لم تُرسل. توقف فحص تشترطه مؤسستك عن العمل. أعد تحميل الصفحة. إذا لم يساعد ذلك، أبلغ المسؤول."
   },
+  "compose_words": {
+    "undo_send": {
+      "label": "التراجع عن الإرسال",
+      "description": "يمنحك بضع ثوانٍ لاسترجاع الرسالة بعد الضغط على إرسال."
+    }
+  },
   "plugin_list": {
     "filters": "المرشحات",
     "remove_filter": "إزالة المرشح {label}"
diff --git a/locales/ca/common.json b/locales/ca/common.json
index eca36135b..a70f2df8d 100644
--- a/locales/ca/common.json
+++ b/locales/ca/common.json
@@ -6384,6 +6384,12 @@
     "not_running": "No s'ha enviat. Una comprovació que exigeix la vostra organització no s'està executant. Torneu-ho a provar d'aquí a un moment.",
     "stopped_working": "No s'ha enviat. Una comprovació que exigeix la vostra organització ha deixat de funcionar. Torneu a carregar la pàgina. Si no ho soluciona, aviseu l'administrador."
   },
+  "compose_words": {
+    "undo_send": {
+      "label": "Desfés l'enviament",
+      "description": "Us dona uns segons per recuperar un missatge després de prémer Envia."
+    }
+  },
   "plugin_list": {
     "filters": "Filtres",
     "remove_filter": "Treu el filtre {label}"
diff --git a/locales/cs/common.json b/locales/cs/common.json
index f1f5076dd..9275aea8c 100644
--- a/locales/cs/common.json
+++ b/locales/cs/common.json
@@ -6384,6 +6384,12 @@
     "not_running": "Neodesláno. Kontrola, kterou vaše organizace vyžaduje, právě neběží. Zkuste to za chvíli znovu.",
     "stopped_working": "Neodesláno. Kontrola, kterou vaše organizace vyžaduje, přestala fungovat. Načtěte stránku znovu. Pokud to nepomůže, obraťte se na správce."
   },
+  "compose_words": {
+    "undo_send": {
+      "label": "Vrátit odeslání",
+      "description": "Dává vám několik sekund na to, abyste zprávu po stisknutí Odeslat vzali zpět."
+    }
+  },
   "plugin_list": {
     "filters": "Filtry",
     "remove_filter": "Odebrat filtr {label}"
diff --git a/locales/da/common.json b/locales/da/common.json
index 7461d652b..cd5076687 100644
--- a/locales/da/common.json
+++ b/locales/da/common.json
@@ -6384,6 +6384,12 @@
     "not_running": "Ikke sendt. En kontrol, som din organisation kræver, kører ikke. Prøv igen om et øjeblik.",
     "stopped_working": "Ikke sendt. En kontrol, som din organisation kræver, virker ikke længere. Genindlæs siden. Hvis det ikke hjælper, så kontakt din administrator."
   },
+  "compose_words": {
+    "undo_send": {
+      "label": "Fortryd afsendelse",
+      "description": "Giver dig et par sekunder til at tage en besked tilbage, efter du har trykket på Send."
+    }
+  },
   "plugin_list": {
     "filters": "Filtre",
     "remove_filter": "Fjern filteret {label}"
diff --git a/locales/de/common.json b/locales/de/common.json
index 31d15c0ed..d881a451c 100644
--- a/locales/de/common.json
+++ b/locales/de/common.json
@@ -6384,6 +6384,12 @@
     "not_running": "Nicht gesendet. Eine Prüfung, die Ihre Organisation vorschreibt, läuft gerade nicht. Versuchen Sie es gleich noch einmal.",
     "stopped_working": "Nicht gesendet. Eine Prüfung, die Ihre Organisation vorschreibt, funktioniert nicht mehr. Laden Sie die Seite neu. Wenn das nicht hilft, wenden Sie sich an Ihre Administration."
   },
+  "compose_words": {
+    "undo_send": {
+      "label": "Senden rückgängig machen",
+      "description": "Gibt Ihnen ein paar Sekunden, um eine Nachricht nach dem Klick auf Senden zurückzuholen."
+    }
+  },
   "plugin_list": {
     "filters": "Filter",
     "remove_filter": "Filter {label} entfernen"
diff --git a/locales/en/common.json b/locales/en/common.json
index e0491ee32..287ef7a97 100644
--- a/locales/en/common.json
+++ b/locales/en/common.json
@@ -6384,6 +6384,12 @@
     "not_running": "Not sent. A check your organisation requires isn't running. Try again in a moment.",
     "stopped_working": "Not sent. A check your organisation requires has stopped working. Reload the page. If that doesn't help, tell your administrator."
   },
+  "compose_words": {
+    "undo_send": {
+      "label": "Undo send",
+      "description": "Gives you a few seconds to take a message back after you press Send."
+    }
+  },
   "plugin_list": {
     "filters": "Filters",
     "remove_filter": "Remove filter {label}"
diff --git a/locales/es/common.json b/locales/es/common.json
index 1050f0f56..8004e3917 100644
--- a/locales/es/common.json
+++ b/locales/es/common.json
@@ -6384,6 +6384,12 @@
     "not_running": "No enviado. Una comprobación que exige tu organización no está en marcha. Vuelve a intentarlo en un momento.",
     "stopped_working": "No enviado. Una comprobación que exige tu organización ha dejado de funcionar. Vuelve a cargar la página. Si no se soluciona, avisa al administrador."
   },
+  "compose_words": {
+    "undo_send": {
+      "label": "Deshacer envío",
+      "description": "Le da unos segundos para recuperar un mensaje después de pulsar Enviar."
+    }
+  },
   "plugin_list": {
     "filters": "Filtros",
     "remove_filter": "Quitar el filtro {label}"
diff --git a/locales/et/common.json b/locales/et/common.json
index df425b8bd..4455842c1 100644
--- a/locales/et/common.json
+++ b/locales/et/common.json
@@ -6384,6 +6384,12 @@
     "not_running": "Ei saadetud. Teie organisatsiooni nõutud kontroll praegu ei tööta. Proovige hetke pärast uuesti.",
     "stopped_working": "Ei saadetud. Teie organisatsiooni nõutud kontroll ei tööta enam. Laadige leht uuesti. Kui see ei aita, teatage administraatorile."
   },
+  "compose_words": {
+    "undo_send": {
+      "label": "Saatmise tühistamine",
+      "description": "Annab sulle pärast Saada vajutamist mõne sekundi, et kiri tagasi võtta."
+    }
+  },
   "plugin_list": {
     "filters": "Filtrid",
     "remove_filter": "Eemalda filter {label}"
diff --git a/locales/fa/common.json b/locales/fa/common.json
index bf242d98d..e7e78d762 100644
--- a/locales/fa/common.json
+++ b/locales/fa/common.json
@@ -6384,6 +6384,12 @@
     "not_running": "ارسال نشد. بررسی‌ای که سازمان شما الزامی کرده در حال اجرا نیست. چند لحظه دیگر دوباره تلاش کنید.",
     "stopped_working": "ارسال نشد. بررسی‌ای که سازمان شما الزامی کرده دیگر کار نمی‌کند. صفحه را دوباره بارگیری کنید. اگر کمکی نکرد، به مدیر سیستم خبر دهید."
   },
+  "compose_words": {
+    "undo_send": {
+      "label": "لغو ارسال",
+      "description": "پس از زدن ارسال، چند ثانیه فرصت می‌دهد تا پیام را پس بگیرید."
+    }
+  },
   "plugin_list": {
     "filters": "فیلترها",
     "remove_filter": "حذف فیلتر {label}"
diff --git a/locales/fr/common.json b/locales/fr/common.json
index 03545491c..86156651d 100644
--- a/locales/fr/common.json
+++ b/locales/fr/common.json
@@ -6384,6 +6384,12 @@
     "not_running": "Non envoyé. Une vérification exigée par votre organisation ne fonctionne pas. Réessayez dans un instant.",
     "stopped_working": "Non envoyé. Une vérification exigée par votre organisation ne fonctionne plus. Rechargez la page. Si cela ne suffit pas, prévenez votre administrateur."
   },
+  "compose_words": {
+    "undo_send": {
+      "label": "Annuler l'envoi",
+      "description": "Vous laisse quelques secondes pour reprendre un message après avoir cliqué sur Envoyer."
+    }
+  },
   "plugin_list": {
     "filters": "Filtres",
     "remove_filter": "Retirer le filtre {label}"
diff --git a/locales/he/common.json b/locales/he/common.json
index f8258a747..6953652ce 100644
--- a/locales/he/common.json
+++ b/locales/he/common.json
@@ -6385,6 +6385,12 @@
     "not_running": "לא נשלח. בדיקה שהארגון שלך מחייב לא פועלת כרגע. נסו שוב בעוד רגע.",
     "stopped_working": "לא נשלח. בדיקה שהארגון שלך מחייב הפסיקה לפעול. טענו את הדף מחדש. אם זה לא עוזר, פנו למנהל המערכת."
   },
+  "compose_words": {
+    "undo_send": {
+      "label": "ביטול שליחה",
+      "description": "נותן לך כמה שניות להחזיר הודעה אחרי שלחצת על שלח."
+    }
+  },
   "plugin_list": {
     "filters": "מסננים",
     "remove_filter": "הסר את המסנן {label}"
diff --git a/locales/hu/common.json b/locales/hu/common.json
index bd65a8ec0..534eec4cb 100644
--- a/locales/hu/common.json
+++ b/locales/hu/common.json
@@ -6384,6 +6384,12 @@
     "not_running": "Nincs elküldve. Egy, a szervezete által előírt ellenőrzés most nem fut. Próbálja újra egy pillanat múlva.",
     "stopped_working": "Nincs elküldve. Egy, a szervezete által előírt ellenőrzés leállt. Töltse be újra az oldalt. Ha ez nem segít, szóljon a rendszergazdának."
   },
+  "compose_words": {
+    "undo_send": {
+      "label": "Küldés visszavonása",
+      "description": "A Küldés megnyomása után néhány másodpercet ad az üzenet visszavonására."
+    }
+  },
   "plugin_list": {
     "filters": "Szűrők",
     "remove_filter": "{label} szűrő eltávolítása"
diff --git a/locales/it/common.json b/locales/it/common.json
index b79013a3a..f7cdeb69d 100644
--- a/locales/it/common.json
+++ b/locales/it/common.json
@@ -6384,6 +6384,12 @@
     "not_running": "Non inviato. Un controllo richiesto dalla tua organizzazione non è attivo. Riprova tra un momento.",
     "stopped_working": "Non inviato. Un controllo richiesto dalla tua organizzazione ha smesso di funzionare. Ricarica la pagina. Se non basta, avvisa l'amministratore."
   },
+  "compose_words": {
+    "undo_send": {
+      "label": "Annulla invio",
+      "description": "Ti dà qualche secondo per riprendere un messaggio dopo aver premuto Invia."
+    }
+  },
   "plugin_list": {
     "filters": "Filtri",
     "remove_filter": "Rimuovi il filtro {label}"
diff --git a/locales/ja/common.json b/locales/ja/common.json
index 0fc511808..6352c0c2e 100644
--- a/locales/ja/common.json
+++ b/locales/ja/common.json
@@ -6384,6 +6384,12 @@
     "not_running": "送信されませんでした。組織で必須のチェックが動作していません。しばらくしてからもう一度お試しください。",
     "stopped_working": "送信されませんでした。組織で必須のチェックが動作しなくなりました。ページを再読み込みしてください。解決しない場合は管理者に連絡してください。"
   },
+  "compose_words": {
+    "undo_send": {
+      "label": "送信取り消し",
+      "description": "送信を押した後、数秒間メッセージを取り消せます。"
+    }
+  },
   "plugin_list": {
     "filters": "フィルター",
     "remove_filter": "フィルター「{label}」を解除"
diff --git a/locales/ko/common.json b/locales/ko/common.json
index 21bc7b936..3be04c536 100644
--- a/locales/ko/common.json
+++ b/locales/ko/common.json
@@ -6384,6 +6384,12 @@
     "not_running": "보내지 않았습니다. 조직에서 요구하는 검사가 실행되고 있지 않습니다. 잠시 후 다시 시도하세요.",
     "stopped_working": "보내지 않았습니다. 조직에서 요구하는 검사가 작동을 멈췄습니다. 페이지를 새로 고치세요. 그래도 안 되면 관리자에게 알리세요."
   },
+  "compose_words": {
+    "undo_send": {
+      "label": "보내기 취소",
+      "description": "보내기를 누른 후 몇 초 동안 메시지를 되돌릴 수 있습니다."
+    }
+  },
   "plugin_list": {
     "filters": "필터",
     "remove_filter": "{label} 필터 제거"
diff --git a/locales/lv/common.json b/locales/lv/common.json
index 2958f811c..2d99614c6 100644
--- a/locales/lv/common.json
+++ b/locales/lv/common.json
@@ -6384,6 +6384,12 @@
     "not_running": "Nav nosūtīts. Jūsu organizācijas pieprasītā pārbaude pašlaik nedarbojas. Mēģiniet vēlreiz pēc brīža.",
     "stopped_working": "Nav nosūtīts. Jūsu organizācijas pieprasītā pārbaude vairs nedarbojas. Pārlādējiet lapu. Ja tas nepalīdz, sazinieties ar administratoru."
   },
+  "compose_words": {
+    "undo_send": {
+      "label": "Atsaukt sūtīšanu",
+      "description": "Dod jums dažas sekundes, lai pēc Sūtīt nospiešanas paņemtu ziņojumu atpakaļ."
+    }
+  },
   "plugin_list": {
     "filters": "Filtri",
     "remove_filter": "Noņemt filtru {label}"
diff --git a/locales/mn/common.json b/locales/mn/common.json
index 57128748e..e633fd898 100644
--- a/locales/mn/common.json
+++ b/locales/mn/common.json
@@ -6384,6 +6384,12 @@
     "not_running": "Илгээгдсэнгүй. Танай байгууллагын шаарддаг шалгалт одоогоор ажиллахгүй байна. Хэсэг хугацааны дараа дахин оролдоно уу.",
     "stopped_working": "Илгээгдсэнгүй. Танай байгууллагын шаарддаг шалгалт ажиллахаа больсон. Хуудсыг дахин ачаална уу. Тус болохгүй бол админдаа мэдэгдээрэй."
   },
+  "compose_words": {
+    "undo_send": {
+      "label": "Илгээлтийг буцаах",
+      "description": "Илгээх товчийг дарсны дараа мессежээ буцаах хэдэн секунд өгнө."
+    }
+  },
   "plugin_list": {
     "filters": "Шүүлтүүр",
     "remove_filter": "{label} шүүлтүүрийг хасах"
diff --git a/locales/nb/common.json b/locales/nb/common.json
index 27c9f7642..c1d848c1b 100644
--- a/locales/nb/common.json
+++ b/locales/nb/common.json
@@ -6384,6 +6384,12 @@
     "not_running": "Ikke sendt. En kontroll organisasjonen din krever, kjører ikke. Prøv igjen om et øyeblikk.",
     "stopped_working": "Ikke sendt. En kontroll organisasjonen din krever, har sluttet å virke. Last inn siden på nytt. Hvis det ikke hjelper, si fra til administratoren."
   },
+  "compose_words": {
+    "undo_send": {
+      "label": "Angre sending",
+      "description": "Gir deg noen sekunder til å ta tilbake en melding etter at du har trykket Send."
+    }
+  },
   "plugin_list": {
     "filters": "Filtre",
     "remove_filter": "Fjern filteret {label}"
diff --git a/locales/nl/common.json b/locales/nl/common.json
index 69e5afbcc..edaf8141a 100644
--- a/locales/nl/common.json
+++ b/locales/nl/common.json
@@ -6384,6 +6384,12 @@
     "not_running": "Niet verzonden. Een controle die je organisatie verplicht stelt, draait niet. Probeer het zo meteen opnieuw.",
     "stopped_working": "Niet verzonden. Een controle die je organisatie verplicht stelt, werkt niet meer. Laad de pagina opnieuw. Helpt dat niet, meld het dan bij je beheerder."
   },
+  "compose_words": {
+    "undo_send": {
+      "label": "Verzenden ongedaan maken",
+      "description": "Geeft je een paar seconden om een bericht terug te halen nadat je op Verzenden hebt gedrukt."
+    }
+  },
   "plugin_list": {
     "filters": "Filters",
     "remove_filter": "Filter {label} verwijderen"
diff --git a/locales/pl/common.json b/locales/pl/common.json
index 35e69ac26..65ad39388 100644
--- a/locales/pl/common.json
+++ b/locales/pl/common.json
@@ -6384,6 +6384,12 @@
     "not_running": "Nie wysłano. Kontrola wymagana przez Twoją organizację nie działa. Spróbuj ponownie za chwilę.",
     "stopped_working": "Nie wysłano. Kontrola wymagana przez Twoją organizację przestała działać. Odśwież stronę. Jeśli to nie pomoże, zgłoś to administratorowi."
   },
+  "compose_words": {
+    "undo_send": {
+      "label": "Cofnij wysyłkę",
+      "description": "Daje kilka sekund na wycofanie wiadomości po naciśnięciu Wyślij."
+    }
+  },
   "plugin_list": {
     "filters": "Filtry",
     "remove_filter": "Usuń filtr {label}"
diff --git a/locales/pt/common.json b/locales/pt/common.json
index 7a094b8ea..a61acd6ee 100644
--- a/locales/pt/common.json
+++ b/locales/pt/common.json
@@ -6384,6 +6384,12 @@
     "not_running": "Não enviado. Uma verificação exigida pela sua organização não está em execução. Tente novamente daqui a pouco.",
     "stopped_working": "Não enviado. Uma verificação exigida pela sua organização deixou de funcionar. Recarregue a página. Se não resolver, avise o administrador."
   },
+  "compose_words": {
+    "undo_send": {
+      "label": "Desfazer envio",
+      "description": "Dá alguns segundos para você recuperar uma mensagem depois de clicar em Enviar."
+    }
+  },
   "plugin_list": {
     "filters": "Filtros",
     "remove_filter": "Remover o filtro {label}"
diff --git a/locales/ro/common.json b/locales/ro/common.json
index 1c3d817ce..1728249f2 100644
--- a/locales/ro/common.json
+++ b/locales/ro/common.json
@@ -6384,6 +6384,12 @@
     "not_running": "Nu a fost trimis. O verificare cerută de organizația ta nu rulează. Încearcă din nou peste o clipă.",
     "stopped_working": "Nu a fost trimis. O verificare cerută de organizația ta nu mai funcționează. Reîncarcă pagina. Dacă nu ajută, anunță administratorul."
   },
+  "compose_words": {
+    "undo_send": {
+      "label": "Anulează trimiterea",
+      "description": "Îți oferă câteva secunde să retragi un mesaj după ce apeși Trimite."
+    }
+  },
   "plugin_list": {
     "filters": "Filtre",
     "remove_filter": "Eliminați filtrul {label}"
diff --git a/locales/ru/common.json b/locales/ru/common.json
index c5c112ea2..e1e631ac4 100644
--- a/locales/ru/common.json
+++ b/locales/ru/common.json
@@ -6384,6 +6384,12 @@
     "not_running": "Не отправлено. Проверка, которую требует ваша организация, сейчас не работает. Повторите попытку через минуту.",
     "stopped_working": "Не отправлено. Проверка, которую требует ваша организация, перестала работать. Перезагрузите страницу. Если это не поможет, сообщите администратору."
   },
+  "compose_words": {
+    "undo_send": {
+      "label": "Отмена отправки",
+      "description": "Даёт несколько секунд, чтобы вернуть письмо после нажатия «Отправить»."
+    }
+  },
   "plugin_list": {
     "filters": "Фильтры",
     "remove_filter": "Убрать фильтр {label}"
diff --git a/locales/sk/common.json b/locales/sk/common.json
index 81d50e05d..68f9fc879 100644
--- a/locales/sk/common.json
+++ b/locales/sk/common.json
@@ -6384,6 +6384,12 @@
     "not_running": "Neodoslané. Kontrola, ktorú vyžaduje vaša organizácia, práve nebeží. Skúste to o chvíľu znova.",
     "stopped_working": "Neodoslané. Kontrola, ktorú vyžaduje vaša organizácia, prestala fungovať. Načítajte stránku znova. Ak to nepomôže, obráťte sa na správcu."
   },
+  "compose_words": {
+    "undo_send": {
+      "label": "Vrátiť odoslanie",
+      "description": "Dáva vám niekoľko sekúnd na to, aby ste správu po stlačení Odoslať vzali späť."
+    }
+  },
   "plugin_list": {
     "filters": "Filtre",
     "remove_filter": "Odstrániť filter {label}"
diff --git a/locales/th/common.json b/locales/th/common.json
index c34c371f1..c172e5bd5 100644
--- a/locales/th/common.json
+++ b/locales/th/common.json
@@ -3305,6 +3305,12 @@
     "not_running": "ยังไม่ได้ส่ง การตรวจสอบที่องค์กรของคุณกำหนดไม่ได้ทำงานอยู่ ลองอีกครั้งในอีกสักครู่",
     "stopped_working": "ยังไม่ได้ส่ง การตรวจสอบที่องค์กรของคุณกำหนดหยุดทำงาน โหลดหน้านี้ใหม่ หากยังไม่ได้ผล โปรดแจ้งผู้ดูแลระบบ"
   },
+  "compose_words": {
+    "undo_send": {
+      "label": "ยกเลิกการส่ง",
+      "description": "ให้เวลาคุณสองสามวินาทีเพื่อเรียกข้อความกลับหลังจากกดส่ง"
+    }
+  },
   "plugin_list": {
     "filters": "ตัวกรอง",
     "remove_filter": "นำตัวกรอง {label} ออก"
diff --git a/locales/tr/common.json b/locales/tr/common.json
index 43380e45c..de9c5d653 100644
--- a/locales/tr/common.json
+++ b/locales/tr/common.json
@@ -6384,6 +6384,12 @@
     "not_running": "Gönderilmedi. Kuruluşunuzun zorunlu tuttuğu bir denetim şu anda çalışmıyor. Biraz sonra yeniden deneyin.",
     "stopped_working": "Gönderilmedi. Kuruluşunuzun zorunlu tuttuğu bir denetim çalışmayı durdurdu. Sayfayı yeniden yükleyin. İşe yaramazsa yöneticinize bildirin."
   },
+  "compose_words": {
+    "undo_send": {
+      "label": "Göndermeyi geri al",
+      "description": "Gönder'e bastıktan sonra iletiyi geri almanız için birkaç saniye verir."
+    }
+  },
   "plugin_list": {
     "filters": "Filtreler",
     "remove_filter": "{label} filtresini kaldır"
diff --git a/locales/uk/common.json b/locales/uk/common.json
index d8d7ecf49..9c8f5634f 100644
--- a/locales/uk/common.json
+++ b/locales/uk/common.json
@@ -6384,6 +6384,12 @@
     "not_running": "Не надіслано. Перевірка, якої вимагає ваша організація, зараз не працює. Спробуйте ще раз за мить.",
     "stopped_working": "Не надіслано. Перевірка, якої вимагає ваша організація, перестала працювати. Перезавантажте сторінку. Якщо це не допоможе, повідомте адміністратора."
   },
+  "compose_words": {
+    "undo_send": {
+      "label": "Скасувати надсилання",
+      "description": "Дає кілька секунд, щоб повернути лист після натискання «Надіслати»."
+    }
+  },
   "plugin_list": {
     "filters": "Фільтри",
     "remove_filter": "Прибрати фільтр {label}"
diff --git a/locales/vi/common.json b/locales/vi/common.json
index ccb97537d..f03718003 100644
--- a/locales/vi/common.json
+++ b/locales/vi/common.json
@@ -6396,6 +6396,12 @@
     "not_running": "Chưa gửi. Một bước kiểm tra mà tổ chức của bạn yêu cầu hiện không chạy. Hãy thử lại sau giây lát.",
     "stopped_working": "Chưa gửi. Một bước kiểm tra mà tổ chức của bạn yêu cầu đã ngừng hoạt động. Hãy tải lại trang. Nếu vẫn không được, hãy báo cho quản trị viên."
   },
+  "compose_words": {
+    "undo_send": {
+      "label": "Hoàn tác gửi",
+      "description": "Cho bạn vài giây để lấy lại thư sau khi nhấn Gửi."
+    }
+  },
   "plugin_list": {
     "filters": "Bộ lọc",
     "remove_filter": "Xóa bộ lọc {label}"
diff --git a/locales/zh-TW/common.json b/locales/zh-TW/common.json
index 3bc47f02b..f10bfecdd 100644
--- a/locales/zh-TW/common.json
+++ b/locales/zh-TW/common.json
@@ -6384,6 +6384,12 @@
     "not_running": "未傳送。貴組織要求的一項檢查目前未執行。請稍後再試。",
     "stopped_working": "未傳送。貴組織要求的一項檢查已停止運作。請重新載入頁面。如果仍無法解決，請告知管理員。"
   },
+  "compose_words": {
+    "undo_send": {
+      "label": "取消傳送",
+      "description": "按下傳送後，給您幾秒鐘撤回郵件。"
+    }
+  },
   "plugin_list": {
     "filters": "篩選",
     "remove_filter": "移除篩選條件 {label}"
diff --git a/locales/zh/common.json b/locales/zh/common.json
index d4646cf11..ba262f0c1 100644
--- a/locales/zh/common.json
+++ b/locales/zh/common.json
@@ -6384,6 +6384,12 @@
     "not_running": "未发送。你的组织要求的一项检查当前未运行。请稍后再试。",
     "stopped_working": "未发送。你的组织要求的一项检查已停止工作。请重新加载页面。如果仍不行，请告诉管理员。"
   },
+  "compose_words": {
+    "undo_send": {
+      "label": "撤销发送",
+      "description": "点击发送后，给您几秒钟时间撤回邮件。"
+    }
+  },
   "plugin_list": {
     "filters": "筛选",
     "remove_filter": "移除筛选条件 {label}"
diff --git a/stores/__tests__/settings-store-policy-defaults.test.ts b/stores/__tests__/settings-store-policy-defaults.test.ts
index f4eaf1b88..006fa5ba5 100644
--- a/stores/__tests__/settings-store-policy-defaults.test.ts
+++ b/stores/__tests__/settings-store-policy-defaults.test.ts
@@ -87,7 +87,7 @@ describe('admin policy defaults (#1248)', () => {
     expect('notASetting' in settings()).toBe(false);
     expect(settings().showSharedMailAccounts).toBe(true);
     expect(settings().emailsPerPage).toBe(50);
-    expect(settings().sendDelaySeconds).toBe(0);
+    expect(settings().sendDelaySeconds).toBe(5);
   });
 
   it('respects the allowed values of a restriction', () => {
diff --git a/stores/__tests__/settings-undo-send-default.test.ts b/stores/__tests__/settings-undo-send-default.test.ts
new file mode 100644
index 000000000..e3078cc0c
--- /dev/null
+++ b/stores/__tests__/settings-undo-send-default.test.ts
@@ -0,0 +1,58 @@
+import { beforeEach, describe, it, expect } from 'vitest';
+import { useSettingsStore, migrateSettings, undoSendOptions } from '../settings-store';
+
+// Undo send is on by default with 5 seconds; it was off (0) before. Off that
+// the user never picked moves to 5, Off they picked stays.
+
+const migrate = (state: Record<string, unknown>, version: number) =>
+  migrateSettings(state, version) as unknown as Record<string, unknown>;
+
+describe('undo send default', () => {
+  beforeEach(() => {
+    useSettingsStore.getState().resetToDefaults();
+  });
+
+  it('gives 5 seconds to undo on a fresh install', () => {
+    expect(useSettingsStore.getState().sendDelaySeconds).toBe(5);
+  });
+
+  it('turns on undo send for someone who never chose Off', () => {
+    expect(migrate({ sendDelaySeconds: 0, explicitSettings: [] }, 12).sendDelaySeconds).toBe(5);
+  });
+
+  it('keeps Off that the user chose', () => {
+    const out = migrate({ sendDelaySeconds: 0, explicitSettings: ['sendDelaySeconds'] }, 12);
+    expect(out.sendDelaySeconds).toBe(0);
+  });
+
+  it('keeps a delay the user chose, 60 seconds included', () => {
+    expect(migrate({ sendDelaySeconds: 30, explicitSettings: ['sendDelaySeconds'] }, 12).sendDelaySeconds).toBe(30);
+    expect(migrate({ sendDelaySeconds: 60 }, 7).sendDelaySeconds).toBe(60);
+  });
+
+  it('does not take Off from before explicitSettings existed as chosen', () => {
+    const out = migrate({ sendDelaySeconds: 0 }, 7);
+    expect(out.sendDelaySeconds).toBe(5);
+    expect(out.explicitSettings).not.toContain('sendDelaySeconds');
+  });
+
+  it('turns undo send on in a server copy or export from an older build', () => {
+    const store = useSettingsStore.getState();
+    expect(store.importSettings(JSON.stringify({ sendDelaySeconds: 0, explicitSettings: [] }))).toBe(true);
+    expect(useSettingsStore.getState().sendDelaySeconds).toBe(5);
+
+    expect(store.importSettings(JSON.stringify({ sendDelaySeconds: 0, explicitSettings: ['sendDelaySeconds'] }))).toBe(true);
+    expect(useSettingsStore.getState().sendDelaySeconds).toBe(0);
+  });
+
+  it('keeps Off once the user picks it', () => {
+    useSettingsStore.getState().updateSetting('sendDelaySeconds', 0);
+    const exported = JSON.parse(useSettingsStore.getState().exportSettings()) as Record<string, unknown>;
+    expect(migrate(exported, 13).sendDelaySeconds).toBe(0);
+  });
+
+  it('offers Off, 5, 10 and 30 seconds, and 60 only to someone who has it', () => {
+    expect(undoSendOptions(5)).toEqual([0, 5, 10, 30]);
+    expect(undoSendOptions(60)).toEqual([0, 5, 10, 30, 60]);
+  });
+});
diff --git a/stores/settings-store.ts b/stores/settings-store.ts
index 1d771cb5f..b140b29a8 100644
--- a/stores/settings-store.ts
+++ b/stores/settings-store.ts
@@ -359,7 +359,18 @@ export type CalendarHoverPreview = 'off' | 'instant' | 'delay-500ms' | 'delay-1s
  */
 export type MonthTimedEventStyle = 'bar' | 'text' | 'dot';
 export const MONTH_TIMED_EVENT_STYLES: readonly MonthTimedEventStyle[] = ['bar', 'text', 'dot'];
-export type SendDelaySeconds = 0 | 10 | 30 | 60;
+export type SendDelaySeconds = 0 | 5 | 10 | 30 | 60;
+/**
+ * The undo send windows a setting may hold. The page offers Off, 5, 10 and
+ * 30 seconds; 60 was offered before and stays valid for those who chose it.
+ */
+export const SEND_DELAY_SECONDS: readonly SendDelaySeconds[] = [0, 5, 10, 30, 60];
+const isSendDelaySeconds = (value: unknown): value is SendDelaySeconds =>
+  SEND_DELAY_SECONDS.includes(value as SendDelaySeconds);
+/** The choices the settings pages offer: 60 only to someone who has it. */
+export function undoSendOptions(current: SendDelaySeconds): SendDelaySeconds[] {
+  return SEND_DELAY_SECONDS.filter((seconds) => seconds !== 60 || current === 60);
+}
 export type ProtocolOpenMode = 'active-session' | 'new-tab';
 
 /**
@@ -973,7 +984,8 @@ const DEFAULT_SETTINGS = {
   writingLanguage: 'auto',
   rtlEditingSupport: false,
   subAddressDelimiter: DEFAULT_SUB_ADDRESS_DELIMITER,
-  sendDelaySeconds: 0 as SendDelaySeconds,
+  // Undo send is on out of the box, as in other mail apps (v13).
+  sendDelaySeconds: 5 as SendDelaySeconds,
   signaturePosition: 'below_quote' as SignaturePosition,
   // On, as before the toggles existed: saved settings and server copies
   // from older builds lack these keys and fall back to this default.
@@ -1182,7 +1194,7 @@ function isPolicySettingKey(key: string): boolean {
 function isAllowedPolicyValue(key: string, value: unknown, restriction?: SettingRestriction): boolean {
   if (!isPolicySettingKey(key) || typeof value !== typeof builtInDefault(key)) return false;
   if (typeof value === 'number' && !Number.isFinite(value)) return false;
-  if (key === 'sendDelaySeconds' && ![0, 10, 30, 60].includes(value as number)) return false;
+  if (key === 'sendDelaySeconds' && !isSendDelaySeconds(value)) return false;
   if (key === 'subAddressDelimiter' && !isValidSubAddressDelimiter(value as string)) return false;
   if (key === 'messageListOrderScope' && value !== 'inbox' && value !== 'all') return false;
   if (key === 'searchDefaultScope' && !isSearchDefaultScope(value)) return false;
@@ -1627,6 +1639,7 @@ export const useSettingsStore = create<SettingsState>()(
           migrateAnimationsSetting(settings);
           migrateNotificationSoundDefault(settings);
           migrateTintListRowsDefault(settings);
+          migrateUndoSendDefault(settings);
           migrateAttachmentPosition(settings);
 
           // Apply settings, noting which keys were taken over for the
@@ -1645,7 +1658,7 @@ export const useSettingsStore = create<SettingsState>()(
               if (key === 'subAddressDelimiter' && !isValidSubAddressDelimiter(settings[key])) {
                 return;
               }
-              if (key === 'sendDelaySeconds' && ![0, 10, 30, 60].includes(settings[key])) {
+              if (key === 'sendDelaySeconds' && !isSendDelaySeconds(settings[key])) {
                 put(key, { sendDelaySeconds: 0 });
                 return;
               }
@@ -2043,7 +2056,7 @@ export const useSettingsStore = create<SettingsState>()(
     },
     {
       name: 'settings-storage',
-      version: 12,
+      version: 13,
       migrate: migrateSettings,
       onRehydrateStorage: () => {
         return (state) => {
@@ -2094,7 +2107,7 @@ export function migrateSettings(persisted: unknown, version: number): SettingsSt
           state.density = state.listDensity;
           delete state.listDensity;
         }
-        if (![0, 10, 30, 60].includes(state.sendDelaySeconds as number)) {
+        if (!isSendDelaySeconds(state.sendDelaySeconds)) {
           state.sendDelaySeconds = 0;
         }
         if (version < 3 && typeof state.protocolOpenMode !== 'string' && typeof state.protocolMailtoOpenMode === 'string') {
@@ -2154,6 +2167,7 @@ export function migrateSettings(persisted: unknown, version: number): SettingsSt
         // taken as chosen below.
         migrateNotificationSoundDefault(state);
         migrateTintListRowsDefault(state);
+        migrateUndoSendDefault(state);
         // The old default must not be taken as chosen below either.
         migrateAttachmentPosition(state);
         // v8: admin policy defaults (#1248) skip settings the user chose.
@@ -2218,6 +2232,18 @@ export function migrateTintListRowsDefault(state: Record<string, unknown>): void
   if (!chosen) state.tintListRowsByTag = false;
 }
 
+/**
+ * v13: undo send is on by default, with 5 seconds. Off (0) that the user
+ * never picked was only the old default and moves to 5; Off they picked
+ * stays. Imports and server copies from older builds still carry the 0 and
+ * go through this too.
+ */
+export function migrateUndoSendDefault(state: Record<string, unknown>): void {
+  if (state.sendDelaySeconds !== 0) return;
+  const chosen = Array.isArray(state.explicitSettings) && state.explicitSettings.includes('sendDelaySeconds');
+  if (!chosen) state.sendDelaySeconds = 5;
+}
+
 // Helper functions to apply settings to DOM
 
 /** The settings applyAccessibilityTo() writes onto <html>. */

From 007b007302dccafd55206077c9a6f7b131729c17 Mon Sep 17 00:00:00 2001
From: Linus Rath <139418639+rathlinus@users.noreply.github.com>
Date: Wed, 4 Nov 2026 06:22:53 +0100
Subject: [PATCH 04/34] feat: open the schedule dialog from Send's arrow and
 say when a scheduled message goes

---
 .../composer-plugin-surfaces.test.tsx         | 15 +++++++++++++++
 components/email/email-composer.tsx           | 19 +++++++++++++------
 .../mail/__tests__/undo-send-toast.test.tsx   | 12 ++++++++++++
 components/mail/mail-app.tsx                  |  6 ++++--
 locales/ar/common.json                        |  3 ++-
 locales/ca/common.json                        |  3 ++-
 locales/cs/common.json                        |  3 ++-
 locales/da/common.json                        |  3 ++-
 locales/de/common.json                        |  3 ++-
 locales/en/common.json                        |  3 ++-
 locales/es/common.json                        |  3 ++-
 locales/et/common.json                        |  3 ++-
 locales/fa/common.json                        |  3 ++-
 locales/fr/common.json                        |  3 ++-
 locales/he/common.json                        |  3 ++-
 locales/hu/common.json                        |  3 ++-
 locales/it/common.json                        |  3 ++-
 locales/ja/common.json                        |  3 ++-
 locales/ko/common.json                        |  3 ++-
 locales/lv/common.json                        |  3 ++-
 locales/mn/common.json                        |  3 ++-
 locales/nb/common.json                        |  3 ++-
 locales/nl/common.json                        |  3 ++-
 locales/pl/common.json                        |  3 ++-
 locales/pt/common.json                        |  3 ++-
 locales/ro/common.json                        |  3 ++-
 locales/ru/common.json                        |  3 ++-
 locales/sk/common.json                        |  3 ++-
 locales/th/common.json                        |  3 ++-
 locales/tr/common.json                        |  3 ++-
 locales/uk/common.json                        |  3 ++-
 locales/vi/common.json                        |  3 ++-
 locales/zh-TW/common.json                     |  3 ++-
 locales/zh/common.json                        |  3 ++-
 34 files changed, 104 insertions(+), 38 deletions(-)

diff --git a/components/email/__tests__/composer-plugin-surfaces.test.tsx b/components/email/__tests__/composer-plugin-surfaces.test.tsx
index 787389c18..51927e1d5 100644
--- a/components/email/__tests__/composer-plugin-surfaces.test.tsx
+++ b/components/email/__tests__/composer-plugin-surfaces.test.tsx
@@ -329,6 +329,21 @@ describe('composer-send-menu', () => {
     expect(follows(schedule, plugin)).toBe(true);
   });
 
+  // compose-23: a menu with "Schedule send" as its only item.
+  it('opens the schedule dialog straight from the arrow when it is the only entry', () => {
+    useAuthStore.setState({
+      client: { hasDelayedSend: () => true, getMaxDelayedSend: () => 30 * 86400, createDraft: vi.fn() } as never,
+    });
+    render(<EmailComposer initialData={DRAFT} onClose={vi.fn()} />);
+
+    const arrow = screen.getAllByRole('button', { name: 'schedule_send' })[0];
+    expect(arrow).toHaveAttribute('aria-haspopup', 'dialog');
+    fireEvent.click(arrow);
+
+    expect(screen.queryByRole('menuitem', { name: /schedule_send/ })).toBeNull();
+    expect(screen.getByRole('dialog')).toHaveTextContent('schedule_send_description');
+  });
+
   it('keeps a plain Send button without plugin entries or scheduled send', () => {
     render(<EmailComposer initialData={DRAFT} onClose={vi.fn()} />);
     expect(screen.queryByRole('button', { name: 'more_actions' })).toBeNull();
diff --git a/components/email/email-composer.tsx b/components/email/email-composer.tsx
index b4d9104a1..95948a852 100644
--- a/components/email/email-composer.tsx
+++ b/components/email/email-composer.tsx
@@ -2793,6 +2793,13 @@ export function EmailComposer({
   // Plugin entries make the Send and Attach buttons menus even where the app
   // itself has nothing else to put there.
   const hasSendMenuActions = usePluginActions('composer-send-menu').length > 0;
+  // With nothing but "Schedule send" in Send's menu, the arrow opens the
+  // schedule dialog itself: a menu with one item was one click too many.
+  const sendArrowSchedules = !hasSendMenuActions && !!composerClient?.hasDelayedSend();
+  const handleSendArrow = (e: React.MouseEvent<HTMLElement>) => {
+    if (sendArrowSchedules) openScheduleDialog();
+    else toggleSendMenu(e);
+  };
   const hasAttachMenuActions = usePluginActions('composer-attach-menu').length > 0;
   // Ticked plugin options count in the Options button's badge like the app's own.
   const pluginOptionsOn = usePluginActions('composer-options-menu').filter((a) => a.checked).length;
@@ -4850,14 +4857,14 @@ export function EmailComposer({
             <Button
               type="button"
               onMouseDown={(e) => { if (showSendMenu) e.stopPropagation(); }}
-              onClick={toggleSendMenu}
+              onClick={handleSendArrow}
               disabled={!canSend || isSending || isSavingAndClosing}
               title={composerClient?.hasDelayedSend() ? t('schedule_send') : tViewer('more_actions')}
               aria-label={composerClient?.hasDelayedSend() ? t('schedule_send') : tViewer('more_actions')}
               size="sm"
               className="h-11 min-w-11 rounded-s-none px-2"
-              aria-haspopup="menu"
-              aria-expanded={showSendMenu}
+              aria-haspopup={sendArrowSchedules ? 'dialog' : 'menu'}
+              aria-expanded={sendArrowSchedules ? undefined : showSendMenu}
             >
               <ChevronDown className="w-4 h-4" />
             </Button>
@@ -5717,13 +5724,13 @@ export function EmailComposer({
                 <Button
                   type="button"
                   onMouseDown={(e) => { if (showSendMenu) e.stopPropagation(); }}
-                  onClick={toggleSendMenu}
+                  onClick={handleSendArrow}
                   disabled={!canSend || isSending || isSavingAndClosing}
                   title={composerClient?.hasDelayedSend() ? t('schedule_send') : tViewer('more_actions')}
                   aria-label={composerClient?.hasDelayedSend() ? t('schedule_send') : tViewer('more_actions')}
                   className="rounded-s-none px-2"
-                  aria-haspopup="menu"
-                  aria-expanded={showSendMenu}
+                  aria-haspopup={sendArrowSchedules ? 'dialog' : 'menu'}
+                  aria-expanded={sendArrowSchedules ? undefined : showSendMenu}
                 >
                   <ChevronDown className="w-4 h-4" />
                 </Button>
diff --git a/components/mail/__tests__/undo-send-toast.test.tsx b/components/mail/__tests__/undo-send-toast.test.tsx
index 17f92fa53..92d7e83e3 100644
--- a/components/mail/__tests__/undo-send-toast.test.tsx
+++ b/components/mail/__tests__/undo-send-toast.test.tsx
@@ -119,6 +119,18 @@ describe('undo send toast', () => {
     expect(toast.pauseOnHover).toBe(false);
   });
 
+  // compose-23: "Email scheduled for sending" with "Undo send" said neither
+  // when it goes nor that the button cancels it.
+  it('says when a scheduled message goes, with Cancel and Send now', async () => {
+    render(<MailApp />);
+    sendDelayedBy(3 * 86_400_000);
+
+    await waitFor(() => expect(useToastStore.getState().toasts.some((t) => t.title === 'compose_send.scheduled_for')).toBe(true));
+    const toast = useToastStore.getState().toasts.find((t) => t.title === 'compose_send.scheduled_for')!;
+    expect(toast.action?.label).toBe('cancel');
+    expect(toast.secondaryAction?.label).toBe('email_viewer.send_now');
+  });
+
   it('says so when the undo comes too late', async () => {
     cancelUndoSend.mockRejectedValue(new Error('The requested message is no longer in the queue.'));
     vi.spyOn(console, 'error').mockImplementation(() => {});
diff --git a/components/mail/mail-app.tsx b/components/mail/mail-app.tsx
index 11d4246c0..bbf7e7833 100644
--- a/components/mail/mail-app.tsx
+++ b/components/mail/mail-app.tsx
@@ -2941,9 +2941,11 @@ export function MailApp({ linkSegments: routeSegments }: MailAppProps = {}) {
       ? Math.max(remainingMs - 1000, 1000)
       : Math.max(sendDelaySeconds, 8) * 1000;
 
+    // A message scheduled for later says when it goes, and offers Cancel
+    // where a send-delay window offers Undo send.
     toast.success(isUndoWindow
       ? t('email_viewer.sending_in', { seconds: Math.round(remainingMs / 1000) })
-      : t('email_viewer.scheduled_send_created'), {
+      : t('compose_send.scheduled_for', { when: formatScheduledSendAt(pending.sendAt, useSettingsStore.getState().timeFormat) }), {
       duration: undoDurationMs,
       pauseOnHover: false,
       secondaryAction: (pending.emailId && pending.identityId)
@@ -2985,7 +2987,7 @@ export function MailApp({ linkSegments: routeSegments }: MailAppProps = {}) {
           }
         : undefined,
       action: {
-        label: t('email_viewer.undo_send'),
+        label: isUndoWindow ? t('email_viewer.undo_send') : tCommon('cancel'),
         onClick: () => {
           if (!undoClient) return refuseSignedOut();
           void (async () => {
diff --git a/locales/ar/common.json b/locales/ar/common.json
index 053453a2a..5ba9c4823 100644
--- a/locales/ar/common.json
+++ b/locales/ar/common.json
@@ -3906,7 +3906,8 @@
     "warning_placeholders": "نص مؤقت سيراه المستلمون:",
     "warning_proofreading": "مشكلات إملائية أو نحوية مفتوحة: {count}",
     "empty_text_title": "هل تريد الإرسال بدون نص؟",
-    "empty_text_message": "لا تحتوي هذه الرسالة على نص ولا على مرفق. هل تريد إرسالها على أي حال؟"
+    "empty_text_message": "لا تحتوي هذه الرسالة على نص ولا على مرفق. هل تريد إرسالها على أي حال؟",
+    "scheduled_for": "مجدولة في {when}"
   },
   "org_templates": {
     "section_personal": "قوالبي",
diff --git a/locales/ca/common.json b/locales/ca/common.json
index 7f4471792..7fb01c5d9 100644
--- a/locales/ca/common.json
+++ b/locales/ca/common.json
@@ -3906,7 +3906,8 @@
     "warning_placeholders": "Text de mostra que veuran els destinataris:",
     "warning_proofreading": "Errors d'ortografia o gramàtica pendents: {count}",
     "empty_text_title": "Vols enviar-lo sense text?",
-    "empty_text_message": "Aquest missatge no té text ni cap fitxer adjunt. Vols enviar-lo igualment?"
+    "empty_text_message": "Aquest missatge no té text ni cap fitxer adjunt. Vols enviar-lo igualment?",
+    "scheduled_for": "Programat per a {when}"
   },
   "org_templates": {
     "section_personal": "Les meves plantilles",
diff --git a/locales/cs/common.json b/locales/cs/common.json
index c20188847..219e9da67 100644
--- a/locales/cs/common.json
+++ b/locales/cs/common.json
@@ -3906,7 +3906,8 @@
     "warning_placeholders": "Zástupný text, který příjemci uvidí:",
     "warning_proofreading": "Nevyřešené pravopisné či gramatické chyby: {count}",
     "empty_text_title": "Odeslat bez textu?",
-    "empty_text_message": "Tato zpráva nemá text ani přílohu. Přesto ji odeslat?"
+    "empty_text_message": "Tato zpráva nemá text ani přílohu. Přesto ji odeslat?",
+    "scheduled_for": "Naplánováno na {when}"
   },
   "org_templates": {
     "section_personal": "Moje šablony",
diff --git a/locales/da/common.json b/locales/da/common.json
index 9c99fd35c..9fdc94b90 100644
--- a/locales/da/common.json
+++ b/locales/da/common.json
@@ -3906,7 +3906,8 @@
     "warning_placeholders": "Pladsholdertekst, som modtagerne vil se:",
     "warning_proofreading": "Åbne stave- eller grammatikfejl: {count}",
     "empty_text_title": "Send uden tekst?",
-    "empty_text_message": "Denne besked har ingen tekst og ingen vedhæftet fil. Send den alligevel?"
+    "empty_text_message": "Denne besked har ingen tekst og ingen vedhæftet fil. Send den alligevel?",
+    "scheduled_for": "Planlagt til {when}"
   },
   "org_templates": {
     "section_personal": "Mine skabeloner",
diff --git a/locales/de/common.json b/locales/de/common.json
index a45ec38e1..2e72aacef 100644
--- a/locales/de/common.json
+++ b/locales/de/common.json
@@ -3906,7 +3906,8 @@
     "warning_placeholders": "Platzhaltertext, den die Empfänger sehen:",
     "warning_proofreading": "Offene Rechtschreib- oder Grammatikfehler: {count}",
     "empty_text_title": "Ohne Text senden?",
-    "empty_text_message": "Diese Nachricht hat keinen Text und keinen Anhang. Trotzdem senden?"
+    "empty_text_message": "Diese Nachricht hat keinen Text und keinen Anhang. Trotzdem senden?",
+    "scheduled_for": "Geplant für {when}"
   },
   "org_templates": {
     "section_personal": "Meine Vorlagen",
diff --git a/locales/en/common.json b/locales/en/common.json
index 26fa9449a..f8e008234 100644
--- a/locales/en/common.json
+++ b/locales/en/common.json
@@ -3906,7 +3906,8 @@
     "warning_placeholders": "Placeholder text that recipients will see:",
     "warning_proofreading": "Open spelling or grammar issues: {count}",
     "empty_text_title": "Send without text?",
-    "empty_text_message": "This message has no text and no attachment. Send it anyway?"
+    "empty_text_message": "This message has no text and no attachment. Send it anyway?",
+    "scheduled_for": "Scheduled for {when}"
   },
   "org_templates": {
     "section_personal": "My templates",
diff --git a/locales/es/common.json b/locales/es/common.json
index 3fb63b84d..1b6a20894 100644
--- a/locales/es/common.json
+++ b/locales/es/common.json
@@ -3906,7 +3906,8 @@
     "warning_placeholders": "Texto de marcador que verán los destinatarios:",
     "warning_proofreading": "Errores de ortografía o gramática pendientes: {count}",
     "empty_text_title": "¿Enviar sin texto?",
-    "empty_text_message": "Este mensaje no tiene texto ni archivos adjuntos. ¿Enviarlo de todos modos?"
+    "empty_text_message": "Este mensaje no tiene texto ni archivos adjuntos. ¿Enviarlo de todos modos?",
+    "scheduled_for": "Programado para {when}"
   },
   "org_templates": {
     "section_personal": "Mis plantillas",
diff --git a/locales/et/common.json b/locales/et/common.json
index 76ac8af66..411dda041 100644
--- a/locales/et/common.json
+++ b/locales/et/common.json
@@ -3906,7 +3906,8 @@
     "warning_placeholders": "Kohatäitetekst, mida saajad näevad:",
     "warning_proofreading": "Lahendamata õigekirja- või grammatikavead: {count}",
     "empty_text_title": "Kas saata ilma tekstita?",
-    "empty_text_message": "Selles kirjas pole teksti ega manust. Kas saata see ikkagi?"
+    "empty_text_message": "Selles kirjas pole teksti ega manust. Kas saata see ikkagi?",
+    "scheduled_for": "Ajastatud: {when}"
   },
   "org_templates": {
     "section_personal": "Minu mallid",
diff --git a/locales/fa/common.json b/locales/fa/common.json
index 40122d82c..f99b675ef 100644
--- a/locales/fa/common.json
+++ b/locales/fa/common.json
@@ -3906,7 +3906,8 @@
     "warning_placeholders": "متن جایگزینی که گیرندگان خواهند دید:",
     "warning_proofreading": "خطاهای املایی یا دستوری باز: {count}",
     "empty_text_title": "بدون متن ارسال شود؟",
-    "empty_text_message": "این پیام متن و پیوست ندارد. به هر حال ارسال شود؟"
+    "empty_text_message": "این پیام متن و پیوست ندارد. به هر حال ارسال شود؟",
+    "scheduled_for": "زمان‌بندی‌شده برای {when}"
   },
   "org_templates": {
     "section_personal": "قالب‌های من",
diff --git a/locales/fr/common.json b/locales/fr/common.json
index fb6acde3b..56f599aed 100644
--- a/locales/fr/common.json
+++ b/locales/fr/common.json
@@ -3906,7 +3906,8 @@
     "warning_placeholders": "Texte de remplacement que les destinataires verront :",
     "warning_proofreading": "Fautes d'orthographe ou de grammaire restantes : {count}",
     "empty_text_title": "Envoyer sans texte ?",
-    "empty_text_message": "Ce message n'a ni texte ni pièce jointe. L'envoyer quand même ?"
+    "empty_text_message": "Ce message n'a ni texte ni pièce jointe. L'envoyer quand même ?",
+    "scheduled_for": "Programmé pour {when}"
   },
   "org_templates": {
     "section_personal": "Mes modèles",
diff --git a/locales/he/common.json b/locales/he/common.json
index 411fd5d51..95ccc1e67 100644
--- a/locales/he/common.json
+++ b/locales/he/common.json
@@ -3803,7 +3803,8 @@
     "warning_placeholders": "טקסט ממלא מקום שהנמענים יראו:",
     "warning_proofreading": "שגיאות כתיב או דקדוק פתוחות: {count}",
     "empty_text_title": "לשלוח ללא טקסט?",
-    "empty_text_message": "להודעה הזו אין טקסט ואין קובץ מצורף. לשלוח אותה בכל זאת?"
+    "empty_text_message": "להודעה הזו אין טקסט ואין קובץ מצורף. לשלוח אותה בכל זאת?",
+    "scheduled_for": "מתוזמן ל-{when}"
   },
   "org_templates": {
     "section_personal": "התבניות שלי",
diff --git a/locales/hu/common.json b/locales/hu/common.json
index ec24d247c..35741dc7e 100644
--- a/locales/hu/common.json
+++ b/locales/hu/common.json
@@ -3906,7 +3906,8 @@
     "warning_placeholders": "Helykitöltő szöveg, amelyet a címzettek látni fognak:",
     "warning_proofreading": "Nyitott helyesírási vagy nyelvtani hibák: {count}",
     "empty_text_title": "Küldés szöveg nélkül?",
-    "empty_text_message": "Ennek az üzenetnek nincs szövege és melléklete. Elküldi így is?"
+    "empty_text_message": "Ennek az üzenetnek nincs szövege és melléklete. Elküldi így is?",
+    "scheduled_for": "Ütemezve: {when}"
   },
   "org_templates": {
     "section_personal": "Saját sablonok",
diff --git a/locales/it/common.json b/locales/it/common.json
index 6198c7e9a..061922c51 100644
--- a/locales/it/common.json
+++ b/locales/it/common.json
@@ -3906,7 +3906,8 @@
     "warning_placeholders": "Testo segnaposto che i destinatari vedranno:",
     "warning_proofreading": "Errori di ortografia o grammatica aperti: {count}",
     "empty_text_title": "Inviare senza testo?",
-    "empty_text_message": "Questo messaggio non ha testo né allegati. Inviarlo comunque?"
+    "empty_text_message": "Questo messaggio non ha testo né allegati. Inviarlo comunque?",
+    "scheduled_for": "Programmato per {when}"
   },
   "org_templates": {
     "section_personal": "I miei modelli",
diff --git a/locales/ja/common.json b/locales/ja/common.json
index 374b5b7e2..aacaa9fa1 100644
--- a/locales/ja/common.json
+++ b/locales/ja/common.json
@@ -3906,7 +3906,8 @@
     "warning_placeholders": "受信者に表示されるプレースホルダー:",
     "warning_proofreading": "未解決のスペル・文法の問題: {count}",
     "empty_text_title": "本文なしで送信しますか？",
-    "empty_text_message": "このメッセージには本文も添付ファイルもありません。そのまま送信しますか？"
+    "empty_text_message": "このメッセージには本文も添付ファイルもありません。そのまま送信しますか？",
+    "scheduled_for": "{when} に送信予定"
   },
   "org_templates": {
     "section_personal": "マイテンプレート",
diff --git a/locales/ko/common.json b/locales/ko/common.json
index cf92bbb07..62961153b 100644
--- a/locales/ko/common.json
+++ b/locales/ko/common.json
@@ -3906,7 +3906,8 @@
     "warning_placeholders": "받는 사람에게 보이는 자리 표시 텍스트:",
     "warning_proofreading": "남은 맞춤법 또는 문법 문제: {count}",
     "empty_text_title": "본문 없이 보낼까요?",
-    "empty_text_message": "이 메일에는 본문도 첨부 파일도 없어요. 그래도 보낼까요?"
+    "empty_text_message": "이 메일에는 본문도 첨부 파일도 없어요. 그래도 보낼까요?",
+    "scheduled_for": "{when}에 보내기 예약됨"
   },
   "org_templates": {
     "section_personal": "내 템플릿",
diff --git a/locales/lv/common.json b/locales/lv/common.json
index ce05b0de3..47ba99e8b 100644
--- a/locales/lv/common.json
+++ b/locales/lv/common.json
@@ -3906,7 +3906,8 @@
     "warning_placeholders": "Vietturu teksts, ko redzēs saņēmēji:",
     "warning_proofreading": "Neatrisinātas pareizrakstības vai gramatikas kļūdas: {count}",
     "empty_text_title": "Sūtīt bez teksta?",
-    "empty_text_message": "Šai vēstulei nav ne teksta, ne pielikuma. Vai tomēr to sūtīt?"
+    "empty_text_message": "Šai vēstulei nav ne teksta, ne pielikuma. Vai tomēr to sūtīt?",
+    "scheduled_for": "Ieplānots: {when}"
   },
   "org_templates": {
     "section_personal": "Manas veidnes",
diff --git a/locales/mn/common.json b/locales/mn/common.json
index 8c6d231f2..2ceac09b1 100644
--- a/locales/mn/common.json
+++ b/locales/mn/common.json
@@ -3906,7 +3906,8 @@
     "warning_placeholders": "Хүлээн авагчид харах орлуулах текст:",
     "warning_proofreading": "Засаагүй зөв бичгийн болон дүрмийн алдаа: {count}",
     "empty_text_title": "Текстгүй илгээх үү?",
-    "empty_text_message": "Энэ захиад текст ч, хавсралт ч алга. Ямар ч байсан илгээх үү?"
+    "empty_text_message": "Энэ захиад текст ч, хавсралт ч алга. Ямар ч байсан илгээх үү?",
+    "scheduled_for": "{when}-д илгээхээр товлосон"
   },
   "org_templates": {
     "section_personal": "Миний загварууд",
diff --git a/locales/nb/common.json b/locales/nb/common.json
index ab96e67a2..89d1f352a 100644
--- a/locales/nb/common.json
+++ b/locales/nb/common.json
@@ -3906,7 +3906,8 @@
     "warning_placeholders": "Plassholdertekst som mottakerne vil se:",
     "warning_proofreading": "Åpne stave- eller grammatikkfeil: {count}",
     "empty_text_title": "Sende uten tekst?",
-    "empty_text_message": "Denne meldingen har verken tekst eller vedlegg. Sende den likevel?"
+    "empty_text_message": "Denne meldingen har verken tekst eller vedlegg. Sende den likevel?",
+    "scheduled_for": "Planlagt til {when}"
   },
   "org_templates": {
     "section_personal": "Mine maler",
diff --git a/locales/nl/common.json b/locales/nl/common.json
index bccdc4a88..9d2cac016 100644
--- a/locales/nl/common.json
+++ b/locales/nl/common.json
@@ -3906,7 +3906,8 @@
     "warning_placeholders": "Tijdelijke tekst die ontvangers zien:",
     "warning_proofreading": "Openstaande spel- of grammaticafouten: {count}",
     "empty_text_title": "Verzenden zonder tekst?",
-    "empty_text_message": "Dit bericht heeft geen tekst en geen bijlage. Toch verzenden?"
+    "empty_text_message": "Dit bericht heeft geen tekst en geen bijlage. Toch verzenden?",
+    "scheduled_for": "Gepland voor {when}"
   },
   "org_templates": {
     "section_personal": "Mijn sjablonen",
diff --git a/locales/pl/common.json b/locales/pl/common.json
index c011ba2f6..2a90864c5 100644
--- a/locales/pl/common.json
+++ b/locales/pl/common.json
@@ -3906,7 +3906,8 @@
     "warning_placeholders": "Tekst zastępczy, który zobaczą odbiorcy:",
     "warning_proofreading": "Nierozwiązane błędy pisowni lub gramatyki: {count}",
     "empty_text_title": "Wysłać bez treści?",
-    "empty_text_message": "Ta wiadomość nie ma treści ani załącznika. Wysłać ją mimo to?"
+    "empty_text_message": "Ta wiadomość nie ma treści ani załącznika. Wysłać ją mimo to?",
+    "scheduled_for": "Zaplanowano na {when}"
   },
   "org_templates": {
     "section_personal": "Moje szablony",
diff --git a/locales/pt/common.json b/locales/pt/common.json
index a10b6f2b4..5988e60e6 100644
--- a/locales/pt/common.json
+++ b/locales/pt/common.json
@@ -3906,7 +3906,8 @@
     "warning_placeholders": "Texto de espaço reservado que os destinatários verão:",
     "warning_proofreading": "Erros de ortografia ou gramática em aberto: {count}",
     "empty_text_title": "Enviar sem texto?",
-    "empty_text_message": "Esta mensagem não tem texto nem anexo. Enviar mesmo assim?"
+    "empty_text_message": "Esta mensagem não tem texto nem anexo. Enviar mesmo assim?",
+    "scheduled_for": "Agendado para {when}"
   },
   "org_templates": {
     "section_personal": "Meus modelos",
diff --git a/locales/ro/common.json b/locales/ro/common.json
index 8a994a38f..8f7064f48 100644
--- a/locales/ro/common.json
+++ b/locales/ro/common.json
@@ -3906,7 +3906,8 @@
     "warning_placeholders": "Text substituent pe care îl vor vedea destinatarii:",
     "warning_proofreading": "Greșeli de ortografie sau gramatică nerezolvate: {count}",
     "empty_text_title": "Trimiteți fără text?",
-    "empty_text_message": "Acest mesaj nu are text și nici atașament. Îl trimiteți totuși?"
+    "empty_text_message": "Acest mesaj nu are text și nici atașament. Îl trimiteți totuși?",
+    "scheduled_for": "Programat pentru {when}"
   },
   "org_templates": {
     "section_personal": "Șabloanele mele",
diff --git a/locales/ru/common.json b/locales/ru/common.json
index 7fa2dfdb0..f21e430b1 100644
--- a/locales/ru/common.json
+++ b/locales/ru/common.json
@@ -3906,7 +3906,8 @@
     "warning_placeholders": "Текст-заполнитель, который увидят получатели:",
     "warning_proofreading": "Неисправленные орфографические или грамматические ошибки: {count}",
     "empty_text_title": "Отправить без текста?",
-    "empty_text_message": "В этом письме нет ни текста, ни вложений. Всё равно отправить?"
+    "empty_text_message": "В этом письме нет ни текста, ни вложений. Всё равно отправить?",
+    "scheduled_for": "Запланировано на {when}"
   },
   "org_templates": {
     "section_personal": "Мои шаблоны",
diff --git a/locales/sk/common.json b/locales/sk/common.json
index 14519e009..e24d849f5 100644
--- a/locales/sk/common.json
+++ b/locales/sk/common.json
@@ -3906,7 +3906,8 @@
     "warning_placeholders": "Zástupný text, ktorý uvidia príjemcovia:",
     "warning_proofreading": "Neopravené pravopisné alebo gramatické chyby: {count}",
     "empty_text_title": "Odoslať bez textu?",
-    "empty_text_message": "Táto správa nemá text ani prílohu. Odoslať ju aj tak?"
+    "empty_text_message": "Táto správa nemá text ani prílohu. Odoslať ju aj tak?",
+    "scheduled_for": "Naplánované na {when}"
   },
   "org_templates": {
     "section_personal": "Moje šablóny",
diff --git a/locales/th/common.json b/locales/th/common.json
index 2aa2198ea..b6d400ff4 100644
--- a/locales/th/common.json
+++ b/locales/th/common.json
@@ -1157,7 +1157,8 @@
     "warning_placeholders": "ข้อความตัวยึดตำแหน่งที่ผู้รับจะเห็น:",
     "warning_proofreading": "ปัญหาการสะกดหรือไวยากรณ์ที่ยังค้างอยู่: {count}",
     "empty_text_title": "ส่งโดยไม่มีข้อความหรือไม่",
-    "empty_text_message": "ข้อความนี้ไม่มีเนื้อหาและไม่มีไฟล์แนบ ส่งต่อไปหรือไม่"
+    "empty_text_message": "ข้อความนี้ไม่มีเนื้อหาและไม่มีไฟล์แนบ ส่งต่อไปหรือไม่",
+    "scheduled_for": "ตั้งเวลาส่งไว้ที่ {when}"
   },
   "org_templates": {
     "section_personal": "แม่แบบของฉัน",
diff --git a/locales/tr/common.json b/locales/tr/common.json
index 12f69457d..6aff55f44 100644
--- a/locales/tr/common.json
+++ b/locales/tr/common.json
@@ -3906,7 +3906,8 @@
     "warning_placeholders": "Alıcıların göreceği yer tutucu metin:",
     "warning_proofreading": "Açık yazım veya dilbilgisi sorunları: {count}",
     "empty_text_title": "Metin olmadan gönderilsin mi?",
-    "empty_text_message": "Bu iletide metin ve ek yok. Yine de gönderilsin mi?"
+    "empty_text_message": "Bu iletide metin ve ek yok. Yine de gönderilsin mi?",
+    "scheduled_for": "{when} için zamanlandı"
   },
   "org_templates": {
     "section_personal": "Şablonlarım",
diff --git a/locales/uk/common.json b/locales/uk/common.json
index d7933e370..5d4fc1d4e 100644
--- a/locales/uk/common.json
+++ b/locales/uk/common.json
@@ -3906,7 +3906,8 @@
     "warning_placeholders": "Текст-заповнювач, який побачать одержувачі:",
     "warning_proofreading": "Невиправлені орфографічні чи граматичні помилки: {count}",
     "empty_text_title": "Надіслати без тексту?",
-    "empty_text_message": "У цьому листі немає ні тексту, ні вкладень. Усе одно надіслати?"
+    "empty_text_message": "У цьому листі немає ні тексту, ні вкладень. Усе одно надіслати?",
+    "scheduled_for": "Заплановано на {when}"
   },
   "org_templates": {
     "section_personal": "Мої шаблони",
diff --git a/locales/vi/common.json b/locales/vi/common.json
index 2bdd89e99..48fcabf42 100644
--- a/locales/vi/common.json
+++ b/locales/vi/common.json
@@ -3918,7 +3918,8 @@
     "warning_placeholders": "Văn bản giữ chỗ mà người nhận sẽ thấy:",
     "warning_proofreading": "Lỗi chính tả hoặc ngữ pháp chưa sửa: {count}",
     "empty_text_title": "Gửi mà không có nội dung?",
-    "empty_text_message": "Thư này không có nội dung và không có tệp đính kèm. Vẫn gửi?"
+    "empty_text_message": "Thư này không có nội dung và không có tệp đính kèm. Vẫn gửi?",
+    "scheduled_for": "Đã lên lịch gửi lúc {when}"
   },
   "org_templates": {
     "section_personal": "Mẫu của tôi",
diff --git a/locales/zh-TW/common.json b/locales/zh-TW/common.json
index 8650ef97c..5e71acdc7 100644
--- a/locales/zh-TW/common.json
+++ b/locales/zh-TW/common.json
@@ -3906,7 +3906,8 @@
     "warning_placeholders": "收件者會看到的預留位置文字：",
     "warning_proofreading": "未處理的拼字或文法問題：{count}",
     "empty_text_title": "不寫內文就傳送？",
-    "empty_text_message": "這封郵件沒有內文，也沒有附件。仍然傳送？"
+    "empty_text_message": "這封郵件沒有內文，也沒有附件。仍然傳送？",
+    "scheduled_for": "已排定於 {when} 傳送"
   },
   "org_templates": {
     "section_personal": "我的範本",
diff --git a/locales/zh/common.json b/locales/zh/common.json
index 500507321..4a013b35d 100644
--- a/locales/zh/common.json
+++ b/locales/zh/common.json
@@ -3906,7 +3906,8 @@
     "warning_placeholders": "收件人会看到的占位文本：",
     "warning_proofreading": "未处理的拼写或语法问题：{count}",
     "empty_text_title": "不写正文就发送？",
-    "empty_text_message": "这封邮件没有正文，也没有附件。仍然发送？"
+    "empty_text_message": "这封邮件没有正文，也没有附件。仍然发送？",
+    "scheduled_for": "已安排在 {when} 发送"
   },
   "org_templates": {
     "section_personal": "我的模板",

From 461a7daf4f861694bac9b9e3c9bc254e21754b34 Mon Sep 17 00:00:00 2001
From: Linus Rath <139418639+rathlinus@users.noreply.github.com>
Date: Wed, 4 Nov 2026 06:24:26 +0100
Subject: [PATCH 05/34] feat: let a composer move to its own window from a
 browser tab, as in Gmail

---
 .../popout/__tests__/popout-host.test.tsx     | 27 ++++++++++-
 components/popout/popout-host.tsx             |  5 +-
 hooks/use-popouts-available.ts                | 21 +++++----
 lib/__tests__/popout-windows.test.ts          | 47 +++++++++++++++++++
 lib/popout/support.ts                         | 31 ++++++++++--
 5 files changed, 113 insertions(+), 18 deletions(-)

diff --git a/components/popout/__tests__/popout-host.test.tsx b/components/popout/__tests__/popout-host.test.tsx
index e8a0dd03e..1627d07a7 100644
--- a/components/popout/__tests__/popout-host.test.tsx
+++ b/components/popout/__tests__/popout-host.test.tsx
@@ -92,9 +92,20 @@ afterEach(() => {
 
 const answers = () => heard.filter((message) => message.type === 'session-answer');
 
-describe('in an ordinary browser tab', () => {
+/** A browser tab: not installed, with or without a mouse. */
+function stubTab(fine: boolean) {
+  delete window.bulwarkDesktop;
+  vi.stubGlobal('matchMedia', (query: string) => ({
+    matches: query.includes('pointer: fine') ? fine : false,
+    addEventListener() {},
+    removeEventListener() {},
+  }));
+  window.matchMedia = globalThis.matchMedia;
+}
+
+describe('in a browser tab on a phone or tablet', () => {
   it('runs nothing: no channel and no lock', async () => {
-    delete window.bulwarkDesktop;
+    stubTab(false);
     const opened = FakeBroadcastChannel.open.size;
     render(<PopoutHost />);
     await settle();
@@ -106,6 +117,18 @@ describe('in an ordinary browser tab', () => {
   });
 });
 
+describe('in a browser tab on a computer', () => {
+  it('lends its session to a composer popped out of it', async () => {
+    stubTab(true);
+    render(<PopoutHost />);
+    await settle();
+    await expect(requestWindowSession({}, 2000)).resolves.toMatchObject({
+      activeAccountId: 'alice',
+      sessions: [{ accountId: 'alice', authMode: 'oauth' }],
+    });
+  });
+});
+
 describe('PopoutHost', () => {
   it('holds no lock while idle, which would keep the page out of the back/forward cache', async () => {
     render(<PopoutHost />);
diff --git a/components/popout/popout-host.tsx b/components/popout/popout-host.tsx
index 4239c73b6..fc7305e60 100644
--- a/components/popout/popout-host.tsx
+++ b/components/popout/popout-host.tsx
@@ -60,8 +60,9 @@ function claimOnce(name: string, work: () => void | Promise<void>): void {
 /**
  * The main window's side of pop-outs: lends them its session and renews it
  * for them, passes on that mail changed, and takes over what a pop-out can't
- * say any more once it has closed. Only where pop-outs are on offer: an
- * ordinary browser tab runs none of this.
+ * say any more once it has closed. Only where pop-outs are on offer: a
+ * browser tab on a computer runs it for composers popped out of it, one on a
+ * phone or tablet runs none of this.
  */
 export function PopoutHost() {
   const available = usePopoutsAvailable();
diff --git a/hooks/use-popouts-available.ts b/hooks/use-popouts-available.ts
index 7628846a0..9e391d73d 100644
--- a/hooks/use-popouts-available.ts
+++ b/hooks/use-popouts-available.ts
@@ -7,27 +7,30 @@ import { resolveEmailBlobContext } from "@/stores/email-store";
 import { toast } from "@/stores/toast-store";
 import type { Email } from "@/lib/jmap/types";
 import { openMessageWindow } from "@/lib/popout/open";
-import { popoutsAvailable } from "@/lib/popout/support";
+import { composerPopoutsAvailable, popoutsAvailable } from "@/lib/popout/support";
 import { isPopoutWindow } from "@/lib/popout/window-role";
 
 /**
- * Whether to offer "Open in new window" here. False on the server and in the
- * first render, so the markup hydrates the same; false in the demo, whose
- * client has no session to share, and inside a pop-out (for a message: it is
- * already in its own window).
+ * Whether to offer "Open in new window" here: for a composer, the default,
+ * also in a browser tab on a computer; for a message only in an installed or
+ * the desktop app. False on the server and in the first render, so the
+ * markup hydrates the same; false in the demo, whose client has no session to
+ * share, and inside a pop-out (for a message: it is already in its own window).
+ * The main window's side of pop-outs (PopoutHost) runs wherever a composer can
+ * move out.
  */
-export function usePopoutsAvailable(): boolean {
+export function usePopoutsAvailable(kind: "compose" | "message" = "compose"): boolean {
   const isDemoMode = useAuthStore((s) => s.isDemoMode);
   const [available, setAvailable] = useState(false);
   useEffect(() => {
-    const check = () => setAvailable(popoutsAvailable() && !isPopoutWindow());
+    const check = () => setAvailable((kind === "message" ? popoutsAvailable() : composerPopoutsAvailable()) && !isPopoutWindow());
     check();
     // Installing the running tab turns it into a window without a reload.
     if (typeof window.matchMedia !== "function") return;
     const media = window.matchMedia("(display-mode: standalone)");
     media.addEventListener?.("change", check);
     return () => media.removeEventListener?.("change", check);
-  }, []);
+  }, [kind]);
   return available && !isDemoMode;
 }
 
@@ -37,7 +40,7 @@ export function usePopoutsAvailable(): boolean {
  * blocks the window; nothing else changes then.
  */
 export function useOpenEmailInWindow(): ((email: Email) => void) | null {
-  const available = usePopoutsAvailable();
+  const available = usePopoutsAvailable("message");
   const t = useTranslations("pwaWindows");
   const open = useCallback((email: Email) => {
     const auth = useAuthStore.getState();
diff --git a/lib/__tests__/popout-windows.test.ts b/lib/__tests__/popout-windows.test.ts
index f3675c552..a041f2114 100644
--- a/lib/__tests__/popout-windows.test.ts
+++ b/lib/__tests__/popout-windows.test.ts
@@ -132,6 +132,53 @@ describe('popoutsAvailable', () => {
   });
 });
 
+describe('composerPopoutsAvailable', () => {
+  async function available() {
+    const { composerPopoutsAvailable } = await import('@/lib/popout/support');
+    return composerPopoutsAvailable();
+  }
+
+  it('is on in a browser tab on a computer: a composer opens as a popup window, as in Gmail', async () => {
+    stubDisplay({ standalone: false });
+    expect(await available()).toBe(true);
+  });
+
+  it('is off in a browser tab on a phone or tablet, where window.open makes a tab', async () => {
+    stubDisplay({ standalone: false, fine: false });
+    expect(await available()).toBe(false);
+  });
+
+  it('is on wherever a message can move out too', async () => {
+    stubDisplay();
+    expect(await available()).toBe(true);
+    stubDisplay({ standalone: false, fine: false });
+    window.bulwarkDesktop = { version: 1, platform: 'win32', windows: {} };
+    expect(await available()).toBe(true);
+  });
+
+  it('is off in an installed app on a touch device', async () => {
+    stubDisplay({ fine: false });
+    expect(await available()).toBe(false);
+  });
+
+  it('is off in a tab without what keeps a shared session safe', async () => {
+    stubDisplay({ standalone: false });
+    vi.stubGlobal('BroadcastChannel', undefined);
+    expect(await available()).toBe(false);
+    vi.stubGlobal('BroadcastChannel', FakeBroadcastChannel);
+    vi.stubGlobal('crypto', {});
+    expect(await available()).toBe(false);
+  });
+
+  it('lets the hook offer a composer its own window from a tab, and still not a message', async () => {
+    stubDisplay({ standalone: false });
+    const { renderHook } = await import('@testing-library/react');
+    const { usePopoutsAvailable } = await import('@/hooks/use-popouts-available');
+    expect(renderHook(() => usePopoutsAvailable()).result.current).toBe(true);
+    expect(renderHook(() => usePopoutsAvailable('message')).result.current).toBe(false);
+  }, 60_000);
+});
+
 describe('opening windows', () => {
   it('opens a message as a popup in the app, with its login and account', async () => {
     const { openMessageWindow } = await import('@/lib/popout/open');
diff --git a/lib/popout/support.ts b/lib/popout/support.ts
index f06f22aeb..150a6380b 100644
--- a/lib/popout/support.ts
+++ b/lib/popout/support.ts
@@ -1,7 +1,8 @@
 /**
  * Whether "Open in new window" is on offer: an installed app or the desktop
  * app, on a device with windows. In a browser tab, a tab does the same job
- * and the app behaves as it always has.
+ * for a message, and the app behaves as it always has. A composer is the
+ * exception: it moves to a window of its own from a tab too, as in Gmail.
  */
 
 import { IS_LITE } from '@/lib/lite';
@@ -13,16 +14,36 @@ export function hasDesktopWindows(): boolean {
   return typeof window !== 'undefined' && !!window.bulwarkDesktop?.windows;
 }
 
-/** Display mode is `browser` in Electron popups too, hence the bridge check. */
-export function popoutsAvailable(): boolean {
+/** A second window can share this one's session, safely. */
+function windowsCanShareSessions(): boolean {
   // Lite has no such route: a static export can't list every message id.
   if (IS_LITE || typeof window === 'undefined') return false;
   // Sharing the session and renewing tokens safely across windows need these.
-  if (typeof BroadcastChannel === 'undefined' || !navigator.locks || !canSealSessions()) return false;
+  return typeof BroadcastChannel !== 'undefined' && !!navigator.locks && canSealSessions();
+}
+
+/** A device with a mouse or trackpad: a phone or tablet has no second window. */
+function hasFinePointer(): boolean {
+  return typeof window.matchMedia === 'function' && window.matchMedia('(pointer: fine)').matches;
+}
+
+/** Display mode is `browser` in Electron popups too, hence the bridge check. */
+export function popoutsAvailable(): boolean {
+  if (!windowsCanShareSessions()) return false;
   if (hasDesktopWindows()) return true;
   if (!isStandaloneDisplayMode()) return false;
   // A home-screen app on a phone or tablet has no second window: window.open
   // leaves for the browser there.
   if ((window.navigator as Navigator & { standalone?: boolean }).standalone === true) return false;
-  return typeof window.matchMedia === 'function' && window.matchMedia('(pointer: fine)').matches;
+  return hasFinePointer();
+}
+
+/**
+ * A composer can move to a window of its own: wherever a message can, and in
+ * a browser tab on a computer too, where it opens as a popup window.
+ */
+export function composerPopoutsAvailable(): boolean {
+  if (popoutsAvailable()) return true;
+  if (!windowsCanShareSessions() || isStandaloneDisplayMode()) return false;
+  return hasFinePointer();
 }

From 08dcff789f3c2347ddf865dd80ad06374381621c Mon Sep 17 00:00:00 2001
From: Linus Rath <139418639+rathlinus@users.noreply.github.com>
Date: Wed, 4 Nov 2026 06:24:27 +0100
Subject: [PATCH 06/34] feat: add a full screen button to the composer, Escape
 brings it back

---
 .../composer-windows-layout.test.tsx          | 37 ++++++++++++++++++-
 components/email/email-composer.tsx           | 29 ++++++++++++++-
 2 files changed, 64 insertions(+), 2 deletions(-)

diff --git a/components/email/__tests__/composer-windows-layout.test.tsx b/components/email/__tests__/composer-windows-layout.test.tsx
index fd1ccd18c..a5a5dd5a4 100644
--- a/components/email/__tests__/composer-windows-layout.test.tsx
+++ b/components/email/__tests__/composer-windows-layout.test.tsx
@@ -1,4 +1,4 @@
-import { render, screen, within } from '@testing-library/react';
+import { fireEvent, render, screen, within } from '@testing-library/react';
 import { describe, it, expect, vi } from 'vitest';
 import React from 'react';
 import { EmailComposer } from '../email-composer';
@@ -222,6 +222,41 @@ describe('a composer in a window of its own', () => {
   });
 });
 
+describe('full screen', () => {
+  it('puts the composer over the whole window, and the same button puts it back', () => {
+    render(<EmailComposer initialData={DATA} />);
+    const root = screen.getByTestId('email-composer');
+    expect(root).not.toHaveAttribute('data-maximized');
+
+    fireEvent.click(screen.getByRole('button', { name: 'maximize' }));
+    expect(root).toHaveAttribute('data-maximized');
+    expect(root.className).toMatch(/(^|\s)fixed(\s|$)/);
+    expect(root.className).toContain('inset-0');
+
+    fireEvent.click(screen.getByRole('button', { name: 'restore' }));
+    expect(root).not.toHaveAttribute('data-maximized');
+    expect(root.className).not.toMatch(/(^|\s)fixed(\s|$)/);
+  });
+
+  it('goes back with Escape, without closing the composer', () => {
+    const onClose = vi.fn();
+    render(<EmailComposer initialData={DATA} onClose={onClose} />);
+    fireEvent.click(screen.getByRole('button', { name: 'maximize' }));
+    const root = screen.getByTestId('email-composer');
+
+    fireEvent.keyDown(screen.getByRole('button', { name: 'restore' }), { key: 'Escape' });
+
+    expect(root).not.toHaveAttribute('data-maximized');
+    expect(onClose).not.toHaveBeenCalled();
+    expect(screen.queryByRole('alertdialog')).toBeNull();
+  });
+
+  it('is not offered in a window of its own, which is all composer already', () => {
+    render(<EmailComposer initialData={DATA} ownWindow={{}} />);
+    expect(screen.queryByRole('button', { name: 'maximize' })).toBeNull();
+  });
+});
+
 describe('a composer in the main window', () => {
   it('keeps the phone layout for a phone: Send in the header there, toolbar folded', () => {
     render(<EmailComposer initialData={DATA} />);
diff --git a/components/email/email-composer.tsx b/components/email/email-composer.tsx
index 42a8fb93b..dbbe94385 100644
--- a/components/email/email-composer.tsx
+++ b/components/email/email-composer.tsx
@@ -1199,6 +1199,10 @@ export function EmailComposer({
   // A pop-out or quick compose window is narrower than a tablet, but it is a
   // window on a computer: it keeps the main window's layout, not the phone's.
   const phoneLayout = !ownWindow;
+  // Full screen: the composer over the whole window, as Gmail has it. The same
+  // button or Escape puts it back. Not in a window of its own, which is all composer.
+  const [maximized, setMaximized] = useState(false);
+  const canMaximize = !ownWindow && !mvWindow;
   // "close" (X, Escape): save or discard. "discard" (the Discard button): the
   // user already chose, so only confirm it.
   const [closeDialogKind, setCloseDialogKind] = useState<'close' | 'discard'>('close');
@@ -4668,6 +4672,11 @@ export function EmailComposer({
       // And for proofreading's popup and panel: Escape closes only them.
       if (proofreading.popup || proofreading.panel) return;
       e.preventDefault();
+      // Full screen first goes back to where the composer was.
+      if (maximized) {
+        setMaximized(false);
+        return;
+      }
       handleClose();
       return;
     }
@@ -4701,7 +4710,13 @@ export function EmailComposer({
       data-testid="email-composer"
       // Edits made while the draft moves wouldn't move with it.
       inert={isPoppingOut || undefined}
-      className={cn("flex h-full bg-background relative", className)}
+      className={cn(
+        "flex h-full bg-background relative",
+        className,
+        // Over everything but dialogs (z-60) and toasts; below the desktop app's window controls.
+        maximized && "fixed inset-0 z-40 h-auto pt-[var(--titlebar-row-height)]",
+      )}
+      data-maximized={maximized || undefined}
       onKeyDownCapture={handleComposerKeyDown}
       // Bubble phase, in the same batch as the field's own onChange. A state
       // change in the capture phase renders first and puts the old value back.
@@ -4888,6 +4903,18 @@ export function EmailComposer({
           </Button>
         ))}
         {rightPanelToggle}
+        {canMaximize && (
+          <button
+            type="button"
+            onClick={() => setMaximized((v) => !v)}
+            className="hidden md:grid h-8 w-8 place-items-center rounded-md text-muted-foreground hover:bg-muted hover:text-foreground"
+            aria-label={maximized ? t('restore') : t('maximize')}
+            title={maximized ? t('restore') : t('maximize')}
+            data-testid="composer-maximize"
+          >
+            {maximized ? <Minimize2 className="w-4 h-4" /> : <Maximize2 className="w-4 h-4" />}
+          </button>
+        )}
         {popOutButton(cn(phoneLayout ? "hidden md:grid" : "grid", "h-8 w-8 place-items-center rounded-md text-muted-foreground hover:bg-muted hover:text-foreground"), "w-4 h-4")}
         {/* Close at the top end (R4). On a phone it moves to the start, as
             the phone's mail apps have it, with Send at the end. */}

From c0300bcb7fb0229be5e94be53268d90bd2ef63e7 Mon Sep 17 00:00:00 2001
From: Linus Rath <139418639+rathlinus@users.noreply.github.com>
Date: Wed, 4 Nov 2026 06:24:28 +0100
Subject: [PATCH 07/34] feat: keep the formatting toolbar in one row, with the
 rest behind More formatting

---
 ...rich-text-editor-toolbar-overflow.test.tsx | 114 +++++++++++++++
 components/email/rich-text-editor.tsx         | 136 +++++++++++++++++-
 locales/ar/common.json                        |   3 +
 locales/ca/common.json                        |   3 +
 locales/cs/common.json                        |   3 +
 locales/da/common.json                        |   3 +
 locales/de/common.json                        |   3 +
 locales/en/common.json                        |   3 +
 locales/es/common.json                        |   3 +
 locales/et/common.json                        |   3 +
 locales/fa/common.json                        |   3 +
 locales/fr/common.json                        |   3 +
 locales/he/common.json                        |   3 +
 locales/hu/common.json                        |   3 +
 locales/it/common.json                        |   3 +
 locales/ja/common.json                        |   3 +
 locales/ko/common.json                        |   3 +
 locales/lv/common.json                        |   3 +
 locales/mn/common.json                        |   3 +
 locales/nb/common.json                        |   3 +
 locales/nl/common.json                        |   3 +
 locales/pl/common.json                        |   3 +
 locales/pt/common.json                        |   3 +
 locales/ro/common.json                        |   3 +
 locales/ru/common.json                        |   3 +
 locales/sk/common.json                        |   3 +
 locales/th/common.json                        |   3 +
 locales/tr/common.json                        |   3 +
 locales/uk/common.json                        |   3 +
 locales/vi/common.json                        |   3 +
 locales/zh-TW/common.json                     |   3 +
 locales/zh/common.json                        |   3 +
 32 files changed, 335 insertions(+), 5 deletions(-)
 create mode 100644 components/email/__tests__/rich-text-editor-toolbar-overflow.test.tsx

diff --git a/components/email/__tests__/rich-text-editor-toolbar-overflow.test.tsx b/components/email/__tests__/rich-text-editor-toolbar-overflow.test.tsx
new file mode 100644
index 000000000..c45bc217c
--- /dev/null
+++ b/components/email/__tests__/rich-text-editor-toolbar-overflow.test.tsx
@@ -0,0 +1,114 @@
+import { act, fireEvent, render, screen, waitFor, within } from '@testing-library/react';
+import { afterEach, describe, expect, it, vi } from 'vitest';
+import React from 'react';
+
+import { RichTextEditor, formattingFoldCount } from '../rich-text-editor';
+
+// The formatting toolbar keeps one row: in a narrow composer (585 px at
+// 1280x720) it wrapped to two and took the body's room. What doesn't fit goes
+// behind "More formatting", the least used first.
+
+let toolbarWidth = 1200;
+const observers = new Set<ResizeObserverCallback>();
+class ReportingResizeObserver {
+  constructor(private cb: ResizeObserverCallback) {}
+  observe() { observers.add(this.cb); }
+  unobserve() {}
+  disconnect() { observers.delete(this.cb); }
+}
+vi.stubGlobal('ResizeObserver', ReportingResizeObserver);
+
+const realClientWidth = Object.getOwnPropertyDescriptor(HTMLElement.prototype, 'clientWidth')!;
+Object.defineProperty(HTMLElement.prototype, 'clientWidth', {
+  configurable: true,
+  get(this: HTMLElement) {
+    return this.getAttribute('role') === 'toolbar' ? toolbarWidth : realClientWidth.get!.call(this);
+  },
+});
+
+afterEach(() => {
+  toolbarWidth = 1200;
+});
+
+async function setup() {
+  let ready = false;
+  render(<RichTextEditor content="<p>Hello</p>" onChange={() => {}} onEditorReady={() => { ready = true; }} />);
+  await waitFor(() => expect(ready).toBe(true));
+}
+
+async function resize(width: number) {
+  toolbarWidth = width;
+  await act(async () => {
+    for (const cb of observers) cb([], {} as ResizeObserver);
+  });
+}
+
+const toolbar = () => screen.getByRole('toolbar', { name: 'formatting' });
+const rowItem = (name: string) => toolbar().querySelector(`[data-toolbar-item="${name}"]`);
+
+describe('formatting toolbar in a narrow composer', () => {
+  it('shows every button in one row when there is room, without a More button', async () => {
+    await setup();
+    for (const name of ['heading-1', 'quote', 'align-left', 'table', 'undo']) expect(rowItem(name)).not.toBeNull();
+    expect(rowItem('more-formatting')).toBeNull();
+  });
+
+  it('moves what does not fit behind "More formatting", and shows it there', async () => {
+    await setup();
+    await resize(561);
+
+    // The least used go first: undo, redo, clear formatting, then alignment.
+    for (const name of ['undo', 'redo', 'clear-formatting', 'align-left', 'align-right']) expect(rowItem(name)).toBeNull();
+    for (const name of ['bold', 'bullet-list', 'link', 'heading-1', 'table']) expect(rowItem(name)).not.toBeNull();
+
+    const more = rowItem('more-formatting') as HTMLButtonElement;
+    expect(more).toHaveAccessibleName('more_formatting');
+    expect(more).toHaveAttribute('aria-expanded', 'false');
+    fireEvent.click(more);
+    const panel = screen.getByRole('dialog', { name: 'more_formatting' });
+    expect(more).toHaveAttribute('aria-expanded', 'true');
+    for (const name of ['align-left', 'align-center', 'align-right', 'clear-formatting', 'undo', 'redo']) {
+      expect(within(panel).getByRole('button', { name: new RegExp(`^${name.replace('-', '_')}`) })).toBeInTheDocument();
+    }
+  });
+
+  it('keeps the arrows in the row: the panel buttons are no Tab stops of the toolbar', async () => {
+    await setup();
+    await resize(561);
+    fireEvent.click(rowItem('more-formatting')!);
+    const panel = screen.getByRole('dialog', { name: 'more_formatting' });
+    const rowStops = Array.from(toolbar().querySelectorAll<HTMLElement>('[data-toolbar-item]'))
+      .filter((el) => !panel.contains(el) && el.tabIndex === 0);
+    expect(rowStops).toHaveLength(1);
+  });
+
+  it('brings everything back into the row when the composer gets wider', async () => {
+    await setup();
+    await resize(400);
+    expect(rowItem('heading-1')).toBeNull();
+    await resize(1000);
+    expect(rowItem('heading-1')).not.toBeNull();
+    expect(rowItem('undo')).not.toBeNull();
+    expect(rowItem('more-formatting')).toBeNull();
+  });
+});
+
+describe('formattingFoldCount', () => {
+  const sizes = { button: 28, gap: 2, separator: 5 };
+
+  it('folds nothing for a toolbar that is not laid out', () => {
+    expect(formattingFoldCount(0, sizes)).toBe(0);
+  });
+
+  it('folds more groups the narrower the row', () => {
+    const counts = [900, 700, 561, 480, 400, 300].map((width) => formattingFoldCount(width, sizes));
+    expect(counts[0]).toBe(0);
+    for (let i = 1; i < counts.length; i++) expect(counts[i]).toBeGreaterThanOrEqual(counts[i - 1]);
+    expect(counts[counts.length - 1]).toBe(5);
+  });
+
+  it('makes room for the text direction button', () => {
+    const width = 700;
+    expect(formattingFoldCount(width, { ...sizes, directionButton: true })).toBeGreaterThanOrEqual(formattingFoldCount(width, sizes));
+  });
+});
diff --git a/components/email/rich-text-editor.tsx b/components/email/rich-text-editor.tsx
index 3448897cd..d4e4ac6cd 100644
--- a/components/email/rich-text-editor.tsx
+++ b/components/email/rich-text-editor.tsx
@@ -70,8 +70,56 @@ import {
   Rows3,
   Columns3,
   ImageIcon,
+  Ellipsis,
 } from "@/components/icons";
 
+/**
+ * Groups of the formatting toolbar that move behind "More formatting" when one
+ * row is too narrow for all of them, the least used first. Each with its
+ * buttons and the separators that go with it.
+ */
+const FOLDABLE_GROUPS = [
+  { id: "history", buttons: 3, separators: 2 },
+  { id: "align", buttons: 3, separators: 1 },
+  { id: "headings", buttons: 2, separators: 1 },
+  { id: "table", buttons: 1, separators: 0 },
+  { id: "blocks", buttons: 2, separators: 0 },
+] as const;
+type FoldableGroup = (typeof FOLDABLE_GROUPS)[number]["id"];
+/**
+ * Always in the row: font size, bold, italic, underline, strikethrough, the
+ * two colours, the lists, link, an image's description and More (12), with
+ * their 3 separators.
+ */
+const FIXED_TOOLBAR = { buttons: 12, separators: 3 };
+
+/**
+ * How many of FOLDABLE_GROUPS go behind "More formatting" for one row of
+ * `width` px. 0 for a toolbar that isn't laid out (hidden, or not measured).
+ */
+export function formattingFoldCount(width: number, sizes: { button: number; gap: number; separator: number; directionButton?: boolean }): number {
+  if (!(width > 0)) return 0;
+  const span = (buttons: number, separators: number) => buttons * (sizes.button + sizes.gap) + separators * (sizes.separator + sizes.gap);
+  const groups = FOLDABLE_GROUPS.map((group) => span(group.buttons + (group.id === "align" && sizes.directionButton ? 1 : 0), group.separators));
+  let needed = span(FIXED_TOOLBAR.buttons, FIXED_TOOLBAR.separators) + groups.reduce((sum, group) => sum + group, 0);
+  // All of it fits without the More button.
+  if (needed - (sizes.button + sizes.gap) <= width + 1) return 0;
+  for (let count = 1; count <= groups.length; count++) {
+    needed -= groups[count - 1];
+    if (needed <= width + 1) return count;
+  }
+  return groups.length;
+}
+
+/** The toolbar's inner width and the sizes of what is in it, in px. */
+function measureFormattingToolbar(toolbar: HTMLElement, directionButton: boolean): number {
+  const rem = parseFloat(getComputedStyle(document.documentElement).fontSize) || 16;
+  const style = getComputedStyle(toolbar);
+  const width = toolbar.clientWidth - (parseFloat(style.paddingLeft) || 0) - (parseFloat(style.paddingRight) || 0);
+  const button = toolbar.querySelector<HTMLElement>(":scope > [data-toolbar-item], :scope > div > [data-toolbar-item]")?.offsetWidth || 1.75 * rem;
+  return formattingFoldCount(width, { button, gap: 0.125 * rem, separator: 1 + 0.25 * rem, directionButton });
+}
+
 export interface InlineImageUpload {
   src: string;
   cid?: string;
@@ -699,6 +747,7 @@ export function RichTextEditor({
   }, [editor, linkDialog]);
 
   const tToolbar = useTranslations("email_composer.toolbar");
+  const tWindows = useTranslations("compose_windows");
   const tCommon = useTranslations("common");
   const [tableMenuOpen, setTableMenuOpen] = useState(false);
   const tableWrapperRef = useRef<HTMLDivElement>(null);
@@ -717,11 +766,13 @@ export function RichTextEditor({
   // focus last keeps it, the arrows, Home and End move inside.
   const toolbarRef = useRef<HTMLDivElement>(null);
   const rovingItemRef = useRef<string | null>(null);
+  // Buttons in the "More formatting" panel are the panel's, with its own keys.
+  const inRow = (el: HTMLElement) => !el.closest("[data-toolbar-more-panel]");
   const toolbarItems = () =>
     Array.from(toolbarRef.current?.querySelectorAll<HTMLButtonElement>("[data-toolbar-item]") ?? [])
-      .filter((el) => !el.disabled);
+      .filter((el) => !el.disabled && inRow(el));
   const syncToolbarTabStops = (focus?: HTMLButtonElement) => {
-    const all = Array.from(toolbarRef.current?.querySelectorAll<HTMLButtonElement>("[data-toolbar-item]") ?? []);
+    const all = Array.from(toolbarRef.current?.querySelectorAll<HTMLButtonElement>("[data-toolbar-item]") ?? []).filter(inRow);
     const enabled = all.filter((el) => !el.disabled);
     const current = focus ?? enabled.find((el) => el.dataset.toolbarItem === rovingItemRef.current) ?? enabled[0];
     if (current) rovingItemRef.current = current.dataset.toolbarItem ?? null;
@@ -740,6 +791,36 @@ export function RichTextEditor({
     return !!stop && document.activeElement === stop;
   };
 
+  // One row: what doesn't fit goes behind "More formatting" (a wrapped
+  // second row took the body's room in a narrow composer).
+  const [foldCount, setFoldCount] = useState(0);
+  const [moreOpen, setMoreOpen] = useState(false);
+  const moreButtonRef = useRef<HTMLButtonElement>(null);
+  const moreWrapperRef = useRef<HTMLDivElement>(null);
+  const hasEditor = !!editor;
+  useLayoutEffect(() => {
+    const toolbar = toolbarRef.current;
+    if (!toolbar) return;
+    const measure = () => setFoldCount(measureFormattingToolbar(toolbar, !!rtlEditingSupport));
+    measure();
+    if (typeof ResizeObserver === "undefined") return;
+    const observer = new ResizeObserver(() => {
+      measure();
+      setMoreOpen(false);
+    });
+    observer.observe(toolbar);
+    return () => observer.disconnect();
+  }, [hasEditor, rtlEditingSupport]);
+
+  useEffect(() => {
+    if (!moreOpen) return;
+    const handler = (e: MouseEvent) => {
+      if (moreWrapperRef.current && !moreWrapperRef.current.contains(e.target as Node)) setMoreOpen(false);
+    };
+    document.addEventListener("mousedown", handler);
+    return () => document.removeEventListener("mousedown", handler);
+  }, [moreOpen]);
+
   useEffect(() => {
     if (!fontSizeMenuOpen) return;
     const handler = (e: MouseEvent) => {
@@ -799,6 +880,15 @@ export function RichTextEditor({
   const altTarget = findAltTarget(editor, altRequest);
   const imageSelected = editor.isActive("image");
 
+  // A group that doesn't fit renders in the "More formatting" panel instead, in row order.
+  const folded = new Set<FoldableGroup>(FOLDABLE_GROUPS.slice(0, foldCount).map((group) => group.id));
+  const overflow: React.ReactNode[] = [];
+  const place = (group: FoldableGroup, node: React.ReactNode) => {
+    if (!folded.has(group)) return node;
+    overflow.push(<React.Fragment key={group}>{node}</React.Fragment>);
+    return null;
+  };
+
   const onToolbarKeyDown = (e: React.KeyboardEvent<HTMLDivElement>) => {
     const target = e.target as HTMLElement;
     // Keys inside a popover are the popover's.
@@ -819,7 +909,7 @@ export function RichTextEditor({
   };
   const onToolbarFocus = (e: React.FocusEvent<HTMLDivElement>) => {
     const target = e.target as HTMLElement;
-    if (target instanceof HTMLButtonElement && target.hasAttribute("data-toolbar-item")) syncToolbarTabStops(target);
+    if (target instanceof HTMLButtonElement && target.hasAttribute("data-toolbar-item") && inRow(target)) syncToolbarTabStops(target);
   };
 
   const renderPalette = (current: string | null, apply: (color: string) => void, removeLabel: string, remove: () => void) => (
@@ -1084,6 +1174,7 @@ export function RichTextEditor({
 
         <ToolbarSeparator />
 
+        {place("headings", <>
         <ToolbarButton
           item="heading-1"
           pressed={editor.isActive("heading", { level: 1 })}
@@ -1102,6 +1193,7 @@ export function RichTextEditor({
         </ToolbarButton>
 
         <ToolbarSeparator />
+        </>)}
 
         <ToolbarButton
           item="bullet-list"
@@ -1119,6 +1211,7 @@ export function RichTextEditor({
         >
           <ListOrdered className="w-4 h-4" />
         </ToolbarButton>
+        {place("blocks", <>
         <ToolbarButton
           item="quote"
           pressed={editor.isActive("blockquote")}
@@ -1135,9 +1228,11 @@ export function RichTextEditor({
         >
           <Code className="w-4 h-4" />
         </ToolbarButton>
+        </>)}
 
         <ToolbarSeparator />
 
+        {place("align", <>
         <ToolbarButton
           item="align-left"
           pressed={editor.isActive({ textAlign: "left" })}
@@ -1181,6 +1276,7 @@ export function RichTextEditor({
         )}
 
         <ToolbarSeparator />
+        </>)}
 
         <ToolbarButton
           item="link"
@@ -1205,7 +1301,7 @@ export function RichTextEditor({
           </ToolbarButton>
         )}
 
-        <div ref={tableWrapperRef} className="relative">
+        {place("table", <div ref={tableWrapperRef} className="relative">
           <ToolbarButton
             ref={tableButtonRef}
             item="table"
@@ -1257,8 +1353,9 @@ export function RichTextEditor({
               </ToolbarPopover>
             )
           )}
-        </div>
+        </div>)}
 
+        {place("history", <>
         <ToolbarSeparator />
 
         <ToolbarButton
@@ -1287,6 +1384,35 @@ export function RichTextEditor({
         >
           <Redo className="w-4 h-4" />
         </ToolbarButton>
+        </>)}
+
+        {overflow.length > 0 && (
+          <div ref={moreWrapperRef} className="relative">
+            <ToolbarButton
+              ref={moreButtonRef}
+              item="more-formatting"
+              popup="dialog"
+              expanded={moreOpen}
+              onClick={() => setMoreOpen((v) => !v)}
+              title={tWindows("more_formatting")}
+            >
+              <Ellipsis className="w-4 h-4" />
+            </ToolbarButton>
+            {moreOpen && (
+              <ToolbarPopover
+                label={tWindows("more_formatting")}
+                role="dialog"
+                triggerRef={moreButtonRef}
+                onClose={() => setMoreOpen(false)}
+                className="p-1 flex w-max max-w-[16rem] flex-wrap items-center gap-0.5"
+              >
+                <div data-toolbar-more-panel="" className="contents">
+                  {overflow}
+                </div>
+              </ToolbarPopover>
+            )}
+          </div>
+        )}
       </div>
 
       {/* Editor */}
diff --git a/locales/ar/common.json b/locales/ar/common.json
index 5bf41a9d5..47150985b 100644
--- a/locales/ar/common.json
+++ b/locales/ar/common.json
@@ -7066,6 +7066,9 @@
     "types_character": "تكتب هذه المفاتيح حرفًا على لوحة مفاتيحك، وسيتوقف عن العمل في كل التطبيقات. جرّب مفاتيح أخرى.",
     "reserved": "يستخدم النظام أو معظم التطبيقات هذه المفاتيح. جرّب مفاتيح أخرى."
   },
+  "compose_windows": {
+    "more_formatting": "مزيد من التنسيق"
+  },
   "desktopReminders": {
     "generic_title": "تذكير",
     "snooze": "تأجيل {count} د",
diff --git a/locales/ca/common.json b/locales/ca/common.json
index eca36135b..ec7b404e9 100644
--- a/locales/ca/common.json
+++ b/locales/ca/common.json
@@ -7066,6 +7066,9 @@
     "types_character": "Aquestes tecles escriuen un caràcter al teu teclat, i deixaria de funcionar a totes les aplicacions. Prova altres tecles.",
     "reserved": "El sistema o la majoria d'aplicacions fan servir aquestes tecles. Prova altres tecles."
   },
+  "compose_windows": {
+    "more_formatting": "Més format"
+  },
   "desktopReminders": {
     "generic_title": "Recordatori",
     "snooze": "Posposa {count} min",
diff --git a/locales/cs/common.json b/locales/cs/common.json
index f1f5076dd..2201071a4 100644
--- a/locales/cs/common.json
+++ b/locales/cs/common.json
@@ -7066,6 +7066,9 @@
     "types_character": "Tyto klávesy na vaší klávesnici píší znak, který by pak nefungoval v žádné aplikaci. Zkuste jiné klávesy.",
     "reserved": "Tyto klávesy používá systém nebo většina aplikací. Zkuste jiné klávesy."
   },
+  "compose_windows": {
+    "more_formatting": "Další formátování"
+  },
   "desktopReminders": {
     "generic_title": "Připomenutí",
     "snooze": "Odložit o {count} min",
diff --git a/locales/da/common.json b/locales/da/common.json
index 7461d652b..9c2068085 100644
--- a/locales/da/common.json
+++ b/locales/da/common.json
@@ -7066,6 +7066,9 @@
     "types_character": "Disse taster skriver et tegn på dit tastatur, og det ville holde op med at virke i alle apps. Prøv andre taster.",
     "reserved": "Dit system eller de fleste apps bruger disse taster. Prøv andre taster."
   },
+  "compose_windows": {
+    "more_formatting": "Mere formatering"
+  },
   "desktopReminders": {
     "generic_title": "Påmindelse",
     "snooze": "Udsæt {count} min.",
diff --git a/locales/de/common.json b/locales/de/common.json
index 31d15c0ed..eb87601a1 100644
--- a/locales/de/common.json
+++ b/locales/de/common.json
@@ -7066,6 +7066,9 @@
     "types_character": "Diese Tasten erzeugen auf Ihrer Tastatur ein Zeichen, das dann in keiner App mehr funktionieren würde. Versuchen Sie andere Tasten.",
     "reserved": "Ihr System oder die meisten Apps verwenden diese Tasten. Versuchen Sie andere Tasten."
   },
+  "compose_windows": {
+    "more_formatting": "Weitere Formatierung"
+  },
   "desktopReminders": {
     "generic_title": "Erinnerung",
     "snooze": "{count} Min. schlummern",
diff --git a/locales/en/common.json b/locales/en/common.json
index e0491ee32..df18634ac 100644
--- a/locales/en/common.json
+++ b/locales/en/common.json
@@ -7066,6 +7066,9 @@
     "types_character": "These keys type a character on your keyboard, and it would stop working in every app. Try other keys.",
     "reserved": "Your system or most apps use these keys. Try other keys."
   },
+  "compose_windows": {
+    "more_formatting": "More formatting"
+  },
   "desktopReminders": {
     "generic_title": "Reminder",
     "snooze": "Snooze {count} min",
diff --git a/locales/es/common.json b/locales/es/common.json
index 1050f0f56..4fdecd792 100644
--- a/locales/es/common.json
+++ b/locales/es/common.json
@@ -7066,6 +7066,9 @@
     "types_character": "Estas teclas escriben un carácter en tu teclado, y dejaría de funcionar en todas las aplicaciones. Prueba otras teclas.",
     "reserved": "Tu sistema o la mayoría de las aplicaciones usan estas teclas. Prueba otras teclas."
   },
+  "compose_windows": {
+    "more_formatting": "Más formato"
+  },
   "desktopReminders": {
     "generic_title": "Recordatorio",
     "snooze": "Posponer {count} min",
diff --git a/locales/et/common.json b/locales/et/common.json
index df425b8bd..cde6d1575 100644
--- a/locales/et/common.json
+++ b/locales/et/common.json
@@ -7066,6 +7066,9 @@
     "types_character": "Need klahvid kirjutavad teie klaviatuuril märgi, mis lakkaks kõigis rakendustes töötamast. Proovige teisi klahve.",
     "reserved": "Neid klahve kasutab süsteem või enamik rakendusi. Proovige teisi klahve."
   },
+  "compose_windows": {
+    "more_formatting": "Rohkem vormindust"
+  },
   "desktopReminders": {
     "generic_title": "Meeldetuletus",
     "snooze": "Lükka {count} min edasi",
diff --git a/locales/fa/common.json b/locales/fa/common.json
index bf242d98d..fead83ed0 100644
--- a/locales/fa/common.json
+++ b/locales/fa/common.json
@@ -7066,6 +7066,9 @@
     "types_character": "این کلیدها روی صفحه‌کلید شما نویسه‌ای می‌نویسند و آن نویسه دیگر در هیچ برنامه‌ای کار نمی‌کند. کلیدهای دیگری را امتحان کنید.",
     "reserved": "سیستم یا بیشتر برنامه‌ها از این کلیدها استفاده می‌کنند. کلیدهای دیگری را امتحان کنید."
   },
+  "compose_windows": {
+    "more_formatting": "قالب‌بندی بیشتر"
+  },
   "desktopReminders": {
     "generic_title": "یادآوری",
     "snooze": "تعویق {count} دقیقه",
diff --git a/locales/fr/common.json b/locales/fr/common.json
index 03545491c..2405729a9 100644
--- a/locales/fr/common.json
+++ b/locales/fr/common.json
@@ -7066,6 +7066,9 @@
     "types_character": "Ces touches produisent un caractère sur votre clavier, et il ne fonctionnerait plus dans aucune application. Essayez d'autres touches.",
     "reserved": "Votre système ou la plupart des applications utilisent ces touches. Essayez d'autres touches."
   },
+  "compose_windows": {
+    "more_formatting": "Plus de mise en forme"
+  },
   "desktopReminders": {
     "generic_title": "Rappel",
     "snooze": "Reporter de {count} min",
diff --git a/locales/he/common.json b/locales/he/common.json
index f8258a747..f3c8a59bb 100644
--- a/locales/he/common.json
+++ b/locales/he/common.json
@@ -7067,6 +7067,9 @@
     "types_character": "המקשים האלה מקלידים תו במקלדת שלכם, והוא יפסיק לעבוד בכל האפליקציות. נסו מקשים אחרים.",
     "reserved": "המערכת או רוב האפליקציות משתמשות במקשים האלה. נסו מקשים אחרים."
   },
+  "compose_windows": {
+    "more_formatting": "עוד עיצוב"
+  },
   "desktopReminders": {
     "generic_title": "תזכורת",
     "snooze": "דחייה ב-{count} דק'",
diff --git a/locales/hu/common.json b/locales/hu/common.json
index bd65a8ec0..52ce79571 100644
--- a/locales/hu/common.json
+++ b/locales/hu/common.json
@@ -7066,6 +7066,9 @@
     "types_character": "Ezek a billentyűk karaktert írnak az Ön billentyűzetén, amely többé egyik alkalmazásban sem működne. Próbáljon más billentyűket.",
     "reserved": "Ezeket a billentyűket a rendszer vagy a legtöbb alkalmazás használja. Próbáljon más billentyűket."
   },
+  "compose_windows": {
+    "more_formatting": "További formázás"
+  },
   "desktopReminders": {
     "generic_title": "Emlékeztető",
     "snooze": "Halasztás {count} perccel",
diff --git a/locales/it/common.json b/locales/it/common.json
index b79013a3a..7fbfffd54 100644
--- a/locales/it/common.json
+++ b/locales/it/common.json
@@ -7066,6 +7066,9 @@
     "types_character": "Questi tasti scrivono un carattere sulla tua tastiera, che smetterebbe di funzionare in tutte le app. Prova altri tasti.",
     "reserved": "Il sistema o la maggior parte delle app usano questi tasti. Prova altri tasti."
   },
+  "compose_windows": {
+    "more_formatting": "Altre opzioni di formattazione"
+  },
   "desktopReminders": {
     "generic_title": "Promemoria",
     "snooze": "Rimanda di {count} min",
diff --git a/locales/ja/common.json b/locales/ja/common.json
index 0fc511808..7e2153f1e 100644
--- a/locales/ja/common.json
+++ b/locales/ja/common.json
@@ -7066,6 +7066,9 @@
     "types_character": "このキーはお使いのキーボードで文字を入力します。割り当てると、すべてのアプリでその文字を入力できなくなります。別のキーをお試しください。",
     "reserved": "このキーはシステムまたは多くのアプリが使用しています。別のキーをお試しください。"
   },
+  "compose_windows": {
+    "more_formatting": "その他の書式"
+  },
   "desktopReminders": {
     "generic_title": "リマインダー",
     "snooze": "{count} 分後に再通知",
diff --git a/locales/ko/common.json b/locales/ko/common.json
index 21bc7b936..184b4c591 100644
--- a/locales/ko/common.json
+++ b/locales/ko/common.json
@@ -7066,6 +7066,9 @@
     "types_character": "이 키는 사용 중인 키보드에서 문자를 입력하며, 지정하면 모든 앱에서 그 문자를 입력할 수 없게 됩니다. 다른 키를 사용해 보세요.",
     "reserved": "시스템 또는 대부분의 앱이 이 키를 사용합니다. 다른 키를 사용해 보세요."
   },
+  "compose_windows": {
+    "more_formatting": "추가 서식"
+  },
   "desktopReminders": {
     "generic_title": "알림",
     "snooze": "{count}분 후 다시 알림",
diff --git a/locales/lv/common.json b/locales/lv/common.json
index 2958f811c..53457abe5 100644
--- a/locales/lv/common.json
+++ b/locales/lv/common.json
@@ -7066,6 +7066,9 @@
     "types_character": "Šie taustiņi jūsu tastatūrā raksta rakstzīmi, kas pārstātu darboties visās lietotnēs. Izmēģiniet citus taustiņus.",
     "reserved": "Šos taustiņus izmanto sistēma vai lielākā daļa lietotņu. Izmēģiniet citus taustiņus."
   },
+  "compose_windows": {
+    "more_formatting": "Vairāk formatēšanas"
+  },
   "desktopReminders": {
     "generic_title": "Atgādinājums",
     "snooze": "Atlikt par {count} min",
diff --git a/locales/mn/common.json b/locales/mn/common.json
index 57128748e..1d6eefc33 100644
--- a/locales/mn/common.json
+++ b/locales/mn/common.json
@@ -7066,6 +7066,9 @@
     "types_character": "Эдгээр товч таны гар дээр тэмдэгт бичдэг тул тэр тэмдэгт бүх аппад ажиллахаа болино. Өөр товч туршина уу.",
     "reserved": "Систем эсвэл ихэнх апп эдгээр товчийг ашигладаг. Өөр товч туршина уу."
   },
+  "compose_windows": {
+    "more_formatting": "Бусад хэлбэржүүлэлт"
+  },
   "desktopReminders": {
     "generic_title": "Сануулга",
     "snooze": "{count} минут хойшлуулах",
diff --git a/locales/nb/common.json b/locales/nb/common.json
index 27c9f7642..9952353ed 100644
--- a/locales/nb/common.json
+++ b/locales/nb/common.json
@@ -7066,6 +7066,9 @@
     "types_character": "Disse tastene skriver et tegn på tastaturet ditt, og det ville slutte å virke i alle apper. Prøv andre taster.",
     "reserved": "Systemet ditt eller de fleste apper bruker disse tastene. Prøv andre taster."
   },
+  "compose_windows": {
+    "more_formatting": "Mer formatering"
+  },
   "desktopReminders": {
     "generic_title": "Påminnelse",
     "snooze": "Utsett {count} min",
diff --git a/locales/nl/common.json b/locales/nl/common.json
index 69e5afbcc..8a57c3d58 100644
--- a/locales/nl/common.json
+++ b/locales/nl/common.json
@@ -7066,6 +7066,9 @@
     "types_character": "Deze toetsen typen een teken op je toetsenbord, en dat zou in geen enkele app meer werken. Probeer andere toetsen.",
     "reserved": "Je systeem of de meeste apps gebruiken deze toetsen. Probeer andere toetsen."
   },
+  "compose_windows": {
+    "more_formatting": "Meer opmaak"
+  },
   "desktopReminders": {
     "generic_title": "Herinnering",
     "snooze": "{count} min uitstellen",
diff --git a/locales/pl/common.json b/locales/pl/common.json
index 35e69ac26..7c63c556d 100644
--- a/locales/pl/common.json
+++ b/locales/pl/common.json
@@ -7066,6 +7066,9 @@
     "types_character": "Te klawisze wpisują znak na Twojej klawiaturze i przestałby on działać we wszystkich aplikacjach. Wypróbuj inne klawisze.",
     "reserved": "Te klawisze są używane przez system lub większość aplikacji. Wypróbuj inne klawisze."
   },
+  "compose_windows": {
+    "more_formatting": "Więcej formatowania"
+  },
   "desktopReminders": {
     "generic_title": "Przypomnienie",
     "snooze": "Odłóż o {count} min",
diff --git a/locales/pt/common.json b/locales/pt/common.json
index 7a094b8ea..784fe41f3 100644
--- a/locales/pt/common.json
+++ b/locales/pt/common.json
@@ -7066,6 +7066,9 @@
     "types_character": "Estas teclas escrevem um carácter no seu teclado, e ele deixaria de funcionar em todas as aplicações. Experimente outras teclas.",
     "reserved": "O seu sistema ou a maioria das aplicações usam estas teclas. Experimente outras teclas."
   },
+  "compose_windows": {
+    "more_formatting": "Mais formatação"
+  },
   "desktopReminders": {
     "generic_title": "Lembrete",
     "snooze": "Adiar {count} min",
diff --git a/locales/ro/common.json b/locales/ro/common.json
index 1c3d817ce..859167031 100644
--- a/locales/ro/common.json
+++ b/locales/ro/common.json
@@ -7066,6 +7066,9 @@
     "types_character": "Aceste taste scriu un caracter pe tastatura ta, iar el n-ar mai funcționa în nicio aplicație. Încearcă alte taste.",
     "reserved": "Sistemul sau majoritatea aplicațiilor folosesc aceste taste. Încearcă alte taste."
   },
+  "compose_windows": {
+    "more_formatting": "Mai multe opțiuni de formatare"
+  },
   "desktopReminders": {
     "generic_title": "Memento",
     "snooze": "Amână {count} min",
diff --git a/locales/ru/common.json b/locales/ru/common.json
index c5c112ea2..a69ddb27f 100644
--- a/locales/ru/common.json
+++ b/locales/ru/common.json
@@ -7066,6 +7066,9 @@
     "types_character": "На вашей клавиатуре эти клавиши вводят символ, и он перестал бы работать во всех приложениях. Попробуйте другие клавиши.",
     "reserved": "Эти клавиши использует система или большинство приложений. Попробуйте другие клавиши."
   },
+  "compose_windows": {
+    "more_formatting": "Дополнительное форматирование"
+  },
   "desktopReminders": {
     "generic_title": "Напоминание",
     "snooze": "Отложить на {count} мин",
diff --git a/locales/sk/common.json b/locales/sk/common.json
index 81d50e05d..a2d4e899d 100644
--- a/locales/sk/common.json
+++ b/locales/sk/common.json
@@ -7066,6 +7066,9 @@
     "types_character": "Tieto klávesy na vašej klávesnici píšu znak, ktorý by potom nefungoval v žiadnej aplikácii. Skúste iné klávesy.",
     "reserved": "Tieto klávesy používa systém alebo väčšina aplikácií. Skúste iné klávesy."
   },
+  "compose_windows": {
+    "more_formatting": "Ďalšie formátovanie"
+  },
   "desktopReminders": {
     "generic_title": "Pripomienka",
     "snooze": "Odložiť o {count} min",
diff --git a/locales/th/common.json b/locales/th/common.json
index c34c371f1..0f75e53a6 100644
--- a/locales/th/common.json
+++ b/locales/th/common.json
@@ -7074,6 +7074,9 @@
     "types_character": "ปุ่มเหล่านี้พิมพ์อักขระบนแป้นพิมพ์ของคุณ และอักขระนั้นจะใช้ไม่ได้ในทุกแอป ลองใช้ปุ่มอื่น",
     "reserved": "ระบบหรือแอปส่วนใหญ่ใช้ปุ่มเหล่านี้ ลองใช้ปุ่มอื่น"
   },
+  "compose_windows": {
+    "more_formatting": "การจัดรูปแบบเพิ่มเติม"
+  },
   "desktopReminders": {
     "generic_title": "การแจ้งเตือน",
     "snooze": "เลื่อน {count} นาที",
diff --git a/locales/tr/common.json b/locales/tr/common.json
index 43380e45c..6b6e6b1d6 100644
--- a/locales/tr/common.json
+++ b/locales/tr/common.json
@@ -7066,6 +7066,9 @@
     "types_character": "Bu tuşlar klavyenizde bir karakter yazar ve bu karakter hiçbir uygulamada çalışmaz olur. Başka tuşlar deneyin.",
     "reserved": "Bu tuşları sisteminiz veya çoğu uygulama kullanıyor. Başka tuşlar deneyin."
   },
+  "compose_windows": {
+    "more_formatting": "Daha fazla biçimlendirme"
+  },
   "desktopReminders": {
     "generic_title": "Anımsatıcı",
     "snooze": "{count} dk ertele",
diff --git a/locales/uk/common.json b/locales/uk/common.json
index d8d7ecf49..9fce99633 100644
--- a/locales/uk/common.json
+++ b/locales/uk/common.json
@@ -7066,6 +7066,9 @@
     "types_character": "На вашій клавіатурі ці клавіші вводять символ, і він перестав би працювати в усіх застосунках. Спробуйте інші клавіші.",
     "reserved": "Ці клавіші використовує система або більшість застосунків. Спробуйте інші клавіші."
   },
+  "compose_windows": {
+    "more_formatting": "Додаткове форматування"
+  },
   "desktopReminders": {
     "generic_title": "Нагадування",
     "snooze": "Відкласти на {count} хв",
diff --git a/locales/vi/common.json b/locales/vi/common.json
index ccb97537d..73d2113ab 100644
--- a/locales/vi/common.json
+++ b/locales/vi/common.json
@@ -7078,6 +7078,9 @@
     "types_character": "Các phím này gõ một ký tự trên bàn phím của bạn, và ký tự đó sẽ không dùng được trong mọi ứng dụng. Hãy thử phím khác.",
     "reserved": "Hệ thống hoặc hầu hết ứng dụng dùng các phím này. Hãy thử phím khác."
   },
+  "compose_windows": {
+    "more_formatting": "Thêm định dạng"
+  },
   "desktopReminders": {
     "generic_title": "Lời nhắc",
     "snooze": "Báo lại sau {count} phút",
diff --git a/locales/zh-TW/common.json b/locales/zh-TW/common.json
index 3bc47f02b..599c9c3b5 100644
--- a/locales/zh-TW/common.json
+++ b/locales/zh-TW/common.json
@@ -7066,6 +7066,9 @@
     "types_character": "這些鍵在您的鍵盤上會輸入一個字元，占用後該字元在所有應用程式中都無法輸入。請試試其他按鍵。",
     "reserved": "系統或大多數應用程式正在使用這些鍵。請試試其他按鍵。"
   },
+  "compose_windows": {
+    "more_formatting": "更多格式"
+  },
   "desktopReminders": {
     "generic_title": "提醒",
     "snooze": "{count} 分鐘後再提醒",
diff --git a/locales/zh/common.json b/locales/zh/common.json
index d4646cf11..d558b39e7 100644
--- a/locales/zh/common.json
+++ b/locales/zh/common.json
@@ -7066,6 +7066,9 @@
     "types_character": "这些键在您的键盘上会输入一个字符，占用后该字符在所有应用中都无法输入。请试试其他按键。",
     "reserved": "系统或大多数应用在使用这些键。请试试其他按键。"
   },
+  "compose_windows": {
+    "more_formatting": "更多格式"
+  },
   "desktopReminders": {
     "generic_title": "提醒",
     "snooze": "{count} 分钟后再提醒",

From 80321e21a2d678d2bf48ff211ce57e35fb07122c Mon Sep 17 00:00:00 2001
From: Linus Rath <139418639+rathlinus@users.noreply.github.com>
Date: Wed, 4 Nov 2026 06:26:28 +0100
Subject: [PATCH 08/34] fix: explain replying from the received address in
 plain words

The admin-locks test finds the row by its label key, which moved to the
compose_words namespace with the new description.
---
 .../composing-settings-locks.test.tsx         |  2 +-
 .../composing-settings-words.test.tsx         | 41 +++++++++++++++++++
 components/settings/composing-settings.tsx    |  2 +-
 lib/settings-schema.ts                        |  2 +-
 lib/settings-search.ts                        |  2 +-
 locales/ar/common.json                        |  4 ++
 locales/ca/common.json                        |  4 ++
 locales/cs/common.json                        |  4 ++
 locales/da/common.json                        |  4 ++
 locales/de/common.json                        |  4 ++
 locales/en/common.json                        |  4 ++
 locales/es/common.json                        |  4 ++
 locales/et/common.json                        |  4 ++
 locales/fa/common.json                        |  4 ++
 locales/fr/common.json                        |  4 ++
 locales/he/common.json                        |  4 ++
 locales/hu/common.json                        |  4 ++
 locales/it/common.json                        |  4 ++
 locales/ja/common.json                        |  4 ++
 locales/ko/common.json                        |  4 ++
 locales/lv/common.json                        |  4 ++
 locales/mn/common.json                        |  4 ++
 locales/nb/common.json                        |  4 ++
 locales/nl/common.json                        |  4 ++
 locales/pl/common.json                        |  4 ++
 locales/pt/common.json                        |  4 ++
 locales/ro/common.json                        |  4 ++
 locales/ru/common.json                        |  4 ++
 locales/sk/common.json                        |  4 ++
 locales/th/common.json                        |  4 ++
 locales/tr/common.json                        |  4 ++
 locales/uk/common.json                        |  4 ++
 locales/vi/common.json                        |  4 ++
 locales/zh-TW/common.json                     |  4 ++
 locales/zh/common.json                        |  4 ++
 35 files changed, 165 insertions(+), 4 deletions(-)
 create mode 100644 components/settings/__tests__/composing-settings-words.test.tsx

diff --git a/components/settings/__tests__/composing-settings-locks.test.tsx b/components/settings/__tests__/composing-settings-locks.test.tsx
index 7dfd0d3dc..a2eb5281c 100644
--- a/components/settings/__tests__/composing-settings-locks.test.tsx
+++ b/components/settings/__tests__/composing-settings-locks.test.tsx
@@ -21,7 +21,7 @@ vi.mock('../settings-section', async (importOriginal) => ({
 
 const ROWS = {
   plainTextMode: 'plain_text_mode.label',
-  autoSelectReplyIdentity: 'auto_select_reply_identity.label',
+  autoSelectReplyIdentity: 'reply_from_received.label',
   replyIdentityMatch: 'reply_identity_match.label',
 } as const;
 
diff --git a/components/settings/__tests__/composing-settings-words.test.tsx b/components/settings/__tests__/composing-settings-words.test.tsx
new file mode 100644
index 000000000..1b17010f7
--- /dev/null
+++ b/components/settings/__tests__/composing-settings-words.test.tsx
@@ -0,0 +1,41 @@
+import { render, screen } from '@testing-library/react';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+import { ComposingSettings } from '../composing-settings';
+import { useSettingsStore } from '@/stores/settings-store';
+import { useAuthStore } from '@/stores/auth-store';
+import en from '@/locales/en/common.json';
+
+// "Reply from the address it was sent to" explained catch-all matching,
+// which belongs to the row below it. The row now says what it does and
+// when it helps.
+
+vi.mock('next-intl', () => ({
+  useTranslations: () => (key: string) => key,
+  useLocale: () => 'en',
+}));
+
+vi.mock('../settings-section', async (importOriginal) => ({
+  ...(await importOriginal<typeof import('../settings-section')>()),
+  SettingsSection: ({ children }: { children: React.ReactNode }) => <div>{children}</div>,
+}));
+
+describe('ComposingSettings wording', () => {
+  beforeEach(() => {
+    useSettingsStore.getState().resetToDefaults();
+    useAuthStore.setState({ client: null });
+  });
+
+  it('describes replying from the received address without the catch-all note', () => {
+    render(<ComposingSettings />);
+    expect(screen.getByText('reply_from_received.description')).toBeTruthy();
+    expect(screen.queryByText('auto_select_reply_identity.description')).toBeNull();
+    expect(en.compose_words.reply_from_received.description).not.toMatch(/catch-all|Received Address Matching/i);
+  });
+
+  it('calls the send delay "Undo send"', () => {
+    render(<ComposingSettings />);
+    expect(screen.getByText('undo_send.label')).toBeTruthy();
+    expect(screen.queryByText('send_delay.label')).toBeNull();
+    expect(en.compose_words.undo_send.label).toBe('Undo send');
+  });
+});
diff --git a/components/settings/composing-settings.tsx b/components/settings/composing-settings.tsx
index b4be22dc7..c804790bc 100644
--- a/components/settings/composing-settings.tsx
+++ b/components/settings/composing-settings.tsx
@@ -104,7 +104,7 @@ export function ComposingSettings() {
         </SettingItem>
 
         {!isSettingHidden('autoSelectReplyIdentity') && (
-        <SettingItem label={t('auto_select_reply_identity.label')} description={t('auto_select_reply_identity.description')} locked={isSettingLocked('autoSelectReplyIdentity')}>
+        <SettingItem label={tWords('reply_from_received.label')} description={tWords('reply_from_received.description')} locked={isSettingLocked('autoSelectReplyIdentity')}>
           <ToggleSwitch
             checked={autoSelectReplyIdentity}
             onChange={(checked) => updateSetting('autoSelectReplyIdentity', checked)}
diff --git a/lib/settings-schema.ts b/lib/settings-schema.ts
index 5773e2048..0c1df52b5 100644
--- a/lib/settings-schema.ts
+++ b/lib/settings-schema.ts
@@ -272,7 +272,7 @@ const ENTRIES: SettingSchemaEntry[] = [
     opts(`${EB}mention_adds_recipient.`, ['to', 'cc', 'off'])),
   bool('rtlEditingSupport', 'composing', `${EB}rtl_editing.label`),
   bool('quickReplyEnabled', 'composing', `${EB}quick_reply.label`),
-  bool('autoSelectReplyIdentity', 'composing', `${EB}auto_select_reply_identity.label`),
+  bool('autoSelectReplyIdentity', 'composing', 'compose_words.reply_from_received.label'),
   // The page shows it only while the composer may rewrite From.
   choice('replyIdentityMatch', 'composing', `${EB}reply_identity_match.label`,
     opts(`${EB}reply_identity_match.`, ['exact', 'domain']), { gate: 'customFromEnabled' }),
diff --git a/lib/settings-search.ts b/lib/settings-search.ts
index b1d8ea701..5ad03149a 100644
--- a/lib/settings-search.ts
+++ b/lib/settings-search.ts
@@ -250,7 +250,7 @@ export const tabSearchEntries: Record<Tab, SettingsSearchEntry[]> = {
     { label: 'proofreading.settings.writing_language' },
     { label: 'settings.composing_page.sections.replying' },
     { label: 'settings.email_behavior.quick_reply.label' },
-    { label: 'settings.email_behavior.auto_select_reply_identity.label' },
+    { label: 'compose_words.reply_from_received.label' },
     { label: 'settings.email_behavior.signature_position.label' },
     { label: 'settings.email_behavior.signature_new_mail.label' },
     { label: 'settings.email_behavior.signature_reply_forward.label' },
diff --git a/locales/ar/common.json b/locales/ar/common.json
index aa4b6e34b..3554362e3 100644
--- a/locales/ar/common.json
+++ b/locales/ar/common.json
@@ -6388,6 +6388,10 @@
     "undo_send": {
       "label": "التراجع عن الإرسال",
       "description": "يمنحك بضع ثوانٍ لاسترجاع الرسالة بعد الضغط على إرسال."
+    },
+    "reply_from_received": {
+      "label": "الرد من العنوان المستلَم إليه",
+      "description": "الرد من العنوان الذي أُرسلت إليه الرسالة. مفيد إذا كانت لديك عدة عناوين."
     }
   },
   "plugin_list": {
diff --git a/locales/ca/common.json b/locales/ca/common.json
index a70f2df8d..3c756c200 100644
--- a/locales/ca/common.json
+++ b/locales/ca/common.json
@@ -6388,6 +6388,10 @@
     "undo_send": {
       "label": "Desfés l'enviament",
       "description": "Us dona uns segons per recuperar un missatge després de prémer Envia."
+    },
+    "reply_from_received": {
+      "label": "Respon des de l'adreça de recepció",
+      "description": "Respon des de l'adreça a la qual es va enviar el correu. Útil si teniu diverses adreces."
     }
   },
   "plugin_list": {
diff --git a/locales/cs/common.json b/locales/cs/common.json
index 9275aea8c..20bd5cb05 100644
--- a/locales/cs/common.json
+++ b/locales/cs/common.json
@@ -6388,6 +6388,10 @@
     "undo_send": {
       "label": "Vrátit odeslání",
       "description": "Dává vám několik sekund na to, abyste zprávu po stisknutí Odeslat vzali zpět."
+    },
+    "reply_from_received": {
+      "label": "Automaticky vybírat adresu pro odpověď",
+      "description": "Odpovídat z adresy, na kterou zpráva přišla. Hodí se, pokud máte více adres."
     }
   },
   "plugin_list": {
diff --git a/locales/da/common.json b/locales/da/common.json
index cd5076687..1c2118e3a 100644
--- a/locales/da/common.json
+++ b/locales/da/common.json
@@ -6388,6 +6388,10 @@
     "undo_send": {
       "label": "Fortryd afsendelse",
       "description": "Giver dig et par sekunder til at tage en besked tilbage, efter du har trykket på Send."
+    },
+    "reply_from_received": {
+      "label": "Svar fra modtaget adresse",
+      "description": "Svar fra den adresse, mailen blev sendt til. Nyttigt, hvis du har flere adresser."
     }
   },
   "plugin_list": {
diff --git a/locales/de/common.json b/locales/de/common.json
index d881a451c..77323e258 100644
--- a/locales/de/common.json
+++ b/locales/de/common.json
@@ -6388,6 +6388,10 @@
     "undo_send": {
       "label": "Senden rückgängig machen",
       "description": "Gibt Ihnen ein paar Sekunden, um eine Nachricht nach dem Klick auf Senden zurückzuholen."
+    },
+    "reply_from_received": {
+      "label": "Antwortadresse automatisch wählen",
+      "description": "Die Antwort geht von der Adresse aus, an die die E-Mail ging. Nützlich, wenn Sie mehrere Adressen haben."
     }
   },
   "plugin_list": {
diff --git a/locales/en/common.json b/locales/en/common.json
index 287ef7a97..465dca018 100644
--- a/locales/en/common.json
+++ b/locales/en/common.json
@@ -6388,6 +6388,10 @@
     "undo_send": {
       "label": "Undo send",
       "description": "Gives you a few seconds to take a message back after you press Send."
+    },
+    "reply_from_received": {
+      "label": "Reply from the address it was sent to",
+      "description": "Reply from the address the mail was sent to. Useful if you have several addresses."
     }
   },
   "plugin_list": {
diff --git a/locales/es/common.json b/locales/es/common.json
index 8004e3917..650e646a1 100644
--- a/locales/es/common.json
+++ b/locales/es/common.json
@@ -6388,6 +6388,10 @@
     "undo_send": {
       "label": "Deshacer envío",
       "description": "Le da unos segundos para recuperar un mensaje después de pulsar Enviar."
+    },
+    "reply_from_received": {
+      "label": "Seleccionar dirección de respuesta automáticamente",
+      "description": "Responder desde la dirección a la que se envió el correo. Útil si tiene varias direcciones."
     }
   },
   "plugin_list": {
diff --git a/locales/et/common.json b/locales/et/common.json
index 4455842c1..8224fd630 100644
--- a/locales/et/common.json
+++ b/locales/et/common.json
@@ -6388,6 +6388,10 @@
     "undo_send": {
       "label": "Saatmise tühistamine",
       "description": "Annab sulle pärast Saada vajutamist mõne sekundi, et kiri tagasi võtta."
+    },
+    "reply_from_received": {
+      "label": "Vasta kirja saanud aadressilt",
+      "description": "Vasta aadressilt, kuhu kiri saadeti. Kasulik, kui sul on mitu aadressi."
     }
   },
   "plugin_list": {
diff --git a/locales/fa/common.json b/locales/fa/common.json
index e7e78d762..fff0e36aa 100644
--- a/locales/fa/common.json
+++ b/locales/fa/common.json
@@ -6388,6 +6388,10 @@
     "undo_send": {
       "label": "لغو ارسال",
       "description": "پس از زدن ارسال، چند ثانیه فرصت می‌دهد تا پیام را پس بگیرید."
+    },
+    "reply_from_received": {
+      "label": "پاسخ از آدرس دریافتی",
+      "description": "پاسخ از نشانی‌ای که نامه به آن فرستاده شده بود. اگر چند نشانی دارید مفید است."
     }
   },
   "plugin_list": {
diff --git a/locales/fr/common.json b/locales/fr/common.json
index 86156651d..58293cf34 100644
--- a/locales/fr/common.json
+++ b/locales/fr/common.json
@@ -6388,6 +6388,10 @@
     "undo_send": {
       "label": "Annuler l'envoi",
       "description": "Vous laisse quelques secondes pour reprendre un message après avoir cliqué sur Envoyer."
+    },
+    "reply_from_received": {
+      "label": "Sélection automatique de l'adresse de réponse",
+      "description": "Répondre depuis l'adresse à laquelle le message a été envoyé. Utile si vous avez plusieurs adresses."
     }
   },
   "plugin_list": {
diff --git a/locales/he/common.json b/locales/he/common.json
index 6953652ce..8d94cfcb4 100644
--- a/locales/he/common.json
+++ b/locales/he/common.json
@@ -6389,6 +6389,10 @@
     "undo_send": {
       "label": "ביטול שליחה",
       "description": "נותן לך כמה שניות להחזיר הודעה אחרי שלחצת על שלח."
+    },
+    "reply_from_received": {
+      "label": "בחירה אוטומטית בכתובת תשובה",
+      "description": "השב מהכתובת שאליה נשלח הדואר. שימושי אם יש לך כמה כתובות."
     }
   },
   "plugin_list": {
diff --git a/locales/hu/common.json b/locales/hu/common.json
index 534eec4cb..458d6c725 100644
--- a/locales/hu/common.json
+++ b/locales/hu/common.json
@@ -6388,6 +6388,10 @@
     "undo_send": {
       "label": "Küldés visszavonása",
       "description": "A Küldés megnyomása után néhány másodpercet ad az üzenet visszavonására."
+    },
+    "reply_from_received": {
+      "label": "Válasz a fogadott címről",
+      "description": "Válasz arról a címről, amelyre a levél érkezett. Hasznos, ha több címe van."
     }
   },
   "plugin_list": {
diff --git a/locales/it/common.json b/locales/it/common.json
index f7cdeb69d..bd0ad832a 100644
--- a/locales/it/common.json
+++ b/locales/it/common.json
@@ -6388,6 +6388,10 @@
     "undo_send": {
       "label": "Annulla invio",
       "description": "Ti dà qualche secondo per riprendere un messaggio dopo aver premuto Invia."
+    },
+    "reply_from_received": {
+      "label": "Seleziona automaticamente l'indirizzo di risposta",
+      "description": "Rispondi dall'indirizzo a cui è stata inviata l'email. Utile se hai più indirizzi."
     }
   },
   "plugin_list": {
diff --git a/locales/ja/common.json b/locales/ja/common.json
index 6352c0c2e..7fcdb4d04 100644
--- a/locales/ja/common.json
+++ b/locales/ja/common.json
@@ -6388,6 +6388,10 @@
     "undo_send": {
       "label": "送信取り消し",
       "description": "送信を押した後、数秒間メッセージを取り消せます。"
+    },
+    "reply_from_received": {
+      "label": "返信元アドレスを自動選択",
+      "description": "メールの宛先になったアドレスから返信します。複数のアドレスがある場合に便利です。"
     }
   },
   "plugin_list": {
diff --git a/locales/ko/common.json b/locales/ko/common.json
index 3be04c536..a43e71e92 100644
--- a/locales/ko/common.json
+++ b/locales/ko/common.json
@@ -6388,6 +6388,10 @@
     "undo_send": {
       "label": "보내기 취소",
       "description": "보내기를 누른 후 몇 초 동안 메시지를 되돌릴 수 있습니다."
+    },
+    "reply_from_received": {
+      "label": "답장 시 보내는 사람 자동 선택",
+      "description": "메일을 받은 주소로 답장합니다. 주소가 여러 개일 때 유용합니다."
     }
   },
   "plugin_list": {
diff --git a/locales/lv/common.json b/locales/lv/common.json
index 2d99614c6..44a79e5a9 100644
--- a/locales/lv/common.json
+++ b/locales/lv/common.json
@@ -6388,6 +6388,10 @@
     "undo_send": {
       "label": "Atsaukt sūtīšanu",
       "description": "Dod jums dažas sekundes, lai pēc Sūtīt nospiešanas paņemtu ziņojumu atpakaļ."
+    },
+    "reply_from_received": {
+      "label": "Automātiski izvēlēties atbildes adresi",
+      "description": "Atbildēt no adreses, uz kuru vēstule tika nosūtīta. Noder, ja jums ir vairākas adreses."
     }
   },
   "plugin_list": {
diff --git a/locales/mn/common.json b/locales/mn/common.json
index e633fd898..1173ac93b 100644
--- a/locales/mn/common.json
+++ b/locales/mn/common.json
@@ -6388,6 +6388,10 @@
     "undo_send": {
       "label": "Илгээлтийг буцаах",
       "description": "Илгээх товчийг дарсны дараа мессежээ буцаах хэдэн секунд өгнө."
+    },
+    "reply_from_received": {
+      "label": "Хүлээн авсан хаягаас хариу бичих",
+      "description": "Захидал илгээгдсэн хаягаас хариу бичнэ. Олон хаягтай бол хэрэгтэй."
     }
   },
   "plugin_list": {
diff --git a/locales/nb/common.json b/locales/nb/common.json
index c1d848c1b..09160a027 100644
--- a/locales/nb/common.json
+++ b/locales/nb/common.json
@@ -6388,6 +6388,10 @@
     "undo_send": {
       "label": "Angre sending",
       "description": "Gir deg noen sekunder til å ta tilbake en melding etter at du har trykket Send."
+    },
+    "reply_from_received": {
+      "label": "Svar fra mottatt adresse",
+      "description": "Svar fra adressen e-posten ble sendt til. Nyttig hvis du har flere adresser."
     }
   },
   "plugin_list": {
diff --git a/locales/nl/common.json b/locales/nl/common.json
index edaf8141a..83c019f2e 100644
--- a/locales/nl/common.json
+++ b/locales/nl/common.json
@@ -6388,6 +6388,10 @@
     "undo_send": {
       "label": "Verzenden ongedaan maken",
       "description": "Geeft je een paar seconden om een bericht terug te halen nadat je op Verzenden hebt gedrukt."
+    },
+    "reply_from_received": {
+      "label": "Antwoordadres automatisch selecteren",
+      "description": "Antwoord vanaf het adres waar de mail naartoe is gestuurd. Handig als je meerdere adressen hebt."
     }
   },
   "plugin_list": {
diff --git a/locales/pl/common.json b/locales/pl/common.json
index 65ad39388..9d4185978 100644
--- a/locales/pl/common.json
+++ b/locales/pl/common.json
@@ -6388,6 +6388,10 @@
     "undo_send": {
       "label": "Cofnij wysyłkę",
       "description": "Daje kilka sekund na wycofanie wiadomości po naciśnięciu Wyślij."
+    },
+    "reply_from_received": {
+      "label": "Automatycznie wybieraj adres odpowiedzi",
+      "description": "Odpowiadaj z adresu, na który wysłano wiadomość. Przydatne, jeśli masz kilka adresów."
     }
   },
   "plugin_list": {
diff --git a/locales/pt/common.json b/locales/pt/common.json
index a61acd6ee..05c89d668 100644
--- a/locales/pt/common.json
+++ b/locales/pt/common.json
@@ -6388,6 +6388,10 @@
     "undo_send": {
       "label": "Desfazer envio",
       "description": "Dá alguns segundos para você recuperar uma mensagem depois de clicar em Enviar."
+    },
+    "reply_from_received": {
+      "label": "Selecionar automaticamente o endereço de resposta",
+      "description": "Responder do endereço para o qual o e-mail foi enviado. Útil se você tiver vários endereços."
     }
   },
   "plugin_list": {
diff --git a/locales/ro/common.json b/locales/ro/common.json
index 1728249f2..b07b5a184 100644
--- a/locales/ro/common.json
+++ b/locales/ro/common.json
@@ -6388,6 +6388,10 @@
     "undo_send": {
       "label": "Anulează trimiterea",
       "description": "Îți oferă câteva secunde să retragi un mesaj după ce apeși Trimite."
+    },
+    "reply_from_received": {
+      "label": "Răspunde de la adresa de la care a fost primit mesajul",
+      "description": "Răspunde de la adresa la care a fost trimis e-mailul. Util dacă ai mai multe adrese."
     }
   },
   "plugin_list": {
diff --git a/locales/ru/common.json b/locales/ru/common.json
index e1e631ac4..ad41eefb2 100644
--- a/locales/ru/common.json
+++ b/locales/ru/common.json
@@ -6388,6 +6388,10 @@
     "undo_send": {
       "label": "Отмена отправки",
       "description": "Даёт несколько секунд, чтобы вернуть письмо после нажатия «Отправить»."
+    },
+    "reply_from_received": {
+      "label": "Автоматически выбирать адрес для ответа",
+      "description": "Отвечать с адреса, на который пришло письмо. Удобно, если у вас несколько адресов."
     }
   },
   "plugin_list": {
diff --git a/locales/sk/common.json b/locales/sk/common.json
index 68f9fc879..ec18d119b 100644
--- a/locales/sk/common.json
+++ b/locales/sk/common.json
@@ -6388,6 +6388,10 @@
     "undo_send": {
       "label": "Vrátiť odoslanie",
       "description": "Dáva vám niekoľko sekúnd na to, aby ste správu po stlačení Odoslať vzali späť."
+    },
+    "reply_from_received": {
+      "label": "Odpovedať z prijatej adresy",
+      "description": "Odpovedať z adresy, na ktorú prišla správa. Hodí sa, ak máte viac adries."
     }
   },
   "plugin_list": {
diff --git a/locales/th/common.json b/locales/th/common.json
index c172e5bd5..a46a03907 100644
--- a/locales/th/common.json
+++ b/locales/th/common.json
@@ -3309,6 +3309,10 @@
     "undo_send": {
       "label": "ยกเลิกการส่ง",
       "description": "ให้เวลาคุณสองสามวินาทีเพื่อเรียกข้อความกลับหลังจากกดส่ง"
+    },
+    "reply_from_received": {
+      "label": "ตอบกลับจากที่อยู่ที่ได้รับ",
+      "description": "ตอบกลับจากที่อยู่ที่อีเมลถูกส่งมา มีประโยชน์หากคุณมีหลายที่อยู่"
     }
   },
   "plugin_list": {
diff --git a/locales/tr/common.json b/locales/tr/common.json
index de9c5d653..55f8ac366 100644
--- a/locales/tr/common.json
+++ b/locales/tr/common.json
@@ -6388,6 +6388,10 @@
     "undo_send": {
       "label": "Göndermeyi geri al",
       "description": "Gönder'e bastıktan sonra iletiyi geri almanız için birkaç saniye verir."
+    },
+    "reply_from_received": {
+      "label": "Yanıt Adresini Otomatik Seç",
+      "description": "Postanın gönderildiği adresten yanıtlayın. Birden çok adresiniz varsa kullanışlıdır."
     }
   },
   "plugin_list": {
diff --git a/locales/uk/common.json b/locales/uk/common.json
index 9c8f5634f..7d672778a 100644
--- a/locales/uk/common.json
+++ b/locales/uk/common.json
@@ -6388,6 +6388,10 @@
     "undo_send": {
       "label": "Скасувати надсилання",
       "description": "Дає кілька секунд, щоб повернути лист після натискання «Надіслати»."
+    },
+    "reply_from_received": {
+      "label": "Автоматичний вибір адреси для відповіді",
+      "description": "Відповідати з адреси, на яку надійшов лист. Зручно, якщо у вас кілька адрес."
     }
   },
   "plugin_list": {
diff --git a/locales/vi/common.json b/locales/vi/common.json
index f03718003..f48c8f8e7 100644
--- a/locales/vi/common.json
+++ b/locales/vi/common.json
@@ -6400,6 +6400,10 @@
     "undo_send": {
       "label": "Hoàn tác gửi",
       "description": "Cho bạn vài giây để lấy lại thư sau khi nhấn Gửi."
+    },
+    "reply_from_received": {
+      "label": "Trả lời bằng địa chỉ nhận thư",
+      "description": "Trả lời từ địa chỉ mà thư đã được gửi đến. Hữu ích nếu bạn có nhiều địa chỉ."
     }
   },
   "plugin_list": {
diff --git a/locales/zh-TW/common.json b/locales/zh-TW/common.json
index f10bfecdd..3ea326a1e 100644
--- a/locales/zh-TW/common.json
+++ b/locales/zh-TW/common.json
@@ -6388,6 +6388,10 @@
     "undo_send": {
       "label": "取消傳送",
       "description": "按下傳送後，給您幾秒鐘撤回郵件。"
+    },
+    "reply_from_received": {
+      "label": "使用收件地址回覆",
+      "description": "從郵件寄達的地址回覆。適合擁有多個地址時使用。"
     }
   },
   "plugin_list": {
diff --git a/locales/zh/common.json b/locales/zh/common.json
index ba262f0c1..937b1ba57 100644
--- a/locales/zh/common.json
+++ b/locales/zh/common.json
@@ -6388,6 +6388,10 @@
     "undo_send": {
       "label": "撤销发送",
       "description": "点击发送后，给您几秒钟时间撤回邮件。"
+    },
+    "reply_from_received": {
+      "label": "自动选择回复地址",
+      "description": "从邮件发往的地址回复。适合拥有多个地址的情况。"
     }
   },
   "plugin_list": {

From 4ec1c128f6d45cc8bd426486433b074fe2829ff6 Mon Sep 17 00:00:00 2001
From: Linus Rath <139418639+rathlinus@users.noreply.github.com>
Date: Wed, 4 Nov 2026 06:36:09 +0100
Subject: [PATCH 09/34] fix: warn about template fill-ins like [Name] before
 sending
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

A lone capitalised word in brackets now counts as a fill-in, so two
cases of ordinary text changed: the cross-language case uses lowercase
"[votre] [ваше]", and the broken word-list case uses "[Your name]", so
both still test what they were written for.
---
 lib/__tests__/placeholder-check.test.ts | 20 ++++++++++++++++++--
 lib/placeholder-check.ts                |  7 ++++++-
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/lib/__tests__/placeholder-check.test.ts b/lib/__tests__/placeholder-check.test.ts
index 9e3d52e3a..8cd351235 100644
--- a/lib/__tests__/placeholder-check.test.ts
+++ b/lib/__tests__/placeholder-check.test.ts
@@ -31,6 +31,22 @@ describe('findUnfilledPlaceholders', () => {
     expect(findUnfilledPlaceholders('', 'Treffpunkt: [ÜBERGABEORT]')).toEqual(['[ÜBERGABEORT]']);
   });
 
+  // A template's "Hi [Name]" went out unchanged: only capitals and
+  // "your/insert" prompts counted.
+  it('finds capitalised words in brackets that a template left to fill in', () => {
+    expect(findUnfilledPlaceholders('', ['Hi [Name],', '[Step] is done. Regards, [First Name] at [Company]. [Date]'].join('\n'), EN)).toEqual([
+      '[Name]',
+      '[Step]',
+      '[First Name]',
+      '[Company]',
+      '[Date]',
+    ]);
+  });
+
+  it('leaves longer bracketed phrases and links alone', () => {
+    expect(findUnfilledPlaceholders('', 'See [Chapter Four Part Two] and [Name](https://example.com).', EN)).toEqual([]);
+  });
+
   it('finds fill-ins that ask the sender to write something', () => {
     expect(findUnfilledPlaceholders('', 'Best regards,\n[Your Name]\n[Insert date]', EN)).toEqual([
       '[Your Name]',
@@ -94,7 +110,7 @@ describe('findUnfilledPlaceholders', () => {
 
   it('skips word lists that are not lists of strings', () => {
     const broken = [{ before: 'your' }, { before: [1, '', '-', null] }, null, { after: {} }] as unknown as PlaceholderWords[];
-    expect(findUnfilledPlaceholders('', '[Your Name] [TIME]', broken)).toEqual(['[TIME]']);
+    expect(findUnfilledPlaceholders('', '[Your name] [TIME]', broken)).toEqual(['[TIME]']);
   });
 
   it('finds the circles that stand in for a name in Japanese and Korean', () => {
@@ -104,7 +120,7 @@ describe('findUnfilledPlaceholders', () => {
   it('leaves bracketed words and headings in other languages alone', () => {
     const text = [
       '【重要】お知らせ 【通知】',
-      '[Votre] [Ваше] [您的]',
+      '[votre] [ваше] [您的]',
       'Le [ton] juste. Vote [tu].',
       'Siehe [Anlage 2] und [Kapitel 3].',
       'Termin: ○ und ◯.',
diff --git a/lib/placeholder-check.ts b/lib/placeholder-check.ts
index a428ef62a..87f8a0f11 100644
--- a/lib/placeholder-check.ts
+++ b/lib/placeholder-check.ts
@@ -10,6 +10,11 @@ const TEMPLATE_PLACEHOLDER = /\{\{\s*[\w.-]+\s*\}\}/g;
 // Markdown link.
 const CAPS_BRACKET = /\[[\p{Lu}\d][\p{Lu}\d _./-]{0,28}[\p{Lu}\d]\](?!\()/gu;
 
+// [Name], [Company], [First Name]: one to three capitalised words, the way
+// templates name a fill-in. A lowercase word ([Yours truly]) or a number
+// ([Anlage 2]) makes it ordinary text.
+const TITLE_BRACKET = /\[\p{Lu}[\p{Ll}'’-]+(?: \p{Lu}[\p{Ll}'’-]+){0,2}\](?!\()/gu;
+
 /**
  * The words that mark a fill-in in one language. They live in each locale
  * file under email_composer.placeholder_words, so a new translation brings
@@ -113,7 +118,7 @@ function collect(text: string, patterns: RegExp[]): Match[] {
  * to check (see PlaceholderWords).
  */
 export function findUnfilledPlaceholders(subject: string, bodyText: string, words: PlaceholderWords[] = []): string[] {
-  const bodyPatterns = [TEMPLATE_PLACEHOLDER, CAPS_BRACKET, CIRCLE_MARKER];
+  const bodyPatterns = [TEMPLATE_PLACEHOLDER, CAPS_BRACKET, TITLE_BRACKET, CIRCLE_MARKER];
   const prompt = promptBracketPattern(words);
   const unfinished = unfinishedWordPattern(words);
   if (prompt) bodyPatterns.push(prompt);

From 781013cc4410f1ae06ad936aed82a2719ecbac17 Mon Sep 17 00:00:00 2001
From: Linus Rath <139418639+rathlinus@users.noreply.github.com>
Date: Wed, 4 Nov 2026 06:41:51 +0100
Subject: [PATCH 10/34] feat: close the composer as soon as Send is pressed and
 show Sending, then Sent with View

---
 .../__tests__/composer-send-failed.test.tsx   | 238 ++++++++++++++++++
 components/email/email-composer.tsx           |  18 ++
 .../__tests__/send-closes-composer.test.tsx   | 156 ++++++++++++
 components/mail/mail-app.tsx                  |  36 ++-
 lib/outgoing/send-progress-toast.ts           |  48 ++++
 locales/ar/common.json                        |   5 +-
 locales/ca/common.json                        |   5 +-
 locales/cs/common.json                        |   5 +-
 locales/da/common.json                        |   5 +-
 locales/de/common.json                        |   5 +-
 locales/en/common.json                        |   5 +-
 locales/es/common.json                        |   5 +-
 locales/et/common.json                        |   5 +-
 locales/fa/common.json                        |   5 +-
 locales/fr/common.json                        |   5 +-
 locales/he/common.json                        |   5 +-
 locales/hu/common.json                        |   5 +-
 locales/it/common.json                        |   5 +-
 locales/ja/common.json                        |   5 +-
 locales/ko/common.json                        |   5 +-
 locales/lv/common.json                        |   5 +-
 locales/mn/common.json                        |   5 +-
 locales/nb/common.json                        |   5 +-
 locales/nl/common.json                        |   5 +-
 locales/pl/common.json                        |   5 +-
 locales/pt/common.json                        |   5 +-
 locales/ro/common.json                        |   5 +-
 locales/ru/common.json                        |   5 +-
 locales/sk/common.json                        |   5 +-
 locales/th/common.json                        |   5 +-
 locales/tr/common.json                        |   5 +-
 locales/uk/common.json                        |   5 +-
 locales/vi/common.json                        |   5 +-
 locales/zh-TW/common.json                     |   5 +-
 locales/zh/common.json                        |   5 +-
 .../email-store-send-list-loading.test.ts     |  43 ++++
 stores/email-store.ts                         |  12 +-
 37 files changed, 658 insertions(+), 43 deletions(-)
 create mode 100644 components/email/__tests__/composer-send-failed.test.tsx
 create mode 100644 components/mail/__tests__/send-closes-composer.test.tsx
 create mode 100644 lib/outgoing/send-progress-toast.ts
 create mode 100644 stores/__tests__/email-store-send-list-loading.test.ts

diff --git a/components/email/__tests__/composer-send-failed.test.tsx b/components/email/__tests__/composer-send-failed.test.tsx
new file mode 100644
index 000000000..aec0f1b79
--- /dev/null
+++ b/components/email/__tests__/composer-send-failed.test.tsx
@@ -0,0 +1,238 @@
+import { render, screen, fireEvent, waitFor } from '@testing-library/react';
+import { describe, it, expect, vi } from 'vitest';
+import React from 'react';
+import { EmailComposer } from '../email-composer';
+
+// ─── Heavy component mocks (mirrors reply-addressing.test.tsx) ────────────────
+
+const editorKeyDown = vi.hoisted(() => vi.fn());
+
+vi.mock('@/components/email/rich-text-editor', () => ({
+  RichTextEditor: () => React.createElement('div', {
+    'data-testid': 'rich-text-editor',
+    onKeyDown: (event: React.KeyboardEvent) => {
+      if (!event.defaultPrevented) editorKeyDown();
+    },
+  }),
+}));
+
+vi.mock('@/components/plugins/plugin-slot', () => ({ PluginSlot: () => null }));
+vi.mock('@/components/identity/sub-address-helper', () => ({ SubAddressHelper: () => null }));
+vi.mock('@/components/templates/template-picker', () => ({ TemplatePicker: () => null }));
+vi.mock('@/components/templates/template-form', () => ({ TemplateForm: () => null }));
+vi.mock('@/components/files/file-preview-modal', () => ({ FilePreviewModal: () => null }));
+vi.mock('@/hooks/use-focus-trap', () => ({
+  useFocusTrap: () => ({ current: null }),
+}));
+vi.mock('@/hooks/use-pro-multi-account-identities', () => ({
+  useProMultiAccountIdentities: () => ({ enabled: false, groups: [], allIdentities: [] }),
+  stripCrossAccountIdentityPrefix: (id: string) => ({ localAccountId: null, rawId: id }),
+}));
+
+// ─── Store mocks ──────────────────────────────────────────────────────────────
+
+vi.mock('@/stores/auth-store', () => {
+  const state = {
+    client: null,
+    identities: [],
+    primaryIdentity: null,
+    isAuthenticated: false,
+    isDemoMode: false,
+    activeAccountId: null,
+    connectionLost: false,
+    getClientForAccount: () => undefined,
+    getAllConnectedClients: () => new Map(),
+    syncIdentities: () => {},
+    refreshIdentities: async () => {},
+  };
+  const hook = (sel?: (s: typeof state) => unknown) =>
+    typeof sel === 'function' ? sel(state) : state;
+  hook.getState = () => state;
+  hook.setState = (p: Partial<typeof state>) => Object.assign(state, p);
+  return { useAuthStore: hook };
+});
+
+vi.mock('@/stores/identity-store', () => {
+  const state = {
+    identities: [{ id: 'id-me', email: 'me@example.com', name: 'Me' }],
+    defaultIdentityId: 'id-me',
+  };
+  const hook = (sel?: (s: typeof state) => unknown) =>
+    typeof sel === 'function' ? sel(state) : state;
+  hook.getState = () => state;
+  hook.setState = (p: Partial<typeof state>) => Object.assign(state, p);
+  return { useIdentityStore: hook };
+});
+
+vi.mock('@/stores/account-store', () => {
+  const state = { accounts: [], getAccountById: () => undefined };
+  const hook = (sel?: (s: typeof state) => unknown) =>
+    typeof sel === 'function' ? sel(state) : state;
+  hook.getState = () => state;
+  hook.setState = (p: Partial<typeof state>) => Object.assign(state, p);
+  return { useAccountStore: hook };
+});
+
+vi.mock('@/stores/email-store', () => {
+  const state = {
+    draftSaveEnabled: false,
+    sendRawEmail: async () => ({ sent: true }),
+  };
+  const hook = (sel?: (s: typeof state) => unknown) =>
+    typeof sel === 'function' ? sel(state) : state;
+  hook.getState = () => state;
+  hook.setState = (p: Partial<typeof state>) => Object.assign(state, p);
+  return { useEmailStore: hook };
+});
+
+const updateSetting = vi.fn();
+
+// compose-24: the host closes the composer as soon as the send starts. A send
+// that fails must still hand the message back, or it would vanish.
+
+
+vi.mock('@/stores/settings-store', () => {
+  const state = {
+    timeFormat: '24h',
+    plainTextMode: false,
+    subAddressDelimiter: '+',
+    autoSelectReplyIdentity: true,
+    attachmentReminderEnabled: false,
+    attachmentReminderKeywords: [],
+    emptySubjectWarningEnabled: true,
+    sendDelaySeconds: 0,
+    signaturePosition: 'above_quote',
+    signatureSeparatorEnabled: false,
+    requestReadReceiptDefault: false,
+    addTrustedSender: () => {},
+    trustedSendersAddressBook: null,
+    updateSetting: (...args: unknown[]) => updateSetting(...args),
+  };
+  const hook = (sel?: (s: typeof state) => unknown) =>
+    typeof sel === 'function' ? sel(state) : state;
+  hook.getState = () => state;
+  hook.setState = (p: Partial<typeof state>) => Object.assign(state, p);
+  return { useSettingsStore: hook };
+});
+
+vi.mock('@/stores/contact-store', () => {
+  const state = {
+    contacts: [],
+    getAutocomplete: async () => [],
+    addToTrustedSendersBook: async () => {},
+  };
+  const hook = (sel?: (s: typeof state) => unknown) =>
+    typeof sel === 'function' ? sel(state) : state;
+  hook.getState = () => state;
+  hook.setState = (p: Partial<typeof state>) => Object.assign(state, p);
+  return { useContactStore: hook };
+});
+
+vi.mock('@/stores/template-store', () => {
+  const state = { templates: [], addTemplate: async () => {} };
+  const hook = (sel?: (s: typeof state) => unknown) =>
+    typeof sel === 'function' ? sel(state) : state;
+  hook.getState = () => state;
+  hook.setState = (p: Partial<typeof state>) => Object.assign(state, p);
+  return { useTemplateStore: hook };
+});
+
+// ─── Misc dependency mocks ────────────────────────────────────────────────────
+
+vi.mock('@/stores/toast-store', () => ({
+  toast: { info: () => {}, error: () => {}, success: () => {} },
+}));
+
+vi.mock('@/lib/plugin-hooks', () => ({
+  identityHooks: {
+    onSignatureRender: { size: 0, transform: async (value: unknown) => value },
+    onIdentitySelect: { size: 0, emit: async () => {} },
+  },
+  templateHooks: {
+    onTemplateRender: { size: 0, transform: async (value: unknown) => value },
+    onTemplateApply: { size: 0, emit: async () => {} },
+  },
+  emailHooks: {
+    onComposerOpen: { call: async () => [] },
+    onRecipientChange: { call: async () => [] },
+    getRecipientSuggestions: { call: async () => [] },
+    onRecipientChipsChange: { transform: async (chips: unknown) => chips },
+    onDraftChange: { emit: () => {} },
+    onBeforeDraftAutoSave: { transform: async (draft: unknown) => draft },
+    onBeforeEmailSend: { intercept: async () => true, interceptOutcome: async () => 'allowed' },
+    onComposeSend: { takeOver: async () => 'default' },
+    onTransformOutgoingEmail: { transform: async (email: unknown) => email },
+  },
+  contactHooks: {
+    search: { call: async () => [] },
+    onProvideRecipientSuggestions: { transform: async (initial: unknown) => initial },
+  },
+}));
+
+vi.mock('@/lib/email-sanitization', () => ({
+  sanitizeSignatureHtml: (v: string) => v,
+  sanitizeEmailHtml: (v: string) => v,
+  parseHtmlSafely: (html: string) => new DOMParser().parseFromString(html, 'text/html'),
+}));
+
+vi.mock('@/lib/email-threading', () => ({
+  computeReplyThreadingHeaders: () => ({ inReplyTo: [], references: [] }),
+}));
+vi.mock('@/lib/signature-utils', () => ({
+  appendPlainTextSignature: (body: string) => body,
+  getPlainTextSignature: () => '',
+}));
+vi.mock('@/lib/sub-addressing', () => ({ generateSubAddress: () => '' }));
+vi.mock('@/lib/debug', () => ({ debug: { log: () => {}, warn: () => {}, error: () => {} } }));
+vi.mock('@/components/email/quoted-html', () => ({
+  buildQuotedHtmlBlock: () => '',
+  serializeEditorContent: () => '',
+}));
+vi.mock('@/lib/template-utils', () => ({ substitutePlaceholders: (s: string) => s }));
+
+// ─── Tests ────────────────────────────────────────────────────────────────────
+
+const READY = {
+  to: 'bob@example.com',
+  cc: '',
+  bcc: '',
+  subject: 'Quarterly numbers',
+  body: '<p>Here they are.</p>',
+  showCc: false,
+  showBcc: false,
+  selectedIdentityId: 'id-me',
+  subAddressTag: '',
+  mode: 'compose' as const,
+  draftId: 'draft-3',
+};
+
+const sendButton = () => screen.getAllByTestId('composer-send')[0] as HTMLButtonElement;
+
+describe('a send that fails after the host closed the composer', () => {
+  it('hands the message back to the host', async () => {
+    const onSend = vi.fn().mockRejectedValue(new Error('refused'));
+    const onSendFailed = vi.fn();
+    render(<EmailComposer initialData={READY} onSend={onSend} onSendFailed={onSendFailed} />);
+
+    fireEvent.click(sendButton());
+
+    await waitFor(() => expect(onSendFailed).toHaveBeenCalledTimes(1));
+    expect(onSendFailed.mock.calls[0][0]).toMatchObject({
+      to: 'bob@example.com',
+      subject: 'Quarterly numbers',
+      body: '<p>Here they are.</p>',
+      draftId: 'draft-3',
+    });
+  });
+
+  it('says nothing to the host when the message went out', async () => {
+    const onSend = vi.fn().mockResolvedValue(undefined);
+    const onSendFailed = vi.fn();
+    render(<EmailComposer initialData={READY} onSend={onSend} onSendFailed={onSendFailed} />);
+
+    fireEvent.click(sendButton());
+
+    await waitFor(() => expect(onSend).toHaveBeenCalledTimes(1));
+    expect(onSendFailed).not.toHaveBeenCalled();
+  });
+});
diff --git a/components/email/email-composer.tsx b/components/email/email-composer.tsx
index 95948a852..22ea0db2b 100644
--- a/components/email/email-composer.tsx
+++ b/components/email/email-composer.tsx
@@ -368,6 +368,11 @@ interface EmailComposerProps {
     /** The id plugins know this composer by, for onAfterEmailSend. */
     composerId?: string;
   }) => void | false | Promise<void | false>;
+  /**
+   * onSend failed. A host that closes the composer as soon as onSend starts
+   * gets the message back here, to open it again: it must never vanish.
+   */
+  onSendFailed?: (state: ComposerDraftData) => void;
   onScheduledSendCreated?: () => void | Promise<void>;
   onClose?: () => void;
   /**
@@ -572,6 +577,7 @@ const OFFLINE_SEND_ERRORS: Record<string, string> = {
 
 export function EmailComposer({
   onSend,
+  onSendFailed,
   onScheduledSendCreated,
   onClose,
   requestCloseRef,
@@ -4052,6 +4058,9 @@ export function EmailComposer({
     const lastStage = (html: string | undefined, text: string) =>
       finalizeOutgoing({ html: html || undefined, text }, outgoingContext, 'last');
     const inlineAttachments = rewritten?.attachments ?? [];
+    // The message as it is now, once onSend has it: the host may close the
+    // composer before the send is through.
+    let handedToHost: ComposerDraftData | null = null;
 
     try {
       const effectiveDelayedUntil = await resolveDelayedUntil(delayedUntil);
@@ -4251,6 +4260,13 @@ export function EmailComposer({
         // Read when the close is reported: the host tears the composer down
         // while onSend is still running. Reset below if the send fails.
         sentRef.current = true;
+        handedToHost = {
+          ...snapshotStateRef.current(),
+          // The save before the send may have moved the draft to a new id.
+          draftId: draftIdRef.current,
+          draftAccountId: draftAccountIdRef.current,
+          draftLocalAccountId: draftLocalAccountIdRef.current,
+        };
         const outcome = await onSend?.({
           to: outgoing.to,
           cc: outgoing.cc,
@@ -4326,6 +4342,8 @@ export function EmailComposer({
       explicitCloseRef.current = false;
       sentRef.current = false;
       debug.error('Failed to send email:', err);
+      // A host that closed the composer at Send opens it again with the text.
+      if (handedToHost) onSendFailed?.(handedToHost);
       if (isLabelRequiredError(err)) {
         setLabelInvalid(true);
         toast.error(tClassification('required_toast'));
diff --git a/components/mail/__tests__/send-closes-composer.test.tsx b/components/mail/__tests__/send-closes-composer.test.tsx
new file mode 100644
index 000000000..aa257cc5a
--- /dev/null
+++ b/components/mail/__tests__/send-closes-composer.test.tsx
@@ -0,0 +1,156 @@
+import React, { Suspense, lazy } from 'react';
+import { act, fireEvent, render, screen, waitFor } from '@testing-library/react';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import type { Mailbox } from '@/lib/jmap/types';
+import { useAuthStore } from '@/stores/auth-store';
+import { useEmailStore } from '@/stores/email-store';
+import { useSettingsStore } from '@/stores/settings-store';
+import { usePluginStore } from '@/stores/plugin-store';
+import { useThemeStore } from '@/stores/theme-store';
+import { useToastStore } from '@/stores/toast-store';
+import { DEFAULT_SEARCH_FILTERS } from '@/lib/jmap/search-utils';
+
+// compose-24: after Send the composer stayed on screen, greyed and without a
+// word, until the server answered. It closes at once now, "Sending…" and then
+// "Sent · View" say what happens, and a send that fails brings the text back.
+vi.mock('next/dynamic', () => ({ default: (load: () => Promise<React.ComponentType<Record<string, unknown>>>) => {
+  const Component = lazy(async () => ({ default: await load() }));
+  return function Dynamic(props: Record<string, unknown>) {
+    return <Suspense fallback={null}><Component {...props} /></Suspense>;
+  };
+} }));
+vi.mock('@/components/email/email-composer', () => ({
+  EmailComposer: ({ onSend, onSendFailed, initialData }: {
+    onSend?: (data: unknown) => Promise<void>;
+    onSendFailed?: (state: unknown) => void;
+    initialData?: { subject?: string } | null;
+  }) => (
+    <div>
+      <span>stub subject: {initialData?.subject ?? ''}</span>
+      <button onClick={() => {
+        // As the composer does: what it handed over comes back on a failure.
+        onSend?.({ to: ['bob@example.com'], cc: [], bcc: [], subject: 'Hi', body: 'Hello' })
+          ?.catch(() => onSendFailed?.({ to: 'bob@example.com', cc: '', bcc: '', subject: 'Hi', body: 'Hello', mode: 'compose' }));
+      }}>
+        stub send
+      </button>
+    </div>
+  ),
+}));
+vi.mock('@/components/layout/sidebar', () => ({ Sidebar: () => null }));
+vi.mock('@/components/layout/navigation-rail', () => ({ NavigationRail: () => null }));
+vi.mock('@/components/layout/calendar-event-notification-toaster', () => ({ CalendarEventNotificationToaster: () => null }));
+vi.mock('@/components/layout/share-notification-toaster', () => ({ ShareNotificationToaster: () => null }));
+vi.mock('@/components/layout/mobile-header', () => ({
+  MobileHeader: ({ onOpenSearch }: { onOpenSearch?: () => void }) => <button onClick={onOpenSearch}>stub open search</button>,
+}));
+vi.mock('@/components/email/message-list-tabs', () => ({ useMessageListPanelProps: (id: string) => ({ id }), MessageListTabs: () => null }));
+vi.mock('@/components/search/search-box', () => ({ SearchBox: () => null }));
+vi.mock('@/components/tour/tour-provider', () => ({ useTour: () => ({ activeTour: null, registerStep: vi.fn() }) }));
+vi.mock('@/components/plugins/plugin-slot', () => ({ PluginSlot: () => null }));
+vi.mock('@/hooks/use-plugin-slot-offers', () => ({ usePluginSlotOffers: () => [] }));
+vi.mock('@/hooks/use-config', () => ({ useConfig: () => ({ appName: 'Mail' }) }));
+vi.mock('@/hooks/use-identity-sync', () => ({ useIdentitySync: () => {} }));
+vi.mock('@/hooks/use-pro-multi-account-identities', () => ({ useProMultiAccountIdentities: () => [] }));
+vi.mock('@/hooks/use-pro-multi-account-mailboxes', () => ({ useProMultiAccountMailboxes: () => {} }));
+vi.mock('@/hooks/use-wopi-status', () => ({ useWopiStatus: () => null, canWopiOpen: () => false }));
+vi.mock('@/hooks/use-browser-navigation', () => ({ useBrowserNavigation: () => {} }));
+vi.mock('@/hooks/use-media-query', () => ({
+  useDeviceDetection: () => ({ isMobile: true, isTablet: false, isDesktop: false }),
+  useMediaQuery: () => false,
+  useIsDesktop: () => false,
+}));
+vi.mock('@/lib/push-bindings', () => ({ reconcilePushBindings: () => {}, releasePushBindings: () => {} }));
+vi.mock('@/components/email/email-list', () => ({ EmailList: () => <div>message list</div> }));
+
+const { MailApp } = await import('../mail-app');
+
+const inbox = { id: 'inbox', name: 'Inbox', role: 'inbox' } as Mailbox;
+const sendEmail = vi.fn();
+
+beforeEach(() => {
+  vi.stubGlobal('fetch', vi.fn().mockRejectedValue(new Error('Unexpected network request')));
+  vi.stubGlobal('ResizeObserver', class { observe() {} unobserve() {} disconnect() {} });
+  usePluginStore.setState({ initializePlugins: vi.fn().mockResolvedValue(undefined) });
+  useThemeStore.setState({ syncServerThemes: vi.fn().mockResolvedValue(undefined) });
+  const client = {
+    getAccountId: () => 'acc', getUsername: () => 'me@example.com',
+    getSieveAccountId: () => null, hasDelayedSend: () => false, getSession: () => null,
+  };
+  useAuthStore.setState({
+    isAuthenticated: true, isLoading: false, client: client as never, activeAccountId: 'login', identities: [],
+    getClientForAccount: () => client as never,
+    getAllConnectedClients: () => new Map([['login', client]]) as never,
+  });
+  useSettingsStore.setState({ enableUnifiedMailbox: false, mailLayout: 'split', sendDelaySeconds: 0 } as never);
+  sendEmail.mockReset().mockResolvedValue({});
+  useToastStore.setState({ toasts: [] });
+  useEmailStore.setState({
+    emails: [], selectedEmail: null, selectedMailbox: inbox.id, mailboxes: [inbox],
+    viewingAccountId: null, accountMailboxes: {}, isUnifiedView: false, unifiedRole: null,
+    isScheduledView: false, isLoadingEmail: false, isLoading: false, searchQuery: '',
+    searchFilters: { ...DEFAULT_SEARCH_FILTERS }, searchMailboxId: '', selectedKeyword: null,
+    selectedEmailKeys: new Set(),
+    fetchMailboxes: vi.fn().mockResolvedValue(undefined), fetchEmails: vi.fn().mockResolvedValue(undefined),
+    fetchQuota: vi.fn().mockResolvedValue(undefined), fetchTagCounts: vi.fn().mockResolvedValue(undefined),
+    refreshScheduledMetadata: vi.fn().mockResolvedValue(undefined),
+    sendEmail,
+  } as never);
+});
+afterEach(() => {
+  vi.restoreAllMocks();
+  vi.unstubAllGlobals();
+});
+
+const toastTitled = (title: string) => useToastStore.getState().toasts.find((t) => t.title === title);
+
+async function openComposer() {
+  render(<MailApp />);
+  fireEvent.click(screen.getByRole('button', { name: 'sidebar.compose' }));
+  await screen.findByText('stub send', {}, { timeout: 5000 });
+}
+
+describe('sending', () => {
+  it('closes the composer at once and says "Sending…", then "Sent" with View', async () => {
+    let finish: (result: unknown) => void = () => {};
+    sendEmail.mockReturnValue(new Promise((resolve) => { finish = resolve; }));
+    await openComposer();
+
+    fireEvent.click(screen.getByText('stub send'));
+
+    // The server hasn't answered yet.
+    await waitFor(() => expect(screen.queryByText('stub send')).not.toBeInTheDocument());
+    expect(sendEmail).toHaveBeenCalled();
+    expect(toastTitled('compose_send.sending')).toBeDefined();
+
+    await act(async () => { finish({ scheduled: false, emailId: 'sent-1' }); });
+
+    await waitFor(() => expect(toastTitled('compose_send.sent')).toBeDefined());
+    expect(toastTitled('compose_send.sent')!.action?.label).toBe('compose_send.view');
+    expect(toastTitled('compose_send.sending')).toBeUndefined();
+  });
+
+  it('opens the composer again with the text when the send fails', async () => {
+    vi.spyOn(console, 'error').mockImplementation(() => {});
+    sendEmail.mockRejectedValue(new Error('refused'));
+    await openComposer();
+
+    fireEvent.click(screen.getByText('stub send'));
+
+    expect(await screen.findByText('stub subject: Hi', {}, { timeout: 5000 })).toBeInTheDocument();
+    expect(toastTitled('compose_send.sending')).toBeUndefined();
+    expect(toastTitled('compose_send.sent')).toBeUndefined();
+  });
+
+  it('leaves a delayed send to the undo toast', async () => {
+    sendEmail.mockResolvedValue({ scheduled: true, emailSubmissionId: 'sub-1', sendAt: new Date(Date.now() + 5000).toISOString() });
+    await openComposer();
+
+    fireEvent.click(screen.getByText('stub send'));
+
+    await waitFor(() => expect(sendEmail).toHaveBeenCalled());
+    await waitFor(() => expect(toastTitled('compose_send.sending')).toBeUndefined());
+    expect(toastTitled('compose_send.sent')).toBeUndefined();
+    expect(screen.queryByText('stub send')).not.toBeInTheDocument();
+  });
+});
diff --git a/components/mail/mail-app.tsx b/components/mail/mail-app.tsx
index bbf7e7833..68922ddfd 100644
--- a/components/mail/mail-app.tsx
+++ b/components/mail/mail-app.tsx
@@ -44,6 +44,7 @@ import { groupSearchScopeFolders, SEARCH_SCOPE_ALL_FOLDERS } from "@/lib/search-
 import { toast } from "@/stores/toast-store";
 import { cancelFailureToast, partlyRefusedWarning, rescheduleFailureToast, rescheduledToast } from "@/lib/send-failure-message";
 import { formatScheduledSendAt } from "@/lib/scheduled-send-label";
+import { startSendProgress } from "@/lib/outgoing/send-progress-toast";
 import { formatRejectedRecipients, RescheduleRestoredError } from "@/lib/jmap/client";
 import { subscribePushStateChanges } from "@/lib/push-events";
 import { createMailPushListener } from "@/lib/mail-push-listener";
@@ -2547,6 +2548,17 @@ export function MailApp({ linkSegments: routeSegments }: MailAppProps = {}) {
     // the user's message without so much as a toast (#702).
     let submitted = false;
 
+    // The composer closes at once and "Sending…" shows meanwhile. A send that
+    // fails comes back through onSendFailed, which opens the composer again.
+    setShowComposer(false);
+    setPendingDraft(null);
+    if (isMobile && !useEmailStore.getState().selectedEmail) setActiveView('list');
+    const progress = startSendProgress({
+      sending: t('compose_send.sending'),
+      sent: t('compose_send.sent'),
+      view: t('compose_send.view'),
+    });
+
     try {
       const effectiveMode = pendingDraft?.mode ?? composerMode;
       const originalEmailId = answeredEmailId;
@@ -2554,7 +2566,17 @@ export function MailApp({ linkSegments: routeSegments }: MailAppProps = {}) {
       const result = await sendEmail(sendClient, data.to, data.subject, data.body, data.cc, data.bcc, data.identityId, data.fromEmail, data.draftId, data.fromName, data.htmlBody, data.attachments, data.inReplyTo, data.references, data.delayedUntil, data.envelopeMailFrom, composerSendOptions(data));
       submitted = true;
       announceSent(result, data);
-      setShowComposer(false);
+      // "Sent" with View. A delayed or scheduled send gets the undo toast, and
+      // a filing error, a refused recipient or the offline outbox say so themselves.
+      if (result.scheduled || result.filingError || result.rejectedRecipients?.length || result.queued) {
+        progress.dismiss();
+      } else {
+        const sentId = result.emailId;
+        const ownerAccountId = result.emailAccountId && result.emailAccountId !== sendClient.getAccountId() ? result.emailAccountId : undefined;
+        progress.sent(sentId && sendClient === client
+          ? () => void applyMailDeepLinkRef.current({ kind: 'message', id: sentId, ownerAccountId })
+          : undefined);
+      }
       // Sending an edited draft destroys it server-side - and every autosave
       // before that already replaced it under a fresh id (createDraft is a
       // destroy+create). If the email on display is the draft this session
@@ -2639,11 +2661,6 @@ export function MailApp({ linkSegments: routeSegments }: MailAppProps = {}) {
         return;
       }
 
-      // Delayed sends get the undo toast instead; a filing error or a refused
-      // recipient already warned.
-      // A message kept in the offline outbox said so itself (#523).
-      if (!result.filingError && !result.rejectedRecipients?.length && !result.queued) toast.success(t('notifications.email_sent'));
-
       // Refresh the current mailbox to update the UI
       if (!isScheduledView) {
         await refreshCurrentMailbox(client);
@@ -2651,6 +2668,8 @@ export function MailApp({ linkSegments: routeSegments }: MailAppProps = {}) {
       }
     } catch (error) {
       console.error("Failed to send email:", error);
+      if (submitted) progress.sent();
+      else progress.dismiss();
       // Post-send bookkeeping - refreshing Sent, flagging the original as
       // answered, re-reading the thread - is cosmetic once the mail is out.
       if (!submitted) throw error;
@@ -5250,6 +5269,11 @@ export function MailApp({ linkSegments: routeSegments }: MailAppProps = {}) {
           setComposerPrefill(null);
           return outcome;
         }}
+        onSendFailed={(state) => {
+          setPendingDraft(state);
+          setShowComposer(true);
+          if (isMobile) setActiveView('viewer');
+        }}
         onScheduledSendCreated={async () => {
           if (client) {
             await refreshScheduledMetadata(client);
diff --git a/lib/outgoing/send-progress-toast.ts b/lib/outgoing/send-progress-toast.ts
new file mode 100644
index 000000000..b94e8753f
--- /dev/null
+++ b/lib/outgoing/send-progress-toast.ts
@@ -0,0 +1,48 @@
+/**
+ * The toast of a send from the moment the composer closes: "Sending…" while
+ * the server takes the message, then "Sent" with View. The composer used to
+ * stay on screen, greyed and without a word, until the server answered.
+ */
+
+import { toast } from '@/stores/toast-store';
+import { announce } from '@/lib/announce';
+import { effectiveToastDuration } from '@/lib/toast-duration';
+
+export interface SendProgressLabels {
+  sending: string;
+  sent: string;
+  view: string;
+}
+
+export interface SendProgress {
+  /** The message is out. `view` opens it; without it there is no View. */
+  sent(view?: () => void): void;
+  /** Another toast says what happened (undo, scheduled, failed, kept offline). */
+  dismiss(): void;
+}
+
+export function startSendProgress(labels: SendProgressLabels): SendProgress {
+  const id = toast.progress(labels.sending, { progress: null });
+  let settled = false;
+  return {
+    sent(view) {
+      if (settled) return;
+      settled = true;
+      const action = view ? { label: labels.view, onClick: view } : undefined;
+      toast.update(id, {
+        type: 'success',
+        title: labels.sent,
+        progress: undefined,
+        action,
+        duration: effectiveToastDuration({ type: 'success', action }),
+      });
+      // An update isn't read out as a new toast is.
+      announce(labels.sent);
+    },
+    dismiss() {
+      if (settled) return;
+      settled = true;
+      toast.dismiss(id);
+    },
+  };
+}
diff --git a/locales/ar/common.json b/locales/ar/common.json
index 5ba9c4823..e16ef0ab3 100644
--- a/locales/ar/common.json
+++ b/locales/ar/common.json
@@ -3907,7 +3907,10 @@
     "warning_proofreading": "مشكلات إملائية أو نحوية مفتوحة: {count}",
     "empty_text_title": "هل تريد الإرسال بدون نص؟",
     "empty_text_message": "لا تحتوي هذه الرسالة على نص ولا على مرفق. هل تريد إرسالها على أي حال؟",
-    "scheduled_for": "مجدولة في {when}"
+    "scheduled_for": "مجدولة في {when}",
+    "sending": "جارٍ الإرسال…",
+    "sent": "تم الإرسال",
+    "view": "عرض"
   },
   "org_templates": {
     "section_personal": "قوالبي",
diff --git a/locales/ca/common.json b/locales/ca/common.json
index 7fb01c5d9..a49fe1c5f 100644
--- a/locales/ca/common.json
+++ b/locales/ca/common.json
@@ -3907,7 +3907,10 @@
     "warning_proofreading": "Errors d'ortografia o gramàtica pendents: {count}",
     "empty_text_title": "Vols enviar-lo sense text?",
     "empty_text_message": "Aquest missatge no té text ni cap fitxer adjunt. Vols enviar-lo igualment?",
-    "scheduled_for": "Programat per a {when}"
+    "scheduled_for": "Programat per a {when}",
+    "sending": "S'està enviant…",
+    "sent": "Enviat",
+    "view": "Mostra"
   },
   "org_templates": {
     "section_personal": "Les meves plantilles",
diff --git a/locales/cs/common.json b/locales/cs/common.json
index 219e9da67..f6253092f 100644
--- a/locales/cs/common.json
+++ b/locales/cs/common.json
@@ -3907,7 +3907,10 @@
     "warning_proofreading": "Nevyřešené pravopisné či gramatické chyby: {count}",
     "empty_text_title": "Odeslat bez textu?",
     "empty_text_message": "Tato zpráva nemá text ani přílohu. Přesto ji odeslat?",
-    "scheduled_for": "Naplánováno na {when}"
+    "scheduled_for": "Naplánováno na {when}",
+    "sending": "Odesílání…",
+    "sent": "Odesláno",
+    "view": "Zobrazit"
   },
   "org_templates": {
     "section_personal": "Moje šablony",
diff --git a/locales/da/common.json b/locales/da/common.json
index 9fdc94b90..9df578928 100644
--- a/locales/da/common.json
+++ b/locales/da/common.json
@@ -3907,7 +3907,10 @@
     "warning_proofreading": "Åbne stave- eller grammatikfejl: {count}",
     "empty_text_title": "Send uden tekst?",
     "empty_text_message": "Denne besked har ingen tekst og ingen vedhæftet fil. Send den alligevel?",
-    "scheduled_for": "Planlagt til {when}"
+    "scheduled_for": "Planlagt til {when}",
+    "sending": "Sender…",
+    "sent": "Sendt",
+    "view": "Vis"
   },
   "org_templates": {
     "section_personal": "Mine skabeloner",
diff --git a/locales/de/common.json b/locales/de/common.json
index 2e72aacef..716e74114 100644
--- a/locales/de/common.json
+++ b/locales/de/common.json
@@ -3907,7 +3907,10 @@
     "warning_proofreading": "Offene Rechtschreib- oder Grammatikfehler: {count}",
     "empty_text_title": "Ohne Text senden?",
     "empty_text_message": "Diese Nachricht hat keinen Text und keinen Anhang. Trotzdem senden?",
-    "scheduled_for": "Geplant für {when}"
+    "scheduled_for": "Geplant für {when}",
+    "sending": "Wird gesendet…",
+    "sent": "Gesendet",
+    "view": "Anzeigen"
   },
   "org_templates": {
     "section_personal": "Meine Vorlagen",
diff --git a/locales/en/common.json b/locales/en/common.json
index f8e008234..48c763384 100644
--- a/locales/en/common.json
+++ b/locales/en/common.json
@@ -3907,7 +3907,10 @@
     "warning_proofreading": "Open spelling or grammar issues: {count}",
     "empty_text_title": "Send without text?",
     "empty_text_message": "This message has no text and no attachment. Send it anyway?",
-    "scheduled_for": "Scheduled for {when}"
+    "scheduled_for": "Scheduled for {when}",
+    "sending": "Sending…",
+    "sent": "Sent",
+    "view": "View"
   },
   "org_templates": {
     "section_personal": "My templates",
diff --git a/locales/es/common.json b/locales/es/common.json
index 1b6a20894..0a734bd11 100644
--- a/locales/es/common.json
+++ b/locales/es/common.json
@@ -3907,7 +3907,10 @@
     "warning_proofreading": "Errores de ortografía o gramática pendientes: {count}",
     "empty_text_title": "¿Enviar sin texto?",
     "empty_text_message": "Este mensaje no tiene texto ni archivos adjuntos. ¿Enviarlo de todos modos?",
-    "scheduled_for": "Programado para {when}"
+    "scheduled_for": "Programado para {when}",
+    "sending": "Enviando…",
+    "sent": "Enviado",
+    "view": "Ver"
   },
   "org_templates": {
     "section_personal": "Mis plantillas",
diff --git a/locales/et/common.json b/locales/et/common.json
index 411dda041..2a329b7f9 100644
--- a/locales/et/common.json
+++ b/locales/et/common.json
@@ -3907,7 +3907,10 @@
     "warning_proofreading": "Lahendamata õigekirja- või grammatikavead: {count}",
     "empty_text_title": "Kas saata ilma tekstita?",
     "empty_text_message": "Selles kirjas pole teksti ega manust. Kas saata see ikkagi?",
-    "scheduled_for": "Ajastatud: {when}"
+    "scheduled_for": "Ajastatud: {when}",
+    "sending": "Saatmine…",
+    "sent": "Saadetud",
+    "view": "Vaata"
   },
   "org_templates": {
     "section_personal": "Minu mallid",
diff --git a/locales/fa/common.json b/locales/fa/common.json
index f99b675ef..ae6a86694 100644
--- a/locales/fa/common.json
+++ b/locales/fa/common.json
@@ -3907,7 +3907,10 @@
     "warning_proofreading": "خطاهای املایی یا دستوری باز: {count}",
     "empty_text_title": "بدون متن ارسال شود؟",
     "empty_text_message": "این پیام متن و پیوست ندارد. به هر حال ارسال شود؟",
-    "scheduled_for": "زمان‌بندی‌شده برای {when}"
+    "scheduled_for": "زمان‌بندی‌شده برای {when}",
+    "sending": "در حال ارسال…",
+    "sent": "ارسال شد",
+    "view": "مشاهده"
   },
   "org_templates": {
     "section_personal": "قالب‌های من",
diff --git a/locales/fr/common.json b/locales/fr/common.json
index 56f599aed..857a4208b 100644
--- a/locales/fr/common.json
+++ b/locales/fr/common.json
@@ -3907,7 +3907,10 @@
     "warning_proofreading": "Fautes d'orthographe ou de grammaire restantes : {count}",
     "empty_text_title": "Envoyer sans texte ?",
     "empty_text_message": "Ce message n'a ni texte ni pièce jointe. L'envoyer quand même ?",
-    "scheduled_for": "Programmé pour {when}"
+    "scheduled_for": "Programmé pour {when}",
+    "sending": "Envoi…",
+    "sent": "Envoyé",
+    "view": "Afficher"
   },
   "org_templates": {
     "section_personal": "Mes modèles",
diff --git a/locales/he/common.json b/locales/he/common.json
index 95ccc1e67..84da00998 100644
--- a/locales/he/common.json
+++ b/locales/he/common.json
@@ -3804,7 +3804,10 @@
     "warning_proofreading": "שגיאות כתיב או דקדוק פתוחות: {count}",
     "empty_text_title": "לשלוח ללא טקסט?",
     "empty_text_message": "להודעה הזו אין טקסט ואין קובץ מצורף. לשלוח אותה בכל זאת?",
-    "scheduled_for": "מתוזמן ל-{when}"
+    "scheduled_for": "מתוזמן ל-{when}",
+    "sending": "שולח…",
+    "sent": "נשלח",
+    "view": "הצג"
   },
   "org_templates": {
     "section_personal": "התבניות שלי",
diff --git a/locales/hu/common.json b/locales/hu/common.json
index 35741dc7e..f119f53b3 100644
--- a/locales/hu/common.json
+++ b/locales/hu/common.json
@@ -3907,7 +3907,10 @@
     "warning_proofreading": "Nyitott helyesírási vagy nyelvtani hibák: {count}",
     "empty_text_title": "Küldés szöveg nélkül?",
     "empty_text_message": "Ennek az üzenetnek nincs szövege és melléklete. Elküldi így is?",
-    "scheduled_for": "Ütemezve: {when}"
+    "scheduled_for": "Ütemezve: {when}",
+    "sending": "Küldés…",
+    "sent": "Elküldve",
+    "view": "Megtekintés"
   },
   "org_templates": {
     "section_personal": "Saját sablonok",
diff --git a/locales/it/common.json b/locales/it/common.json
index 061922c51..1b2b07908 100644
--- a/locales/it/common.json
+++ b/locales/it/common.json
@@ -3907,7 +3907,10 @@
     "warning_proofreading": "Errori di ortografia o grammatica aperti: {count}",
     "empty_text_title": "Inviare senza testo?",
     "empty_text_message": "Questo messaggio non ha testo né allegati. Inviarlo comunque?",
-    "scheduled_for": "Programmato per {when}"
+    "scheduled_for": "Programmato per {when}",
+    "sending": "Invio in corso…",
+    "sent": "Inviato",
+    "view": "Visualizza"
   },
   "org_templates": {
     "section_personal": "I miei modelli",
diff --git a/locales/ja/common.json b/locales/ja/common.json
index aacaa9fa1..1c080bd35 100644
--- a/locales/ja/common.json
+++ b/locales/ja/common.json
@@ -3907,7 +3907,10 @@
     "warning_proofreading": "未解決のスペル・文法の問題: {count}",
     "empty_text_title": "本文なしで送信しますか？",
     "empty_text_message": "このメッセージには本文も添付ファイルもありません。そのまま送信しますか？",
-    "scheduled_for": "{when} に送信予定"
+    "scheduled_for": "{when} に送信予定",
+    "sending": "送信中…",
+    "sent": "送信しました",
+    "view": "表示"
   },
   "org_templates": {
     "section_personal": "マイテンプレート",
diff --git a/locales/ko/common.json b/locales/ko/common.json
index 62961153b..ae2a92c38 100644
--- a/locales/ko/common.json
+++ b/locales/ko/common.json
@@ -3907,7 +3907,10 @@
     "warning_proofreading": "남은 맞춤법 또는 문법 문제: {count}",
     "empty_text_title": "본문 없이 보낼까요?",
     "empty_text_message": "이 메일에는 본문도 첨부 파일도 없어요. 그래도 보낼까요?",
-    "scheduled_for": "{when}에 보내기 예약됨"
+    "scheduled_for": "{when}에 보내기 예약됨",
+    "sending": "보내는 중…",
+    "sent": "보냈어요",
+    "view": "보기"
   },
   "org_templates": {
     "section_personal": "내 템플릿",
diff --git a/locales/lv/common.json b/locales/lv/common.json
index 47ba99e8b..b264be861 100644
--- a/locales/lv/common.json
+++ b/locales/lv/common.json
@@ -3907,7 +3907,10 @@
     "warning_proofreading": "Neatrisinātas pareizrakstības vai gramatikas kļūdas: {count}",
     "empty_text_title": "Sūtīt bez teksta?",
     "empty_text_message": "Šai vēstulei nav ne teksta, ne pielikuma. Vai tomēr to sūtīt?",
-    "scheduled_for": "Ieplānots: {when}"
+    "scheduled_for": "Ieplānots: {when}",
+    "sending": "Sūta…",
+    "sent": "Nosūtīts",
+    "view": "Skatīt"
   },
   "org_templates": {
     "section_personal": "Manas veidnes",
diff --git a/locales/mn/common.json b/locales/mn/common.json
index 2ceac09b1..a9a4e523d 100644
--- a/locales/mn/common.json
+++ b/locales/mn/common.json
@@ -3907,7 +3907,10 @@
     "warning_proofreading": "Засаагүй зөв бичгийн болон дүрмийн алдаа: {count}",
     "empty_text_title": "Текстгүй илгээх үү?",
     "empty_text_message": "Энэ захиад текст ч, хавсралт ч алга. Ямар ч байсан илгээх үү?",
-    "scheduled_for": "{when}-д илгээхээр товлосон"
+    "scheduled_for": "{when}-д илгээхээр товлосон",
+    "sending": "Илгээж байна…",
+    "sent": "Илгээгдлээ",
+    "view": "Харах"
   },
   "org_templates": {
     "section_personal": "Миний загварууд",
diff --git a/locales/nb/common.json b/locales/nb/common.json
index 89d1f352a..bb2e3880a 100644
--- a/locales/nb/common.json
+++ b/locales/nb/common.json
@@ -3907,7 +3907,10 @@
     "warning_proofreading": "Åpne stave- eller grammatikkfeil: {count}",
     "empty_text_title": "Sende uten tekst?",
     "empty_text_message": "Denne meldingen har verken tekst eller vedlegg. Sende den likevel?",
-    "scheduled_for": "Planlagt til {when}"
+    "scheduled_for": "Planlagt til {when}",
+    "sending": "Sender…",
+    "sent": "Sendt",
+    "view": "Vis"
   },
   "org_templates": {
     "section_personal": "Mine maler",
diff --git a/locales/nl/common.json b/locales/nl/common.json
index 9d2cac016..a9941ecf0 100644
--- a/locales/nl/common.json
+++ b/locales/nl/common.json
@@ -3907,7 +3907,10 @@
     "warning_proofreading": "Openstaande spel- of grammaticafouten: {count}",
     "empty_text_title": "Verzenden zonder tekst?",
     "empty_text_message": "Dit bericht heeft geen tekst en geen bijlage. Toch verzenden?",
-    "scheduled_for": "Gepland voor {when}"
+    "scheduled_for": "Gepland voor {when}",
+    "sending": "Bezig met verzenden…",
+    "sent": "Verzonden",
+    "view": "Bekijken"
   },
   "org_templates": {
     "section_personal": "Mijn sjablonen",
diff --git a/locales/pl/common.json b/locales/pl/common.json
index 2a90864c5..9766bb92d 100644
--- a/locales/pl/common.json
+++ b/locales/pl/common.json
@@ -3907,7 +3907,10 @@
     "warning_proofreading": "Nierozwiązane błędy pisowni lub gramatyki: {count}",
     "empty_text_title": "Wysłać bez treści?",
     "empty_text_message": "Ta wiadomość nie ma treści ani załącznika. Wysłać ją mimo to?",
-    "scheduled_for": "Zaplanowano na {when}"
+    "scheduled_for": "Zaplanowano na {when}",
+    "sending": "Wysyłanie…",
+    "sent": "Wysłano",
+    "view": "Pokaż"
   },
   "org_templates": {
     "section_personal": "Moje szablony",
diff --git a/locales/pt/common.json b/locales/pt/common.json
index 5988e60e6..55b28a608 100644
--- a/locales/pt/common.json
+++ b/locales/pt/common.json
@@ -3907,7 +3907,10 @@
     "warning_proofreading": "Erros de ortografia ou gramática em aberto: {count}",
     "empty_text_title": "Enviar sem texto?",
     "empty_text_message": "Esta mensagem não tem texto nem anexo. Enviar mesmo assim?",
-    "scheduled_for": "Agendado para {when}"
+    "scheduled_for": "Agendado para {when}",
+    "sending": "Enviando…",
+    "sent": "Enviado",
+    "view": "Ver"
   },
   "org_templates": {
     "section_personal": "Meus modelos",
diff --git a/locales/ro/common.json b/locales/ro/common.json
index 8f7064f48..318bf1d4f 100644
--- a/locales/ro/common.json
+++ b/locales/ro/common.json
@@ -3907,7 +3907,10 @@
     "warning_proofreading": "Greșeli de ortografie sau gramatică nerezolvate: {count}",
     "empty_text_title": "Trimiteți fără text?",
     "empty_text_message": "Acest mesaj nu are text și nici atașament. Îl trimiteți totuși?",
-    "scheduled_for": "Programat pentru {when}"
+    "scheduled_for": "Programat pentru {when}",
+    "sending": "Se trimite…",
+    "sent": "Trimis",
+    "view": "Vezi"
   },
   "org_templates": {
     "section_personal": "Șabloanele mele",
diff --git a/locales/ru/common.json b/locales/ru/common.json
index f21e430b1..c8f382676 100644
--- a/locales/ru/common.json
+++ b/locales/ru/common.json
@@ -3907,7 +3907,10 @@
     "warning_proofreading": "Неисправленные орфографические или грамматические ошибки: {count}",
     "empty_text_title": "Отправить без текста?",
     "empty_text_message": "В этом письме нет ни текста, ни вложений. Всё равно отправить?",
-    "scheduled_for": "Запланировано на {when}"
+    "scheduled_for": "Запланировано на {when}",
+    "sending": "Отправка…",
+    "sent": "Отправлено",
+    "view": "Открыть"
   },
   "org_templates": {
     "section_personal": "Мои шаблоны",
diff --git a/locales/sk/common.json b/locales/sk/common.json
index e24d849f5..aefbf6012 100644
--- a/locales/sk/common.json
+++ b/locales/sk/common.json
@@ -3907,7 +3907,10 @@
     "warning_proofreading": "Neopravené pravopisné alebo gramatické chyby: {count}",
     "empty_text_title": "Odoslať bez textu?",
     "empty_text_message": "Táto správa nemá text ani prílohu. Odoslať ju aj tak?",
-    "scheduled_for": "Naplánované na {when}"
+    "scheduled_for": "Naplánované na {when}",
+    "sending": "Odosielanie…",
+    "sent": "Odoslané",
+    "view": "Zobraziť"
   },
   "org_templates": {
     "section_personal": "Moje šablóny",
diff --git a/locales/th/common.json b/locales/th/common.json
index b6d400ff4..fcad4fef7 100644
--- a/locales/th/common.json
+++ b/locales/th/common.json
@@ -1158,7 +1158,10 @@
     "warning_proofreading": "ปัญหาการสะกดหรือไวยากรณ์ที่ยังค้างอยู่: {count}",
     "empty_text_title": "ส่งโดยไม่มีข้อความหรือไม่",
     "empty_text_message": "ข้อความนี้ไม่มีเนื้อหาและไม่มีไฟล์แนบ ส่งต่อไปหรือไม่",
-    "scheduled_for": "ตั้งเวลาส่งไว้ที่ {when}"
+    "scheduled_for": "ตั้งเวลาส่งไว้ที่ {when}",
+    "sending": "กำลังส่ง…",
+    "sent": "ส่งแล้ว",
+    "view": "ดู"
   },
   "org_templates": {
     "section_personal": "แม่แบบของฉัน",
diff --git a/locales/tr/common.json b/locales/tr/common.json
index 6aff55f44..71a097b10 100644
--- a/locales/tr/common.json
+++ b/locales/tr/common.json
@@ -3907,7 +3907,10 @@
     "warning_proofreading": "Açık yazım veya dilbilgisi sorunları: {count}",
     "empty_text_title": "Metin olmadan gönderilsin mi?",
     "empty_text_message": "Bu iletide metin ve ek yok. Yine de gönderilsin mi?",
-    "scheduled_for": "{when} için zamanlandı"
+    "scheduled_for": "{when} için zamanlandı",
+    "sending": "Gönderiliyor…",
+    "sent": "Gönderildi",
+    "view": "Görüntüle"
   },
   "org_templates": {
     "section_personal": "Şablonlarım",
diff --git a/locales/uk/common.json b/locales/uk/common.json
index 5d4fc1d4e..c0c04b84f 100644
--- a/locales/uk/common.json
+++ b/locales/uk/common.json
@@ -3907,7 +3907,10 @@
     "warning_proofreading": "Невиправлені орфографічні чи граматичні помилки: {count}",
     "empty_text_title": "Надіслати без тексту?",
     "empty_text_message": "У цьому листі немає ні тексту, ні вкладень. Усе одно надіслати?",
-    "scheduled_for": "Заплановано на {when}"
+    "scheduled_for": "Заплановано на {when}",
+    "sending": "Надсилання…",
+    "sent": "Надіслано",
+    "view": "Переглянути"
   },
   "org_templates": {
     "section_personal": "Мої шаблони",
diff --git a/locales/vi/common.json b/locales/vi/common.json
index 48fcabf42..e0132525a 100644
--- a/locales/vi/common.json
+++ b/locales/vi/common.json
@@ -3919,7 +3919,10 @@
     "warning_proofreading": "Lỗi chính tả hoặc ngữ pháp chưa sửa: {count}",
     "empty_text_title": "Gửi mà không có nội dung?",
     "empty_text_message": "Thư này không có nội dung và không có tệp đính kèm. Vẫn gửi?",
-    "scheduled_for": "Đã lên lịch gửi lúc {when}"
+    "scheduled_for": "Đã lên lịch gửi lúc {when}",
+    "sending": "Đang gửi…",
+    "sent": "Đã gửi",
+    "view": "Xem"
   },
   "org_templates": {
     "section_personal": "Mẫu của tôi",
diff --git a/locales/zh-TW/common.json b/locales/zh-TW/common.json
index 5e71acdc7..b0d322bed 100644
--- a/locales/zh-TW/common.json
+++ b/locales/zh-TW/common.json
@@ -3907,7 +3907,10 @@
     "warning_proofreading": "未處理的拼字或文法問題：{count}",
     "empty_text_title": "不寫內文就傳送？",
     "empty_text_message": "這封郵件沒有內文，也沒有附件。仍然傳送？",
-    "scheduled_for": "已排定於 {when} 傳送"
+    "scheduled_for": "已排定於 {when} 傳送",
+    "sending": "正在傳送…",
+    "sent": "已傳送",
+    "view": "檢視"
   },
   "org_templates": {
     "section_personal": "我的範本",
diff --git a/locales/zh/common.json b/locales/zh/common.json
index 4a013b35d..83dc1a395 100644
--- a/locales/zh/common.json
+++ b/locales/zh/common.json
@@ -3907,7 +3907,10 @@
     "warning_proofreading": "未处理的拼写或语法问题：{count}",
     "empty_text_title": "不写正文就发送？",
     "empty_text_message": "这封邮件没有正文，也没有附件。仍然发送？",
-    "scheduled_for": "已安排在 {when} 发送"
+    "scheduled_for": "已安排在 {when} 发送",
+    "sending": "正在发送…",
+    "sent": "已发送",
+    "view": "查看"
   },
   "org_templates": {
     "section_personal": "我的模板",
diff --git a/stores/__tests__/email-store-send-list-loading.test.ts b/stores/__tests__/email-store-send-list-loading.test.ts
new file mode 100644
index 000000000..72d867a0a
--- /dev/null
+++ b/stores/__tests__/email-store-send-list-loading.test.ts
@@ -0,0 +1,43 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+import { useEmailStore } from '../email-store';
+import { useAuthStore } from '../auth-store';
+import type { IJMAPClient } from '@/lib/jmap/client-interface';
+
+// isLoading is the message list's: while it is set, the list fades under
+// "Loading emails…". A send set it too, so every send reloaded the list on
+// screen until the message was out (compose-24).
+
+describe('the message list during a send', () => {
+  let client: IJMAPClient;
+  let finishSend: (value: unknown) => void;
+
+  beforeEach(() => {
+    client = {
+      getAccountId: () => 'acc-1',
+      pruneEmailSubmissions: vi.fn().mockResolvedValue(0),
+      sendEmail: vi.fn(() => new Promise((resolve) => { finishSend = resolve; })),
+      getAllMailboxesWithState: vi.fn().mockResolvedValue({ mailboxes: [], states: {} }),
+    } as unknown as IJMAPClient;
+    useAuthStore.setState({ client: null });
+    useEmailStore.setState({ isLoading: false, pendingUndoSend: null });
+  });
+
+  it('is not put in its loading state while the message goes out', async () => {
+    const sending = useEmailStore.getState().sendEmail(client, ['bob@example.net'], 'Subject', 'body');
+
+    expect(useEmailStore.getState().isLoading).toBe(false);
+
+    finishSend({ scheduled: false, emailId: 'sent-1' });
+    await sending;
+    expect(useEmailStore.getState().isLoading).toBe(false);
+  });
+
+  it('keeps loading a folder that a send finished in the middle of', async () => {
+    useEmailStore.setState({ isLoading: true });
+    const sending = useEmailStore.getState().sendEmail(client, ['bob@example.net'], 'Subject', 'body');
+    finishSend({ scheduled: false, emailId: 'sent-1' });
+    await sending;
+
+    expect(useEmailStore.getState().isLoading).toBe(true);
+  });
+});
diff --git a/stores/email-store.ts b/stores/email-store.ts
index 96d37325e..0ac3db403 100644
--- a/stores/email-store.ts
+++ b/stores/email-store.ts
@@ -4399,7 +4399,9 @@ export const useEmailStore = create<EmailStore>((set, get) => ({
     const outbox = options?.outbox ? getOutboxHooks() : null;
     const queueArgs = () => [to, subject, body, cc, bcc, identityId, fromEmail, draftId, fromName, htmlBody, attachments, inReplyTo, references, delayedUntil, envelopeMailFrom, options];
     if (outbox?.shouldQueue(client)) return outbox.queueEmail(client, queueArgs());
-    set({ isLoading: true, error: null });
+    // Not isLoading: that is the message list's own, and a send put the list
+    // under "Loading emails…" until the message was out.
+    set({ error: null });
     try {
       // Files attached while offline are uploaded now that the server answers.
       const sendAttachments = attachments && getOutboxHooks() ? await getOutboxHooks()!.resolveHeldAttachments(client, attachments) : attachments;
@@ -4414,7 +4416,6 @@ export const useEmailStore = create<EmailStore>((set, get) => ({
       if (useAuthStore.getState().client === client) void get().fetchMailboxes(client);
       // Refresh handled by UI layer for immediate feedback
       set({
-        isLoading: false,
         pendingUndoSend: result.scheduled && result.emailSubmissionId && result.sendAt
           ? {
               submissionId: result.emailSubmissionId,
@@ -4435,12 +4436,10 @@ export const useEmailStore = create<EmailStore>((set, get) => ({
       // (the client says so: SendNotStartedError): keep it. Any other
       // failure may have come after the server took the message.
       if (outbox && error instanceof Error && error.name === 'SendNotStartedError' && outbox.shouldQueue(client)) {
-        set({ isLoading: false });
         return outbox.queueEmail(client, queueArgs());
       }
       set({
         error: error instanceof Error ? error.message : "Failed to send email",
-        isLoading: false
       });
       throw error;
     }
@@ -4451,7 +4450,8 @@ export const useEmailStore = create<EmailStore>((set, get) => ({
     // encrypted with the user present, so the finished message can wait.
     const outbox = options?.outbox ? getOutboxHooks() : null;
     if (outbox?.shouldQueue(client)) return outbox.queueRaw(client, rawMimeBlob, { identityId, delayedUntil, envelopeRecipients });
-    set({ isLoading: true, error: null });
+    // Not isLoading, as in sendEmail.
+    set({ error: null });
     try {
       const mailboxes = await client.getMailboxes();
       const sentMailbox = mailboxes.find(mb => mb.role === 'sent');
@@ -4460,7 +4460,6 @@ export const useEmailStore = create<EmailStore>((set, get) => ({
       const result = await client.sendRawEmail(rawMimeBlob, identityId, sentMailbox.id, draftsMailbox?.id, delayedUntil, envelopeRecipients);
       void client.pruneEmailSubmissions();
       set({
-        isLoading: false,
         pendingUndoSend: result.scheduled && result.emailSubmissionId && result.sendAt
           ? { submissionId: result.emailSubmissionId, emailId: result.emailId, identityId, sendAt: result.sendAt, isSmime: true, submissionAccountId: result.submissionAccountId }
           : get().pendingUndoSend,
@@ -4469,7 +4468,6 @@ export const useEmailStore = create<EmailStore>((set, get) => ({
     } catch (error) {
       set({
         error: error instanceof Error ? error.message : "Failed to send email",
-        isLoading: false,
       });
       throw error;
     }

From 317f3b40dda5959e017027def292abfe0439c577 Mon Sep 17 00:00:00 2001
From: Linus Rath <139418639+rathlinus@users.noreply.github.com>
Date: Wed, 4 Nov 2026 06:42:47 +0100
Subject: [PATCH 11/34] fix: suggest recipients whose name starts with what you
 type first

---
 stores/__tests__/contact-store.test.ts | 41 +++++++++++++++++
 stores/contact-store.ts                | 62 ++++++++++++++++++--------
 2 files changed, 85 insertions(+), 18 deletions(-)

diff --git a/stores/__tests__/contact-store.test.ts b/stores/__tests__/contact-store.test.ts
index f52aa4e11..e16eb1a09 100644
--- a/stores/__tests__/contact-store.test.ts
+++ b/stores/__tests__/contact-store.test.ts
@@ -419,6 +419,47 @@ describe('contact-store', () => {
       expect(results).toEqual([{ name: 'Jane Doe', email: 'jane.doe@example.com' }]);
     });
 
+    // "an" offered Daniel Okafor and Greta Hoffmann before Anna Becker.
+    it('should put names and addresses that start with the query first', () => {
+      const person = (id: string, given: string, surname: string, address: string) => makeContact({
+        id,
+        name: { components: [{ kind: 'given', value: given }, { kind: 'surname', value: surname }], isOrdered: true },
+        emails: { e0: { address } },
+      });
+      useContactStore.setState({
+        contacts: [
+          person('d', 'Daniel', 'Okafor', 'daniel@example.com'),
+          person('g', 'Greta', 'Hoffmann', 'greta@example.com'),
+          person('a', 'Anna', 'Becker', 'anna@example.com'),
+          person('h', 'Hiro', 'Tanaka', 'hiro@example.com'),
+          person('m', 'Mia', 'Schulz', 'mia.anders@example.com'),
+        ],
+        directoryPrincipals: [],
+        recentRecipients: [{ name: '', email: 'brandt@example.com' }, { name: 'Andreas Wolf', email: 'wolf@example.com' }],
+      });
+      const results = useContactStore.getState().getAutocomplete('an');
+      expect(results.map((r) => r.email)).toEqual([
+        'anna@example.com',
+        'mia.anders@example.com',
+        'wolf@example.com',
+        'daniel@example.com',
+        'greta@example.com',
+        'hiro@example.com',
+        'brandt@example.com',
+      ]);
+    });
+
+    it('should not lose a name that starts with the query behind ten that only contain it', () => {
+      const contacts = Array.from({ length: 12 }, (_, i) =>
+        makeContact({ id: `d${i}`, name: { components: [{ kind: 'given', value: `Dan${i}` }], isOrdered: true }, emails: { e0: { address: `dan${i}@example.com` } } }),
+      );
+      contacts.push(makeContact({ id: 'anna', name: { components: [{ kind: 'given', value: 'Anna' }], isOrdered: true }, emails: { e0: { address: 'anna@example.com' } } }));
+      useContactStore.setState({ contacts, directoryPrincipals: [], recentRecipients: [] });
+      const results = useContactStore.getState().getAutocomplete('an');
+      expect(results).toHaveLength(10);
+      expect(results[0].email).toBe('anna@example.com');
+    });
+
     it('should repair a recent recipient whose address lost its closing bracket', () => {
       useContactStore.setState({
         contacts: [],
diff --git a/stores/contact-store.ts b/stores/contact-store.ts
index 924dfc99a..78414be6b 100644
--- a/stores/contact-store.ts
+++ b/stores/contact-store.ts
@@ -41,6 +41,27 @@ function sameIdSet(a: Set<string>, b: Set<string>): boolean {
 /** One compose-autocomplete suggestion: a person, or a contact group. */
 type RecipientSuggestion = { name: string; email: string; group?: { id: string; memberCount: number } };
 
+/** How many suggestions the compose autocomplete offers. */
+const MAX_SUGGESTIONS = 10;
+
+/**
+ * How well `query` (lowercase) matches any of `texts`: 0 at the start of a
+ * word ("an" in "Anna" or "an@x"), 1 inside a word ("an" in "Daniel"),
+ * -1 not at all. Word starts come first in the suggestions.
+ */
+function matchRank(query: string, ...texts: (string | undefined)[]): number {
+  let rank = -1;
+  for (const text of texts) {
+    if (!text) continue;
+    const lower = text.toLowerCase();
+    for (let at = lower.indexOf(query); at !== -1; at = lower.indexOf(query, at + 1)) {
+      if (at === 0 || !/[\p{L}\p{N}]/u.test(lower[at - 1])) return 0;
+      rank = 1;
+    }
+  }
+  return rank;
+}
+
 /**
  * Reduces every suggestion to a clean display name plus a bare address and
  * collapses the ones that resolve to the same address.
@@ -925,17 +946,26 @@ export const useContactStore = create<ContactStore>()(
 
         const lower = query.toLowerCase();
         const results: RecipientSuggestion[] = [];
+        // Every match is collected and ranked: a word that starts with the
+        // query ("an": Anna, an@x) before one that only contains it
+        // (Daniel), each kind in the order contacts, directory, recent.
+        const ranks = new Map<RecipientSuggestion, number>();
+        const add = (suggestion: RecipientSuggestion, rank: number) => {
+          results.push(suggestion);
+          ranks.set(suggestion, rank);
+        };
 
         for (const contact of contacts) {
           if (contact.kind === 'group') {
             // Suggest the group itself as a single entry (Outlook-style);
             // the composer turns it into one chip carrying the members.
             const groupName = getContactDisplayName(contact);
-            if (groupName && groupName.toLowerCase().includes(lower)) {
+            const rank = matchRank(lower, groupName);
+            if (rank >= 0) {
               const memberCount = get().getGroupMembers(contact.id)
                 .filter(m => getContactPrimaryEmail(m).trim()).length;
               if (memberCount > 0) {
-                results.push({ name: groupName, email: '', group: { id: contact.id, memberCount } });
+                add({ name: groupName, email: '', group: { id: contact.id, memberCount } }, rank);
               }
             }
             continue;
@@ -946,15 +976,9 @@ export const useContactStore = create<ContactStore>()(
 
           for (const emailEntry of emails) {
             if (!emailEntry.address) continue;
-            if (
-              name.toLowerCase().includes(lower) ||
-              emailEntry.address.toLowerCase().includes(lower)
-            ) {
-              results.push({ name, email: emailEntry.address });
-            }
+            const rank = matchRank(lower, name, emailEntry.address);
+            if (rank >= 0) add({ name, email: emailEntry.address }, rank);
           }
-
-          if (results.length >= 10) break;
         }
 
         // Augment with directory principals (other users on the server, RFC 9670).
@@ -963,7 +987,6 @@ export const useContactStore = create<ContactStore>()(
         if (directoryPrincipals.length > 0) {
           const seen = new Set(results.map(r => r.email.toLowerCase()));
           for (const p of directoryPrincipals) {
-            if (results.length >= 10) break;
             const addr = p.email.toLowerCase();
             if (seen.has(addr)) {
               const betterName = p.description || p.name;
@@ -975,10 +998,11 @@ export const useContactStore = create<ContactStore>()(
               }
               continue;
             }
-            if (p.name.toLowerCase().includes(lower) || addr.includes(lower) || (p.description && p.description.toLowerCase().includes(lower))) {
+            const rank = matchRank(lower, p.name, addr, p.description);
+            if (rank >= 0) {
               const displayName = p.description || p.name;
               const name = displayName !== p.email ? displayName : '';
-              results.push({ name, email: p.email });
+              add({ name, email: p.email }, rank);
               seen.add(addr);
             }
           }
@@ -990,20 +1014,22 @@ export const useContactStore = create<ContactStore>()(
         // duplicates). These carry the display name from the message, so match
         // on name or address.
         const { recentRecipients } = get();
-        if (recentRecipients.length > 0 && results.length < 10) {
+        if (recentRecipients.length > 0) {
           const seenRecent = new Set(results.map(r => r.email.toLowerCase()));
           for (const rec of recentRecipients) {
-            if (results.length >= 10) break;
             const addr = rec.email.toLowerCase();
             if (seenRecent.has(addr)) continue;
-            if (addr.includes(lower) || (rec.name && rec.name.toLowerCase().includes(lower))) {
-              results.push({ name: rec.name, email: rec.email });
+            const rank = matchRank(lower, addr, rec.name);
+            if (rank >= 0) {
+              add({ name: rec.name, email: rec.email }, rank);
               seenRecent.add(addr);
             }
           }
         }
 
-        return normalizeSuggestions(results);
+        // Array.prototype.sort is stable, so each rank keeps the order above.
+        const ranked = [...results].sort((a, b) => (ranks.get(a) ?? 1) - (ranks.get(b) ?? 1));
+        return normalizeSuggestions(ranked).slice(0, MAX_SUGGESTIONS);
       },
 
       getGroups: () => {

From 7d2859e064b0ca2d33650ccc3b7b6f05a31ffdd6 Mon Sep 17 00:00:00 2001
From: Linus Rath <139418639+rathlinus@users.noreply.github.com>
Date: Wed, 4 Nov 2026 06:44:56 +0100
Subject: [PATCH 12/34] feat: keep undo send in the pop-out or quick compose
 window until the time is over

---
 .../__tests__/popout-compose-app.test.tsx     |  88 ++++++++++
 components/popout/popout-compose-app.tsx      | 162 +++++++++++++++++-
 2 files changed, 244 insertions(+), 6 deletions(-)

diff --git a/components/popout/__tests__/popout-compose-app.test.tsx b/components/popout/__tests__/popout-compose-app.test.tsx
index 6ceedf1fa..d92e90439 100644
--- a/components/popout/__tests__/popout-compose-app.test.tsx
+++ b/components/popout/__tests__/popout-compose-app.test.tsx
@@ -4,6 +4,7 @@ import { FakeBroadcastChannel } from '@/lib/__tests__/fixtures/fake-broadcast-ch
 import { openPopoutChannel, type PopoutMessage, type RescuedDraft } from '@/lib/popout/channel';
 import { createComposeHandoff, rememberComposePayload, rememberedComposePayload } from '@/lib/popout/compose-handoff';
 import { useAuthStore } from '@/stores/auth-store';
+import { useEmailStore } from '@/stores/email-store';
 import { useIdentityStore } from '@/stores/identity-store';
 import { usePluginStore } from '@/stores/plugin-store';
 import { emailHooks } from '@/lib/plugin-hooks';
@@ -547,3 +548,90 @@ describe('after this page crashed', () => {
     expect(rememberedComposePayload('h2')).toBeNull();
   });
 });
+
+describe('a send held for undo', () => {
+  const closeSelf = vi.fn();
+  const MAILBOXES = [{ id: 'mDrafts', role: 'drafts' }, { id: 'mSent', role: 'sent' }];
+  const startDraft = {
+    id: 'd0', subject: 'Before sending', to: [{ email: 'a@example.org' }], cc: [], bcc: [], from: [{ name: 'Me', email: 'me@example.org' }],
+    keywords: { $draft: true }, mailboxIds: { mDrafts: true },
+    bodyValues: { t: { value: 'Text' } }, textBody: [{ partId: 't', type: 'text/plain' }], htmlBody: [], attachments: [],
+  };
+  const restoredDraft = {
+    id: 'e1', subject: 'Back again', to: [{ email: 'a@example.org' }], cc: [], bcc: [], from: [{ name: 'Me', email: 'me@example.org' }],
+    keywords: { $draft: true }, mailboxIds: { mDrafts: true },
+    bodyValues: { t: { value: 'Text' } }, textBody: [{ partId: 't', type: 'text/plain' }], htmlBody: [], attachments: [],
+  };
+  let originalEmail: ReturnType<typeof useEmailStore.getState>;
+  let sendAt: string;
+  let cancelUndoSend: ReturnType<typeof vi.fn>;
+
+  beforeEach(() => {
+    closeSelf.mockClear();
+    originalEmail = useEmailStore.getState();
+    window.bulwarkDesktop = { version: 1, platform: 'win32', windows: { closeSelf, setRestore: vi.fn() } } as never;
+    useIdentityStore.setState({ identities: [{ id: 'id-1', email: 'me@example.org', name: 'Me' }] } as never);
+    identityMocks.multi = { enabled: false, allIdentities: [], groups: [] };
+    const client = { getEmail: vi.fn(async (id: string) => (id === 'e1' ? restoredDraft : startDraft)), getMailboxes: vi.fn(async () => MAILBOXES) };
+    useAuthStore.setState({ client: client as never, getClientForAccount: (id: string) => (id === 'alice' ? client : undefined) } as never);
+    cancelUndoSend = vi.fn(async () => restoredDraft);
+    useEmailStore.setState({
+      sendEmail: vi.fn(async () => {
+        useEmailStore.setState({ pendingUndoSend: { submissionId: 'sub1', emailId: 'e1', identityId: 'id-1', sendAt, isSmime: false } });
+        return { scheduled: true, emailSubmissionId: 'sub1', emailId: 'e1', sendAt };
+      }),
+      cancelUndoSend,
+    } as never);
+  });
+
+  afterEach(() => {
+    useEmailStore.setState(originalEmail);
+    window.bulwarkDesktop = undefined;
+  });
+
+  type Sending = { onSend: (data: object) => Promise<unknown>; onClose: () => void };
+  const DATA = { to: ['a@example.org'], cc: [], bcc: [], subject: 'Hi', body: 'Text', localAccountId: 'alice' };
+
+  /** Opens the window, sends from it and lets the composer close, as it does after a send. */
+  async function sendFromWindow(seconds: number) {
+    sendAt = new Date(Date.now() + seconds * 1000).toISOString();
+    window.history.replaceState(null, '', '/en/popout/compose?draft=d0&account=alice');
+    render(<PopoutComposeApp />);
+    await waitFor(() => expect(screen.getByTestId('composer').textContent).toBe('Before sending'));
+    const props = composer as unknown as Sending;
+    await act(async () => { await props.onSend(DATA); });
+    act(() => props.onClose());
+  }
+
+  it('stays open with "Sending in" and Undo, and does not hand the undo to the main window', async () => {
+    await sendFromWindow(5);
+    expect(screen.getByTestId('popout-sending').textContent).toContain('sending_in');
+    expect(screen.getByRole('button', { name: 'undo_send' })).toBeInTheDocument();
+    expect(closeSelf).not.toHaveBeenCalled();
+    const sent = heard.find((message) => message.type === 'sent') as Extract<PopoutMessage, { type: 'sent' }> | undefined;
+    expect(sent?.notice.pendingUndoSend ?? null).toBeNull();
+  });
+
+  it('closes once the undo time is over', async () => {
+    await sendFromWindow(1.2);
+    expect(closeSelf).not.toHaveBeenCalled();
+    await waitFor(() => expect(closeSelf).toHaveBeenCalled(), { timeout: 4000 });
+  });
+
+  it('Undo takes the send back and opens the message again in this window', async () => {
+    await sendFromWindow(30);
+    fireEvent.click(screen.getByRole('button', { name: 'undo_send' }));
+    await waitFor(() => expect(cancelUndoSend).toHaveBeenCalledWith(expect.anything(), expect.objectContaining({ submissionId: 'sub1', localAccountId: 'alice' })));
+    await waitFor(() => expect(screen.getByTestId('composer').textContent).toBe('Back again'));
+    expect(closeSelf).not.toHaveBeenCalled();
+    expect(new URLSearchParams(window.location.search).get('draft')).toBe('e1');
+  });
+
+  it('a message scheduled for later still goes to the main window, and the window closes', async () => {
+    await sendFromWindow(3600);
+    expect(screen.queryByTestId('popout-sending')).toBeNull();
+    expect(closeSelf).toHaveBeenCalled();
+    const sent = heard.find((message) => message.type === 'sent') as Extract<PopoutMessage, { type: 'sent' }> | undefined;
+    expect(sent?.notice.pendingUndoSend?.submissionId).toBe('sub1');
+  });
+});
diff --git a/components/popout/popout-compose-app.tsx b/components/popout/popout-compose-app.tsx
index 4b9f058a8..e29b8810d 100644
--- a/components/popout/popout-compose-app.tsx
+++ b/components/popout/popout-compose-app.tsx
@@ -1,6 +1,6 @@
 "use client";
 
-import { useCallback, useEffect, useMemo, useState } from "react";
+import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { useTranslations } from "next-intl";
 import { EmailComposer, type ComposerDraftData } from "@/components/email/email-composer";
 import { ErrorBoundary, ComposerErrorFallback } from "@/components/error";
@@ -13,8 +13,9 @@ import { toast } from "@/stores/toast-store";
 import { formatRejectedRecipients } from "@/lib/jmap/client";
 import { debug } from "@/lib/debug";
 import { composerSendOptions } from "@/lib/outgoing/composer-send-options";
-import { announceSent } from "@/lib/plugin-after-send";
-import { announceMailChanged, announceSentToMainWindow, askRescuedDraftId, watchMainWindow, type RescuedDraft } from "@/lib/popout/channel";
+import { announceSent, cancelAnnouncedSend, releaseAnnouncedSend } from "@/lib/plugin-after-send";
+import { cancelFailureToast } from "@/lib/send-failure-message";
+import { announceMailChanged, announceSentToMainWindow, askRescuedDraftId, watchMainWindow, type PopoutSentNotice, type RescuedDraft } from "@/lib/popout/channel";
 import { acknowledgeComposeHandoff, forgetComposePayload, receiveComposeHandoff, rememberComposePayload, rememberedComposePayload, watchHandoffCancel } from "@/lib/popout/compose-handoff";
 import type { ComposePopoutPayload } from "@/lib/popout/compose-payload";
 import { returnComposerToMain, type ReturnResult } from "@/lib/popout/return-to-main";
@@ -30,6 +31,7 @@ import { emailHooks } from "@/lib/plugin-hooks";
 import { useProMultiAccountIdentities } from "@/hooks/use-pro-multi-account-identities";
 import { useIdentityStore } from "@/stores/identity-store";
 import type { Email } from "@/lib/jmap/types";
+import { Send } from "@/components/icons";
 import { PopoutNotice, PopoutShell, PopoutSkeleton } from "./popout-shell";
 
 /** A warning with no main window left to show it stays this long before the window goes. */
@@ -49,6 +51,91 @@ const MAIN_CHECK_MS = 1000;
 /** How long a reloaded window waits to hear what became of the text it handed over on the way out. */
 const RESCUE_ANSWER_MS = 2000;
 
+/** A send held this long or less is an undo window ("Sending in 5 s"), not a message scheduled for later. */
+const UNDO_WINDOW_MS = 120_000;
+/** Undo goes this long before the server lets the message go, as in the main window. */
+const UNDO_MARGIN_MS = 1000;
+/** What the plugins are told when the hold runs out gets this long before the window goes. */
+const RELEASE_WAIT_MS = 1000;
+
+type HeldSend = NonNullable<PopoutSentNotice["pendingUndoSend"]>;
+
+/** A draft to open again in this window, after Undo brought the message back to Drafts. */
+interface ReopenTarget {
+  draftId: string;
+  accountId: string;
+  ownerAccountId?: string;
+}
+
+/**
+ * A send held for undo, shown in the window it was sent from: that's where the
+ * user is looking, and quick compose is used with the main window out of sight.
+ * The window stays until the hold runs out, then goes.
+ */
+function SendingWithUndo({ held, onUndone, onGone }: {
+  held: HeldSend;
+  /** The send was taken back; the message, back in Drafts, when there is one to open. */
+  onUndone: (restored: Email | null) => void;
+  onGone: () => void;
+}) {
+  const tViewer = useTranslations("email_viewer");
+  const [now, setNow] = useState(() => Date.now());
+  const [busy, setBusy] = useState(false);
+  const sendAt = Date.parse(held.sendAt);
+  const over = !Number.isFinite(sendAt) || now >= sendAt - UNDO_MARGIN_MS;
+
+  useEffect(() => {
+    if (over) return;
+    const timer = setInterval(() => setNow(Date.now()), 250);
+    return () => clearInterval(timer);
+  }, [over]);
+
+  // Too late to undo: the plugins hear of the send now, and the window goes.
+  useEffect(() => {
+    if (!over || busy) return;
+    releaseAnnouncedSend(held.submissionId);
+    const timer = setTimeout(onGone, RELEASE_WAIT_MS);
+    return () => clearTimeout(timer);
+  }, [over, busy, held.submissionId, onGone]);
+
+  const undo = async () => {
+    const auth = useAuthStore.getState();
+    // Never another login: the submission id names another submission there.
+    const client = held.localAccountId ? auth.getClientForAccount(held.localAccountId) : auth.client;
+    if (!client) {
+      toast.error(tViewer("undo_send_signed_out"));
+      return;
+    }
+    setBusy(true);
+    let restored: Email | null;
+    try {
+      restored = await useEmailStore.getState().cancelUndoSend(client, held);
+    } catch (error) {
+      debug.error("Failed to undo the send:", error);
+      const { title, message } = cancelFailureToast(error, tViewer, tViewer("undo_send_failed"));
+      toast.error(title, message ? { message } : undefined);
+      setBusy(false);
+      return;
+    }
+    // Never left the server: plugins don't hear about it.
+    cancelAnnouncedSend(held.submissionId);
+    onUndone(held.isSmime ? null : restored);
+  };
+
+  const seconds = Math.max(0, Math.ceil((sendAt - now) / 1000));
+  return (
+    <div className="flex min-h-0 flex-1 flex-col items-center justify-center gap-4 p-6 text-center" data-testid="popout-sending">
+      <Send className="h-6 w-6 text-muted-foreground" aria-hidden="true" />
+      <p role="status" className="text-sm text-foreground">{tViewer("sending_in", { seconds })}</p>
+      {!over && (
+        <Button onClick={() => void undo()} disabled={busy} data-testid="popout-undo-send">
+          {tViewer("undo_send")}
+        </Button>
+      )}
+    </div>
+  );
+}
+
 function readLaunch(): { handoffId: string | null; accountId?: string; draftId?: string; ownerAccountId?: string } {
   if (typeof window === "undefined") return { handoffId: null };
   const search = new URLSearchParams(window.location.search);
@@ -214,7 +301,12 @@ function NewMessageGate({ onReady }: { onReady: (payload: ComposePopoutPayload)
 }
 
 /** The composer alone, in its own window: sending, autosave and discard go through the shared stores, as in a Pro tab. */
-function PopoutComposer({ payload, handoffId }: { payload: ComposePopoutPayload; handoffId: string | null }) {
+function PopoutComposer({ payload, handoffId, onReopen }: {
+  payload: ComposePopoutPayload;
+  handoffId: string | null;
+  /** Undo brought the message back to Drafts: open it again here. */
+  onReopen: (target: ReopenTarget) => void;
+}) {
   const t = useTranslations();
   const tQuick = useTranslations("desktopQuickCompose");
   const client = useAuthStore((s) => s.client);
@@ -267,6 +359,16 @@ function PopoutComposer({ payload, handoffId }: { payload: ComposePopoutPayload;
 
     const accountId = data.localAccountId ?? useAuthStore.getState().activeAccountId;
     const pending = useEmailStore.getState().pendingUndoSend;
+    const withLogin = pending ? { ...pending, localAccountId: pending.localAccountId ?? accountId ?? undefined } : null;
+    // An undo window stays here, where Send was pressed: the window shows it
+    // and closes when it runs out. A message scheduled for later goes to the
+    // main window as before.
+    const remaining = withLogin ? Date.parse(withLogin.sendAt) - Date.now() : NaN;
+    const keepHere = result.scheduled && withLogin && Number.isFinite(remaining) && remaining <= UNDO_WINDOW_MS ? withLogin : null;
+    if (keepHere) {
+      heldRef.current = keepHere;
+      useEmailStore.setState({ pendingUndoSend: null });
+    }
     const rejectedRecipients = result.rejectedRecipients?.length ? formatRejectedRecipients(result.rejectedRecipients) : undefined;
     const taken = await announceSentToMainWindow({
       accountId,
@@ -274,7 +376,7 @@ function PopoutComposer({ payload, handoffId }: { payload: ComposePopoutPayload;
       queued: !!result.queued,
       filingError: !!result.filingError,
       rejectedRecipients,
-      pendingUndoSend: pending ? { ...pending, localAccountId: pending.localAccountId ?? accountId ?? undefined } : null,
+      pendingUndoSend: keepHere ? null : withLogin,
     });
     // No main window to say so, and this is the only notice these get (#1123).
     if (!taken && (result.filingError || rejectedRecipients)) {
@@ -301,11 +403,36 @@ function PopoutComposer({ payload, handoffId }: { payload: ComposePopoutPayload;
     }
   }, [client, t]);
 
+  // A send held for undo, kept in this window until it runs out.
+  const heldRef = useRef<HeldSend | null>(null);
+  const [held, setHeld] = useState<HeldSend | null>(null);
+
   const handleClose = useCallback(() => {
+    announceMailChanged(useAuthStore.getState().activeAccountId);
+    if (heldRef.current) {
+      setHeld(heldRef.current);
+      return;
+    }
+    closePopoutWindow();
+  }, []);
+
+  const heldGone = useCallback(() => {
     announceMailChanged(useAuthStore.getState().activeAccountId);
     closePopoutWindow();
   }, []);
 
+  const heldUndone = useCallback((restored: Email | null) => {
+    const sent = heldRef.current;
+    heldRef.current = null;
+    const login = sent?.localAccountId ?? useAuthStore.getState().activeAccountId;
+    announceMailChanged(login);
+    if (!restored || !login) {
+      closePopoutWindow();
+      return;
+    }
+    onReopen({ draftId: restored.id, accountId: login, ownerAccountId: sent?.submissionAccountId });
+  }, [onReopen]);
+
   const [mainWindow] = useState(watchMainWindow);
   useEffect(() => () => mainWindow.stop(), [mainWindow]);
 
@@ -373,6 +500,8 @@ function PopoutComposer({ payload, handoffId }: { payload: ComposePopoutPayload;
     },
   }), [handoffId, mainWindow, payload]);
 
+  if (held) return <SendingWithUndo held={held} onUndone={heldUndone} onGone={heldGone} />;
+
   return (
     <ErrorBoundary fallback={ComposerErrorFallback}>
       <EmailComposer
@@ -405,6 +534,26 @@ export function PopoutComposeApp() {
   // draft is the newest there is. An ordinary reload remembers as it unloads.
   const [handoffId] = useState(() => (named && draftId && !rememberedComposePayload(named) ? null : named));
   const [payload, setPayload] = useState<ComposePopoutPayload | null>(null);
+  // After Undo: the message back in Drafts, opened again in a new composer here.
+  const [reopen, setReopen] = useState<ReopenTarget | null>(null);
+  const [generation, setGeneration] = useState(0);
+  const handleReopen = useCallback((target: ReopenTarget) => {
+    // A reload starts from the draft, as after a save.
+    const url = new URL(window.location.href);
+    url.searchParams.delete("handoff");
+    url.searchParams.set("draft", target.draftId);
+    url.searchParams.set("account", target.accountId);
+    if (target.ownerAccountId) url.searchParams.set("owner", target.ownerAccountId);
+    else url.searchParams.delete("owner");
+    window.history.replaceState(null, "", `${url.pathname}${url.search}`);
+    setPayload(null);
+    setReopen(target);
+  }, []);
+  const reopened = useCallback((next: ComposePopoutPayload) => {
+    setReopen(null);
+    setGeneration((n) => n + 1);
+    setPayload(next);
+  }, []);
 
   useEffect(() => {
     if (!handoffId) return;
@@ -438,7 +587,8 @@ export function PopoutComposeApp() {
 
   return (
     <PopoutShell kind="compose" accountId={accountId}>
-      {payload ? <PopoutComposer payload={payload} handoffId={handoffId} />
+      {payload ? <PopoutComposer key={generation} payload={payload} handoffId={generation === 0 ? handoffId : null} onReopen={handleReopen} />
+        : reopen ? <RestoredDraft draftId={reopen.draftId} accountId={reopen.accountId} ownerAccountId={reopen.ownerAccountId} onReady={reopened} />
         : handoffId ? <PopoutSkeleton label={t("opening")} />
         : draftId ? <RestoredDraft draftId={draftId} accountId={accountId} ownerAccountId={ownerAccountId} onReady={setPayload} />
         : <NewMessageGate onReady={setPayload} />}

From 0c5ba654c6c3b17e8d01d113186cda3259948f08 Mon Sep 17 00:00:00 2001
From: Linus Rath <139418639+rathlinus@users.noreply.github.com>
Date: Wed, 4 Nov 2026 06:56:08 +0100
Subject: [PATCH 13/34] fix: show the name only on recipient chips, with the
 address on hover

The autocomplete, chip-drag and paste tests found chips by their old
"Name (address)" text; they now find them by the "Name <address>"
tooltip, which is where the address went.
---
 .../__tests__/recipient-autocomplete.test.tsx |  8 +++---
 .../__tests__/recipient-chip-drag.test.tsx    |  4 +--
 .../email/__tests__/recipient-paste.test.tsx  | 27 ++++++++++++++-----
 components/email/email-composer.tsx           | 17 ++++++++----
 4 files changed, 38 insertions(+), 18 deletions(-)

diff --git a/components/email/__tests__/recipient-autocomplete.test.tsx b/components/email/__tests__/recipient-autocomplete.test.tsx
index af1feb66d..be289b5a7 100644
--- a/components/email/__tests__/recipient-autocomplete.test.tsx
+++ b/components/email/__tests__/recipient-autocomplete.test.tsx
@@ -243,7 +243,7 @@ describe('recipient autocomplete', () => {
 
     fireEvent.keyDown(input, { key: 'Enter' });
 
-    expect(screen.getByText('User B (userb@example.org)')).toBeInTheDocument();
+    expect(screen.getByTitle('User B <userb@example.org>')).toBeInTheDocument();
     expect(screen.queryByText('user')).not.toBeInTheDocument();
   });
 
@@ -255,7 +255,7 @@ describe('recipient autocomplete', () => {
 
     fireEvent.keyDown(input, { key: 'Tab' });
 
-    expect(screen.getByText('User C (userc@example.org)')).toBeInTheDocument();
+    expect(screen.getByTitle('User C <userc@example.org>')).toBeInTheDocument();
   });
 
   it('keeps a complete typed address that no suggestion matches exactly', async () => {
@@ -268,7 +268,7 @@ describe('recipient autocomplete', () => {
     fireEvent.keyDown(input, { key: 'Enter' });
 
     expect(screen.getByText('userb@example.or')).toBeInTheDocument();
-    expect(screen.queryByText('User B (userb@example.org)')).not.toBeInTheDocument();
+    expect(screen.queryByTitle('User B <userb@example.org>')).not.toBeInTheDocument();
   });
 
   it('starts the arrow keys from the highlighted suggestion', async () => {
@@ -280,6 +280,6 @@ describe('recipient autocomplete', () => {
     fireEvent.keyDown(input, { key: 'ArrowDown' });
     fireEvent.keyDown(input, { key: 'Enter' });
 
-    expect(screen.getByText('User C (userc@example.org)')).toBeInTheDocument();
+    expect(screen.getByTitle('User C <userc@example.org>')).toBeInTheDocument();
   });
 });
diff --git a/components/email/__tests__/recipient-chip-drag.test.tsx b/components/email/__tests__/recipient-chip-drag.test.tsx
index 058916079..c9971480e 100644
--- a/components/email/__tests__/recipient-chip-drag.test.tsx
+++ b/components/email/__tests__/recipient-chip-drag.test.tsx
@@ -249,8 +249,8 @@ describe('RecipientChipInput drag and drop', () => {
   it('keeps a display name with a comma in a single chip (array model)', async () => {
     render(<EmailComposer initialData={{ ...BASE_DATA, to: '"Doo, John" <john@doo.org>, ' }} />);
 
-    // One chip, displayed as "Doo, John (john@doo.org)" — not split on the comma.
-    const chip = await screen.findByText('Doo, John (john@doo.org)');
+    // One chip, "Doo, John" with the address in its tooltip — not split on the comma.
+    const chip = await screen.findByTitle('Doo, John <john@doo.org>');
     const chipSpan = chip.closest('[draggable]') as HTMLElement;
     expect(chipSpan).not.toBeNull();
 
diff --git a/components/email/__tests__/recipient-paste.test.tsx b/components/email/__tests__/recipient-paste.test.tsx
index 3d8a80ca9..911ce6768 100644
--- a/components/email/__tests__/recipient-paste.test.tsx
+++ b/components/email/__tests__/recipient-paste.test.tsx
@@ -1,4 +1,4 @@
-import { render, screen } from '@testing-library/react';
+import { render, screen, within } from '@testing-library/react';
 import { fireEvent } from '@testing-library/dom';
 import { describe, it, expect, vi, beforeEach } from 'vitest';
 import React from 'react';
@@ -239,18 +239,31 @@ describe('RecipientChipInput paste', () => {
     const input = toInput();
     paste(input, '"Alice Smith <alice@x.com>", "Alex Smith <alex@x.com>"');
 
-    // Chips render as "Name (email)" when a display name is present.
-    expect(screen.getByText('Alice Smith (alice@x.com)')).toBeInTheDocument();
-    expect(screen.getByText('Alex Smith (alex@x.com)')).toBeInTheDocument();
+    // A named chip has its address in the tooltip.
+    expect(screen.getByTitle('Alice Smith <alice@x.com>')).toBeInTheDocument();
+    expect(screen.getByTitle('Alex Smith <alex@x.com>')).toBeInTheDocument();
     expect(input.value).toBe('');
   });
 
+  // "Maximilian Alexander von Hoh…": the chip showed "Name (address)" and
+  // cut both. It shows the name; the address is in the tooltip, and screen
+  // readers still hear it.
+  it('shows the name only on a named chip', () => {
+    render(<EmailComposer initialData={EMPTY_DATA} />);
+    paste(toInput(), 'Maximilian Alexander von Hohenberg <max.hohenberg@example.org>');
+
+    const label = screen.getByTitle('Maximilian Alexander von Hohenberg <max.hohenberg@example.org>');
+    expect(within(label).getByText('Maximilian Alexander von Hohenberg')).toHaveClass('truncate');
+    expect(within(label).queryByText(/max\.hohenberg@example\.org/, { ignore: '.sr-only' })).toBeNull();
+    expect(label.closest('[draggable]')?.textContent).toBe('Maximilian Alexander von Hohenberg (max.hohenberg@example.org)');
+  });
+
   it('keeps a `Name <email>` pair as a single named chip', () => {
     render(<EmailComposer initialData={EMPTY_DATA} />);
     const input = toInput();
     paste(input, 'John Doe <j@x.com>, jane@y.com');
 
-    expect(screen.getByText('John Doe (j@x.com)')).toBeInTheDocument();
+    expect(screen.getByTitle('John Doe <j@x.com>')).toBeInTheDocument();
     expect(screen.getByText('jane@y.com')).toBeInTheDocument();
     expect(input.value).toBe('');
   });
@@ -260,7 +273,7 @@ describe('RecipientChipInput paste', () => {
     const input = toInput();
     paste(input, '"Doe, John" <j@x.com>; bob@z.com');
 
-    expect(screen.getByText('Doe, John (j@x.com)')).toBeInTheDocument();
+    expect(screen.getByTitle('Doe, John <j@x.com>')).toBeInTheDocument();
     expect(screen.getByText('bob@z.com')).toBeInTheDocument();
     expect(input.value).toBe('');
   });
@@ -295,7 +308,7 @@ describe('RecipientChipInput paste', () => {
     const input = toInput();
     paste(input, '"VIP" <vip@x.com>, not-an-email, b@y.com');
 
-    expect(screen.getByText('VIP (vip@x.com)')).toBeInTheDocument();
+    expect(screen.getByTitle('VIP <vip@x.com>')).toBeInTheDocument();
     expect(screen.getByText('b@y.com')).toBeInTheDocument();
     expect(input.value).toBe('not-an-email');
   });
diff --git a/components/email/email-composer.tsx b/components/email/email-composer.tsx
index 3409f77db..9dcb154ca 100644
--- a/components/email/email-composer.tsx
+++ b/components/email/email-composer.tsx
@@ -6248,11 +6248,16 @@ export function RecipientChipInput({
     }
   }, [editingChip]);
 
-  // Format a recipient for display in a chip / context menu
+  // A chip shows the name only (the address when there is none); the full
+  // "Name <address>" is in its tooltip and at the top of its menu.
   const formatChipDisplay = (r: Recipient): string =>
     r.group
       ? `${r.name || 'Group'} (${r.group.members.length})`
-      : r.name && r.name !== r.email ? `${r.name} (${r.email})` : r.email;
+      : r.name && r.name !== r.email ? r.name : r.email;
+  const formatChipFull = (r: Recipient): string =>
+    r.group
+      ? formatChipDisplay(r)
+      : r.name && r.name !== r.email ? `${r.name} <${r.email}>` : r.email;
 
   // Handle saving an edited chip
   const handleSaveEdit = (newValue: string) => {
@@ -6645,10 +6650,12 @@ export function RecipientChipInput({
               ) : (
                 <span
                   className="inline-flex items-center gap-1 min-w-0 max-w-[200px]"
-                  title={chip.group ? chip.group.members.map(m => m.email).join(', ') : undefined}
+                  title={chip.group ? chip.group.members.map(m => m.email).join(', ') : formatChipFull(chip)}
                 >
                   {chip.group && <Users className="w-3 h-3 shrink-0" aria-hidden />}
                   <span className="truncate">{chipDisplay}</span>
+                  {/* Screen readers still hear the address the chip no longer shows. */}
+                  {!chip.group && chipDisplay !== chip.email && <span className="sr-only">{` (${chip.email})`}</span>}
                   {isInvalid && <span className="sr-only">{`, ${t('invalid_recipient')}`}</span>}
                 </span>
               )}
@@ -6745,8 +6752,8 @@ export function RecipientChipInput({
       >
         {contextMenu.data && (
           <>
-            <div className="px-3 py-1.5 text-xs font-medium text-muted-foreground truncate max-w-[200px]">
-              {formatChipDisplay(contextMenu.data.recipient)}
+            <div className="px-3 py-1.5 text-xs font-medium text-muted-foreground break-all max-w-[260px]">
+              {formatChipFull(contextMenu.data.recipient)}
             </div>
             <ContextMenuSeparator />
             {!contextMenu.data.recipient.group && (

From 0ced5482d5624662da4ec8cc19e6d062256e2165 Mon Sep 17 00:00:00 2001
From: Linus Rath <139418639+rathlinus@users.noreply.github.com>
Date: Wed, 4 Nov 2026 07:03:15 +0100
Subject: [PATCH 14/34] feat: list your contacts in the composer's recipient
 picker, with the directory on its own tab

---
 .../directory-picker-dialog.test.tsx          |  73 +++++++++++-
 components/contacts/directory-browser.tsx     |  43 ++++---
 .../contacts/directory-picker-dialog.tsx      | 111 ++++++++++++++++--
 .../email/__tests__/composer-mention.test.tsx |  17 +++
 components/email/email-composer.tsx           |   9 +-
 locales/ar/common.json                        |   9 +-
 locales/ca/common.json                        |   9 +-
 locales/cs/common.json                        |   9 +-
 locales/da/common.json                        |   9 +-
 locales/de/common.json                        |   9 +-
 locales/en/common.json                        |   9 +-
 locales/es/common.json                        |   9 +-
 locales/et/common.json                        |   9 +-
 locales/fa/common.json                        |   9 +-
 locales/fr/common.json                        |   9 +-
 locales/he/common.json                        |   9 +-
 locales/hu/common.json                        |   9 +-
 locales/it/common.json                        |   9 +-
 locales/ja/common.json                        |   9 +-
 locales/ko/common.json                        |   9 +-
 locales/lv/common.json                        |   9 +-
 locales/mn/common.json                        |   9 +-
 locales/nb/common.json                        |   9 +-
 locales/nl/common.json                        |   9 +-
 locales/pl/common.json                        |   9 +-
 locales/pt/common.json                        |   9 +-
 locales/ro/common.json                        |   9 +-
 locales/ru/common.json                        |   9 +-
 locales/sk/common.json                        |   9 +-
 locales/th/common.json                        |   9 +-
 locales/tr/common.json                        |   9 +-
 locales/uk/common.json                        |   9 +-
 locales/vi/common.json                        |   9 +-
 locales/zh-TW/common.json                     |   9 +-
 locales/zh/common.json                        |   9 +-
 35 files changed, 462 insertions(+), 61 deletions(-)

diff --git a/components/contacts/__tests__/directory-picker-dialog.test.tsx b/components/contacts/__tests__/directory-picker-dialog.test.tsx
index 192f8dc4b..8f41baf9d 100644
--- a/components/contacts/__tests__/directory-picker-dialog.test.tsx
+++ b/components/contacts/__tests__/directory-picker-dialog.test.tsx
@@ -4,6 +4,7 @@ import { describe, it, expect, vi, beforeEach } from 'vitest';
 import { DirectoryPickerDialog } from '../directory-picker-dialog';
 import { useContactStore, type DirectoryEntry, type DirectoryStatus } from '@/stores/contact-store';
 import type { IJMAPClient } from '@/lib/jmap/client-interface';
+import type { ContactCard } from '@/lib/jmap/types';
 
 // next-intl is mocked globally in vitest.setup (t returns the key).
 
@@ -25,7 +26,11 @@ function rows() {
 }
 
 describe('DirectoryPickerDialog', () => {
-  beforeEach(() => vi.clearAllMocks());
+  beforeEach(() => {
+    vi.clearAllMocks();
+    // No contacts of the user's own: the picker opens on the directory.
+    useContactStore.setState({ contacts: [] });
+  });
 
   it('lists the directory before any search, one page at a time', () => {
     setDirectory(people(60), 'ready');
@@ -109,3 +114,69 @@ describe('DirectoryPickerDialog', () => {
     expect(screen.queryByText('refresh_failed')).not.toBeInTheDocument();
   });
 });
+
+// compose-17: the picker listed only the server's directory, not the
+// contacts the To field's suggestions offer.
+describe('DirectoryPickerDialog with contacts', () => {
+  function contact(id: string, name: string, ...emails: string[]): ContactCard {
+    return {
+      id, addressBookIds: { book: true },
+      name: { full: name },
+      emails: Object.fromEntries(emails.map((address, i) => [`e${i}`, { address }])),
+    } as unknown as ContactCard;
+  }
+
+  beforeEach(() => {
+    vi.clearAllMocks();
+    setDirectory([{ name: 'Server Account', email: 'server@example.org' }], 'ready');
+    useContactStore.setState({
+      contacts: [
+        contact('c1', 'Zoe Fischer', 'zoe@example.com', 'zoe.f@work.example'),
+        contact('c2', 'Anna Becker', 'anna@example.com'),
+        { id: 'g1', kind: 'group', name: { full: 'Team' } } as unknown as ContactCard,
+      ],
+    });
+  });
+
+  it('opens on the contacts, one row per address, without groups', () => {
+    render(<DirectoryPickerDialog client={client} onClose={vi.fn()} onAdd={vi.fn()} />);
+
+    expect(screen.getByRole('tab', { name: 'tab_contacts' })).toHaveAttribute('aria-selected', 'true');
+    expect(rows().map((r) => r.textContent)).toEqual([
+      expect.stringContaining('anna@example.com'),
+      expect.stringContaining('zoe.f@work.example'),
+      expect.stringContaining('zoe@example.com'),
+    ]);
+    expect(screen.queryByText('Server Account')).not.toBeInTheDocument();
+  });
+
+  it('searches the contacts', () => {
+    render(<DirectoryPickerDialog client={client} onClose={vi.fn()} onAdd={vi.fn()} />);
+    fireEvent.change(screen.getByPlaceholderText('search_placeholder'), { target: { value: 'anna' } });
+    expect(rows()).toHaveLength(1);
+    fireEvent.change(screen.getByPlaceholderText('search_placeholder'), { target: { value: 'nobody' } });
+    expect(screen.getByText('contacts_no_match')).toBeInTheDocument();
+  });
+
+  it('adds what was checked on both tabs', () => {
+    const onAdd = vi.fn();
+    render(<DirectoryPickerDialog client={client} onClose={vi.fn()} onAdd={onAdd} />);
+    fireEvent.click(rows()[0]);
+    fireEvent.click(screen.getByRole('tab', { name: 'tab_directory' }));
+    fireEvent.click(rows()[0]);
+    fireEvent.click(screen.getByText('add_to'));
+
+    expect(onAdd).toHaveBeenCalledWith('to', [
+      expect.objectContaining({ name: 'Anna Becker', email: 'anna@example.com' }),
+      expect.objectContaining({ email: 'server@example.org' }),
+    ]);
+  });
+
+  it('shows the contacts alone where the server has no directory', () => {
+    const noDirectory = { supportsPrincipals: () => false } as unknown as IJMAPClient;
+    render(<DirectoryPickerDialog client={noDirectory} onClose={vi.fn()} onAdd={vi.fn()} />);
+    expect(screen.queryByRole('tab')).not.toBeInTheDocument();
+    expect(rows()).toHaveLength(3);
+  });
+});
+
diff --git a/components/contacts/directory-browser.tsx b/components/contacts/directory-browser.tsx
index 5f5f89d8b..1998b702b 100644
--- a/components/contacts/directory-browser.tsx
+++ b/components/contacts/directory-browser.tsx
@@ -51,6 +51,13 @@ interface DirectoryBrowserProps {
   /** Set while the list is being printed. */
   printing?: boolean;
   className?: string;
+  /**
+   * Browse these instead of the server's directory (the recipient picker's
+   * Contacts tab): nothing is fetched and there is nothing to refresh.
+   */
+  entries?: DirectoryEntry[];
+  /** With `entries`: the list's name and what an empty list or search says. */
+  labels?: { list: string; emptyTitle: string; emptyHint?: string; noMatch: string };
 }
 
 /**
@@ -69,13 +76,17 @@ export function DirectoryBrowser({
   onPrint,
   printing = false,
   className,
+  entries: ownEntries,
+  labels,
 }: DirectoryBrowserProps) {
   const t = useTranslations("contacts.directory");
   const tContacts = useTranslations("contacts");
   const tCommon = useTranslations("common");
   const locale = useLocale();
-  const entries = useContactStore((s) => s.directoryPrincipals);
-  const status = useContactStore((s) => s.directoryStatus);
+  const directoryEntries = useContactStore((s) => s.directoryPrincipals);
+  const directoryStatus = useContactStore((s) => s.directoryStatus);
+  const entries = ownEntries ?? directoryEntries;
+  const status = ownEntries ? "ready" : directoryStatus;
   const fetchDirectory = useContactStore((s) => s.fetchDirectory);
   const [query, setQuery] = useState("");
   const [page, setPage] = useState(0);
@@ -83,8 +94,8 @@ export function DirectoryBrowser({
 
   // The directory loads at sign-in; fetch here only if that never ran.
   useEffect(() => {
-    if (client && status === "idle") void fetchDirectory(client);
-  }, [client, status, fetchDirectory]);
+    if (!ownEntries && client && status === "idle") void fetchDirectory(client);
+  }, [ownEntries, client, status, fetchDirectory]);
 
   useEffect(() => {
     if (autoFocusSearch) searchRef.current?.focus();
@@ -117,7 +128,9 @@ export function DirectoryBrowser({
   };
 
   let placeholder: React.ReactNode = null;
-  if (entries.length === 0) {
+  if (entries.length === 0 && ownEntries) {
+    placeholder = <StatePanel icon={<BookUser className="w-6 h-6" />} title={labels?.emptyTitle ?? t("empty_title")} hint={labels?.emptyHint} />;
+  } else if (entries.length === 0) {
     if (loading) {
       placeholder = (
         <StatePanel icon={<Loader2 className="w-6 h-6 animate-spin" />} title={t("loading")} />
@@ -132,7 +145,7 @@ export function DirectoryBrowser({
       placeholder = <StatePanel icon={<BookUser className="w-6 h-6" />} title={t("empty_title")} hint={t("empty_hint")} />;
     }
   } else if (filtered.length === 0) {
-    placeholder = <StatePanel icon={<Search className="w-6 h-6" />} title={t("no_match")} />;
+    placeholder = <StatePanel icon={<Search className="w-6 h-6" />} title={labels?.noMatch ?? t("no_match")} />;
   }
 
   return (
@@ -163,13 +176,15 @@ export function DirectoryBrowser({
             onClear={() => { setQuery(""); setPage(0); }}
             clearLabel={tContacts("clear_search")}
           />
-          <ToolbarButton
-            label={t("refresh")}
-            onClick={refresh}
-            disabled={!client || status === "loading" || status === "unavailable"}
-          >
-            <RefreshCw className={cn(status === "loading" && "animate-spin [animation-direction:reverse]")} />
-          </ToolbarButton>
+          {!ownEntries && (
+            <ToolbarButton
+              label={t("refresh")}
+              onClick={refresh}
+              disabled={!client || status === "loading" || status === "unavailable"}
+            >
+              <RefreshCw className={cn(status === "loading" && "animate-spin [animation-direction:reverse]")} />
+            </ToolbarButton>
+          )}
           {onPrint && (
             <ToolbarButton label={tCommon("print")} onClick={onPrint}>
               <Printer />
@@ -186,7 +201,7 @@ export function DirectoryBrowser({
         )}
       </div>
 
-      <div className="flex-1 min-h-0 overflow-y-auto" role="list" aria-label={t("title")}>
+      <div className="flex-1 min-h-0 overflow-y-auto" role="list" aria-label={labels?.list ?? t("title")}>
         {placeholder ?? pageEntries.map((entry) => {
           const key = directoryKey(entry);
           const checked = selected.has(key);
diff --git a/components/contacts/directory-picker-dialog.tsx b/components/contacts/directory-picker-dialog.tsx
index 493a84e3c..ca031d91c 100644
--- a/components/contacts/directory-picker-dialog.tsx
+++ b/components/contacts/directory-picker-dialog.tsx
@@ -1,36 +1,94 @@
 "use client";
 
-import { useState } from "react";
+import { useMemo, useState } from "react";
 import { useTranslations } from "next-intl";
 import { X } from "@/components/icons";
 import { Button } from "@/components/ui/button";
 import { useFocusTrap } from "@/hooks/use-focus-trap";
+import { cn } from "@/lib/utils";
 import type { IJMAPClient } from "@/lib/jmap/client-interface";
-import { useContactStore, type DirectoryEntry } from "@/stores/contact-store";
+import type { ContactCard } from "@/lib/jmap/types";
+import { useContactStore, getContactDisplayName, type DirectoryEntry } from "@/stores/contact-store";
 import { DirectoryBrowser, directoryKey } from "./directory-browser";
 
 export type RecipientField = "to" | "cc" | "bcc";
 
+type PickerTab = "contacts" | "directory";
+
 interface DirectoryPickerDialogProps {
   client: IJMAPClient | null;
   onClose: () => void;
-  /** Called with the checked entries in directory order; the dialog closes afterwards. */
+  /** Called with the checked entries in list order; the dialog closes afterwards. */
   onAdd: (field: RecipientField, entries: DirectoryEntry[]) => void;
 }
 
-/** The composer's "Select from directory" dialog. */
+/** Every address of the user's own contacts, one row each; groups are left out. */
+export function contactEntries(contacts: ContactCard[]): DirectoryEntry[] {
+  const seen = new Set<string>();
+  const entries: DirectoryEntry[] = [];
+  for (const contact of contacts) {
+    if (contact.kind === "group") continue;
+    const name = getContactDisplayName(contact);
+    for (const email of Object.values(contact.emails ?? {})) {
+      const address = email?.address?.trim();
+      if (!address) continue;
+      const entry = { id: `${contact.id}:${address}`, name: name || address, email: address };
+      if (seen.has(directoryKey(entry))) continue;
+      seen.add(directoryKey(entry));
+      entries.push(entry);
+    }
+  }
+  return entries;
+}
+
+/**
+ * The composer's recipient picker: the user's own contacts, and the server's
+ * directory (other accounts) on a tab of its own where the server has one.
+ * It used to list only the directory, without the contacts autocomplete offers.
+ */
 export function DirectoryPickerDialog({ client, onClose, onAdd }: DirectoryPickerDialogProps) {
   const t = useTranslations("contacts.directory");
+  const tSend = useTranslations("compose_send");
   const modalRef = useFocusTrap({ isActive: true, onEscape: onClose, restoreFocus: true });
+  const contacts = useContactStore((s) => s.contacts);
+  const ownEntries = useMemo(() => contactEntries(contacts ?? []), [contacts]);
+  const hasDirectory = !!client?.supportsPrincipals?.();
+  // Contacts first; straight to the directory for someone who has none.
+  const [tab, setTab] = useState<PickerTab>(() => (ownEntries.length === 0 && hasDirectory ? "directory" : "contacts"));
   const [selected, setSelected] = useState<Set<string>>(() => new Set());
 
   const add = (field: RecipientField) => {
-    const entries = useContactStore.getState().directoryPrincipals.filter((e) => selected.has(directoryKey(e)));
+    // Checked on either tab, each address once.
+    const pool = [...ownEntries, ...useContactStore.getState().directoryPrincipals];
+    const seen = new Set<string>();
+    const entries = pool.filter((e) => {
+      const key = directoryKey(e);
+      if (!selected.has(key) || seen.has(key)) return false;
+      seen.add(key);
+      return true;
+    });
     if (entries.length === 0) return;
     onAdd(field, entries);
     onClose();
   };
 
+  const tabButton = (value: PickerTab, label: string) => (
+    <button
+      type="button"
+      role="tab"
+      id={`recipient-picker-tab-${value}`}
+      aria-selected={tab === value}
+      aria-controls="recipient-picker-panel"
+      onClick={() => setTab(value)}
+      className={cn(
+        "px-3 py-2 text-sm font-medium border-b-2 -mb-px transition-colors",
+        tab === value ? "border-primary text-foreground" : "border-transparent text-muted-foreground hover:text-foreground",
+      )}
+    >
+      {label}
+    </button>
+  );
+
   return (
     <div className="fixed inset-0 bg-black/50 flex items-center justify-center z-50 p-4 animate-in fade-in duration-150">
       <div
@@ -43,7 +101,7 @@ export function DirectoryPickerDialog({ client, onClose, onAdd }: DirectoryPicke
       >
         <div className="flex items-center justify-between px-4 py-3 border-b border-border">
           <h2 id="directory-picker-title" className="text-sm font-semibold text-foreground">
-            {t("picker_title")}
+            {tSend("picker_title")}
           </h2>
           <button
             type="button"
@@ -55,13 +113,40 @@ export function DirectoryPickerDialog({ client, onClose, onAdd }: DirectoryPicke
           </button>
         </div>
 
-        <DirectoryBrowser
-          client={client}
-          selected={selected}
-          onSelectedChange={setSelected}
-          autoFocusSearch
-          className="flex-1"
-        />
+        {hasDirectory && (
+          <div role="tablist" className="flex gap-1 px-3 border-b border-border">
+            {tabButton("contacts", tSend("tab_contacts"))}
+            {tabButton("directory", tSend("tab_directory"))}
+          </div>
+        )}
+
+        <div
+          id="recipient-picker-panel"
+          role={hasDirectory ? "tabpanel" : undefined}
+          aria-labelledby={hasDirectory ? `recipient-picker-tab-${tab}` : undefined}
+          className="flex-1 min-h-0 flex flex-col"
+        >
+          <DirectoryBrowser
+            // A fresh search and first page on each tab.
+            key={tab}
+            client={client}
+            selected={selected}
+            onSelectedChange={setSelected}
+            autoFocusSearch
+            className="flex-1"
+            {...(tab === "contacts"
+              ? {
+                  entries: ownEntries,
+                  labels: {
+                    list: tSend("tab_contacts"),
+                    emptyTitle: tSend("contacts_empty_title"),
+                    emptyHint: tSend("contacts_empty_hint"),
+                    noMatch: tSend("contacts_no_match"),
+                  },
+                }
+              : {})}
+          />
+        </div>
 
         <div className="flex flex-wrap items-center gap-2 px-4 py-3 border-t border-border">
           <span className="text-xs text-muted-foreground me-auto tabular-nums">
diff --git a/components/email/__tests__/composer-mention.test.tsx b/components/email/__tests__/composer-mention.test.tsx
index d50d46ad5..42c312b12 100644
--- a/components/email/__tests__/composer-mention.test.tsx
+++ b/components/email/__tests__/composer-mention.test.tsx
@@ -3,6 +3,7 @@ import { afterAll, beforeAll, describe, expect, it, vi } from 'vitest';
 import React from 'react';
 import type { Editor } from '@tiptap/core';
 import { useAuthStore } from '@/stores/auth-store';
+import { useContactStore } from '@/stores/contact-store';
 import { EmailComposer } from '../email-composer';
 import { useSettingsStore } from '@/stores/settings-store';
 
@@ -546,6 +547,22 @@ describe('composer with the @ recipient list', () => {
     expect(to.value).toBe('Sarah Kim <sarah@example.com>');
   });
 
+  // compose-17: the button was there only with a server directory, so
+  // contacts alone were never offered.
+  it('offers the recipient picker for the contacts when the server has no directory', async () => {
+    const contactState = (useContactStore as unknown as { getState: () => { contacts: unknown[] } }).getState();
+    contactState.contacts = [{ id: 'c1', name: { full: 'Zoe Fischer' }, emails: { e: { address: 'zoe@example.com' } } }];
+    try {
+      await renderComposer();
+      const button = screen.getByTestId('composer-directory-picker');
+      expect(button).toHaveAccessibleName('picker_button');
+      fireEvent.click(button);
+      expect(screen.getByRole('dialog', { name: 'directory' })).toBeInTheDocument();
+    } finally {
+      contactState.contacts = [];
+    }
+  });
+
   // The directory picker is drawn inside the composer itself, not portaled.
   it('lets Escape in the directory picker leave the composer alone', async () => {
     // Every other capability answers nothing.
diff --git a/components/email/email-composer.tsx b/components/email/email-composer.tsx
index 22ea0db2b..5f4a9ab85 100644
--- a/components/email/email-composer.tsx
+++ b/components/email/email-composer.tsx
@@ -1775,6 +1775,9 @@ export function EmailComposer({
   // Whether a Sent mailbox is known so the on-demand server search is worth
   // offering (falls back to hiding the "search the server" row otherwise).
   const canSearchServer = useContactStore((s) => s.sentMailboxId != null);
+  // The recipient picker: the user's contacts, and the server's directory.
+  const hasContacts = useContactStore((s) => (s.contacts?.length ?? 0) > 0);
+  const tSend = useTranslations('compose_send');
   const addToTrustedSendersBook = useContactStore((s) => s.addToTrustedSendersBook);
   const addTrustedSender = useSettingsStore((s) => s.addTrustedSender);
   const trustedSendersAddressBook = useSettingsStore((s) => s.trustedSendersAddressBook);
@@ -5091,15 +5094,15 @@ export function EmailComposer({
               onMoveChip={handleMoveChip}
             />
             <div className="flex gap-0.5 shrink-0">
-              {activeClient?.supportsPrincipals?.() && (
+              {(hasContacts || activeClient?.supportsPrincipals?.()) && (
                 <Button
                   type="button"
                   variant="ghost"
                   size="sm"
                   onClick={() => setShowDirectoryPicker(true)}
                   className="h-7 w-7 p-0"
-                  title={t('select_from_directory')}
-                  aria-label={t('select_from_directory')}
+                  title={tSend('picker_button')}
+                  aria-label={tSend('picker_button')}
                   data-testid="composer-directory-picker"
                 >
                   <BookUser className="w-4 h-4" />
diff --git a/locales/ar/common.json b/locales/ar/common.json
index e16ef0ab3..8fc060a58 100644
--- a/locales/ar/common.json
+++ b/locales/ar/common.json
@@ -3910,7 +3910,14 @@
     "scheduled_for": "مجدولة في {when}",
     "sending": "جارٍ الإرسال…",
     "sent": "تم الإرسال",
-    "view": "عرض"
+    "view": "عرض",
+    "picker_button": "إضافة من جهات الاتصال",
+    "picker_title": "إضافة مستلمين",
+    "tab_contacts": "جهات الاتصال",
+    "tab_directory": "الدليل",
+    "contacts_empty_title": "لا توجد جهات اتصال بعد",
+    "contacts_empty_hint": "يظهر هنا الأشخاص الذين تحفظهم في جهات الاتصال.",
+    "contacts_no_match": "لا توجد جهة اتصال تطابق بحثك"
   },
   "org_templates": {
     "section_personal": "قوالبي",
diff --git a/locales/ca/common.json b/locales/ca/common.json
index a49fe1c5f..ea9846760 100644
--- a/locales/ca/common.json
+++ b/locales/ca/common.json
@@ -3910,7 +3910,14 @@
     "scheduled_for": "Programat per a {when}",
     "sending": "S'està enviant…",
     "sent": "Enviat",
-    "view": "Mostra"
+    "view": "Mostra",
+    "picker_button": "Afegeix des dels contactes",
+    "picker_title": "Afegeix destinataris",
+    "tab_contacts": "Contactes",
+    "tab_directory": "Directori",
+    "contacts_empty_title": "Encara no hi ha contactes",
+    "contacts_empty_hint": "Aquí apareixen les persones que deses a Contactes.",
+    "contacts_no_match": "Cap contacte coincideix amb la cerca"
   },
   "org_templates": {
     "section_personal": "Les meves plantilles",
diff --git a/locales/cs/common.json b/locales/cs/common.json
index f6253092f..211878338 100644
--- a/locales/cs/common.json
+++ b/locales/cs/common.json
@@ -3910,7 +3910,14 @@
     "scheduled_for": "Naplánováno na {when}",
     "sending": "Odesílání…",
     "sent": "Odesláno",
-    "view": "Zobrazit"
+    "view": "Zobrazit",
+    "picker_button": "Přidat z kontaktů",
+    "picker_title": "Přidat příjemce",
+    "tab_contacts": "Kontakty",
+    "tab_directory": "Adresář organizace",
+    "contacts_empty_title": "Zatím žádné kontakty",
+    "contacts_empty_hint": "Zde se zobrazí lidé, které uložíte do Kontaktů.",
+    "contacts_no_match": "Hledání neodpovídá žádný kontakt"
   },
   "org_templates": {
     "section_personal": "Moje šablony",
diff --git a/locales/da/common.json b/locales/da/common.json
index 9df578928..3b27a738f 100644
--- a/locales/da/common.json
+++ b/locales/da/common.json
@@ -3910,7 +3910,14 @@
     "scheduled_for": "Planlagt til {when}",
     "sending": "Sender…",
     "sent": "Sendt",
-    "view": "Vis"
+    "view": "Vis",
+    "picker_button": "Tilføj fra kontakter",
+    "picker_title": "Tilføj modtagere",
+    "tab_contacts": "Kontakter",
+    "tab_directory": "Adressefortegnelse",
+    "contacts_empty_title": "Ingen kontakter endnu",
+    "contacts_empty_hint": "Personer, du gemmer i Kontakter, vises her.",
+    "contacts_no_match": "Ingen kontakter matcher din søgning"
   },
   "org_templates": {
     "section_personal": "Mine skabeloner",
diff --git a/locales/de/common.json b/locales/de/common.json
index 716e74114..ae5039e3e 100644
--- a/locales/de/common.json
+++ b/locales/de/common.json
@@ -3910,7 +3910,14 @@
     "scheduled_for": "Geplant für {when}",
     "sending": "Wird gesendet…",
     "sent": "Gesendet",
-    "view": "Anzeigen"
+    "view": "Anzeigen",
+    "picker_button": "Aus Kontakten hinzufügen",
+    "picker_title": "Empfänger hinzufügen",
+    "tab_contacts": "Kontakte",
+    "tab_directory": "Verzeichnis",
+    "contacts_empty_title": "Noch keine Kontakte",
+    "contacts_empty_hint": "Personen, die Sie in Kontakten speichern, erscheinen hier.",
+    "contacts_no_match": "Kein Kontakt passt zu Ihrer Suche"
   },
   "org_templates": {
     "section_personal": "Meine Vorlagen",
diff --git a/locales/en/common.json b/locales/en/common.json
index 48c763384..dbef12f39 100644
--- a/locales/en/common.json
+++ b/locales/en/common.json
@@ -3910,7 +3910,14 @@
     "scheduled_for": "Scheduled for {when}",
     "sending": "Sending…",
     "sent": "Sent",
-    "view": "View"
+    "view": "View",
+    "picker_button": "Add from contacts",
+    "picker_title": "Add recipients",
+    "tab_contacts": "Contacts",
+    "tab_directory": "Directory",
+    "contacts_empty_title": "No contacts yet",
+    "contacts_empty_hint": "People you save in Contacts show up here.",
+    "contacts_no_match": "No contact matches your search"
   },
   "org_templates": {
     "section_personal": "My templates",
diff --git a/locales/es/common.json b/locales/es/common.json
index 0a734bd11..44b012eb1 100644
--- a/locales/es/common.json
+++ b/locales/es/common.json
@@ -3910,7 +3910,14 @@
     "scheduled_for": "Programado para {when}",
     "sending": "Enviando…",
     "sent": "Enviado",
-    "view": "Ver"
+    "view": "Ver",
+    "picker_button": "Añadir desde contactos",
+    "picker_title": "Añadir destinatarios",
+    "tab_contacts": "Contactos",
+    "tab_directory": "Directorio",
+    "contacts_empty_title": "Aún no hay contactos",
+    "contacts_empty_hint": "Aquí aparecen las personas que guardas en Contactos.",
+    "contacts_no_match": "Ningún contacto coincide con la búsqueda"
   },
   "org_templates": {
     "section_personal": "Mis plantillas",
diff --git a/locales/et/common.json b/locales/et/common.json
index 2a329b7f9..fed4d3fa0 100644
--- a/locales/et/common.json
+++ b/locales/et/common.json
@@ -3910,7 +3910,14 @@
     "scheduled_for": "Ajastatud: {when}",
     "sending": "Saatmine…",
     "sent": "Saadetud",
-    "view": "Vaata"
+    "view": "Vaata",
+    "picker_button": "Lisa kontaktidest",
+    "picker_title": "Lisa saajaid",
+    "tab_contacts": "Kontaktid",
+    "tab_directory": "Kataloog",
+    "contacts_empty_title": "Kontakte veel pole",
+    "contacts_empty_hint": "Siin kuvatakse inimesed, kelle salvestate kontaktidesse.",
+    "contacts_no_match": "Otsingule ei vasta ükski kontakt"
   },
   "org_templates": {
     "section_personal": "Minu mallid",
diff --git a/locales/fa/common.json b/locales/fa/common.json
index ae6a86694..6ce99c57a 100644
--- a/locales/fa/common.json
+++ b/locales/fa/common.json
@@ -3910,7 +3910,14 @@
     "scheduled_for": "زمان‌بندی‌شده برای {when}",
     "sending": "در حال ارسال…",
     "sent": "ارسال شد",
-    "view": "مشاهده"
+    "view": "مشاهده",
+    "picker_button": "افزودن از مخاطبین",
+    "picker_title": "افزودن گیرندگان",
+    "tab_contacts": "مخاطبین",
+    "tab_directory": "فهرست سازمانی",
+    "contacts_empty_title": "هنوز مخاطبی وجود ندارد",
+    "contacts_empty_hint": "افرادی که در مخاطبین ذخیره می‌کنید اینجا نمایش داده می‌شوند.",
+    "contacts_no_match": "هیچ مخاطبی با جستجوی شما مطابقت ندارد"
   },
   "org_templates": {
     "section_personal": "قالب‌های من",
diff --git a/locales/fr/common.json b/locales/fr/common.json
index 857a4208b..18783b5e7 100644
--- a/locales/fr/common.json
+++ b/locales/fr/common.json
@@ -3910,7 +3910,14 @@
     "scheduled_for": "Programmé pour {when}",
     "sending": "Envoi…",
     "sent": "Envoyé",
-    "view": "Afficher"
+    "view": "Afficher",
+    "picker_button": "Ajouter depuis les contacts",
+    "picker_title": "Ajouter des destinataires",
+    "tab_contacts": "Contacts",
+    "tab_directory": "Annuaire",
+    "contacts_empty_title": "Aucun contact pour l'instant",
+    "contacts_empty_hint": "Les personnes enregistrées dans Contacts s'affichent ici.",
+    "contacts_no_match": "Aucun contact ne correspond à votre recherche"
   },
   "org_templates": {
     "section_personal": "Mes modèles",
diff --git a/locales/he/common.json b/locales/he/common.json
index 84da00998..1735dee2a 100644
--- a/locales/he/common.json
+++ b/locales/he/common.json
@@ -3807,7 +3807,14 @@
     "scheduled_for": "מתוזמן ל-{when}",
     "sending": "שולח…",
     "sent": "נשלח",
-    "view": "הצג"
+    "view": "הצג",
+    "picker_button": "הוסף מאנשי הקשר",
+    "picker_title": "הוספת נמענים",
+    "tab_contacts": "אנשי קשר",
+    "tab_directory": "ספרייה",
+    "contacts_empty_title": "אין עדיין אנשי קשר",
+    "contacts_empty_hint": "אנשים שתשמרו באנשי הקשר יופיעו כאן.",
+    "contacts_no_match": "אין איש קשר שתואם לחיפוש"
   },
   "org_templates": {
     "section_personal": "התבניות שלי",
diff --git a/locales/hu/common.json b/locales/hu/common.json
index f119f53b3..74a817551 100644
--- a/locales/hu/common.json
+++ b/locales/hu/common.json
@@ -3910,7 +3910,14 @@
     "scheduled_for": "Ütemezve: {when}",
     "sending": "Küldés…",
     "sent": "Elküldve",
-    "view": "Megtekintés"
+    "view": "Megtekintés",
+    "picker_button": "Hozzáadás a névjegyekből",
+    "picker_title": "Címzettek hozzáadása",
+    "tab_contacts": "Névjegyek",
+    "tab_directory": "Címtár",
+    "contacts_empty_title": "Még nincsenek névjegyek",
+    "contacts_empty_hint": "A névjegyekbe mentett személyek itt jelennek meg.",
+    "contacts_no_match": "Egy névjegy sem felel meg a keresésnek"
   },
   "org_templates": {
     "section_personal": "Saját sablonok",
diff --git a/locales/it/common.json b/locales/it/common.json
index 1b2b07908..5b254ce9c 100644
--- a/locales/it/common.json
+++ b/locales/it/common.json
@@ -3910,7 +3910,14 @@
     "scheduled_for": "Programmato per {when}",
     "sending": "Invio in corso…",
     "sent": "Inviato",
-    "view": "Visualizza"
+    "view": "Visualizza",
+    "picker_button": "Aggiungi dai contatti",
+    "picker_title": "Aggiungi destinatari",
+    "tab_contacts": "Contatti",
+    "tab_directory": "Rubrica aziendale",
+    "contacts_empty_title": "Ancora nessun contatto",
+    "contacts_empty_hint": "Le persone salvate in Contatti compaiono qui.",
+    "contacts_no_match": "Nessun contatto corrisponde alla ricerca"
   },
   "org_templates": {
     "section_personal": "I miei modelli",
diff --git a/locales/ja/common.json b/locales/ja/common.json
index 1c080bd35..73cf4eb8e 100644
--- a/locales/ja/common.json
+++ b/locales/ja/common.json
@@ -3910,7 +3910,14 @@
     "scheduled_for": "{when} に送信予定",
     "sending": "送信中…",
     "sent": "送信しました",
-    "view": "表示"
+    "view": "表示",
+    "picker_button": "連絡先から追加",
+    "picker_title": "宛先を追加",
+    "tab_contacts": "連絡先",
+    "tab_directory": "ディレクトリ",
+    "contacts_empty_title": "連絡先はまだありません",
+    "contacts_empty_hint": "連絡先に保存した人がここに表示されます。",
+    "contacts_no_match": "検索に一致する連絡先はありません"
   },
   "org_templates": {
     "section_personal": "マイテンプレート",
diff --git a/locales/ko/common.json b/locales/ko/common.json
index ae2a92c38..827cb61f0 100644
--- a/locales/ko/common.json
+++ b/locales/ko/common.json
@@ -3910,7 +3910,14 @@
     "scheduled_for": "{when}에 보내기 예약됨",
     "sending": "보내는 중…",
     "sent": "보냈어요",
-    "view": "보기"
+    "view": "보기",
+    "picker_button": "연락처에서 추가",
+    "picker_title": "받는 사람 추가",
+    "tab_contacts": "연락처",
+    "tab_directory": "디렉터리",
+    "contacts_empty_title": "아직 연락처가 없어요",
+    "contacts_empty_hint": "연락처에 저장한 사람이 여기에 표시돼요.",
+    "contacts_no_match": "검색과 일치하는 연락처가 없어요"
   },
   "org_templates": {
     "section_personal": "내 템플릿",
diff --git a/locales/lv/common.json b/locales/lv/common.json
index b264be861..5ceb5f684 100644
--- a/locales/lv/common.json
+++ b/locales/lv/common.json
@@ -3910,7 +3910,14 @@
     "scheduled_for": "Ieplānots: {when}",
     "sending": "Sūta…",
     "sent": "Nosūtīts",
-    "view": "Skatīt"
+    "view": "Skatīt",
+    "picker_button": "Pievienot no kontaktiem",
+    "picker_title": "Pievienot saņēmējus",
+    "tab_contacts": "Kontakti",
+    "tab_directory": "Katalogs",
+    "contacts_empty_title": "Vēl nav kontaktu",
+    "contacts_empty_hint": "Šeit redzami cilvēki, kurus saglabājat kontaktos.",
+    "contacts_no_match": "Meklēšanai neatbilst neviens kontakts"
   },
   "org_templates": {
     "section_personal": "Manas veidnes",
diff --git a/locales/mn/common.json b/locales/mn/common.json
index a9a4e523d..37458cb71 100644
--- a/locales/mn/common.json
+++ b/locales/mn/common.json
@@ -3910,7 +3910,14 @@
     "scheduled_for": "{when}-д илгээхээр товлосон",
     "sending": "Илгээж байна…",
     "sent": "Илгээгдлээ",
-    "view": "Харах"
+    "view": "Харах",
+    "picker_button": "Харилцагчдаас нэмэх",
+    "picker_title": "Хүлээн авагч нэмэх",
+    "tab_contacts": "Харилцагчид",
+    "tab_directory": "Лавлах",
+    "contacts_empty_title": "Одоогоор харилцагч алга",
+    "contacts_empty_hint": "Харилцагчдад хадгалсан хүмүүс энд харагдана.",
+    "contacts_no_match": "Хайлтад тохирох харилцагч алга"
   },
   "org_templates": {
     "section_personal": "Миний загварууд",
diff --git a/locales/nb/common.json b/locales/nb/common.json
index bb2e3880a..4a8f8f941 100644
--- a/locales/nb/common.json
+++ b/locales/nb/common.json
@@ -3910,7 +3910,14 @@
     "scheduled_for": "Planlagt til {when}",
     "sending": "Sender…",
     "sent": "Sendt",
-    "view": "Vis"
+    "view": "Vis",
+    "picker_button": "Legg til fra kontakter",
+    "picker_title": "Legg til mottakere",
+    "tab_contacts": "Kontakter",
+    "tab_directory": "Katalog",
+    "contacts_empty_title": "Ingen kontakter ennå",
+    "contacts_empty_hint": "Personer du lagrer i Kontakter, vises her.",
+    "contacts_no_match": "Ingen kontakter samsvarer med søket"
   },
   "org_templates": {
     "section_personal": "Mine maler",
diff --git a/locales/nl/common.json b/locales/nl/common.json
index a9941ecf0..75d1a276d 100644
--- a/locales/nl/common.json
+++ b/locales/nl/common.json
@@ -3910,7 +3910,14 @@
     "scheduled_for": "Gepland voor {when}",
     "sending": "Bezig met verzenden…",
     "sent": "Verzonden",
-    "view": "Bekijken"
+    "view": "Bekijken",
+    "picker_button": "Toevoegen uit contacten",
+    "picker_title": "Ontvangers toevoegen",
+    "tab_contacts": "Contacten",
+    "tab_directory": "Adresboek van de organisatie",
+    "contacts_empty_title": "Nog geen contacten",
+    "contacts_empty_hint": "Mensen die u in Contacten opslaat, verschijnen hier.",
+    "contacts_no_match": "Geen contact komt overeen met uw zoekopdracht"
   },
   "org_templates": {
     "section_personal": "Mijn sjablonen",
diff --git a/locales/pl/common.json b/locales/pl/common.json
index 9766bb92d..f728e9e79 100644
--- a/locales/pl/common.json
+++ b/locales/pl/common.json
@@ -3910,7 +3910,14 @@
     "scheduled_for": "Zaplanowano na {when}",
     "sending": "Wysyłanie…",
     "sent": "Wysłano",
-    "view": "Pokaż"
+    "view": "Pokaż",
+    "picker_button": "Dodaj z kontaktów",
+    "picker_title": "Dodaj odbiorców",
+    "tab_contacts": "Kontakty",
+    "tab_directory": "Katalog",
+    "contacts_empty_title": "Brak kontaktów",
+    "contacts_empty_hint": "Tutaj pojawią się osoby zapisane w Kontaktach.",
+    "contacts_no_match": "Żaden kontakt nie pasuje do wyszukiwania"
   },
   "org_templates": {
     "section_personal": "Moje szablony",
diff --git a/locales/pt/common.json b/locales/pt/common.json
index 55b28a608..58f9dbdeb 100644
--- a/locales/pt/common.json
+++ b/locales/pt/common.json
@@ -3910,7 +3910,14 @@
     "scheduled_for": "Agendado para {when}",
     "sending": "Enviando…",
     "sent": "Enviado",
-    "view": "Ver"
+    "view": "Ver",
+    "picker_button": "Adicionar dos contatos",
+    "picker_title": "Adicionar destinatários",
+    "tab_contacts": "Contatos",
+    "tab_directory": "Diretório",
+    "contacts_empty_title": "Nenhum contato ainda",
+    "contacts_empty_hint": "As pessoas que você salvar em Contatos aparecem aqui.",
+    "contacts_no_match": "Nenhum contato corresponde à sua pesquisa"
   },
   "org_templates": {
     "section_personal": "Meus modelos",
diff --git a/locales/ro/common.json b/locales/ro/common.json
index 318bf1d4f..3f006f780 100644
--- a/locales/ro/common.json
+++ b/locales/ro/common.json
@@ -3910,7 +3910,14 @@
     "scheduled_for": "Programat pentru {when}",
     "sending": "Se trimite…",
     "sent": "Trimis",
-    "view": "Vezi"
+    "view": "Vezi",
+    "picker_button": "Adaugă din contacte",
+    "picker_title": "Adaugă destinatari",
+    "tab_contacts": "Contacte",
+    "tab_directory": "Director",
+    "contacts_empty_title": "Încă nu există contacte",
+    "contacts_empty_hint": "Aici apar persoanele pe care le salvați în Contacte.",
+    "contacts_no_match": "Niciun contact nu corespunde căutării"
   },
   "org_templates": {
     "section_personal": "Șabloanele mele",
diff --git a/locales/ru/common.json b/locales/ru/common.json
index c8f382676..afa5dc6c8 100644
--- a/locales/ru/common.json
+++ b/locales/ru/common.json
@@ -3910,7 +3910,14 @@
     "scheduled_for": "Запланировано на {when}",
     "sending": "Отправка…",
     "sent": "Отправлено",
-    "view": "Открыть"
+    "view": "Открыть",
+    "picker_button": "Добавить из контактов",
+    "picker_title": "Добавить получателей",
+    "tab_contacts": "Контакты",
+    "tab_directory": "Справочник",
+    "contacts_empty_title": "Контактов пока нет",
+    "contacts_empty_hint": "Здесь появятся люди, которых вы сохраните в контактах.",
+    "contacts_no_match": "Нет контактов, подходящих под запрос"
   },
   "org_templates": {
     "section_personal": "Мои шаблоны",
diff --git a/locales/sk/common.json b/locales/sk/common.json
index aefbf6012..901a328b8 100644
--- a/locales/sk/common.json
+++ b/locales/sk/common.json
@@ -3910,7 +3910,14 @@
     "scheduled_for": "Naplánované na {when}",
     "sending": "Odosielanie…",
     "sent": "Odoslané",
-    "view": "Zobraziť"
+    "view": "Zobraziť",
+    "picker_button": "Pridať z kontaktov",
+    "picker_title": "Pridať príjemcov",
+    "tab_contacts": "Kontakty",
+    "tab_directory": "Adresár organizácie",
+    "contacts_empty_title": "Zatiaľ žiadne kontakty",
+    "contacts_empty_hint": "Tu sa zobrazia ľudia, ktorých uložíte do Kontaktov.",
+    "contacts_no_match": "Vyhľadávaniu nezodpovedá žiadny kontakt"
   },
   "org_templates": {
     "section_personal": "Moje šablóny",
diff --git a/locales/th/common.json b/locales/th/common.json
index fcad4fef7..7b86f34b3 100644
--- a/locales/th/common.json
+++ b/locales/th/common.json
@@ -1161,7 +1161,14 @@
     "scheduled_for": "ตั้งเวลาส่งไว้ที่ {when}",
     "sending": "กำลังส่ง…",
     "sent": "ส่งแล้ว",
-    "view": "ดู"
+    "view": "ดู",
+    "picker_button": "เพิ่มจากผู้ติดต่อ",
+    "picker_title": "เพิ่มผู้รับ",
+    "tab_contacts": "ผู้ติดต่อ",
+    "tab_directory": "ไดเรกทอรีกลาง",
+    "contacts_empty_title": "ยังไม่มีผู้ติดต่อ",
+    "contacts_empty_hint": "คนที่คุณบันทึกไว้ในผู้ติดต่อจะแสดงที่นี่",
+    "contacts_no_match": "ไม่มีผู้ติดต่อที่ตรงกับการค้นหา"
   },
   "org_templates": {
     "section_personal": "แม่แบบของฉัน",
diff --git a/locales/tr/common.json b/locales/tr/common.json
index 71a097b10..6a02a84e8 100644
--- a/locales/tr/common.json
+++ b/locales/tr/common.json
@@ -3910,7 +3910,14 @@
     "scheduled_for": "{when} için zamanlandı",
     "sending": "Gönderiliyor…",
     "sent": "Gönderildi",
-    "view": "Görüntüle"
+    "view": "Görüntüle",
+    "picker_button": "Kişilerden ekle",
+    "picker_title": "Alıcı ekle",
+    "tab_contacts": "Kişiler",
+    "tab_directory": "Dizin",
+    "contacts_empty_title": "Henüz kişi yok",
+    "contacts_empty_hint": "Kişiler'e kaydettiğiniz kişiler burada görünür.",
+    "contacts_no_match": "Aramanızla eşleşen kişi yok"
   },
   "org_templates": {
     "section_personal": "Şablonlarım",
diff --git a/locales/uk/common.json b/locales/uk/common.json
index c0c04b84f..9cdeb4bd7 100644
--- a/locales/uk/common.json
+++ b/locales/uk/common.json
@@ -3910,7 +3910,14 @@
     "scheduled_for": "Заплановано на {when}",
     "sending": "Надсилання…",
     "sent": "Надіслано",
-    "view": "Переглянути"
+    "view": "Переглянути",
+    "picker_button": "Додати з контактів",
+    "picker_title": "Додати одержувачів",
+    "tab_contacts": "Контакти",
+    "tab_directory": "Довідник",
+    "contacts_empty_title": "Контактів ще немає",
+    "contacts_empty_hint": "Тут з’являться люди, яких ви збережете в контактах.",
+    "contacts_no_match": "Немає контактів, що відповідають пошуку"
   },
   "org_templates": {
     "section_personal": "Мої шаблони",
diff --git a/locales/vi/common.json b/locales/vi/common.json
index e0132525a..459eb3aea 100644
--- a/locales/vi/common.json
+++ b/locales/vi/common.json
@@ -3922,7 +3922,14 @@
     "scheduled_for": "Đã lên lịch gửi lúc {when}",
     "sending": "Đang gửi…",
     "sent": "Đã gửi",
-    "view": "Xem"
+    "view": "Xem",
+    "picker_button": "Thêm từ danh bạ",
+    "picker_title": "Thêm người nhận",
+    "tab_contacts": "Danh bạ",
+    "tab_directory": "Danh bạ tổ chức",
+    "contacts_empty_title": "Chưa có liên hệ nào",
+    "contacts_empty_hint": "Những người bạn lưu trong Danh bạ sẽ hiện ở đây.",
+    "contacts_no_match": "Không có liên hệ nào khớp với tìm kiếm"
   },
   "org_templates": {
     "section_personal": "Mẫu của tôi",
diff --git a/locales/zh-TW/common.json b/locales/zh-TW/common.json
index b0d322bed..cda397e2b 100644
--- a/locales/zh-TW/common.json
+++ b/locales/zh-TW/common.json
@@ -3910,7 +3910,14 @@
     "scheduled_for": "已排定於 {when} 傳送",
     "sending": "正在傳送…",
     "sent": "已傳送",
-    "view": "檢視"
+    "view": "檢視",
+    "picker_button": "從聯絡人新增",
+    "picker_title": "新增收件者",
+    "tab_contacts": "聯絡人",
+    "tab_directory": "通訊錄目錄",
+    "contacts_empty_title": "還沒有聯絡人",
+    "contacts_empty_hint": "你在聯絡人中儲存的人會顯示在這裡。",
+    "contacts_no_match": "沒有符合搜尋的聯絡人"
   },
   "org_templates": {
     "section_personal": "我的範本",
diff --git a/locales/zh/common.json b/locales/zh/common.json
index 83dc1a395..ede1e67b7 100644
--- a/locales/zh/common.json
+++ b/locales/zh/common.json
@@ -3910,7 +3910,14 @@
     "scheduled_for": "已安排在 {when} 发送",
     "sending": "正在发送…",
     "sent": "已发送",
-    "view": "查看"
+    "view": "查看",
+    "picker_button": "从联系人添加",
+    "picker_title": "添加收件人",
+    "tab_contacts": "联系人",
+    "tab_directory": "通讯录目录",
+    "contacts_empty_title": "还没有联系人",
+    "contacts_empty_hint": "你在联系人中保存的人会显示在这里。",
+    "contacts_no_match": "没有符合搜索的联系人"
   },
   "org_templates": {
     "section_personal": "我的模板",

From 43c9ef9ad1e48a5c2bfd0844697948aad6ef329b Mon Sep 17 00:00:00 2001
From: Linus Rath <139418639+rathlinus@users.noreply.github.com>
Date: Wed, 4 Nov 2026 07:11:03 +0100
Subject: [PATCH 15/34] fix: name the TLS-only delivery option plainly and
 point to encryption add-ons

---
 .../composer-encryption-options.test.tsx      | 280 ++++++++++++++++++
 components/email/composer-toolbar-menu.tsx    |  15 +-
 components/email/email-composer.tsx           |  26 +-
 locales/ar/common.json                        |   6 +-
 locales/ca/common.json                        |   6 +-
 locales/cs/common.json                        |   6 +-
 locales/da/common.json                        |   6 +-
 locales/de/common.json                        |   6 +-
 locales/en/common.json                        |   6 +-
 locales/es/common.json                        |   6 +-
 locales/et/common.json                        |   6 +-
 locales/fa/common.json                        |   6 +-
 locales/fr/common.json                        |   6 +-
 locales/he/common.json                        |   6 +-
 locales/hu/common.json                        |   6 +-
 locales/it/common.json                        |   6 +-
 locales/ja/common.json                        |   6 +-
 locales/ko/common.json                        |   6 +-
 locales/lv/common.json                        |   6 +-
 locales/mn/common.json                        |   6 +-
 locales/nb/common.json                        |   6 +-
 locales/nl/common.json                        |   6 +-
 locales/pl/common.json                        |   6 +-
 locales/pt/common.json                        |   6 +-
 locales/ro/common.json                        |   6 +-
 locales/ru/common.json                        |   6 +-
 locales/sk/common.json                        |   6 +-
 locales/th/common.json                        |   6 +-
 locales/tr/common.json                        |   6 +-
 locales/uk/common.json                        |   6 +-
 locales/vi/common.json                        |   6 +-
 locales/zh-TW/common.json                     |   6 +-
 locales/zh/common.json                        |   6 +-
 33 files changed, 464 insertions(+), 37 deletions(-)
 create mode 100644 components/email/__tests__/composer-encryption-options.test.tsx

diff --git a/components/email/__tests__/composer-encryption-options.test.tsx b/components/email/__tests__/composer-encryption-options.test.tsx
new file mode 100644
index 000000000..95f74169d
--- /dev/null
+++ b/components/email/__tests__/composer-encryption-options.test.tsx
@@ -0,0 +1,280 @@
+import { render, screen, fireEvent } from '@testing-library/react';
+import { describe, it, expect, vi, afterEach, beforeEach } from 'vitest';
+import React from 'react';
+import { EmailComposer } from '../email-composer';
+import { useAuthStore } from '@/stores/auth-store';
+import { useSettingsStore } from '@/stores/settings-store';
+import { usePolicyStore } from '@/stores/policy-store';
+import { emailHooks } from '@/lib/plugin-hooks';
+
+// "Require encrypted delivery" read like encryption but only asks the servers
+// for TLS on the way. It is now named for what it does and is an advanced
+// option, and without a crypto plugin an "Encrypt…" item says where to get one.
+
+// ─── Heavy component mocks (mirrors composer-close-guard.test.tsx) ──────────
+
+vi.mock('@/components/email/rich-text-editor', () => ({
+  RichTextEditor: () => React.createElement('div', { 'data-testid': 'rich-text-editor' }),
+}));
+
+vi.mock('@/components/plugins/plugin-slot', () => ({ PluginSlot: () => null }));
+vi.mock('@/components/identity/sub-address-helper', () => ({ SubAddressHelper: () => null }));
+vi.mock('@/components/templates/template-picker', () => ({ TemplatePicker: () => null }));
+vi.mock('@/components/templates/template-form', () => ({ TemplateForm: () => null }));
+vi.mock('@/components/files/file-preview-modal', () => ({ FilePreviewModal: () => null }));
+vi.mock('@/hooks/use-focus-trap', () => ({
+  useFocusTrap: () => ({ current: null }),
+}));
+vi.mock('@/hooks/use-pro-multi-account-identities', () => ({
+  useProMultiAccountIdentities: () => ({ enabled: false, groups: [], allIdentities: [] }),
+  stripCrossAccountIdentityPrefix: (id: string) => ({ localAccountId: null, rawId: id }),
+}));
+
+const push = vi.fn();
+vi.mock('@/i18n/navigation', () => ({
+  useRouter: () => ({ push, back: vi.fn(), replace: vi.fn() }),
+  usePathname: () => '/en',
+}));
+
+// ─── Store mocks ──────────────────────────────────────────────────────────────
+
+vi.mock('@/stores/auth-store', () => {
+  const state = {
+    client: null,
+    identities: [],
+    primaryIdentity: null,
+    isAuthenticated: false,
+    isDemoMode: false,
+    activeAccountId: null,
+    connectionLost: false,
+    getClientForAccount: () => undefined,
+    getAllConnectedClients: () => new Map(),
+    syncIdentities: () => {},
+    refreshIdentities: async () => {},
+  };
+  const hook = (sel?: (s: typeof state) => unknown) =>
+    typeof sel === 'function' ? sel(state) : state;
+  hook.getState = () => state;
+  hook.setState = (p: Partial<typeof state>) => Object.assign(state, p);
+  return { useAuthStore: hook };
+});
+
+vi.mock('@/stores/identity-store', () => {
+  const state = {
+    identities: [{ id: 'id-me', email: 'me@example.com', name: 'Me' }],
+    defaultIdentityId: 'id-me',
+  };
+  const hook = (sel?: (s: typeof state) => unknown) =>
+    typeof sel === 'function' ? sel(state) : state;
+  hook.getState = () => state;
+  hook.setState = (p: Partial<typeof state>) => Object.assign(state, p);
+  return { useIdentityStore: hook };
+});
+
+vi.mock('@/stores/account-store', () => {
+  const state = { accounts: [], getAccountById: () => undefined };
+  const hook = (sel?: (s: typeof state) => unknown) =>
+    typeof sel === 'function' ? sel(state) : state;
+  hook.getState = () => state;
+  hook.setState = (p: Partial<typeof state>) => Object.assign(state, p);
+  return { useAccountStore: hook };
+});
+
+vi.mock('@/stores/email-store', () => {
+  const state = {
+    draftSaveEnabled: false,
+    sendRawEmail: async () => ({ sent: true }),
+  };
+  const hook = (sel?: (s: typeof state) => unknown) =>
+    typeof sel === 'function' ? sel(state) : state;
+  hook.getState = () => state;
+  hook.setState = (p: Partial<typeof state>) => Object.assign(state, p);
+  return { useEmailStore: hook };
+});
+
+const updateSetting = vi.fn();
+
+vi.mock('@/stores/settings-store', () => {
+  const state = {
+    timeFormat: '24h',
+    plainTextMode: false,
+    subAddressDelimiter: '+',
+    autoSelectReplyIdentity: true,
+    attachmentReminderEnabled: false,
+    attachmentReminderKeywords: [],
+    emptySubjectWarningEnabled: true,
+    sendDelaySeconds: 0,
+    showAdvancedSettings: false,
+    signaturePosition: 'above_quote',
+    signatureSeparatorEnabled: false,
+    requestReadReceiptDefault: false,
+    addTrustedSender: () => {},
+    trustedSendersAddressBook: null,
+    updateSetting: (...args: unknown[]) => updateSetting(...args),
+  };
+  const hook = (sel?: (s: typeof state) => unknown) =>
+    typeof sel === 'function' ? sel(state) : state;
+  hook.getState = () => state;
+  hook.setState = (p: Partial<typeof state>) => Object.assign(state, p);
+  return { useSettingsStore: hook };
+});
+
+vi.mock('@/stores/contact-store', () => {
+  const state = {
+    contacts: [],
+    getAutocomplete: async () => [],
+    addToTrustedSendersBook: async () => {},
+  };
+  const hook = (sel?: (s: typeof state) => unknown) =>
+    typeof sel === 'function' ? sel(state) : state;
+  hook.getState = () => state;
+  hook.setState = (p: Partial<typeof state>) => Object.assign(state, p);
+  return { useContactStore: hook };
+});
+
+vi.mock('@/stores/template-store', () => {
+  const state = { templates: [], addTemplate: async () => {} };
+  const hook = (sel?: (s: typeof state) => unknown) =>
+    typeof sel === 'function' ? sel(state) : state;
+  hook.getState = () => state;
+  hook.setState = (p: Partial<typeof state>) => Object.assign(state, p);
+  return { useTemplateStore: hook };
+});
+
+// ─── Misc dependency mocks ────────────────────────────────────────────────────
+
+vi.mock('@/stores/toast-store', () => ({
+  toast: { info: () => {}, error: () => {}, success: () => {} },
+}));
+
+vi.mock('@/lib/plugin-hooks', () => ({
+  identityHooks: {
+    onSignatureRender: { size: 0, transform: async (value: unknown) => value },
+    onIdentitySelect: { size: 0, emit: async () => {} },
+  },
+  templateHooks: {
+    onTemplateRender: { size: 0, transform: async (value: unknown) => value },
+    onTemplateApply: { size: 0, emit: async () => {} },
+  },
+  emailHooks: {
+    onComposerOpen: { call: async () => [] },
+    onRecipientChange: { call: async () => [] },
+    getRecipientSuggestions: { call: async () => [] },
+    onRecipientChipsChange: { transform: async (chips: unknown) => chips },
+    onDraftChange: { emit: () => {} },
+    onBeforeDraftAutoSave: { transform: async (draft: unknown) => draft },
+    onBeforeEmailSend: { intercept: async () => true, interceptOutcome: async () => 'allowed' },
+    onComposeSend: { size: 0, takeOver: async () => 'default' },
+    onTransformOutgoingEmail: { transform: async (email: unknown) => email },
+  },
+  contactHooks: {
+    search: { call: async () => [] },
+    onProvideRecipientSuggestions: { transform: async (initial: unknown) => initial },
+  },
+}));
+
+vi.mock('@/lib/email-sanitization', () => ({
+  sanitizeSignatureHtml: (v: string) => v,
+  sanitizeEmailHtml: (v: string) => v,
+  sanitizeSignatureHtmlForDisplay: (v: string) => v,
+  sanitizePluginBodyHtml: (v: string) => v,
+  escapeHtml: (v: string) => v,
+  parseHtmlSafely: (html: string) => new DOMParser().parseFromString(html, 'text/html'),
+}));
+
+vi.mock('@/lib/email-threading', () => ({
+  computeReplyThreadingHeaders: () => ({ inReplyTo: [], references: [] }),
+}));
+vi.mock('@/lib/signature-utils', () => ({
+  appendPlainTextSignature: (body: string) => body,
+  getPlainTextSignature: () => '',
+}));
+vi.mock('@/lib/sub-addressing', () => ({ generateSubAddress: () => '' }));
+vi.mock('@/lib/debug', () => ({ debug: { log: () => {}, warn: () => {}, error: () => {} } }));
+vi.mock('@/components/email/quoted-html', () => ({
+  buildQuotedHtmlBlock: () => '',
+  serializeEditorContent: () => '',
+}));
+vi.mock('@/lib/template-utils', () => ({ substitutePlaceholders: (s: string) => s }));
+
+// ─── Tests ────────────────────────────────────────────────────────────────────
+
+const DRAFT = {
+  to: 'bob@example.com',
+  cc: '',
+  bcc: '',
+  subject: 'Plans',
+  body: '<p>Hello</p>',
+  showCc: false,
+  showBcc: false,
+  selectedIdentityId: 'id-me',
+  subAddressTag: '',
+  mode: 'compose' as const,
+  draftId: null,
+};
+
+const openOptions = () => fireEvent.click(screen.getByTestId('composer-options-menu'));
+const setComposeSendHandlers = (size: number) => {
+  (emailHooks.onComposeSend as unknown as { size: number }).size = size;
+};
+
+describe('composer encryption options', () => {
+  beforeEach(() => {
+    useAuthStore.setState({
+      client: { supportsSubmissionExtension: (name: string) => name === 'REQUIRETLS', hasDelayedSend: () => false, getMaxDelayedSend: () => 0 } as never,
+    });
+    usePolicyStore.setState({ demoFeatureOverrides: { pluginsEnabled: true } } as never);
+    setComposeSendHandlers(0);
+  });
+  afterEach(() => {
+    useAuthStore.setState({ client: null });
+    useSettingsStore.setState({ showAdvancedSettings: false } as never);
+    usePolicyStore.setState({ demoFeatureOverrides: {} } as never);
+    vi.clearAllMocks();
+  });
+
+  it('names the TLS option for what it does and keeps it to advanced settings', () => {
+    const { unmount } = render(<EmailComposer initialData={DRAFT} />);
+    openOptions();
+    expect(screen.queryByTestId('composer-require-tls-toggle')).toBeNull();
+    unmount();
+
+    useSettingsStore.setState({ showAdvancedSettings: true } as never);
+    render(<EmailComposer initialData={DRAFT} />);
+    openOptions();
+    const item = screen.getByTestId('composer-require-tls-toggle');
+    expect(item).toHaveTextContent('require_tls');
+    expect(item).toHaveTextContent('require_tls_hint');
+    expect(item).not.toHaveTextContent('option_require_tls');
+  });
+
+  it('keeps a ticked TLS option visible so it can be unticked', () => {
+    render(<EmailComposer initialData={{ ...DRAFT, requireTls: true }} />);
+    openOptions();
+    expect(screen.getByTestId('composer-require-tls-toggle')).toHaveAttribute('aria-checked', 'true');
+  });
+
+  it('offers "Encrypt…" without a crypto plugin, opening the add-ons', () => {
+    render(<EmailComposer initialData={DRAFT} />);
+    openOptions();
+    const item = screen.getByTestId('composer-encrypt-setup');
+    expect(item).toHaveTextContent('encrypt');
+    expect(item).toHaveTextContent('encrypt_hint');
+    fireEvent.click(item);
+    expect(push).toHaveBeenCalledWith('/settings/addons');
+  });
+
+  it('leaves "Encrypt…" out once a crypto plugin takes over sending', () => {
+    setComposeSendHandlers(1);
+    render(<EmailComposer initialData={DRAFT} />);
+    openOptions();
+    expect(screen.queryByTestId('composer-encrypt-setup')).toBeNull();
+  });
+
+  it('leaves "Encrypt…" out where add-ons are switched off', () => {
+    usePolicyStore.setState({ demoFeatureOverrides: { pluginsEnabled: false } } as never);
+    render(<EmailComposer initialData={DRAFT} />);
+    openOptions();
+    expect(screen.queryByTestId('composer-encrypt-setup')).toBeNull();
+  });
+});
diff --git a/components/email/composer-toolbar-menu.tsx b/components/email/composer-toolbar-menu.tsx
index 639d758cb..07abf0e97 100644
--- a/components/email/composer-toolbar-menu.tsx
+++ b/components/email/composer-toolbar-menu.tsx
@@ -67,21 +67,28 @@ export function ComposerToolbarMenu({ icon: Icon, label, activeCount = 0, testId
 interface ItemProps {
   icon?: AppIcon;
   onSelect: () => void;
+  /** A line under the label, as on the check items. */
+  description?: string;
+  /** Greyed out: the item can't do its job here yet, and says where to set it up. */
+  muted?: boolean;
   testId?: string;
   children: React.ReactNode;
 }
 
-export function ComposerToolbarMenuItem({ icon: Icon, onSelect, testId, children }: ItemProps) {
+export function ComposerToolbarMenuItem({ icon: Icon, onSelect, description, muted, testId, children }: ItemProps) {
   return (
     <button
       type="button"
       role="menuitem"
       onClick={onSelect}
       data-testid={testId}
-      className={CONTEXT_MENU_ITEM_CLASS}
+      className={cn(CONTEXT_MENU_ITEM_CLASS, description && "items-start", muted && "text-muted-foreground")}
     >
-      {Icon ? <Icon className="w-4 h-4 shrink-0" /> : null}
-      <span className="flex-1">{children}</span>
+      {Icon ? <Icon className={cn("w-4 h-4 shrink-0", description && "mt-0.5")} /> : null}
+      <span className="flex-1">
+        <span className="block">{children}</span>
+        {description && <span className="block text-xs text-muted-foreground">{description}</span>}
+      </span>
     </button>
   );
 }
diff --git a/components/email/email-composer.tsx b/components/email/email-composer.tsx
index 9dcb154ca..3b0003861 100644
--- a/components/email/email-composer.tsx
+++ b/components/email/email-composer.tsx
@@ -41,7 +41,9 @@ import {
   Reply,
   Forward,
   BookUser,
+  Lock,
 } from "@/components/icons";
+import { useRouter } from "@/i18n/navigation";
 import { ComposerPluginMenuItems, ComposerPluginToolbarButtons, ComposerToolbarMenu, ComposerToolbarMenuItem, ComposerToolbarMenuCheckItem } from "@/components/email/composer-toolbar-menu";
 import { ComposerToolbarMenuRadioItem } from "@/components/email/composer-toolbar-menu";
 import type { MessagePriority } from "@/lib/message-priority";
@@ -603,6 +605,9 @@ export function EmailComposer({
   const tOffline = useTranslations('offline');
   const tOfflineNotes = useTranslations('offlineConflicts');
   const tSendGuards = useTranslations('send_guards');
+  const tWords = useTranslations('compose_words');
+  const router = useRouter();
+  const showAdvancedSettings = useSettingsStore((state) => state.showAdvancedSettings);
   const timeFormat = useSettingsStore((state) => state.timeFormat);
   const plainTextModeDefault = useSettingsStore((state) => state.plainTextMode);
   // Per-message format (#1022). Seeded from the "plain text only" setting -
@@ -5632,16 +5637,31 @@ export function EmailComposer({
                     {t('option_dsn')}
                   </ComposerToolbarMenuCheckItem>
                 )}
-                {composerClient?.supportsSubmissionExtension?.('REQUIRETLS') && (
+                {/* REQUIRETLS only secures the way there, so it is an advanced
+                    option; one already ticked stays visible to untick. */}
+                {composerClient?.supportsSubmissionExtension?.('REQUIRETLS') && (showAdvancedSettings || requireTls) && (
                   <ComposerToolbarMenuCheckItem
                     checked={requireTls}
                     onToggle={() => setRequireTls(v => !v)}
-                    description={t('option_require_tls_hint')}
+                    description={tWords('require_tls_hint')}
                     testId="composer-require-tls-toggle"
                   >
-                    {t('option_require_tls')}
+                    {tWords('require_tls')}
                   </ComposerToolbarMenuCheckItem>
                 )}
+                {/* Encrypting is a crypto plugin's job (S/MIME, PGP). Without
+                    one, say where to get it rather than offer nothing. */}
+                {emailHooks.onComposeSend.size === 0 && isFeatureEnabled('pluginsEnabled') && !ownWindow && (
+                  <ComposerToolbarMenuItem
+                    icon={Lock}
+                    muted
+                    description={tWords('encrypt_hint')}
+                    onSelect={() => { close(); router.push('/settings/addons'); }}
+                    testId="composer-encrypt-setup"
+                  >
+                    {tWords('encrypt')}
+                  </ComposerToolbarMenuItem>
+                )}
                 <div role="separator" className="my-1 h-px bg-border" />
                 <div role="group" aria-label={t('option_priority')} data-testid="composer-priority">
                   <div className="px-3 pt-1 pb-0.5 text-xs font-medium text-muted-foreground" aria-hidden="true">{t('option_priority')}</div>
diff --git a/locales/ar/common.json b/locales/ar/common.json
index 3554362e3..ed6682970 100644
--- a/locales/ar/common.json
+++ b/locales/ar/common.json
@@ -6392,7 +6392,11 @@
     "reply_from_received": {
       "label": "الرد من العنوان المستلَم إليه",
       "description": "الرد من العنوان الذي أُرسلت إليه الرسالة. مفيد إذا كانت لديك عدة عناوين."
-    }
+    },
+    "require_tls": "التسليم عبر اتصال آمن فقط",
+    "require_tls_hint": "الرسالة نفسها غير مشفّرة. تُرَد إذا لم يتمكن خادم من استخدام TLS.",
+    "encrypt": "تشفير…",
+    "encrypt_hint": "يتطلب إضافة S/MIME أو PGP. يفتح الإعدادات."
   },
   "plugin_list": {
     "filters": "المرشحات",
diff --git a/locales/ca/common.json b/locales/ca/common.json
index 3c756c200..7836a4f0e 100644
--- a/locales/ca/common.json
+++ b/locales/ca/common.json
@@ -6392,7 +6392,11 @@
     "reply_from_received": {
       "label": "Respon des de l'adreça de recepció",
       "description": "Respon des de l'adreça a la qual es va enviar el correu. Útil si teniu diverses adreces."
-    }
+    },
+    "require_tls": "Lliura només per una connexió segura",
+    "require_tls_hint": "El missatge en si no està xifrat. Es retorna si un servidor no pot fer servir TLS.",
+    "encrypt": "Xifra…",
+    "encrypt_hint": "Cal un complement S/MIME o PGP. Obre la configuració."
   },
   "plugin_list": {
     "filters": "Filtres",
diff --git a/locales/cs/common.json b/locales/cs/common.json
index 20bd5cb05..301fbdacc 100644
--- a/locales/cs/common.json
+++ b/locales/cs/common.json
@@ -6392,7 +6392,11 @@
     "reply_from_received": {
       "label": "Automaticky vybírat adresu pro odpověď",
       "description": "Odpovídat z adresy, na kterou zpráva přišla. Hodí se, pokud máte více adres."
-    }
+    },
+    "require_tls": "Doručit jen přes zabezpečené spojení",
+    "require_tls_hint": "Samotná zpráva šifrovaná není. Vrátí se, pokud server nemůže použít TLS.",
+    "encrypt": "Šifrovat…",
+    "encrypt_hint": "Vyžaduje doplněk S/MIME nebo PGP. Otevře Nastavení."
   },
   "plugin_list": {
     "filters": "Filtry",
diff --git a/locales/da/common.json b/locales/da/common.json
index 1c2118e3a..fd0a954df 100644
--- a/locales/da/common.json
+++ b/locales/da/common.json
@@ -6392,7 +6392,11 @@
     "reply_from_received": {
       "label": "Svar fra modtaget adresse",
       "description": "Svar fra den adresse, mailen blev sendt til. Nyttigt, hvis du har flere adresser."
-    }
+    },
+    "require_tls": "Lever kun via en sikker forbindelse",
+    "require_tls_hint": "Selve beskeden er ikke krypteret. Den sendes retur, hvis en server ikke kan bruge TLS.",
+    "encrypt": "Krypter…",
+    "encrypt_hint": "Kræver en S/MIME- eller PGP-tilføjelse. Åbner Indstillinger."
   },
   "plugin_list": {
     "filters": "Filtre",
diff --git a/locales/de/common.json b/locales/de/common.json
index 77323e258..03b98526d 100644
--- a/locales/de/common.json
+++ b/locales/de/common.json
@@ -6392,7 +6392,11 @@
     "reply_from_received": {
       "label": "Antwortadresse automatisch wählen",
       "description": "Die Antwort geht von der Adresse aus, an die die E-Mail ging. Nützlich, wenn Sie mehrere Adressen haben."
-    }
+    },
+    "require_tls": "Nur über eine sichere Verbindung zustellen",
+    "require_tls_hint": "Die Nachricht selbst wird nicht verschlüsselt. Sie kommt zurück, wenn ein Server kein TLS nutzen kann.",
+    "encrypt": "Verschlüsseln…",
+    "encrypt_hint": "Dafür brauchen Sie eine S/MIME- oder PGP-Erweiterung. Öffnet die Einstellungen."
   },
   "plugin_list": {
     "filters": "Filter",
diff --git a/locales/en/common.json b/locales/en/common.json
index 465dca018..4138b9b32 100644
--- a/locales/en/common.json
+++ b/locales/en/common.json
@@ -6392,7 +6392,11 @@
     "reply_from_received": {
       "label": "Reply from the address it was sent to",
       "description": "Reply from the address the mail was sent to. Useful if you have several addresses."
-    }
+    },
+    "require_tls": "Only deliver over a secure connection",
+    "require_tls_hint": "The message itself isn't encrypted. It bounces if a server can't use TLS.",
+    "encrypt": "Encrypt…",
+    "encrypt_hint": "Needs an S/MIME or PGP add-on. Opens Settings."
   },
   "plugin_list": {
     "filters": "Filters",
diff --git a/locales/es/common.json b/locales/es/common.json
index 650e646a1..fda797ee8 100644
--- a/locales/es/common.json
+++ b/locales/es/common.json
@@ -6392,7 +6392,11 @@
     "reply_from_received": {
       "label": "Seleccionar dirección de respuesta automáticamente",
       "description": "Responder desde la dirección a la que se envió el correo. Útil si tiene varias direcciones."
-    }
+    },
+    "require_tls": "Entregar solo por una conexión segura",
+    "require_tls_hint": "El mensaje en sí no se cifra. Se devuelve si un servidor no puede usar TLS.",
+    "encrypt": "Cifrar…",
+    "encrypt_hint": "Necesita un complemento S/MIME o PGP. Abre la Configuración."
   },
   "plugin_list": {
     "filters": "Filtros",
diff --git a/locales/et/common.json b/locales/et/common.json
index 8224fd630..5793da0ee 100644
--- a/locales/et/common.json
+++ b/locales/et/common.json
@@ -6392,7 +6392,11 @@
     "reply_from_received": {
       "label": "Vasta kirja saanud aadressilt",
       "description": "Vasta aadressilt, kuhu kiri saadeti. Kasulik, kui sul on mitu aadressi."
-    }
+    },
+    "require_tls": "Toimeta kohale ainult turvalise ühenduse kaudu",
+    "require_tls_hint": "Kiri ise ei ole krüpteeritud. See tuleb tagasi, kui server ei saa TLS-i kasutada.",
+    "encrypt": "Krüpteeri…",
+    "encrypt_hint": "Vajab S/MIME või PGP lisa. Avab seaded."
   },
   "plugin_list": {
     "filters": "Filtrid",
diff --git a/locales/fa/common.json b/locales/fa/common.json
index fff0e36aa..730598745 100644
--- a/locales/fa/common.json
+++ b/locales/fa/common.json
@@ -6392,7 +6392,11 @@
     "reply_from_received": {
       "label": "پاسخ از آدرس دریافتی",
       "description": "پاسخ از نشانی‌ای که نامه به آن فرستاده شده بود. اگر چند نشانی دارید مفید است."
-    }
+    },
+    "require_tls": "تحویل فقط از راه اتصال امن",
+    "require_tls_hint": "خود پیام رمزگذاری نمی‌شود. اگر سروری نتواند از TLS استفاده کند، برگشت می‌خورد.",
+    "encrypt": "رمزگذاری…",
+    "encrypt_hint": "به افزونهٔ S/MIME یا PGP نیاز دارد. تنظیمات را باز می‌کند."
   },
   "plugin_list": {
     "filters": "فیلترها",
diff --git a/locales/fr/common.json b/locales/fr/common.json
index 58293cf34..f76c76c4f 100644
--- a/locales/fr/common.json
+++ b/locales/fr/common.json
@@ -6392,7 +6392,11 @@
     "reply_from_received": {
       "label": "Sélection automatique de l'adresse de réponse",
       "description": "Répondre depuis l'adresse à laquelle le message a été envoyé. Utile si vous avez plusieurs adresses."
-    }
+    },
+    "require_tls": "Livrer uniquement par une connexion sécurisée",
+    "require_tls_hint": "Le message lui-même n'est pas chiffré. Il est renvoyé si un serveur ne peut pas utiliser TLS.",
+    "encrypt": "Chiffrer…",
+    "encrypt_hint": "Nécessite une extension S/MIME ou PGP. Ouvre les Paramètres."
   },
   "plugin_list": {
     "filters": "Filtres",
diff --git a/locales/he/common.json b/locales/he/common.json
index 8d94cfcb4..3662a919d 100644
--- a/locales/he/common.json
+++ b/locales/he/common.json
@@ -6393,7 +6393,11 @@
     "reply_from_received": {
       "label": "בחירה אוטומטית בכתובת תשובה",
       "description": "השב מהכתובת שאליה נשלח הדואר. שימושי אם יש לך כמה כתובות."
-    }
+    },
+    "require_tls": "מסירה רק דרך חיבור מאובטח",
+    "require_tls_hint": "ההודעה עצמה אינה מוצפנת. היא תוחזר אם שרת לא יכול להשתמש ב-TLS.",
+    "encrypt": "הצפנה…",
+    "encrypt_hint": "דורש תוסף S/MIME או PGP. פותח את ההגדרות."
   },
   "plugin_list": {
     "filters": "מסננים",
diff --git a/locales/hu/common.json b/locales/hu/common.json
index 458d6c725..7dedc7a49 100644
--- a/locales/hu/common.json
+++ b/locales/hu/common.json
@@ -6392,7 +6392,11 @@
     "reply_from_received": {
       "label": "Válasz a fogadott címről",
       "description": "Válasz arról a címről, amelyre a levél érkezett. Hasznos, ha több címe van."
-    }
+    },
+    "require_tls": "Kézbesítés csak biztonságos kapcsolaton át",
+    "require_tls_hint": "Maga az üzenet nincs titkosítva. Visszapattan, ha egy szerver nem tud TLS-t használni.",
+    "encrypt": "Titkosítás…",
+    "encrypt_hint": "S/MIME vagy PGP bővítmény kell hozzá. Megnyitja a Beállításokat."
   },
   "plugin_list": {
     "filters": "Szűrők",
diff --git a/locales/it/common.json b/locales/it/common.json
index bd0ad832a..ad285a749 100644
--- a/locales/it/common.json
+++ b/locales/it/common.json
@@ -6392,7 +6392,11 @@
     "reply_from_received": {
       "label": "Seleziona automaticamente l'indirizzo di risposta",
       "description": "Rispondi dall'indirizzo a cui è stata inviata l'email. Utile se hai più indirizzi."
-    }
+    },
+    "require_tls": "Consegna solo tramite una connessione sicura",
+    "require_tls_hint": "Il messaggio in sé non è cifrato. Viene respinto se un server non può usare TLS.",
+    "encrypt": "Cifra…",
+    "encrypt_hint": "Serve un componente aggiuntivo S/MIME o PGP. Apre le Impostazioni."
   },
   "plugin_list": {
     "filters": "Filtri",
diff --git a/locales/ja/common.json b/locales/ja/common.json
index 7fcdb4d04..c5f44ee3e 100644
--- a/locales/ja/common.json
+++ b/locales/ja/common.json
@@ -6392,7 +6392,11 @@
     "reply_from_received": {
       "label": "返信元アドレスを自動選択",
       "description": "メールの宛先になったアドレスから返信します。複数のアドレスがある場合に便利です。"
-    }
+    },
+    "require_tls": "安全な接続でのみ配信",
+    "require_tls_hint": "メッセージ自体は暗号化されません。サーバーが TLS を使えない場合は返送されます。",
+    "encrypt": "暗号化…",
+    "encrypt_hint": "S/MIME または PGP のアドオンが必要です。設定を開きます。"
   },
   "plugin_list": {
     "filters": "フィルター",
diff --git a/locales/ko/common.json b/locales/ko/common.json
index a43e71e92..d7a56c111 100644
--- a/locales/ko/common.json
+++ b/locales/ko/common.json
@@ -6392,7 +6392,11 @@
     "reply_from_received": {
       "label": "답장 시 보내는 사람 자동 선택",
       "description": "메일을 받은 주소로 답장합니다. 주소가 여러 개일 때 유용합니다."
-    }
+    },
+    "require_tls": "보안 연결로만 배달",
+    "require_tls_hint": "메시지 자체는 암호화되지 않습니다. 서버가 TLS를 사용할 수 없으면 반송됩니다.",
+    "encrypt": "암호화…",
+    "encrypt_hint": "S/MIME 또는 PGP 추가 기능이 필요합니다. 설정을 엽니다."
   },
   "plugin_list": {
     "filters": "필터",
diff --git a/locales/lv/common.json b/locales/lv/common.json
index 44a79e5a9..bcfadf592 100644
--- a/locales/lv/common.json
+++ b/locales/lv/common.json
@@ -6392,7 +6392,11 @@
     "reply_from_received": {
       "label": "Automātiski izvēlēties atbildes adresi",
       "description": "Atbildēt no adreses, uz kuru vēstule tika nosūtīta. Noder, ja jums ir vairākas adreses."
-    }
+    },
+    "require_tls": "Piegādāt tikai pa drošu savienojumu",
+    "require_tls_hint": "Pats ziņojums nav šifrēts. Tas tiek atgriezts, ja serveris nevar izmantot TLS.",
+    "encrypt": "Šifrēt…",
+    "encrypt_hint": "Nepieciešams S/MIME vai PGP papildinājums. Atver iestatījumus."
   },
   "plugin_list": {
     "filters": "Filtri",
diff --git a/locales/mn/common.json b/locales/mn/common.json
index 1173ac93b..8d03df472 100644
--- a/locales/mn/common.json
+++ b/locales/mn/common.json
@@ -6392,7 +6392,11 @@
     "reply_from_received": {
       "label": "Хүлээн авсан хаягаас хариу бичих",
       "description": "Захидал илгээгдсэн хаягаас хариу бичнэ. Олон хаягтай бол хэрэгтэй."
-    }
+    },
+    "require_tls": "Зөвхөн аюулгүй холболтоор хүргэх",
+    "require_tls_hint": "Мессеж өөрөө шифрлэгдэхгүй. Сервер TLS ашиглаж чадахгүй бол буцаагдана.",
+    "encrypt": "Шифрлэх…",
+    "encrypt_hint": "S/MIME эсвэл PGP нэмэлт хэрэгтэй. Тохиргоог нээнэ."
   },
   "plugin_list": {
     "filters": "Шүүлтүүр",
diff --git a/locales/nb/common.json b/locales/nb/common.json
index 09160a027..589082828 100644
--- a/locales/nb/common.json
+++ b/locales/nb/common.json
@@ -6392,7 +6392,11 @@
     "reply_from_received": {
       "label": "Svar fra mottatt adresse",
       "description": "Svar fra adressen e-posten ble sendt til. Nyttig hvis du har flere adresser."
-    }
+    },
+    "require_tls": "Lever bare over en sikker tilkobling",
+    "require_tls_hint": "Selve meldingen er ikke kryptert. Den sendes i retur hvis en server ikke kan bruke TLS.",
+    "encrypt": "Krypter…",
+    "encrypt_hint": "Krever et S/MIME- eller PGP-tillegg. Åpner Innstillinger."
   },
   "plugin_list": {
     "filters": "Filtre",
diff --git a/locales/nl/common.json b/locales/nl/common.json
index 83c019f2e..3fd8ddc41 100644
--- a/locales/nl/common.json
+++ b/locales/nl/common.json
@@ -6392,7 +6392,11 @@
     "reply_from_received": {
       "label": "Antwoordadres automatisch selecteren",
       "description": "Antwoord vanaf het adres waar de mail naartoe is gestuurd. Handig als je meerdere adressen hebt."
-    }
+    },
+    "require_tls": "Alleen via een beveiligde verbinding bezorgen",
+    "require_tls_hint": "Het bericht zelf is niet versleuteld. Het komt terug als een server geen TLS kan gebruiken.",
+    "encrypt": "Versleutelen…",
+    "encrypt_hint": "Vereist een S/MIME- of PGP-add-on. Opent Instellingen."
   },
   "plugin_list": {
     "filters": "Filters",
diff --git a/locales/pl/common.json b/locales/pl/common.json
index 9d4185978..1db35978a 100644
--- a/locales/pl/common.json
+++ b/locales/pl/common.json
@@ -6392,7 +6392,11 @@
     "reply_from_received": {
       "label": "Automatycznie wybieraj adres odpowiedzi",
       "description": "Odpowiadaj z adresu, na który wysłano wiadomość. Przydatne, jeśli masz kilka adresów."
-    }
+    },
+    "require_tls": "Doręczaj tylko przez bezpieczne połączenie",
+    "require_tls_hint": "Sama wiadomość nie jest szyfrowana. Zostanie zwrócona, jeśli serwer nie może użyć TLS.",
+    "encrypt": "Zaszyfruj…",
+    "encrypt_hint": "Wymaga dodatku S/MIME lub PGP. Otwiera Ustawienia."
   },
   "plugin_list": {
     "filters": "Filtry",
diff --git a/locales/pt/common.json b/locales/pt/common.json
index 05c89d668..24db7fd80 100644
--- a/locales/pt/common.json
+++ b/locales/pt/common.json
@@ -6392,7 +6392,11 @@
     "reply_from_received": {
       "label": "Selecionar automaticamente o endereço de resposta",
       "description": "Responder do endereço para o qual o e-mail foi enviado. Útil se você tiver vários endereços."
-    }
+    },
+    "require_tls": "Entregar só por uma conexão segura",
+    "require_tls_hint": "A mensagem em si não é cifrada. Ela volta se um servidor não puder usar TLS.",
+    "encrypt": "Cifrar…",
+    "encrypt_hint": "Precisa de um extra S/MIME ou PGP. Abre as Configurações."
   },
   "plugin_list": {
     "filters": "Filtros",
diff --git a/locales/ro/common.json b/locales/ro/common.json
index b07b5a184..6b46ce602 100644
--- a/locales/ro/common.json
+++ b/locales/ro/common.json
@@ -6392,7 +6392,11 @@
     "reply_from_received": {
       "label": "Răspunde de la adresa de la care a fost primit mesajul",
       "description": "Răspunde de la adresa la care a fost trimis e-mailul. Util dacă ai mai multe adrese."
-    }
+    },
+    "require_tls": "Livrează doar printr-o conexiune sigură",
+    "require_tls_hint": "Mesajul în sine nu este criptat. Este returnat dacă un server nu poate folosi TLS.",
+    "encrypt": "Criptează…",
+    "encrypt_hint": "Necesită un supliment S/MIME sau PGP. Deschide Setările."
   },
   "plugin_list": {
     "filters": "Filtre",
diff --git a/locales/ru/common.json b/locales/ru/common.json
index ad41eefb2..4ea47ede2 100644
--- a/locales/ru/common.json
+++ b/locales/ru/common.json
@@ -6392,7 +6392,11 @@
     "reply_from_received": {
       "label": "Автоматически выбирать адрес для ответа",
       "description": "Отвечать с адреса, на который пришло письмо. Удобно, если у вас несколько адресов."
-    }
+    },
+    "require_tls": "Доставлять только по защищённому соединению",
+    "require_tls_hint": "Само письмо не шифруется. Оно вернётся, если сервер не может использовать TLS.",
+    "encrypt": "Зашифровать…",
+    "encrypt_hint": "Нужно дополнение S/MIME или PGP. Открывает настройки."
   },
   "plugin_list": {
     "filters": "Фильтры",
diff --git a/locales/sk/common.json b/locales/sk/common.json
index ec18d119b..c532d76e1 100644
--- a/locales/sk/common.json
+++ b/locales/sk/common.json
@@ -6392,7 +6392,11 @@
     "reply_from_received": {
       "label": "Odpovedať z prijatej adresy",
       "description": "Odpovedať z adresy, na ktorú prišla správa. Hodí sa, ak máte viac adries."
-    }
+    },
+    "require_tls": "Doručiť len cez zabezpečené spojenie",
+    "require_tls_hint": "Samotná správa nie je šifrovaná. Vráti sa, ak server nemôže použiť TLS.",
+    "encrypt": "Šifrovať…",
+    "encrypt_hint": "Vyžaduje doplnok S/MIME alebo PGP. Otvorí Nastavenia."
   },
   "plugin_list": {
     "filters": "Filtre",
diff --git a/locales/th/common.json b/locales/th/common.json
index a46a03907..9a5932b1a 100644
--- a/locales/th/common.json
+++ b/locales/th/common.json
@@ -3313,7 +3313,11 @@
     "reply_from_received": {
       "label": "ตอบกลับจากที่อยู่ที่ได้รับ",
       "description": "ตอบกลับจากที่อยู่ที่อีเมลถูกส่งมา มีประโยชน์หากคุณมีหลายที่อยู่"
-    }
+    },
+    "require_tls": "ส่งผ่านการเชื่อมต่อที่ปลอดภัยเท่านั้น",
+    "require_tls_hint": "ตัวข้อความเองไม่ได้ถูกเข้ารหัส ข้อความจะถูกตีกลับหากเซิร์ฟเวอร์ใช้ TLS ไม่ได้",
+    "encrypt": "เข้ารหัส…",
+    "encrypt_hint": "ต้องใช้ส่วนเสริม S/MIME หรือ PGP จะเปิดการตั้งค่า"
   },
   "plugin_list": {
     "filters": "ตัวกรอง",
diff --git a/locales/tr/common.json b/locales/tr/common.json
index 55f8ac366..38db522bf 100644
--- a/locales/tr/common.json
+++ b/locales/tr/common.json
@@ -6392,7 +6392,11 @@
     "reply_from_received": {
       "label": "Yanıt Adresini Otomatik Seç",
       "description": "Postanın gönderildiği adresten yanıtlayın. Birden çok adresiniz varsa kullanışlıdır."
-    }
+    },
+    "require_tls": "Yalnızca güvenli bağlantı üzerinden teslim et",
+    "require_tls_hint": "İletinin kendisi şifrelenmez. Bir sunucu TLS kullanamazsa geri döner.",
+    "encrypt": "Şifrele…",
+    "encrypt_hint": "S/MIME veya PGP eklentisi gerekir. Ayarlar'ı açar."
   },
   "plugin_list": {
     "filters": "Filtreler",
diff --git a/locales/uk/common.json b/locales/uk/common.json
index 7d672778a..946065a5f 100644
--- a/locales/uk/common.json
+++ b/locales/uk/common.json
@@ -6392,7 +6392,11 @@
     "reply_from_received": {
       "label": "Автоматичний вибір адреси для відповіді",
       "description": "Відповідати з адреси, на яку надійшов лист. Зручно, якщо у вас кілька адрес."
-    }
+    },
+    "require_tls": "Доставляти лише захищеним з'єднанням",
+    "require_tls_hint": "Сам лист не шифрується. Він повернеться, якщо сервер не може використати TLS.",
+    "encrypt": "Зашифрувати…",
+    "encrypt_hint": "Потрібен додаток S/MIME або PGP. Відкриває налаштування."
   },
   "plugin_list": {
     "filters": "Фільтри",
diff --git a/locales/vi/common.json b/locales/vi/common.json
index f48c8f8e7..0919080c0 100644
--- a/locales/vi/common.json
+++ b/locales/vi/common.json
@@ -6404,7 +6404,11 @@
     "reply_from_received": {
       "label": "Trả lời bằng địa chỉ nhận thư",
       "description": "Trả lời từ địa chỉ mà thư đã được gửi đến. Hữu ích nếu bạn có nhiều địa chỉ."
-    }
+    },
+    "require_tls": "Chỉ gửi qua kết nối an toàn",
+    "require_tls_hint": "Bản thân thư không được mã hóa. Thư sẽ bị trả lại nếu máy chủ không dùng được TLS.",
+    "encrypt": "Mã hóa…",
+    "encrypt_hint": "Cần tiện ích S/MIME hoặc PGP. Mở Cài đặt."
   },
   "plugin_list": {
     "filters": "Bộ lọc",
diff --git a/locales/zh-TW/common.json b/locales/zh-TW/common.json
index 3ea326a1e..1234d09e6 100644
--- a/locales/zh-TW/common.json
+++ b/locales/zh-TW/common.json
@@ -6392,7 +6392,11 @@
     "reply_from_received": {
       "label": "使用收件地址回覆",
       "description": "從郵件寄達的地址回覆。適合擁有多個地址時使用。"
-    }
+    },
+    "require_tls": "僅透過安全連線投遞",
+    "require_tls_hint": "郵件本身不會加密。如果伺服器無法使用 TLS，郵件會被退回。",
+    "encrypt": "加密…",
+    "encrypt_hint": "需要 S/MIME 或 PGP 附加元件。將開啟設定。"
   },
   "plugin_list": {
     "filters": "篩選",
diff --git a/locales/zh/common.json b/locales/zh/common.json
index 937b1ba57..fd354b278 100644
--- a/locales/zh/common.json
+++ b/locales/zh/common.json
@@ -6392,7 +6392,11 @@
     "reply_from_received": {
       "label": "自动选择回复地址",
       "description": "从邮件发往的地址回复。适合拥有多个地址的情况。"
-    }
+    },
+    "require_tls": "仅通过安全连接投递",
+    "require_tls_hint": "邮件本身不会加密。如果服务器无法使用 TLS，邮件会被退回。",
+    "encrypt": "加密…",
+    "encrypt_hint": "需要 S/MIME 或 PGP 附加组件。将打开设置。"
   },
   "plugin_list": {
     "filters": "筛选",

From 1b13b4ce88b8ccd0a949b6f5a36d805169ee3056 Mon Sep 17 00:00:00 2001
From: Linus Rath <139418639+rathlinus@users.noreply.github.com>
Date: Wed, 4 Nov 2026 07:12:24 +0100
Subject: [PATCH 16/34] feat: show Offline in the composer and keep the message
 when Send can't go out

---
 .../__tests__/composer-offline-send.test.tsx  | 289 ++++++++++++++++++
 .../__tests__/composer-own-window.test.tsx    |  21 +-
 components/email/email-composer.tsx           |  67 +++-
 hooks/use-browser-online.ts                   |  21 ++
 locales/ar/common.json                        |   7 +-
 locales/ca/common.json                        |   7 +-
 locales/cs/common.json                        |   7 +-
 locales/da/common.json                        |   7 +-
 locales/de/common.json                        |   7 +-
 locales/en/common.json                        |   7 +-
 locales/es/common.json                        |   7 +-
 locales/et/common.json                        |   7 +-
 locales/fa/common.json                        |   7 +-
 locales/fr/common.json                        |   7 +-
 locales/he/common.json                        |   7 +-
 locales/hu/common.json                        |   7 +-
 locales/it/common.json                        |   7 +-
 locales/ja/common.json                        |   7 +-
 locales/ko/common.json                        |   7 +-
 locales/lv/common.json                        |   7 +-
 locales/mn/common.json                        |   7 +-
 locales/nb/common.json                        |   7 +-
 locales/nl/common.json                        |   7 +-
 locales/pl/common.json                        |   7 +-
 locales/pt/common.json                        |   7 +-
 locales/ro/common.json                        |   7 +-
 locales/ru/common.json                        |   7 +-
 locales/sk/common.json                        |   7 +-
 locales/th/common.json                        |   7 +-
 locales/tr/common.json                        |   7 +-
 locales/uk/common.json                        |   7 +-
 locales/vi/common.json                        |   7 +-
 locales/zh-TW/common.json                     |   7 +-
 locales/zh/common.json                        |   7 +-
 34 files changed, 572 insertions(+), 36 deletions(-)
 create mode 100644 components/email/__tests__/composer-offline-send.test.tsx
 create mode 100644 hooks/use-browser-online.ts

diff --git a/components/email/__tests__/composer-offline-send.test.tsx b/components/email/__tests__/composer-offline-send.test.tsx
new file mode 100644
index 000000000..5c7b5f425
--- /dev/null
+++ b/components/email/__tests__/composer-offline-send.test.tsx
@@ -0,0 +1,289 @@
+import { act, fireEvent, render, screen, waitFor } from '@testing-library/react';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import React from 'react';
+import { EmailComposer } from '../email-composer';
+
+// Writing offline. The footer says "Offline" next to Send. With "Keep mail on
+// this device" on, Send puts the message in the outbox as before. Without it
+// nothing can keep the message safely for later: Send says so, keeps the
+// text, and points at the setting. It used to fail with "Failed to send".
+
+const offline = vi.hoisted(() => ({ active: false, allowed: true }));
+vi.mock('@/lib/offline/offline-mode', async (importOriginal) => ({
+  ...(await importOriginal<object>()),
+  offlineActive: () => offline.active,
+  offlineAllowed: () => offline.allowed,
+}));
+
+vi.mock('@/components/email/rich-text-editor', () => ({
+  RichTextEditor: ({ collapseToolbarOnMobile }: { collapseToolbarOnMobile?: boolean }) =>
+    React.createElement('div', { 'data-testid': 'rich-text-editor', 'data-collapsed': String(!!collapseToolbarOnMobile) }),
+}));
+
+vi.mock('@/components/plugins/plugin-slot', () => ({ PluginSlot: () => null }));
+vi.mock('@/components/ui/avatar', () => ({ Avatar: () => null }));
+vi.mock('@/components/identity/sub-address-helper', () => ({ SubAddressHelper: () => null }));
+vi.mock('@/components/templates/template-picker', () => ({ TemplatePicker: () => null }));
+vi.mock('@/components/templates/template-form', () => ({ TemplateForm: () => null }));
+vi.mock('@/components/files/file-preview-modal', () => ({ FilePreviewModal: () => null }));
+vi.mock('@/hooks/use-focus-trap', () => ({
+  useFocusTrap: () => ({ current: null }),
+}));
+vi.mock('@/hooks/use-pro-multi-account-identities', () => ({
+  useProMultiAccountIdentities: () => ({ enabled: false, groups: [], allIdentities: [] }),
+  stripCrossAccountIdentityPrefix: (id: string) => ({ localAccountId: null, rawId: id }),
+}));
+
+vi.mock('@/stores/auth-store', () => {
+  const state = {
+    client: null,
+    identities: [],
+    primaryIdentity: null,
+    isAuthenticated: false,
+    isDemoMode: false,
+    activeAccountId: null,
+    connectionLost: false,
+    getClientForAccount: () => undefined,
+    getAllConnectedClients: () => new Map(),
+    syncIdentities: () => {},
+    refreshIdentities: async () => {},
+  };
+  const hook = (sel?: (s: typeof state) => unknown) =>
+    typeof sel === 'function' ? sel(state) : state;
+  hook.getState = () => state;
+  hook.setState = (p: Partial<typeof state>) => Object.assign(state, p);
+  return { useAuthStore: hook };
+});
+
+vi.mock('@/stores/identity-store', () => {
+  const state = {
+    identities: [{ id: 'id-me', email: 'me@example.com', name: 'Me' }],
+    defaultIdentityId: 'id-me',
+  };
+  const hook = (sel?: (s: typeof state) => unknown) =>
+    typeof sel === 'function' ? sel(state) : state;
+  hook.getState = () => state;
+  hook.setState = (p: Partial<typeof state>) => Object.assign(state, p);
+  return { useIdentityStore: hook };
+});
+
+vi.mock('@/stores/account-store', () => {
+  const state = { accounts: [], getAccountById: () => undefined };
+  const hook = (sel?: (s: typeof state) => unknown) =>
+    typeof sel === 'function' ? sel(state) : state;
+  hook.getState = () => state;
+  hook.setState = (p: Partial<typeof state>) => Object.assign(state, p);
+  return { useAccountStore: hook };
+});
+
+vi.mock('@/stores/email-store', () => {
+  const state = {
+    draftSaveEnabled: false,
+    sendRawEmail: async () => ({ sent: true }),
+  };
+  const hook = (sel?: (s: typeof state) => unknown) =>
+    typeof sel === 'function' ? sel(state) : state;
+  hook.getState = () => state;
+  hook.setState = (p: Partial<typeof state>) => Object.assign(state, p);
+  return { useEmailStore: hook };
+});
+
+vi.mock('@/stores/settings-store', () => {
+  const state = {
+    timeFormat: '24h',
+    plainTextMode: false,
+    subAddressDelimiter: '+',
+    autoSelectReplyIdentity: true,
+    attachmentReminderEnabled: false,
+    attachmentReminderKeywords: [],
+    emptySubjectWarningEnabled: true,
+    sendDelaySeconds: 0,
+    signaturePosition: 'above_quote',
+    signatureSeparatorEnabled: false,
+    requestReadReceiptDefault: false,
+    addTrustedSender: () => {},
+    trustedSendersAddressBook: null,
+    updateSetting: () => {},
+  };
+  const hook = (sel?: (s: typeof state) => unknown) =>
+    typeof sel === 'function' ? sel(state) : state;
+  hook.getState = () => state;
+  hook.setState = (p: Partial<typeof state>) => Object.assign(state, p);
+  return { useSettingsStore: hook };
+});
+
+vi.mock('@/stores/contact-store', () => {
+  const state = {
+    contacts: [],
+    getAutocomplete: async () => [],
+    addToTrustedSendersBook: async () => {},
+  };
+  const hook = (sel?: (s: typeof state) => unknown) =>
+    typeof sel === 'function' ? sel(state) : state;
+  hook.getState = () => state;
+  hook.setState = (p: Partial<typeof state>) => Object.assign(state, p);
+  return { useContactStore: hook };
+});
+
+vi.mock('@/stores/template-store', () => {
+  const state = { templates: [], addTemplate: async () => {} };
+  const hook = (sel?: (s: typeof state) => unknown) =>
+    typeof sel === 'function' ? sel(state) : state;
+  hook.getState = () => state;
+  hook.setState = (p: Partial<typeof state>) => Object.assign(state, p);
+  return { useTemplateStore: hook };
+});
+
+vi.mock('@/stores/toast-store', () => ({
+  toast: { info: () => {}, error: () => {}, success: () => {}, warning: () => {} },
+}));
+
+vi.mock('@/lib/plugin-hooks', () => ({
+  identityHooks: {
+    onSignatureRender: { size: 0, transform: async (value: unknown) => value },
+    onIdentitySelect: { size: 0, emit: async () => {} },
+  },
+  templateHooks: {
+    onTemplateRender: { size: 0, transform: async (value: unknown) => value },
+    onTemplateApply: { size: 0, emit: async () => {} },
+  },
+  emailHooks: {
+    onComposerOpen: { call: async () => [] },
+    onRecipientChange: { call: async () => [] },
+    getRecipientSuggestions: { call: async () => [] },
+    onRecipientChipsChange: { transform: async (chips: unknown) => chips },
+    onDraftChange: { emit: () => {} },
+    onBeforeDraftAutoSave: { transform: async (draft: unknown) => draft },
+    onBeforeEmailSend: { intercept: async () => true, interceptOutcome: async () => 'allowed' },
+    onComposeSend: { takeOver: async () => 'default' },
+    onTransformOutgoingEmail: { transform: async (email: unknown) => email },
+  },
+  contactHooks: {
+    search: { call: async () => [] },
+    onProvideRecipientSuggestions: { transform: async (initial: unknown) => initial },
+  },
+}));
+
+vi.mock('@/lib/email-sanitization', () => ({
+  sanitizeSignatureHtml: (v: string) => v,
+  sanitizeEmailHtml: (v: string) => v,
+  parseHtmlSafely: (html: string) => new DOMParser().parseFromString(html, 'text/html'),
+}));
+
+vi.mock('@/lib/email-threading', () => ({
+  computeReplyThreadingHeaders: () => ({ inReplyTo: [], references: [] }),
+}));
+vi.mock('@/lib/signature-utils', () => ({
+  appendPlainTextSignature: (body: string) => body,
+  getPlainTextSignature: () => '',
+}));
+vi.mock('@/lib/sub-addressing', () => ({ generateSubAddress: () => '' }));
+vi.mock('@/lib/debug', () => ({ debug: { log: () => {}, warn: () => {}, error: () => {} } }));
+vi.mock('@/components/email/quoted-html', () => ({
+  buildQuotedHtmlBlock: () => '',
+  serializeEditorContent: () => '',
+}));
+vi.mock('@/lib/template-utils', () => ({ substitutePlaceholders: (s: string) => s }));
+
+const DATA = {
+  to: 'bob@example.com',
+  cc: '',
+  bcc: '',
+  subject: 'Lunch',
+  body: '<p>Hello there</p>',
+  showCc: false,
+  showBcc: false,
+  selectedIdentityId: 'id-me',
+  subAddressTag: '',
+  mode: 'compose' as const,
+  draftId: null,
+};
+
+let online = true;
+beforeEach(() => {
+  online = true;
+  offline.active = false;
+  offline.allowed = true;
+  Object.defineProperty(navigator, 'onLine', { configurable: true, get: () => online });
+});
+afterEach(() => {
+  online = true;
+});
+
+function goOffline() {
+  online = false;
+  act(() => { window.dispatchEvent(new Event('offline')); });
+}
+function goOnline() {
+  online = true;
+  act(() => { window.dispatchEvent(new Event('online')); });
+}
+
+const footer = () => document.querySelector<HTMLElement>('[data-composer-footer]')!;
+
+describe('the composer while offline', () => {
+  it('says "Offline" next to Send, and stops once the network is back', () => {
+    render(<EmailComposer initialData={DATA} ownWindow={{}} />);
+    expect(screen.queryByTestId('composer-offline')).toBeNull();
+    goOffline();
+    const label = screen.getByTestId('composer-offline');
+    expect(footer()).toContainElement(label);
+    expect(label.textContent).toContain('offline');
+    expect(label.textContent).toContain('offline_hint');
+    goOnline();
+    expect(screen.queryByTestId('composer-offline')).toBeNull();
+  });
+
+  it('without offline mode, Send keeps the message and says why, with the way to the setting', async () => {
+    const onSend = vi.fn();
+    render(<EmailComposer initialData={DATA} ownWindow={{}} onSend={onSend} />);
+    goOffline();
+    fireEvent.click(screen.getByTestId('composer-send'));
+    const notice = await screen.findByTestId('composer-offline-notice');
+    expect(notice.textContent).toContain('offline_send_unsaved');
+    const link = screen.getByRole('link', { name: 'settings.keep_label' });
+    expect(link.getAttribute('href')).toMatch(/\/settings\/backup\/offline$/);
+    expect(link).toHaveAttribute('target', '_blank');
+    expect(onSend).not.toHaveBeenCalled();
+    expect(screen.getByTestId('email-composer')).toBeInTheDocument();
+
+    goOnline();
+    expect(screen.queryByTestId('composer-offline-notice')).toBeNull();
+  });
+
+  it('says the message is in Drafts only when the server has it', async () => {
+    render(<EmailComposer initialData={{ ...DATA, draftId: 'd1' }} ownWindow={{}} onSend={vi.fn()} />);
+    goOffline();
+    fireEvent.click(screen.getByTestId('composer-send'));
+    expect((await screen.findByTestId('composer-offline-notice')).textContent).toContain('offline_send_saved');
+  });
+
+  it('Ctrl+Enter takes the same way', async () => {
+    const onSend = vi.fn();
+    render(<EmailComposer initialData={DATA} ownWindow={{}} onSend={onSend} />);
+    goOffline();
+    fireEvent.keyDown(screen.getByTestId('composer-send'), { key: 'Enter', ctrlKey: true });
+    await screen.findByTestId('composer-offline-notice');
+    expect(onSend).not.toHaveBeenCalled();
+  });
+
+  it('leaves out the link where this device may not keep mail', async () => {
+    offline.allowed = false;
+    render(<EmailComposer initialData={DATA} ownWindow={{}} onSend={vi.fn()} />);
+    goOffline();
+    fireEvent.click(screen.getByTestId('composer-send'));
+    await screen.findByTestId('composer-offline-notice');
+    expect(screen.queryByRole('link', { name: 'settings.keep_label' })).toBeNull();
+  });
+
+  it('with offline mode on, Send goes ahead: the outbox keeps it until the network is back', async () => {
+    offline.active = true;
+    const onSend = vi.fn();
+    render(<EmailComposer initialData={DATA} ownWindow={{}} onSend={onSend} />);
+    goOffline();
+    expect(screen.getByTestId('composer-offline').textContent).toContain('offline_hint_outbox');
+    fireEvent.click(screen.getByTestId('composer-send'));
+    await waitFor(() => expect(onSend).toHaveBeenCalled());
+    expect(screen.queryByTestId('composer-offline-notice')).toBeNull();
+  });
+});
diff --git a/components/email/__tests__/composer-own-window.test.tsx b/components/email/__tests__/composer-own-window.test.tsx
index 199eee835..ab200fb56 100644
--- a/components/email/__tests__/composer-own-window.test.tsx
+++ b/components/email/__tests__/composer-own-window.test.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { cleanup, fireEvent, render, screen, waitFor } from '@testing-library/react';
+import { act, cleanup, fireEvent, render, screen, waitFor } from '@testing-library/react';
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 import { NextIntlClientProvider } from 'next-intl';
 import { EmailComposer, type ComposerDraftData, type ComposerPopOut } from '../email-composer';
@@ -364,3 +364,22 @@ describe('a composer that is all its window shows', () => {
     expect(creations).toHaveLength(saved);
   });
 });
+
+describe('back online', () => {
+  it('saves what could not be saved while offline, so "saved in Drafts once you are back online" holds', async () => {
+    let onLine = true;
+    vi.spyOn(navigator, 'onLine', 'get').mockImplementation(() => onLine);
+    rejectSave = true;
+    mount({});
+    onLine = false;
+    act(() => { window.dispatchEvent(new Event('offline')); });
+    fireEvent.change(subjectField(), { target: { value: 'Written on a train' } });
+    await waitFor(() => expect(creations).toHaveLength(1), { timeout: 4000 });
+
+    rejectSave = false;
+    onLine = true;
+    act(() => { window.dispatchEvent(new Event('online')); });
+    await waitFor(() => expect(creations).toHaveLength(2));
+    expect(creations[1].subject).toBe('Written on a train');
+  });
+});
diff --git a/components/email/email-composer.tsx b/components/email/email-composer.tsx
index dbbe94385..aee9fbe6b 100644
--- a/components/email/email-composer.tsx
+++ b/components/email/email-composer.tsx
@@ -41,6 +41,7 @@ import {
   Reply,
   Forward,
   BookUser,
+  CloudOff,
 } from "@/components/icons";
 import { ComposerPluginMenuItems, ComposerPluginToolbarButtons, ComposerToolbarMenu, ComposerToolbarMenuItem, ComposerToolbarMenuCheckItem } from "@/components/email/composer-toolbar-menu";
 import { ComposerToolbarMenuRadioItem } from "@/components/email/composer-toolbar-menu";
@@ -95,6 +96,9 @@ import type { DirectoryEntry } from "@/stores/contact-store";
 import type { IJMAPClient } from "@/lib/jmap/client-interface";
 import { isStandInId } from "@/lib/jmap/stand-in-ids";
 import { noteDraftReplacedElsewhere } from "@/lib/offline/queue";
+import { offlineActive, offlineAllowed } from "@/lib/offline/offline-mode";
+import { useBrowserOnline } from "@/hooks/use-browser-online";
+import { appPath, buildSettingsPath } from "@/lib/deep-links";
 import type { FileNode } from "@/lib/jmap/types";
 import { useContactStore, getContactDisplayName, getContactPrimaryEmail } from "@/stores/contact-store";
 import { renderTemplateWithPlugins, notifyTemplateApplied } from "@/stores/template-store";
@@ -4626,6 +4630,35 @@ export function EmailComposer({
     };
   });
 
+  // Offline. With "Keep mail on this device" on, a send waits in the outbox
+  // and goes out once the server answers again. Without it there is nowhere
+  // safe to keep a message for later: Send says so and the text stays here.
+  const tComposeWindows = useTranslations('compose_windows');
+  const browserOnline = useBrowserOnline();
+  const [offlineSendNotice, setOfflineSendNotice] = useState<'saved' | 'unsaved' | null>(null);
+  const sendOrSayOffline = () => {
+    if (typeof navigator !== 'undefined' && navigator.onLine === false && !offlineActive(composingAccountId ?? null)) {
+      const saved = !!draftIdRef.current && changeVersionRef.current === savedVersionRef.current && !saveFailedRef.current;
+      setOfflineSendNotice(saved ? 'saved' : 'unsaved');
+      announceStatus(tComposeWindows(saved ? 'offline_send_saved' : 'offline_send_unsaved'));
+      return;
+    }
+    handleSend();
+  };
+  // Back online: the notice goes, and what couldn't be saved meanwhile is saved now.
+  const wasOnlineRef = useRef(browserOnline);
+  useEffect(() => {
+    const cameBack = browserOnline && !wasOnlineRef.current;
+    wasOnlineRef.current = browserOnline;
+    if (!cameBack) return;
+    setOfflineSendNotice(null);
+    if (saveCloseAttemptRef.current || sentRef.current || isSendingRef.current || !isDirtyRef.current) return;
+    if (changeVersionRef.current === savedVersionRef.current && !saveFailedRef.current) return;
+    void saveDraftRef.current({ auto: true });
+  }, [browserOnline]);
+  // Only asked while offline: it reads the organisation's policy and the store's support.
+  const offlineHint = browserOnline ? '' : tComposeWindows(offlineActive(composingAccountId ?? null) ? 'offline_hint_outbox' : 'offline_hint');
+
   const handleComposerKeyDown = (e: React.KeyboardEvent<HTMLDivElement>) => {
     if (e.defaultPrevented) return;
     // Keys from a dialog the composer opened (Insert link, ...) reach here
@@ -4694,7 +4727,7 @@ export function EmailComposer({
       }
 
       e.preventDefault();
-      handleSend();
+      sendOrSayOffline();
       return;
     }
 
@@ -4864,7 +4897,7 @@ export function EmailComposer({
         {phoneLayout && (composerClient?.hasDelayedSend() || hasSendMenuActions ? (
           <div className="relative inline-flex md:hidden">
             <Button
-              onClick={() => handleSend()}
+              onClick={() => sendOrSayOffline()}
               disabled={!canSend || isSending || isSavingAndClosing}
               title={getSendTooltip()}
               size="sm"
@@ -4891,7 +4924,7 @@ export function EmailComposer({
           </div>
         ) : (
           <Button
-            onClick={() => handleSend()}
+            onClick={() => sendOrSayOffline()}
             disabled={!canSend || isSending || isSavingAndClosing}
             title={getSendTooltip()}
             size="sm"
@@ -5541,6 +5574,23 @@ export function EmailComposer({
           </div>
         )}
 
+        {offlineSendNotice && !browserOnline && (
+          <div className="flex flex-wrap items-center gap-x-3 gap-y-1 border-t bg-muted px-4 py-2 text-sm text-foreground" data-testid="composer-offline-notice">
+            <CloudOff className="h-4 w-4 shrink-0" aria-hidden="true" />
+            <span className="min-w-0">{tComposeWindows(offlineSendNotice === 'saved' ? 'offline_send_saved' : 'offline_send_unsaved')}</span>
+            {offlineAllowed(composingAccountId ?? null) && (
+              <a
+                href={appPath(buildSettingsPath('backup', 'offline'))}
+                target="_blank"
+                rel="noopener"
+                className="font-medium text-primary underline underline-offset-2"
+              >
+                {tOffline('settings.keep_label')}
+              </a>
+            )}
+          </div>
+        )}
+
         {/* Bottom toolbar. In Mountain View's window both halves fold into
             one row (see [data-mv-compose-footer] in globals.css): Send first,
             the tools after it, and Discard as a bin at the far end. */}
@@ -5714,6 +5764,13 @@ export function EmailComposer({
 
           {/* Right side - Discard + Send (desktop) */}
           <div className="flex shrink-0 items-center gap-2">
+            {!browserOnline && (
+              <span className="flex items-center gap-1 text-xs text-muted-foreground" title={offlineHint} data-testid="composer-offline">
+                <CloudOff className="h-3.5 w-3.5" aria-hidden="true" />
+                {tComposeWindows('offline')}
+                <span className="sr-only">{offlineHint}</span>
+              </span>
+            )}
             {mvWindow ? (
               <button
                 type="button"
@@ -5744,7 +5801,7 @@ export function EmailComposer({
             {composerClient?.hasDelayedSend() || hasSendMenuActions ? (
               <div data-mv-send={mvWindow ? "" : undefined} className={cn("relative", phoneLayout ? "hidden md:inline-flex" : "inline-flex")}>
                 <Button
-                  onClick={() => handleSend()}
+                  onClick={() => sendOrSayOffline()}
                   disabled={!canSend || isSending || isSavingAndClosing}
                   title={getSendTooltip()}
                   data-testid="composer-send"
@@ -5769,7 +5826,7 @@ export function EmailComposer({
               </div>
             ) : (
               <Button
-                onClick={() => handleSend()}
+                onClick={() => sendOrSayOffline()}
                 disabled={!canSend || isSending || isSavingAndClosing}
                 title={getSendTooltip()}
                 data-testid="composer-send"
diff --git a/hooks/use-browser-online.ts b/hooks/use-browser-online.ts
new file mode 100644
index 000000000..00d6d86e1
--- /dev/null
+++ b/hooks/use-browser-online.ts
@@ -0,0 +1,21 @@
+"use client";
+
+import { useSyncExternalStore } from "react";
+
+function subscribe(onChange: () => void): () => void {
+  window.addEventListener("online", onChange);
+  window.addEventListener("offline", onChange);
+  return () => {
+    window.removeEventListener("online", onChange);
+    window.removeEventListener("offline", onChange);
+  };
+}
+
+/**
+ * Whether the browser says it has a network, kept up to date. Also without
+ * offline mode, whose store only follows it while that runs. True on the
+ * server and while the page hydrates.
+ */
+export function useBrowserOnline(): boolean {
+  return useSyncExternalStore(subscribe, () => navigator.onLine !== false, () => true);
+}
diff --git a/locales/ar/common.json b/locales/ar/common.json
index 47150985b..65ddd75dc 100644
--- a/locales/ar/common.json
+++ b/locales/ar/common.json
@@ -7067,7 +7067,12 @@
     "reserved": "يستخدم النظام أو معظم التطبيقات هذه المفاتيح. جرّب مفاتيح أخرى."
   },
   "compose_windows": {
-    "more_formatting": "مزيد من التنسيق"
+    "more_formatting": "مزيد من التنسيق",
+    "offline": "دون اتصال",
+    "offline_hint": "يحتاج الإرسال إلى اتصال.",
+    "offline_hint_outbox": "ما ترسله الآن ينتظر في صندوق الصادر ويُرسل عند عودة الاتصال.",
+    "offline_send_saved": "أنت دون اتصال. الرسالة محفوظة في المسودات.",
+    "offline_send_unsaved": "أنت دون اتصال. تبقى الرسالة هنا وتُحفظ في المسودات عند عودة الاتصال."
   },
   "desktopReminders": {
     "generic_title": "تذكير",
diff --git a/locales/ca/common.json b/locales/ca/common.json
index ec7b404e9..12a02335c 100644
--- a/locales/ca/common.json
+++ b/locales/ca/common.json
@@ -7067,7 +7067,12 @@
     "reserved": "El sistema o la majoria d'aplicacions fan servir aquestes tecles. Prova altres tecles."
   },
   "compose_windows": {
-    "more_formatting": "Més format"
+    "more_formatting": "Més format",
+    "offline": "Sense connexió",
+    "offline_hint": "Per enviar cal connexió.",
+    "offline_hint_outbox": "El que envieu ara espera a la safata de sortida i s'envia quan torneu a tenir connexió.",
+    "offline_send_saved": "No teniu connexió. El missatge està desat a Esborranys.",
+    "offline_send_unsaved": "No teniu connexió. El missatge es queda aquí i es desa a Esborranys quan torneu a tenir connexió."
   },
   "desktopReminders": {
     "generic_title": "Recordatori",
diff --git a/locales/cs/common.json b/locales/cs/common.json
index 2201071a4..155fdb653 100644
--- a/locales/cs/common.json
+++ b/locales/cs/common.json
@@ -7067,7 +7067,12 @@
     "reserved": "Tyto klávesy používá systém nebo většina aplikací. Zkuste jiné klávesy."
   },
   "compose_windows": {
-    "more_formatting": "Další formátování"
+    "more_formatting": "Další formátování",
+    "offline": "Offline",
+    "offline_hint": "Odeslání potřebuje připojení.",
+    "offline_hint_outbox": "Co teď odešlete, počká mezi zprávami k odeslání a odejde, až budete znovu online.",
+    "offline_send_saved": "Jste offline. Zpráva je uložená v Konceptech.",
+    "offline_send_unsaved": "Jste offline. Zpráva tu zůstane a uloží se do Konceptů, až budete znovu online."
   },
   "desktopReminders": {
     "generic_title": "Připomenutí",
diff --git a/locales/da/common.json b/locales/da/common.json
index 9c2068085..317928e7d 100644
--- a/locales/da/common.json
+++ b/locales/da/common.json
@@ -7067,7 +7067,12 @@
     "reserved": "Dit system eller de fleste apps bruger disse taster. Prøv andre taster."
   },
   "compose_windows": {
-    "more_formatting": "Mere formatering"
+    "more_formatting": "Mere formatering",
+    "offline": "Offline",
+    "offline_hint": "Det kræver forbindelse at sende.",
+    "offline_hint_outbox": "Det, du sender nu, venter i udbakken og sendes, når du er online igen.",
+    "offline_send_saved": "Du er offline. Beskeden er gemt i Kladder.",
+    "offline_send_unsaved": "Du er offline. Beskeden bliver her og gemmes i Kladder, når du er online igen."
   },
   "desktopReminders": {
     "generic_title": "Påmindelse",
diff --git a/locales/de/common.json b/locales/de/common.json
index eb87601a1..c63fb408d 100644
--- a/locales/de/common.json
+++ b/locales/de/common.json
@@ -7067,7 +7067,12 @@
     "reserved": "Ihr System oder die meisten Apps verwenden diese Tasten. Versuchen Sie andere Tasten."
   },
   "compose_windows": {
-    "more_formatting": "Weitere Formatierung"
+    "more_formatting": "Weitere Formatierung",
+    "offline": "Offline",
+    "offline_hint": "Zum Senden ist eine Verbindung nötig.",
+    "offline_hint_outbox": "Was Sie jetzt senden, wartet im Postausgang und wird gesendet, sobald Sie wieder online sind.",
+    "offline_send_saved": "Sie sind offline. Die Nachricht ist in den Entwürfen gespeichert.",
+    "offline_send_unsaved": "Sie sind offline. Die Nachricht bleibt hier und wird in den Entwürfen gespeichert, sobald Sie wieder online sind."
   },
   "desktopReminders": {
     "generic_title": "Erinnerung",
diff --git a/locales/en/common.json b/locales/en/common.json
index df18634ac..c1915db7c 100644
--- a/locales/en/common.json
+++ b/locales/en/common.json
@@ -7067,7 +7067,12 @@
     "reserved": "Your system or most apps use these keys. Try other keys."
   },
   "compose_windows": {
-    "more_formatting": "More formatting"
+    "more_formatting": "More formatting",
+    "offline": "Offline",
+    "offline_hint": "Sending needs a connection.",
+    "offline_hint_outbox": "What you send now waits in the outbox and goes out when you're back online.",
+    "offline_send_saved": "You're offline. The message is saved in Drafts.",
+    "offline_send_unsaved": "You're offline. The message stays here and is saved in Drafts when you're back online."
   },
   "desktopReminders": {
     "generic_title": "Reminder",
diff --git a/locales/es/common.json b/locales/es/common.json
index 4fdecd792..6a4bf2a69 100644
--- a/locales/es/common.json
+++ b/locales/es/common.json
@@ -7067,7 +7067,12 @@
     "reserved": "Tu sistema o la mayoría de las aplicaciones usan estas teclas. Prueba otras teclas."
   },
   "compose_windows": {
-    "more_formatting": "Más formato"
+    "more_formatting": "Más formato",
+    "offline": "Sin conexión",
+    "offline_hint": "Para enviar hace falta conexión.",
+    "offline_hint_outbox": "Lo que envíes ahora espera en la bandeja de salida y se envía cuando vuelvas a tener conexión.",
+    "offline_send_saved": "No tienes conexión. El mensaje está guardado en Borradores.",
+    "offline_send_unsaved": "No tienes conexión. El mensaje se queda aquí y se guarda en Borradores cuando vuelvas a tener conexión."
   },
   "desktopReminders": {
     "generic_title": "Recordatorio",
diff --git a/locales/et/common.json b/locales/et/common.json
index cde6d1575..315b58fa5 100644
--- a/locales/et/common.json
+++ b/locales/et/common.json
@@ -7067,7 +7067,12 @@
     "reserved": "Neid klahve kasutab süsteem või enamik rakendusi. Proovige teisi klahve."
   },
   "compose_windows": {
-    "more_formatting": "Rohkem vormindust"
+    "more_formatting": "Rohkem vormindust",
+    "offline": "Võrguta",
+    "offline_hint": "Saatmiseks on vaja ühendust.",
+    "offline_hint_outbox": "Mida praegu saadad, ootab väljuvate kirjade kastis ja läheb teele, kui oled jälle võrgus.",
+    "offline_send_saved": "Oled võrguta. Kiri on salvestatud mustanditesse.",
+    "offline_send_unsaved": "Oled võrguta. Kiri jääb siia ja salvestatakse mustanditesse, kui oled jälle võrgus."
   },
   "desktopReminders": {
     "generic_title": "Meeldetuletus",
diff --git a/locales/fa/common.json b/locales/fa/common.json
index fead83ed0..5f1b52047 100644
--- a/locales/fa/common.json
+++ b/locales/fa/common.json
@@ -7067,7 +7067,12 @@
     "reserved": "سیستم یا بیشتر برنامه‌ها از این کلیدها استفاده می‌کنند. کلیدهای دیگری را امتحان کنید."
   },
   "compose_windows": {
-    "more_formatting": "قالب‌بندی بیشتر"
+    "more_formatting": "قالب‌بندی بیشتر",
+    "offline": "آفلاین",
+    "offline_hint": "ارسال به اتصال نیاز دارد.",
+    "offline_hint_outbox": "آنچه اکنون می‌فرستید در صندوق خروجی می‌ماند و وقتی دوباره آنلاین شدید فرستاده می‌شود.",
+    "offline_send_saved": "آفلاین هستید. پیام در پیش‌نویس‌ها ذخیره شده است.",
+    "offline_send_unsaved": "آفلاین هستید. پیام همین‌جا می‌ماند و وقتی دوباره آنلاین شدید در پیش‌نویس‌ها ذخیره می‌شود."
   },
   "desktopReminders": {
     "generic_title": "یادآوری",
diff --git a/locales/fr/common.json b/locales/fr/common.json
index 2405729a9..f56fadfe5 100644
--- a/locales/fr/common.json
+++ b/locales/fr/common.json
@@ -7067,7 +7067,12 @@
     "reserved": "Votre système ou la plupart des applications utilisent ces touches. Essayez d'autres touches."
   },
   "compose_windows": {
-    "more_formatting": "Plus de mise en forme"
+    "more_formatting": "Plus de mise en forme",
+    "offline": "Hors ligne",
+    "offline_hint": "L'envoi nécessite une connexion.",
+    "offline_hint_outbox": "Ce que vous envoyez maintenant attend dans la boîte d'envoi et part dès que vous êtes de nouveau en ligne.",
+    "offline_send_saved": "Vous êtes hors ligne. Le message est enregistré dans les Brouillons.",
+    "offline_send_unsaved": "Vous êtes hors ligne. Le message reste ici et sera enregistré dans les Brouillons dès que vous serez de nouveau en ligne."
   },
   "desktopReminders": {
     "generic_title": "Rappel",
diff --git a/locales/he/common.json b/locales/he/common.json
index f3c8a59bb..9a922ded5 100644
--- a/locales/he/common.json
+++ b/locales/he/common.json
@@ -7068,7 +7068,12 @@
     "reserved": "המערכת או רוב האפליקציות משתמשות במקשים האלה. נסו מקשים אחרים."
   },
   "compose_windows": {
-    "more_formatting": "עוד עיצוב"
+    "more_formatting": "עוד עיצוב",
+    "offline": "אין חיבור",
+    "offline_hint": "כדי לשלוח צריך חיבור.",
+    "offline_hint_outbox": "מה ששולחים עכשיו ממתין בתיבת הדואר היוצא ונשלח כשחוזרים לרשת.",
+    "offline_send_saved": "אין חיבור. ההודעה שמורה בטיוטות.",
+    "offline_send_unsaved": "אין חיבור. ההודעה נשארת כאן ותישמר בטיוטות כשתחזרו לרשת."
   },
   "desktopReminders": {
     "generic_title": "תזכורת",
diff --git a/locales/hu/common.json b/locales/hu/common.json
index 52ce79571..e41749518 100644
--- a/locales/hu/common.json
+++ b/locales/hu/common.json
@@ -7067,7 +7067,12 @@
     "reserved": "Ezeket a billentyűket a rendszer vagy a legtöbb alkalmazás használja. Próbáljon más billentyűket."
   },
   "compose_windows": {
-    "more_formatting": "További formázás"
+    "more_formatting": "További formázás",
+    "offline": "Offline",
+    "offline_hint": "A küldéshez kapcsolat kell.",
+    "offline_hint_outbox": "Amit most elküld, a postázandók között vár, és elmegy, amint újra online lesz.",
+    "offline_send_saved": "Offline állapotban van. Az üzenet a Piszkozatok között van mentve.",
+    "offline_send_unsaved": "Offline állapotban van. Az üzenet itt marad, és a Piszkozatok közé kerül, amint újra online lesz."
   },
   "desktopReminders": {
     "generic_title": "Emlékeztető",
diff --git a/locales/it/common.json b/locales/it/common.json
index 7fbfffd54..9359f8be1 100644
--- a/locales/it/common.json
+++ b/locales/it/common.json
@@ -7067,7 +7067,12 @@
     "reserved": "Il sistema o la maggior parte delle app usano questi tasti. Prova altri tasti."
   },
   "compose_windows": {
-    "more_formatting": "Altre opzioni di formattazione"
+    "more_formatting": "Altre opzioni di formattazione",
+    "offline": "Offline",
+    "offline_hint": "Per inviare serve una connessione.",
+    "offline_hint_outbox": "Quello che invii ora aspetta nella posta in uscita e parte quando torni online.",
+    "offline_send_saved": "Sei offline. Il messaggio è salvato nelle Bozze.",
+    "offline_send_unsaved": "Sei offline. Il messaggio resta qui e viene salvato nelle Bozze quando torni online."
   },
   "desktopReminders": {
     "generic_title": "Promemoria",
diff --git a/locales/ja/common.json b/locales/ja/common.json
index 7e2153f1e..f102ef51a 100644
--- a/locales/ja/common.json
+++ b/locales/ja/common.json
@@ -7067,7 +7067,12 @@
     "reserved": "このキーはシステムまたは多くのアプリが使用しています。別のキーをお試しください。"
   },
   "compose_windows": {
-    "more_formatting": "その他の書式"
+    "more_formatting": "その他の書式",
+    "offline": "オフライン",
+    "offline_hint": "送信には接続が必要です。",
+    "offline_hint_outbox": "今送信したものは送信トレイで待機し、オンラインに戻ると送信されます。",
+    "offline_send_saved": "オフラインです。メッセージは下書きに保存されています。",
+    "offline_send_unsaved": "オフラインです。メッセージはここに残り、オンラインに戻ると下書きに保存されます。"
   },
   "desktopReminders": {
     "generic_title": "リマインダー",
diff --git a/locales/ko/common.json b/locales/ko/common.json
index 184b4c591..f7aa7ee73 100644
--- a/locales/ko/common.json
+++ b/locales/ko/common.json
@@ -7067,7 +7067,12 @@
     "reserved": "시스템 또는 대부분의 앱이 이 키를 사용합니다. 다른 키를 사용해 보세요."
   },
   "compose_windows": {
-    "more_formatting": "추가 서식"
+    "more_formatting": "추가 서식",
+    "offline": "오프라인",
+    "offline_hint": "보내려면 연결이 필요합니다.",
+    "offline_hint_outbox": "지금 보내는 메일은 보낼편지함에서 기다리다가 다시 온라인이 되면 전송됩니다.",
+    "offline_send_saved": "오프라인 상태입니다. 메시지는 임시보관함에 저장되어 있습니다.",
+    "offline_send_unsaved": "오프라인 상태입니다. 메시지는 여기에 남아 있으며 다시 온라인이 되면 임시보관함에 저장됩니다."
   },
   "desktopReminders": {
     "generic_title": "알림",
diff --git a/locales/lv/common.json b/locales/lv/common.json
index 53457abe5..2ac96100b 100644
--- a/locales/lv/common.json
+++ b/locales/lv/common.json
@@ -7067,7 +7067,12 @@
     "reserved": "Šos taustiņus izmanto sistēma vai lielākā daļa lietotņu. Izmēģiniet citus taustiņus."
   },
   "compose_windows": {
-    "more_formatting": "Vairāk formatēšanas"
+    "more_formatting": "Vairāk formatēšanas",
+    "offline": "Bezsaistē",
+    "offline_hint": "Sūtīšanai vajadzīgs savienojums.",
+    "offline_hint_outbox": "Ko sūtāt tagad, gaida izsūtnē un tiek nosūtīts, kad atkal esat tiešsaistē.",
+    "offline_send_saved": "Jūs esat bezsaistē. Ziņojums ir saglabāts melnrakstos.",
+    "offline_send_unsaved": "Jūs esat bezsaistē. Ziņojums paliek šeit un tiks saglabāts melnrakstos, kad atkal būsiet tiešsaistē."
   },
   "desktopReminders": {
     "generic_title": "Atgādinājums",
diff --git a/locales/mn/common.json b/locales/mn/common.json
index 1d6eefc33..8b839becc 100644
--- a/locales/mn/common.json
+++ b/locales/mn/common.json
@@ -7067,7 +7067,12 @@
     "reserved": "Систем эсвэл ихэнх апп эдгээр товчийг ашигладаг. Өөр товч туршина уу."
   },
   "compose_windows": {
-    "more_formatting": "Бусад хэлбэржүүлэлт"
+    "more_formatting": "Бусад хэлбэржүүлэлт",
+    "offline": "Офлайн",
+    "offline_hint": "Илгээхэд холболт хэрэгтэй.",
+    "offline_hint_outbox": "Одоо илгээсэн зүйл гарах хайрцагт хүлээж, онлайн болмогц илгээгдэнэ.",
+    "offline_send_saved": "Та офлайн байна. Мессеж нооргонд хадгалагдсан.",
+    "offline_send_unsaved": "Та офлайн байна. Мессеж энд үлдэж, онлайн болмогц нооргонд хадгалагдана."
   },
   "desktopReminders": {
     "generic_title": "Сануулга",
diff --git a/locales/nb/common.json b/locales/nb/common.json
index 9952353ed..703dcae34 100644
--- a/locales/nb/common.json
+++ b/locales/nb/common.json
@@ -7067,7 +7067,12 @@
     "reserved": "Systemet ditt eller de fleste apper bruker disse tastene. Prøv andre taster."
   },
   "compose_windows": {
-    "more_formatting": "Mer formatering"
+    "more_formatting": "Mer formatering",
+    "offline": "Frakoblet",
+    "offline_hint": "Du må ha tilkobling for å sende.",
+    "offline_hint_outbox": "Det du sender nå, venter i utboksen og sendes når du er på nett igjen.",
+    "offline_send_saved": "Du er frakoblet. Meldingen er lagret i Utkast.",
+    "offline_send_unsaved": "Du er frakoblet. Meldingen blir her og lagres i Utkast når du er på nett igjen."
   },
   "desktopReminders": {
     "generic_title": "Påminnelse",
diff --git a/locales/nl/common.json b/locales/nl/common.json
index 8a57c3d58..179bb7d95 100644
--- a/locales/nl/common.json
+++ b/locales/nl/common.json
@@ -7067,7 +7067,12 @@
     "reserved": "Je systeem of de meeste apps gebruiken deze toetsen. Probeer andere toetsen."
   },
   "compose_windows": {
-    "more_formatting": "Meer opmaak"
+    "more_formatting": "Meer opmaak",
+    "offline": "Offline",
+    "offline_hint": "Voor verzenden is een verbinding nodig.",
+    "offline_hint_outbox": "Wat je nu verstuurt, wacht in Postvak UIT en gaat weg zodra je weer online bent.",
+    "offline_send_saved": "Je bent offline. Het bericht is opgeslagen in Concepten.",
+    "offline_send_unsaved": "Je bent offline. Het bericht blijft hier en wordt in Concepten opgeslagen zodra je weer online bent."
   },
   "desktopReminders": {
     "generic_title": "Herinnering",
diff --git a/locales/pl/common.json b/locales/pl/common.json
index 7c63c556d..e5feabddc 100644
--- a/locales/pl/common.json
+++ b/locales/pl/common.json
@@ -7067,7 +7067,12 @@
     "reserved": "Te klawisze są używane przez system lub większość aplikacji. Wypróbuj inne klawisze."
   },
   "compose_windows": {
-    "more_formatting": "Więcej formatowania"
+    "more_formatting": "Więcej formatowania",
+    "offline": "Offline",
+    "offline_hint": "Do wysłania potrzebne jest połączenie.",
+    "offline_hint_outbox": "To, co teraz wyślesz, czeka w skrzynce nadawczej i wyjdzie, gdy wrócisz do sieci.",
+    "offline_send_saved": "Jesteś offline. Wiadomość jest zapisana w Szkicach.",
+    "offline_send_unsaved": "Jesteś offline. Wiadomość zostaje tutaj i zostanie zapisana w Szkicach, gdy wrócisz do sieci."
   },
   "desktopReminders": {
     "generic_title": "Przypomnienie",
diff --git a/locales/pt/common.json b/locales/pt/common.json
index 784fe41f3..0ea3883ab 100644
--- a/locales/pt/common.json
+++ b/locales/pt/common.json
@@ -7067,7 +7067,12 @@
     "reserved": "O seu sistema ou a maioria das aplicações usam estas teclas. Experimente outras teclas."
   },
   "compose_windows": {
-    "more_formatting": "Mais formatação"
+    "more_formatting": "Mais formatação",
+    "offline": "Offline",
+    "offline_hint": "Enviar precisa de ligação.",
+    "offline_hint_outbox": "O que enviar agora espera na caixa de saída e é enviado quando voltar a estar online.",
+    "offline_send_saved": "Está offline. A mensagem está guardada em Rascunhos.",
+    "offline_send_unsaved": "Está offline. A mensagem fica aqui e é guardada em Rascunhos quando voltar a estar online."
   },
   "desktopReminders": {
     "generic_title": "Lembrete",
diff --git a/locales/ro/common.json b/locales/ro/common.json
index 859167031..cad66c515 100644
--- a/locales/ro/common.json
+++ b/locales/ro/common.json
@@ -7067,7 +7067,12 @@
     "reserved": "Sistemul sau majoritatea aplicațiilor folosesc aceste taste. Încearcă alte taste."
   },
   "compose_windows": {
-    "more_formatting": "Mai multe opțiuni de formatare"
+    "more_formatting": "Mai multe opțiuni de formatare",
+    "offline": "Offline",
+    "offline_hint": "Pentru trimitere e nevoie de conexiune.",
+    "offline_hint_outbox": "Ce trimiteți acum așteaptă în Mesaje de trimis și pleacă atunci când sunteți din nou online.",
+    "offline_send_saved": "Sunteți offline. Mesajul este salvat în Ciorne.",
+    "offline_send_unsaved": "Sunteți offline. Mesajul rămâne aici și este salvat în Ciorne când sunteți din nou online."
   },
   "desktopReminders": {
     "generic_title": "Memento",
diff --git a/locales/ru/common.json b/locales/ru/common.json
index a69ddb27f..006028599 100644
--- a/locales/ru/common.json
+++ b/locales/ru/common.json
@@ -7067,7 +7067,12 @@
     "reserved": "Эти клавиши использует система или большинство приложений. Попробуйте другие клавиши."
   },
   "compose_windows": {
-    "more_formatting": "Дополнительное форматирование"
+    "more_formatting": "Дополнительное форматирование",
+    "offline": "Не в сети",
+    "offline_hint": "Для отправки нужно подключение.",
+    "offline_hint_outbox": "То, что вы отправите сейчас, подождёт в исходящих и уйдёт, когда вы снова будете в сети.",
+    "offline_send_saved": "Вы не в сети. Сообщение сохранено в черновиках.",
+    "offline_send_unsaved": "Вы не в сети. Сообщение останется здесь и сохранится в черновиках, когда вы снова будете в сети."
   },
   "desktopReminders": {
     "generic_title": "Напоминание",
diff --git a/locales/sk/common.json b/locales/sk/common.json
index a2d4e899d..6f5f7f54e 100644
--- a/locales/sk/common.json
+++ b/locales/sk/common.json
@@ -7067,7 +7067,12 @@
     "reserved": "Tieto klávesy používa systém alebo väčšina aplikácií. Skúste iné klávesy."
   },
   "compose_windows": {
-    "more_formatting": "Ďalšie formátovanie"
+    "more_formatting": "Ďalšie formátovanie",
+    "offline": "Offline",
+    "offline_hint": "Na odoslanie treba pripojenie.",
+    "offline_hint_outbox": "Čo teraz odošlete, počká medzi správami na odoslanie a odíde, keď budete znova online.",
+    "offline_send_saved": "Ste offline. Správa je uložená v Konceptoch.",
+    "offline_send_unsaved": "Ste offline. Správa tu zostane a uloží sa do Konceptov, keď budete znova online."
   },
   "desktopReminders": {
     "generic_title": "Pripomienka",
diff --git a/locales/th/common.json b/locales/th/common.json
index 0f75e53a6..48a22f1af 100644
--- a/locales/th/common.json
+++ b/locales/th/common.json
@@ -7075,7 +7075,12 @@
     "reserved": "ระบบหรือแอปส่วนใหญ่ใช้ปุ่มเหล่านี้ ลองใช้ปุ่มอื่น"
   },
   "compose_windows": {
-    "more_formatting": "การจัดรูปแบบเพิ่มเติม"
+    "more_formatting": "การจัดรูปแบบเพิ่มเติม",
+    "offline": "ออฟไลน์",
+    "offline_hint": "ต้องเชื่อมต่อจึงจะส่งได้",
+    "offline_hint_outbox": "สิ่งที่คุณส่งตอนนี้จะรออยู่ในกล่องขาออกและถูกส่งเมื่อคุณกลับมาออนไลน์",
+    "offline_send_saved": "คุณออฟไลน์อยู่ ข้อความถูกบันทึกไว้ในจดหมายร่างแล้ว",
+    "offline_send_unsaved": "คุณออฟไลน์อยู่ ข้อความจะอยู่ที่นี่และถูกบันทึกในจดหมายร่างเมื่อคุณกลับมาออนไลน์"
   },
   "desktopReminders": {
     "generic_title": "การแจ้งเตือน",
diff --git a/locales/tr/common.json b/locales/tr/common.json
index 6b6e6b1d6..382d5b68c 100644
--- a/locales/tr/common.json
+++ b/locales/tr/common.json
@@ -7067,7 +7067,12 @@
     "reserved": "Bu tuşları sisteminiz veya çoğu uygulama kullanıyor. Başka tuşlar deneyin."
   },
   "compose_windows": {
-    "more_formatting": "Daha fazla biçimlendirme"
+    "more_formatting": "Daha fazla biçimlendirme",
+    "offline": "Çevrimdışı",
+    "offline_hint": "Göndermek için bağlantı gerekir.",
+    "offline_hint_outbox": "Şimdi gönderdikleriniz giden kutusunda bekler ve yeniden çevrimiçi olduğunuzda gönderilir.",
+    "offline_send_saved": "Çevrimdışısınız. İleti Taslaklar'a kaydedildi.",
+    "offline_send_unsaved": "Çevrimdışısınız. İleti burada kalır ve yeniden çevrimiçi olduğunuzda Taslaklar'a kaydedilir."
   },
   "desktopReminders": {
     "generic_title": "Anımsatıcı",
diff --git a/locales/uk/common.json b/locales/uk/common.json
index 9fce99633..f623e84d8 100644
--- a/locales/uk/common.json
+++ b/locales/uk/common.json
@@ -7067,7 +7067,12 @@
     "reserved": "Ці клавіші використовує система або більшість застосунків. Спробуйте інші клавіші."
   },
   "compose_windows": {
-    "more_formatting": "Додаткове форматування"
+    "more_formatting": "Додаткове форматування",
+    "offline": "Не в мережі",
+    "offline_hint": "Для надсилання потрібне підключення.",
+    "offline_hint_outbox": "Те, що ви надішлете зараз, чекатиме у вихідних і піде, коли ви знову будете в мережі.",
+    "offline_send_saved": "Ви не в мережі. Повідомлення збережено в чернетках.",
+    "offline_send_unsaved": "Ви не в мережі. Повідомлення залишиться тут і збережеться в чернетках, коли ви знову будете в мережі."
   },
   "desktopReminders": {
     "generic_title": "Нагадування",
diff --git a/locales/vi/common.json b/locales/vi/common.json
index 73d2113ab..a886e44a3 100644
--- a/locales/vi/common.json
+++ b/locales/vi/common.json
@@ -7079,7 +7079,12 @@
     "reserved": "Hệ thống hoặc hầu hết ứng dụng dùng các phím này. Hãy thử phím khác."
   },
   "compose_windows": {
-    "more_formatting": "Thêm định dạng"
+    "more_formatting": "Thêm định dạng",
+    "offline": "Ngoại tuyến",
+    "offline_hint": "Cần có kết nối để gửi.",
+    "offline_hint_outbox": "Thư bạn gửi bây giờ sẽ chờ trong Hộp thư đi và được gửi khi bạn trực tuyến trở lại.",
+    "offline_send_saved": "Bạn đang ngoại tuyến. Thư đã được lưu trong Bản nháp.",
+    "offline_send_unsaved": "Bạn đang ngoại tuyến. Thư vẫn ở đây và sẽ được lưu vào Bản nháp khi bạn trực tuyến trở lại."
   },
   "desktopReminders": {
     "generic_title": "Lời nhắc",
diff --git a/locales/zh-TW/common.json b/locales/zh-TW/common.json
index 599c9c3b5..0e7d00e14 100644
--- a/locales/zh-TW/common.json
+++ b/locales/zh-TW/common.json
@@ -7067,7 +7067,12 @@
     "reserved": "系統或大多數應用程式正在使用這些鍵。請試試其他按鍵。"
   },
   "compose_windows": {
-    "more_formatting": "更多格式"
+    "more_formatting": "更多格式",
+    "offline": "離線",
+    "offline_hint": "寄出需要連線。",
+    "offline_hint_outbox": "你現在寄出的郵件會在寄件匣中等待，恢復連線後送出。",
+    "offline_send_saved": "你已離線。郵件已儲存在草稿中。",
+    "offline_send_unsaved": "你已離線。郵件會留在這裡，恢復連線後儲存到草稿。"
   },
   "desktopReminders": {
     "generic_title": "提醒",
diff --git a/locales/zh/common.json b/locales/zh/common.json
index d558b39e7..7983707c5 100644
--- a/locales/zh/common.json
+++ b/locales/zh/common.json
@@ -7067,7 +7067,12 @@
     "reserved": "系统或大多数应用在使用这些键。请试试其他按键。"
   },
   "compose_windows": {
-    "more_formatting": "更多格式"
+    "more_formatting": "更多格式",
+    "offline": "离线",
+    "offline_hint": "发送需要联网。",
+    "offline_hint_outbox": "你现在发送的邮件会在发件箱中等待，恢复联网后发出。",
+    "offline_send_saved": "你已离线。邮件已保存在草稿中。",
+    "offline_send_unsaved": "你已离线。邮件会留在这里，恢复联网后保存到草稿。"
   },
   "desktopReminders": {
     "generic_title": "提醒",

From 165c94996073d97e3131edca9561c233a08acdf4 Mon Sep 17 00:00:00 2001
From: Linus Rath <139418639+rathlinus@users.noreply.github.com>
Date: Wed, 4 Nov 2026 07:13:05 +0100
Subject: [PATCH 17/34] feat: save a message as a template with just a name,
 and show each template's name once

---
 .../composer-template-reply.test.tsx          | 43 ++++++++-
 components/email/email-composer.tsx           | 20 ++++-
 .../template-picker-headings.test.tsx         | 49 +++++++++++
 .../templates/quick-save-template-dialog.tsx  | 87 +++++++++++++++++++
 components/templates/template-form.tsx        |  4 +-
 components/templates/template-picker.tsx      | 17 ++--
 locales/ar/common.json                        |  4 +-
 locales/ca/common.json                        |  4 +-
 locales/cs/common.json                        |  4 +-
 locales/da/common.json                        |  4 +-
 locales/de/common.json                        |  4 +-
 locales/en/common.json                        |  4 +-
 locales/es/common.json                        |  4 +-
 locales/et/common.json                        |  4 +-
 locales/fa/common.json                        |  4 +-
 locales/fr/common.json                        |  4 +-
 locales/he/common.json                        |  4 +-
 locales/hu/common.json                        |  4 +-
 locales/it/common.json                        |  4 +-
 locales/ja/common.json                        |  4 +-
 locales/ko/common.json                        |  4 +-
 locales/lv/common.json                        |  4 +-
 locales/mn/common.json                        |  4 +-
 locales/nb/common.json                        |  4 +-
 locales/nl/common.json                        |  4 +-
 locales/pl/common.json                        |  4 +-
 locales/pt/common.json                        |  4 +-
 locales/ro/common.json                        |  4 +-
 locales/ru/common.json                        |  4 +-
 locales/sk/common.json                        |  4 +-
 locales/th/common.json                        |  4 +-
 locales/tr/common.json                        |  4 +-
 locales/uk/common.json                        |  4 +-
 locales/vi/common.json                        |  4 +-
 locales/zh-TW/common.json                     |  4 +-
 locales/zh/common.json                        |  4 +-
 36 files changed, 298 insertions(+), 42 deletions(-)
 create mode 100644 components/templates/__tests__/template-picker-headings.test.tsx
 create mode 100644 components/templates/quick-save-template-dialog.tsx

diff --git a/components/email/__tests__/composer-template-reply.test.tsx b/components/email/__tests__/composer-template-reply.test.tsx
index db74b7ee8..d2d5abc3e 100644
--- a/components/email/__tests__/composer-template-reply.test.tsx
+++ b/components/email/__tests__/composer-template-reply.test.tsx
@@ -1,9 +1,10 @@
-import { act, fireEvent, render, screen, waitFor } from '@testing-library/react';
+import { act, fireEvent, render, screen, waitFor, within } from '@testing-library/react';
 import { afterAll, afterEach, beforeAll, describe, expect, it, vi } from 'vitest';
 import React from 'react';
 import type { Editor } from '@tiptap/core';
 import { EmailComposer } from '../email-composer';
 import { useSettingsStore } from '@/stores/settings-store';
+import { useTemplateStore } from '@/stores/template-store';
 
 // The real composer around the real editor: applying a template to a reply
 // the user has already started (#911, follow-up to #540).
@@ -30,9 +31,9 @@ vi.mock('@/components/templates/template-picker', () => ({
     React.createElement('button', { 'data-testid': 'pick-template', onClick: () => onSelect(TEMPLATE, {}) }, 'pick'),
 }));
 // Save as template: what the composer hands the form.
-const savedForm = vi.hoisted(() => ({ initialData: null as null | { body?: string; isHTML?: boolean } }));
+const savedForm = vi.hoisted(() => ({ initialData: null as null | { name?: string; body?: string; isHTML?: boolean } }));
 vi.mock('@/components/templates/template-form', () => ({
-  TemplateForm: (props: { initialData?: { body?: string; isHTML?: boolean } }) => {
+  TemplateForm: (props: { initialData?: { name?: string; body?: string; isHTML?: boolean } }) => {
     savedForm.initialData = props.initialData ?? null;
     return null;
   },
@@ -158,6 +159,7 @@ vi.mock('@/lib/plugin-hooks', () => ({
   templateHooks: {
     onTemplateRender: { size: 0, transform: async (value: unknown) => value },
     onTemplateApply: { size: 0, emit: async () => {} },
+    onTemplateCreate: { size: 0, emit: async () => {} },
   },
   emailHooks: {
     onComposerOpen: { call: async () => [] },
@@ -308,13 +310,46 @@ describe('applying a template to a reply (#911)', () => {
       savedForm.initialData = null;
     });
 
-    async function openSaveAsTemplate() {
+    async function openNameDialog() {
       fireEvent.click(await screen.findByTestId('composer-templates-menu'));
       fireEvent.click(await screen.findByRole('menuitem', { name: 'save_as_template' }));
+      return screen.findByTestId('quick-save-template');
+    }
+
+    // The full editor is behind "Edit details…" (compose-18).
+    async function openSaveAsTemplate() {
+      fireEvent.click(within(await openNameDialog()).getByText('template_edit_details'));
       await waitFor(() => expect(savedForm.initialData).not.toBeNull());
       return savedForm.initialData!;
     }
 
+    // compose-18: Save as template opened an editor with nine fields.
+    it('asks for a name only, starting from the subject, and saves the message', async () => {
+      useTemplateStore.setState({ templates: [] });
+      await openReply();
+      const subject = (screen.getByTestId('composer-subject') as HTMLInputElement).value;
+      const dialog = await openNameDialog();
+      const name = within(dialog).getByLabelText('template_name') as HTMLInputElement;
+      expect(name.value).toBe(subject);
+      expect(savedForm.initialData).toBeNull();
+
+      fireEvent.change(name, { target: { value: 'Quick answer' } });
+      fireEvent.click(within(dialog).getByText('save'));
+
+      await waitFor(() => expect(useTemplateStore.getState().templates).toHaveLength(1));
+      expect(useTemplateStore.getState().templates[0]).toMatchObject({ name: 'Quick answer', subject, isHTML: true });
+      expect(screen.queryByTestId('quick-save-template')).not.toBeInTheDocument();
+    });
+
+    it('carries the name over into the full editor', async () => {
+      await openReply();
+      const dialog = await openNameDialog();
+      fireEvent.change(within(dialog).getByLabelText('template_name'), { target: { value: 'Quick answer' } });
+      fireEvent.click(within(dialog).getByText('template_edit_details'));
+
+      await waitFor(() => expect(savedForm.initialData).toMatchObject({ name: 'Quick answer' }));
+    });
+
     it('marks a rich text draft as HTML', async () => {
       await openReply();
       const data = await openSaveAsTemplate();
diff --git a/components/email/email-composer.tsx b/components/email/email-composer.tsx
index 5f4a9ab85..64e965452 100644
--- a/components/email/email-composer.tsx
+++ b/components/email/email-composer.tsx
@@ -53,6 +53,7 @@ import { matchesCombo } from "@/lib/plugin-sandbox/shortcuts";
 import { cn, formatFileSize, formatDateTime, generateUUID } from "@/lib/utils";
 import { ScheduleSendDialog } from "./schedule-send-dialog";
 import { SendWarningsDialog, type SendWarning } from "./send-warnings-dialog";
+import { QuickSaveTemplateDialog } from "@/components/templates/quick-save-template-dialog";
 import { debug } from "@/lib/debug";
 import { toast } from "@/stores/toast-store";
 import { useContextMenu, isContextMenuKey } from "@/hooks/use-context-menu";
@@ -1194,6 +1195,9 @@ export function EmailComposer({
   const [filesPicker, setFilesPicker] = useState<{ client: IJMAPClient; accountId?: string } | null>(null);
   const [showDirectoryPicker, setShowDirectoryPicker] = useState(false);
   const [showSaveAsTemplate, setShowSaveAsTemplate] = useState(false);
+  // Save as template asks for a name only; "Edit details…" opens the full
+  // editor with the name typed so far (null: the name dialog).
+  const [saveTemplateDetails, setSaveTemplateDetails] = useState<string | null>(null);
   const [showCloseDialog, setShowCloseDialog] = useState(false);
   // The formatting toolbar is folded away on a phone until asked for.
   const [showFormattingOnMobile, setShowFormattingOnMobile] = useState(false);
@@ -1232,6 +1236,7 @@ export function EmailComposer({
     if (!(await confirmDiscardTemplate(saveTemplateDirty))) return;
     setSaveTemplateDirty(false);
     setShowSaveAsTemplate(false);
+    setSaveTemplateDetails(null);
   };
 
   const { client: activeClient } = useAuthStore();
@@ -5797,7 +5802,18 @@ export function EmailComposer({
         />
       )}
 
-      {showSaveAsTemplate && (
+      {showSaveAsTemplate && saveTemplateDetails === null && (
+        <QuickSaveTemplateDialog
+          defaultName={subject.trim()}
+          onClose={() => setShowSaveAsTemplate(false)}
+          onEditDetails={(name) => setSaveTemplateDetails(name)}
+          onSave={(name) => {
+            addTemplate({ name, subject, body, isHTML: !plainTextMode, category: '', isFavorite: false });
+            setShowSaveAsTemplate(false);
+          }}
+        />
+      )}
+      {showSaveAsTemplate && saveTemplateDetails !== null && (
         <Dialog
           isOpen
           onClose={() => void closeSaveAsTemplate()}
@@ -5810,6 +5826,7 @@ export function EmailComposer({
             <TemplateForm
               categorySource={composingPersonalTemplates}
               initialData={{
+                name: saveTemplateDetails,
                 subject,
                 body,
                 isHTML: !plainTextMode,
@@ -5821,6 +5838,7 @@ export function EmailComposer({
                 addTemplate(data);
                 setSaveTemplateDirty(false);
                 setShowSaveAsTemplate(false);
+                setSaveTemplateDetails(null);
               }}
               onCancel={() => void closeSaveAsTemplate()}
               onDirtyChange={setSaveTemplateDirty}
diff --git a/components/templates/__tests__/template-picker-headings.test.tsx b/components/templates/__tests__/template-picker-headings.test.tsx
new file mode 100644
index 000000000..b93b8bd1f
--- /dev/null
+++ b/components/templates/__tests__/template-picker-headings.test.tsx
@@ -0,0 +1,49 @@
+import { beforeEach, describe, expect, it } from 'vitest';
+import { render, screen } from '@testing-library/react';
+import { TemplatePicker } from '../template-picker';
+import { DEFAULT_POLICY } from '@/lib/admin/types';
+import { resolvePolicy } from '@/lib/admin/policy-scopes';
+import { usePolicyStore } from '@/stores/policy-store';
+import { useTemplateStore } from '@/stores/template-store';
+import { useAccountTemplatesStore } from '@/stores/account-templates-store';
+import type { EmailTemplate } from '@/lib/template-types';
+
+// compose-18: a template saved from the composer showed its name twice
+// ("Meeting follow-up / Meeting follow-up") under the heading "Other", with
+// no other heading for it to stand apart from. The next-intl mock returns keys.
+
+const own = (id: string, name: string, extra: Partial<EmailTemplate> = {}): EmailTemplate => ({
+  id, name, subject: name, body: `${name} body`, category: '', isFavorite: false,
+  createdAt: '2026-01-01T00:00:00.000Z', updatedAt: '2026-01-01T00:00:00.000Z', ...extra,
+});
+
+beforeEach(() => {
+  const subject = { email: 'alice@example.org', groups: [] };
+  usePolicyStore.setState({ rawPolicy: DEFAULT_POLICY, policy: resolvePolicy(DEFAULT_POLICY, subject).policy, subject });
+  useTemplateStore.setState({ templates: [own('t1', 'Meeting follow-up')], recentTemplateIds: [], deletedTemplateIds: {} });
+  useAccountTemplatesStore.setState({ personal: {}, teams: {}, active: null });
+});
+
+describe('the template picker', () => {
+  it('shows a name once, and no "Other" heading without categories', () => {
+    render(<TemplatePicker isOpen onClose={() => {}} onSelect={() => {}} />);
+
+    expect(screen.getAllByText('Meeting follow-up')).toHaveLength(1);
+    expect(screen.queryByText('section_uncategorized')).not.toBeInTheDocument();
+  });
+
+  it('keeps the subject when it says more than the name', () => {
+    useTemplateStore.setState({ templates: [own('t1', 'Follow-up', { subject: 'Thanks for meeting today' })] });
+    render(<TemplatePicker isOpen onClose={() => {}} onSelect={() => {}} />);
+
+    expect(screen.getByText('Thanks for meeting today')).toBeInTheDocument();
+  });
+
+  it('keeps "Other" apart from the categories', () => {
+    useTemplateStore.setState({ templates: [own('t1', 'Follow-up'), own('t2', 'Invoice', { category: 'Billing' })] });
+    render(<TemplatePicker isOpen onClose={() => {}} onSelect={() => {}} />);
+
+    expect(screen.getByText('Billing', { selector: 'h3' })).toBeInTheDocument();
+    expect(screen.getByText('section_uncategorized')).toBeInTheDocument();
+  });
+});
diff --git a/components/templates/quick-save-template-dialog.tsx b/components/templates/quick-save-template-dialog.tsx
new file mode 100644
index 000000000..04bb5295d
--- /dev/null
+++ b/components/templates/quick-save-template-dialog.tsx
@@ -0,0 +1,87 @@
+'use client';
+
+import { useId, useState } from 'react';
+import { useTranslations } from 'next-intl';
+import { Button } from '@/components/ui/button';
+import { Dialog } from '@/components/ui/dialog';
+import { Input } from '@/components/ui/input';
+import { cn } from '@/lib/utils';
+import { validateTemplateName } from '@/lib/template-utils';
+
+interface QuickSaveTemplateDialogProps {
+  /** The name to start with: the message's subject. */
+  defaultName: string;
+  onSave: (name: string) => void;
+  /** "Edit details…": the full template editor, with the name typed so far. */
+  onEditDetails: (name: string) => void;
+  onClose: () => void;
+}
+
+/**
+ * "Save as template" from the composer: a name and Save. The full editor
+ * (category, recipients, sending identity, favourite) is one click further,
+ * behind "Edit details…"; it used to open straight away with nine fields.
+ */
+export function QuickSaveTemplateDialog({ defaultName, onSave, onEditDetails, onClose }: QuickSaveTemplateDialogProps) {
+  const tComposer = useTranslations('email_composer');
+  const tSend = useTranslations('compose_send');
+  const tSettings = useTranslations('settings.templates');
+  const tCommon = useTranslations('common');
+  const fieldId = useId();
+  const [name, setName] = useState(defaultName);
+  const [error, setError] = useState<string | null>(null);
+
+  const save = () => {
+    const problem = validateTemplateName(name);
+    if (problem) {
+      setError(problem);
+      return;
+    }
+    onSave(name.trim());
+  };
+
+  return (
+    <Dialog
+      isOpen
+      onClose={onClose}
+      title={tComposer('save_as_template')}
+      size="sm"
+      dirty={name !== defaultName}
+      testId="quick-save-template"
+      onSubmit={(e) => {
+        e.preventDefault();
+        save();
+      }}
+      footer={
+        <>
+          <Button type="button" variant="ghost" className="me-auto" onClick={() => onEditDetails(name)}>
+            {tSend('template_edit_details')}
+          </Button>
+          <Button type="button" variant="outline" onClick={onClose}>{tCommon('cancel')}</Button>
+          <Button type="submit" disabled={!name.trim()}>{tCommon('save')}</Button>
+        </>
+      }
+    >
+      <div className="mt-4">
+        <label htmlFor={fieldId} className="text-sm font-medium text-foreground">{tSend('template_name')}</label>
+        <Input
+          id={fieldId}
+          value={name}
+          onChange={(e) => {
+            setName(e.target.value);
+            if (error) setError(null);
+          }}
+          className={cn('mt-1', error && 'border-destructive')}
+          aria-invalid={error ? true : undefined}
+          aria-describedby={error ? `${fieldId}-error` : undefined}
+          autoFocus
+        />
+        {error && (
+          <p id={`${fieldId}-error`} className="text-xs text-red-600 dark:text-red-400 mt-1">
+            {tSettings(`validation.${error}`)}
+          </p>
+        )}
+      </div>
+    </Dialog>
+  );
+}
diff --git a/components/templates/template-form.tsx b/components/templates/template-form.tsx
index 5109d4a2e..7f6b78fbc 100644
--- a/components/templates/template-form.tsx
+++ b/components/templates/template-form.tsx
@@ -22,6 +22,8 @@ import type { Editor } from '@tiptap/react';
 interface TemplateFormProps {
   template?: EmailTemplate;
   initialData?: {
+    /** A name typed before the full editor opened (Save as template). */
+    name?: string;
     subject?: string;
     body?: string;
     /** The body is the composer's HTML, not plain text (#1506). */
@@ -57,7 +59,7 @@ export function TemplateForm({ template, initialData, onSave, onCancel, shared =
   const browserList = useTemplateStore((s) => s.templates);
   const templates = categorySource ?? browserList;
 
-  const [name, setName] = useState(template?.name || '');
+  const [name, setName] = useState(template?.name || initialData?.name || '');
   const [category, setCategory] = useState(template?.category || '');
   const [subject, setSubject] = useState(template?.subject || initialData?.subject || '');
   const [body, setBody] = useState(template?.body || initialData?.body || '');
diff --git a/components/templates/template-picker.tsx b/components/templates/template-picker.tsx
index a8cbd72b3..f84990342 100644
--- a/components/templates/template-picker.tsx
+++ b/components/templates/template-picker.tsx
@@ -114,7 +114,8 @@ export function TemplatePicker({ isOpen, onClose, onSelect, accountId }: Templat
           </span>
         )}
       </div>
-      {template.subject && (
+      {/* Not the name a second time ("Meeting follow-up / Meeting follow-up"). */}
+      {template.subject && template.subject.trim() !== template.name.trim() && (
         <p className="text-xs text-muted-foreground truncate mt-1">
           {template.subject}
         </p>
@@ -131,13 +132,15 @@ export function TemplatePicker({ isOpen, onClose, onSelect, accountId }: Templat
     </button>
   );
 
-  const renderSection = (title: string, items: EmailTemplate[], source: TemplateSource) => {
+  const renderSection = (title: string, items: EmailTemplate[], source: TemplateSource, withHeading = true) => {
     if (items.length === 0) return null;
     return (
       <div className="mb-4" key={`${source.key}:${title}`}>
-        <h3 className="text-xs font-semibold text-muted-foreground mb-1 px-3">
-          {title}
-        </h3>
+        {withHeading && (
+          <h3 className="text-xs font-semibold text-muted-foreground mb-1 px-3">
+            {title}
+          </h3>
+        )}
         <div className="space-y-0.5">{items.map((item) => renderTemplateItem(item, source))}</div>
       </div>
     );
@@ -171,7 +174,9 @@ export function TemplatePicker({ isOpen, onClose, onSelect, accountId }: Templat
         {Object.entries(byCategory)
           .filter(([cat]) => cat !== '')
           .map(([cat, items]) => renderSection(cat, items, source))}
-        {renderSection(t('section_uncategorized'), byCategory[''] ?? [], source)}
+        {/* "Other" only sets them apart from favourites, recent or categories. */}
+        {renderSection(t('section_uncategorized'), byCategory[''] ?? [], source,
+          favorites.length > 0 || recent.length > 0 || Object.keys(byCategory).some((cat) => cat !== ''))}
       </>
     );
     if (!withHeading) return <div key={source.key}>{body}</div>;
diff --git a/locales/ar/common.json b/locales/ar/common.json
index 8fc060a58..24d70a5f5 100644
--- a/locales/ar/common.json
+++ b/locales/ar/common.json
@@ -3917,7 +3917,9 @@
     "tab_directory": "الدليل",
     "contacts_empty_title": "لا توجد جهات اتصال بعد",
     "contacts_empty_hint": "يظهر هنا الأشخاص الذين تحفظهم في جهات الاتصال.",
-    "contacts_no_match": "لا توجد جهة اتصال تطابق بحثك"
+    "contacts_no_match": "لا توجد جهة اتصال تطابق بحثك",
+    "template_name": "اسم القالب",
+    "template_edit_details": "تعديل التفاصيل…"
   },
   "org_templates": {
     "section_personal": "قوالبي",
diff --git a/locales/ca/common.json b/locales/ca/common.json
index ea9846760..660791f93 100644
--- a/locales/ca/common.json
+++ b/locales/ca/common.json
@@ -3917,7 +3917,9 @@
     "tab_directory": "Directori",
     "contacts_empty_title": "Encara no hi ha contactes",
     "contacts_empty_hint": "Aquí apareixen les persones que deses a Contactes.",
-    "contacts_no_match": "Cap contacte coincideix amb la cerca"
+    "contacts_no_match": "Cap contacte coincideix amb la cerca",
+    "template_name": "Nom de la plantilla",
+    "template_edit_details": "Edita els detalls…"
   },
   "org_templates": {
     "section_personal": "Les meves plantilles",
diff --git a/locales/cs/common.json b/locales/cs/common.json
index 211878338..28032fd09 100644
--- a/locales/cs/common.json
+++ b/locales/cs/common.json
@@ -3917,7 +3917,9 @@
     "tab_directory": "Adresář organizace",
     "contacts_empty_title": "Zatím žádné kontakty",
     "contacts_empty_hint": "Zde se zobrazí lidé, které uložíte do Kontaktů.",
-    "contacts_no_match": "Hledání neodpovídá žádný kontakt"
+    "contacts_no_match": "Hledání neodpovídá žádný kontakt",
+    "template_name": "Název šablony",
+    "template_edit_details": "Upravit podrobnosti…"
   },
   "org_templates": {
     "section_personal": "Moje šablony",
diff --git a/locales/da/common.json b/locales/da/common.json
index 3b27a738f..a1e3dac0f 100644
--- a/locales/da/common.json
+++ b/locales/da/common.json
@@ -3917,7 +3917,9 @@
     "tab_directory": "Adressefortegnelse",
     "contacts_empty_title": "Ingen kontakter endnu",
     "contacts_empty_hint": "Personer, du gemmer i Kontakter, vises her.",
-    "contacts_no_match": "Ingen kontakter matcher din søgning"
+    "contacts_no_match": "Ingen kontakter matcher din søgning",
+    "template_name": "Skabelonens navn",
+    "template_edit_details": "Rediger detaljer…"
   },
   "org_templates": {
     "section_personal": "Mine skabeloner",
diff --git a/locales/de/common.json b/locales/de/common.json
index ae5039e3e..c2976faf0 100644
--- a/locales/de/common.json
+++ b/locales/de/common.json
@@ -3917,7 +3917,9 @@
     "tab_directory": "Verzeichnis",
     "contacts_empty_title": "Noch keine Kontakte",
     "contacts_empty_hint": "Personen, die Sie in Kontakten speichern, erscheinen hier.",
-    "contacts_no_match": "Kein Kontakt passt zu Ihrer Suche"
+    "contacts_no_match": "Kein Kontakt passt zu Ihrer Suche",
+    "template_name": "Name der Vorlage",
+    "template_edit_details": "Details bearbeiten…"
   },
   "org_templates": {
     "section_personal": "Meine Vorlagen",
diff --git a/locales/en/common.json b/locales/en/common.json
index dbef12f39..3af2a2f74 100644
--- a/locales/en/common.json
+++ b/locales/en/common.json
@@ -3917,7 +3917,9 @@
     "tab_directory": "Directory",
     "contacts_empty_title": "No contacts yet",
     "contacts_empty_hint": "People you save in Contacts show up here.",
-    "contacts_no_match": "No contact matches your search"
+    "contacts_no_match": "No contact matches your search",
+    "template_name": "Template name",
+    "template_edit_details": "Edit details…"
   },
   "org_templates": {
     "section_personal": "My templates",
diff --git a/locales/es/common.json b/locales/es/common.json
index 44b012eb1..0509e004c 100644
--- a/locales/es/common.json
+++ b/locales/es/common.json
@@ -3917,7 +3917,9 @@
     "tab_directory": "Directorio",
     "contacts_empty_title": "Aún no hay contactos",
     "contacts_empty_hint": "Aquí aparecen las personas que guardas en Contactos.",
-    "contacts_no_match": "Ningún contacto coincide con la búsqueda"
+    "contacts_no_match": "Ningún contacto coincide con la búsqueda",
+    "template_name": "Nombre de la plantilla",
+    "template_edit_details": "Editar detalles…"
   },
   "org_templates": {
     "section_personal": "Mis plantillas",
diff --git a/locales/et/common.json b/locales/et/common.json
index fed4d3fa0..0f7f020db 100644
--- a/locales/et/common.json
+++ b/locales/et/common.json
@@ -3917,7 +3917,9 @@
     "tab_directory": "Kataloog",
     "contacts_empty_title": "Kontakte veel pole",
     "contacts_empty_hint": "Siin kuvatakse inimesed, kelle salvestate kontaktidesse.",
-    "contacts_no_match": "Otsingule ei vasta ükski kontakt"
+    "contacts_no_match": "Otsingule ei vasta ükski kontakt",
+    "template_name": "Malli nimi",
+    "template_edit_details": "Muuda üksikasju…"
   },
   "org_templates": {
     "section_personal": "Minu mallid",
diff --git a/locales/fa/common.json b/locales/fa/common.json
index 6ce99c57a..e109ff7b6 100644
--- a/locales/fa/common.json
+++ b/locales/fa/common.json
@@ -3917,7 +3917,9 @@
     "tab_directory": "فهرست سازمانی",
     "contacts_empty_title": "هنوز مخاطبی وجود ندارد",
     "contacts_empty_hint": "افرادی که در مخاطبین ذخیره می‌کنید اینجا نمایش داده می‌شوند.",
-    "contacts_no_match": "هیچ مخاطبی با جستجوی شما مطابقت ندارد"
+    "contacts_no_match": "هیچ مخاطبی با جستجوی شما مطابقت ندارد",
+    "template_name": "نام قالب",
+    "template_edit_details": "ویرایش جزئیات…"
   },
   "org_templates": {
     "section_personal": "قالب‌های من",
diff --git a/locales/fr/common.json b/locales/fr/common.json
index 18783b5e7..4956fb6ad 100644
--- a/locales/fr/common.json
+++ b/locales/fr/common.json
@@ -3917,7 +3917,9 @@
     "tab_directory": "Annuaire",
     "contacts_empty_title": "Aucun contact pour l'instant",
     "contacts_empty_hint": "Les personnes enregistrées dans Contacts s'affichent ici.",
-    "contacts_no_match": "Aucun contact ne correspond à votre recherche"
+    "contacts_no_match": "Aucun contact ne correspond à votre recherche",
+    "template_name": "Nom du modèle",
+    "template_edit_details": "Modifier les détails…"
   },
   "org_templates": {
     "section_personal": "Mes modèles",
diff --git a/locales/he/common.json b/locales/he/common.json
index 1735dee2a..a9f5fda38 100644
--- a/locales/he/common.json
+++ b/locales/he/common.json
@@ -3814,7 +3814,9 @@
     "tab_directory": "ספרייה",
     "contacts_empty_title": "אין עדיין אנשי קשר",
     "contacts_empty_hint": "אנשים שתשמרו באנשי הקשר יופיעו כאן.",
-    "contacts_no_match": "אין איש קשר שתואם לחיפוש"
+    "contacts_no_match": "אין איש קשר שתואם לחיפוש",
+    "template_name": "שם התבנית",
+    "template_edit_details": "עריכת פרטים…"
   },
   "org_templates": {
     "section_personal": "התבניות שלי",
diff --git a/locales/hu/common.json b/locales/hu/common.json
index 74a817551..c66311018 100644
--- a/locales/hu/common.json
+++ b/locales/hu/common.json
@@ -3917,7 +3917,9 @@
     "tab_directory": "Címtár",
     "contacts_empty_title": "Még nincsenek névjegyek",
     "contacts_empty_hint": "A névjegyekbe mentett személyek itt jelennek meg.",
-    "contacts_no_match": "Egy névjegy sem felel meg a keresésnek"
+    "contacts_no_match": "Egy névjegy sem felel meg a keresésnek",
+    "template_name": "Sablon neve",
+    "template_edit_details": "Részletek szerkesztése…"
   },
   "org_templates": {
     "section_personal": "Saját sablonok",
diff --git a/locales/it/common.json b/locales/it/common.json
index 5b254ce9c..90b2ef2e9 100644
--- a/locales/it/common.json
+++ b/locales/it/common.json
@@ -3917,7 +3917,9 @@
     "tab_directory": "Rubrica aziendale",
     "contacts_empty_title": "Ancora nessun contatto",
     "contacts_empty_hint": "Le persone salvate in Contatti compaiono qui.",
-    "contacts_no_match": "Nessun contatto corrisponde alla ricerca"
+    "contacts_no_match": "Nessun contatto corrisponde alla ricerca",
+    "template_name": "Nome del modello",
+    "template_edit_details": "Modifica dettagli…"
   },
   "org_templates": {
     "section_personal": "I miei modelli",
diff --git a/locales/ja/common.json b/locales/ja/common.json
index 73cf4eb8e..79317ef5d 100644
--- a/locales/ja/common.json
+++ b/locales/ja/common.json
@@ -3917,7 +3917,9 @@
     "tab_directory": "ディレクトリ",
     "contacts_empty_title": "連絡先はまだありません",
     "contacts_empty_hint": "連絡先に保存した人がここに表示されます。",
-    "contacts_no_match": "検索に一致する連絡先はありません"
+    "contacts_no_match": "検索に一致する連絡先はありません",
+    "template_name": "テンプレート名",
+    "template_edit_details": "詳細を編集…"
   },
   "org_templates": {
     "section_personal": "マイテンプレート",
diff --git a/locales/ko/common.json b/locales/ko/common.json
index 827cb61f0..e2eab9c80 100644
--- a/locales/ko/common.json
+++ b/locales/ko/common.json
@@ -3917,7 +3917,9 @@
     "tab_directory": "디렉터리",
     "contacts_empty_title": "아직 연락처가 없어요",
     "contacts_empty_hint": "연락처에 저장한 사람이 여기에 표시돼요.",
-    "contacts_no_match": "검색과 일치하는 연락처가 없어요"
+    "contacts_no_match": "검색과 일치하는 연락처가 없어요",
+    "template_name": "템플릿 이름",
+    "template_edit_details": "세부 정보 편집…"
   },
   "org_templates": {
     "section_personal": "내 템플릿",
diff --git a/locales/lv/common.json b/locales/lv/common.json
index 5ceb5f684..ace10bc3f 100644
--- a/locales/lv/common.json
+++ b/locales/lv/common.json
@@ -3917,7 +3917,9 @@
     "tab_directory": "Katalogs",
     "contacts_empty_title": "Vēl nav kontaktu",
     "contacts_empty_hint": "Šeit redzami cilvēki, kurus saglabājat kontaktos.",
-    "contacts_no_match": "Meklēšanai neatbilst neviens kontakts"
+    "contacts_no_match": "Meklēšanai neatbilst neviens kontakts",
+    "template_name": "Veidnes nosaukums",
+    "template_edit_details": "Rediģēt detaļas…"
   },
   "org_templates": {
     "section_personal": "Manas veidnes",
diff --git a/locales/mn/common.json b/locales/mn/common.json
index 37458cb71..ba80232aa 100644
--- a/locales/mn/common.json
+++ b/locales/mn/common.json
@@ -3917,7 +3917,9 @@
     "tab_directory": "Лавлах",
     "contacts_empty_title": "Одоогоор харилцагч алга",
     "contacts_empty_hint": "Харилцагчдад хадгалсан хүмүүс энд харагдана.",
-    "contacts_no_match": "Хайлтад тохирох харилцагч алга"
+    "contacts_no_match": "Хайлтад тохирох харилцагч алга",
+    "template_name": "Загварын нэр",
+    "template_edit_details": "Дэлгэрэнгүйг засах…"
   },
   "org_templates": {
     "section_personal": "Миний загварууд",
diff --git a/locales/nb/common.json b/locales/nb/common.json
index 4a8f8f941..84f0718f6 100644
--- a/locales/nb/common.json
+++ b/locales/nb/common.json
@@ -3917,7 +3917,9 @@
     "tab_directory": "Katalog",
     "contacts_empty_title": "Ingen kontakter ennå",
     "contacts_empty_hint": "Personer du lagrer i Kontakter, vises her.",
-    "contacts_no_match": "Ingen kontakter samsvarer med søket"
+    "contacts_no_match": "Ingen kontakter samsvarer med søket",
+    "template_name": "Navn på mal",
+    "template_edit_details": "Rediger detaljer…"
   },
   "org_templates": {
     "section_personal": "Mine maler",
diff --git a/locales/nl/common.json b/locales/nl/common.json
index 75d1a276d..bd8b6deda 100644
--- a/locales/nl/common.json
+++ b/locales/nl/common.json
@@ -3917,7 +3917,9 @@
     "tab_directory": "Adresboek van de organisatie",
     "contacts_empty_title": "Nog geen contacten",
     "contacts_empty_hint": "Mensen die u in Contacten opslaat, verschijnen hier.",
-    "contacts_no_match": "Geen contact komt overeen met uw zoekopdracht"
+    "contacts_no_match": "Geen contact komt overeen met uw zoekopdracht",
+    "template_name": "Naam van sjabloon",
+    "template_edit_details": "Details bewerken…"
   },
   "org_templates": {
     "section_personal": "Mijn sjablonen",
diff --git a/locales/pl/common.json b/locales/pl/common.json
index f728e9e79..87d6f7bdb 100644
--- a/locales/pl/common.json
+++ b/locales/pl/common.json
@@ -3917,7 +3917,9 @@
     "tab_directory": "Katalog",
     "contacts_empty_title": "Brak kontaktów",
     "contacts_empty_hint": "Tutaj pojawią się osoby zapisane w Kontaktach.",
-    "contacts_no_match": "Żaden kontakt nie pasuje do wyszukiwania"
+    "contacts_no_match": "Żaden kontakt nie pasuje do wyszukiwania",
+    "template_name": "Nazwa szablonu",
+    "template_edit_details": "Edytuj szczegóły…"
   },
   "org_templates": {
     "section_personal": "Moje szablony",
diff --git a/locales/pt/common.json b/locales/pt/common.json
index 58f9dbdeb..d153f9f63 100644
--- a/locales/pt/common.json
+++ b/locales/pt/common.json
@@ -3917,7 +3917,9 @@
     "tab_directory": "Diretório",
     "contacts_empty_title": "Nenhum contato ainda",
     "contacts_empty_hint": "As pessoas que você salvar em Contatos aparecem aqui.",
-    "contacts_no_match": "Nenhum contato corresponde à sua pesquisa"
+    "contacts_no_match": "Nenhum contato corresponde à sua pesquisa",
+    "template_name": "Nome do modelo",
+    "template_edit_details": "Editar detalhes…"
   },
   "org_templates": {
     "section_personal": "Meus modelos",
diff --git a/locales/ro/common.json b/locales/ro/common.json
index 3f006f780..d69744bf6 100644
--- a/locales/ro/common.json
+++ b/locales/ro/common.json
@@ -3917,7 +3917,9 @@
     "tab_directory": "Director",
     "contacts_empty_title": "Încă nu există contacte",
     "contacts_empty_hint": "Aici apar persoanele pe care le salvați în Contacte.",
-    "contacts_no_match": "Niciun contact nu corespunde căutării"
+    "contacts_no_match": "Niciun contact nu corespunde căutării",
+    "template_name": "Numele șablonului",
+    "template_edit_details": "Editează detaliile…"
   },
   "org_templates": {
     "section_personal": "Șabloanele mele",
diff --git a/locales/ru/common.json b/locales/ru/common.json
index afa5dc6c8..c82e2d783 100644
--- a/locales/ru/common.json
+++ b/locales/ru/common.json
@@ -3917,7 +3917,9 @@
     "tab_directory": "Справочник",
     "contacts_empty_title": "Контактов пока нет",
     "contacts_empty_hint": "Здесь появятся люди, которых вы сохраните в контактах.",
-    "contacts_no_match": "Нет контактов, подходящих под запрос"
+    "contacts_no_match": "Нет контактов, подходящих под запрос",
+    "template_name": "Название шаблона",
+    "template_edit_details": "Изменить подробности…"
   },
   "org_templates": {
     "section_personal": "Мои шаблоны",
diff --git a/locales/sk/common.json b/locales/sk/common.json
index 901a328b8..73fc1a0eb 100644
--- a/locales/sk/common.json
+++ b/locales/sk/common.json
@@ -3917,7 +3917,9 @@
     "tab_directory": "Adresár organizácie",
     "contacts_empty_title": "Zatiaľ žiadne kontakty",
     "contacts_empty_hint": "Tu sa zobrazia ľudia, ktorých uložíte do Kontaktov.",
-    "contacts_no_match": "Vyhľadávaniu nezodpovedá žiadny kontakt"
+    "contacts_no_match": "Vyhľadávaniu nezodpovedá žiadny kontakt",
+    "template_name": "Názov šablóny",
+    "template_edit_details": "Upraviť podrobnosti…"
   },
   "org_templates": {
     "section_personal": "Moje šablóny",
diff --git a/locales/th/common.json b/locales/th/common.json
index 7b86f34b3..76af0639e 100644
--- a/locales/th/common.json
+++ b/locales/th/common.json
@@ -1168,7 +1168,9 @@
     "tab_directory": "ไดเรกทอรีกลาง",
     "contacts_empty_title": "ยังไม่มีผู้ติดต่อ",
     "contacts_empty_hint": "คนที่คุณบันทึกไว้ในผู้ติดต่อจะแสดงที่นี่",
-    "contacts_no_match": "ไม่มีผู้ติดต่อที่ตรงกับการค้นหา"
+    "contacts_no_match": "ไม่มีผู้ติดต่อที่ตรงกับการค้นหา",
+    "template_name": "ชื่อแม่แบบ",
+    "template_edit_details": "แก้ไขรายละเอียด…"
   },
   "org_templates": {
     "section_personal": "แม่แบบของฉัน",
diff --git a/locales/tr/common.json b/locales/tr/common.json
index 6a02a84e8..8fc0c1d0e 100644
--- a/locales/tr/common.json
+++ b/locales/tr/common.json
@@ -3917,7 +3917,9 @@
     "tab_directory": "Dizin",
     "contacts_empty_title": "Henüz kişi yok",
     "contacts_empty_hint": "Kişiler'e kaydettiğiniz kişiler burada görünür.",
-    "contacts_no_match": "Aramanızla eşleşen kişi yok"
+    "contacts_no_match": "Aramanızla eşleşen kişi yok",
+    "template_name": "Şablon adı",
+    "template_edit_details": "Ayrıntıları düzenle…"
   },
   "org_templates": {
     "section_personal": "Şablonlarım",
diff --git a/locales/uk/common.json b/locales/uk/common.json
index 9cdeb4bd7..9a12ae296 100644
--- a/locales/uk/common.json
+++ b/locales/uk/common.json
@@ -3917,7 +3917,9 @@
     "tab_directory": "Довідник",
     "contacts_empty_title": "Контактів ще немає",
     "contacts_empty_hint": "Тут з’являться люди, яких ви збережете в контактах.",
-    "contacts_no_match": "Немає контактів, що відповідають пошуку"
+    "contacts_no_match": "Немає контактів, що відповідають пошуку",
+    "template_name": "Назва шаблону",
+    "template_edit_details": "Редагувати подробиці…"
   },
   "org_templates": {
     "section_personal": "Мої шаблони",
diff --git a/locales/vi/common.json b/locales/vi/common.json
index 459eb3aea..d120c2103 100644
--- a/locales/vi/common.json
+++ b/locales/vi/common.json
@@ -3929,7 +3929,9 @@
     "tab_directory": "Danh bạ tổ chức",
     "contacts_empty_title": "Chưa có liên hệ nào",
     "contacts_empty_hint": "Những người bạn lưu trong Danh bạ sẽ hiện ở đây.",
-    "contacts_no_match": "Không có liên hệ nào khớp với tìm kiếm"
+    "contacts_no_match": "Không có liên hệ nào khớp với tìm kiếm",
+    "template_name": "Tên mẫu",
+    "template_edit_details": "Sửa chi tiết…"
   },
   "org_templates": {
     "section_personal": "Mẫu của tôi",
diff --git a/locales/zh-TW/common.json b/locales/zh-TW/common.json
index cda397e2b..c0b50d357 100644
--- a/locales/zh-TW/common.json
+++ b/locales/zh-TW/common.json
@@ -3917,7 +3917,9 @@
     "tab_directory": "通訊錄目錄",
     "contacts_empty_title": "還沒有聯絡人",
     "contacts_empty_hint": "你在聯絡人中儲存的人會顯示在這裡。",
-    "contacts_no_match": "沒有符合搜尋的聯絡人"
+    "contacts_no_match": "沒有符合搜尋的聯絡人",
+    "template_name": "範本名稱",
+    "template_edit_details": "編輯詳細資料…"
   },
   "org_templates": {
     "section_personal": "我的範本",
diff --git a/locales/zh/common.json b/locales/zh/common.json
index ede1e67b7..78f0c9f09 100644
--- a/locales/zh/common.json
+++ b/locales/zh/common.json
@@ -3917,7 +3917,9 @@
     "tab_directory": "通讯录目录",
     "contacts_empty_title": "还没有联系人",
     "contacts_empty_hint": "你在联系人中保存的人会显示在这里。",
-    "contacts_no_match": "没有符合搜索的联系人"
+    "contacts_no_match": "没有符合搜索的联系人",
+    "template_name": "模板名称",
+    "template_edit_details": "编辑详细信息…"
   },
   "org_templates": {
     "section_personal": "我的模板",

From 242d0bacfce5227b7ea569a74106227b0ccf8ad8 Mon Sep 17 00:00:00 2001
From: Linus Rath <139418639+rathlinus@users.noreply.github.com>
Date: Wed, 4 Nov 2026 07:16:24 +0100
Subject: [PATCH 18/34] fix: keep toasts at the bottom instead of over the
 composer's close button

---
 components/ui/__tests__/toast-layout.test.tsx | 19 +++++++++++++++++++
 components/ui/toast.tsx                       | 18 +++++++++++++-----
 2 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/components/ui/__tests__/toast-layout.test.tsx b/components/ui/__tests__/toast-layout.test.tsx
index a421af676..335d03634 100644
--- a/components/ui/__tests__/toast-layout.test.tsx
+++ b/components/ui/__tests__/toast-layout.test.tsx
@@ -208,6 +208,25 @@ describe('toasts and the focused element', () => {
     expect(toastContainer()).not.toHaveAttribute('data-dodging');
   });
 
+  // With the focus in the composer's text or the quick reply box, "Email
+  // sent" and "Sending in 5 seconds" moved to the top and covered the
+  // composer's close button and the reader's toolbar. A large field the
+  // stack only overlaps at a corner keeps the toasts at the bottom.
+  it('stays at the bottom over a corner of a large focused field', () => {
+    const h = window.innerHeight;
+    vi.spyOn(HTMLElement.prototype, 'getBoundingClientRect').mockImplementation(function (this: HTMLElement) {
+      if (this.hasAttribute('data-toast-container')) return rect(h - 100, 600, 360, 80);
+      if (this.id === 'body') return rect(h - 400, 300, 700, 360);
+      return rect(10, 10, 80, 36);
+    });
+    render(<><Toasts /><textarea id="body" /></>);
+    act(() => { (document.getElementById('body') as HTMLElement).focus(); });
+    act(() => { toast.success('Email sent'); });
+    act(() => { vi.advanceTimersByTime(20); });
+    expect(toastContainer()).not.toHaveAttribute('data-dodging');
+    expect(toastContainer()).not.toHaveClass('top-5');
+  });
+
   // On a phone the top of the screen is the header with Back and the message
   // actions; an Undo toast that moved there blocked them. (#1472)
   it('stays at the bottom on a phone, clear of the header', () => {
diff --git a/components/ui/toast.tsx b/components/ui/toast.tsx
index a3d96a2be..a8a742715 100644
--- a/components/ui/toast.tsx
+++ b/components/ui/toast.tsx
@@ -358,10 +358,14 @@ export function ToastItem({ toast, onClose, held = false, onFocusLost }: ToastPr
 }
 
 /**
- * True when the toast stack, in its usual place at the bottom, overlaps the
- * element that has the focus. The stack's own box is measured where it is
- * now; while it sits at the top, its bottom place is worked out from the gap
- * it left there (data-bottom-gap).
+ * True when the toast stack, in its usual place at the bottom, hides at
+ * least half of the element that has the focus: a button or a field. A
+ * large element it only overlaps at a corner (the composer's text, the
+ * quick reply box) stays usable, and moving the stack to the top for it put
+ * the toasts over the composer's close button and the reader's toolbar. The
+ * stack's own box is measured where it is now; while it sits at the top,
+ * its bottom place is worked out from the gap it left there
+ * (data-bottom-gap).
  */
 export function stackWouldCoverFocus(stack: HTMLElement | null): boolean {
   if (!stack) return false;
@@ -379,7 +383,11 @@ export function stackWouldCoverFocus(stack: HTMLElement | null): boolean {
     stack.dataset.bottomGap = String(Math.max(0, window.innerHeight - box.bottom));
   }
   const f = focused.getBoundingClientRect();
-  return f.right > box.left && f.left < box.right && f.bottom > top && f.top < bottom;
+  const overlapWidth = Math.min(f.right, box.right) - Math.max(f.left, box.left);
+  const overlapHeight = Math.min(f.bottom, bottom) - Math.max(f.top, top);
+  if (overlapWidth <= 0 || overlapHeight <= 0) return false;
+  const area = Math.max(f.width, 0) * Math.max(f.height, 0);
+  return area === 0 || overlapWidth * overlapHeight >= area / 2;
 }
 
 export function ToastContainer({ toasts, onClose }: { toasts: Toast[]; onClose: (id: string) => void }) {

From e6f8c7a241af1f2af9432f98df81ca8e1adc8cb1 Mon Sep 17 00:00:00 2001
From: Linus Rath <139418639+rathlinus@users.noreply.github.com>
Date: Wed, 4 Nov 2026 07:25:05 +0100
Subject: [PATCH 19/34] fix: show who a quick reply goes to and offer the full
 editor by name

The quick reply tests find the box by its new placeholder key, which
names the recipients instead of "Write a quick reply...".
---
 .../viewer-quick-reply-back.test.tsx          |  4 +-
 .../viewer-quick-reply-words.test.tsx         | 87 +++++++++++++++++++
 .../__tests__/viewer-send-failures.test.tsx   | 10 +--
 components/email/email-viewer.tsx             | 22 +++--
 lib/outgoing/quick-reply-envelope.ts          | 16 +++-
 locales/ar/common.json                        |  4 +-
 locales/ca/common.json                        |  4 +-
 locales/cs/common.json                        |  4 +-
 locales/da/common.json                        |  4 +-
 locales/de/common.json                        |  4 +-
 locales/en/common.json                        |  4 +-
 locales/es/common.json                        |  4 +-
 locales/et/common.json                        |  4 +-
 locales/fa/common.json                        |  4 +-
 locales/fr/common.json                        |  4 +-
 locales/he/common.json                        |  4 +-
 locales/hu/common.json                        |  4 +-
 locales/it/common.json                        |  4 +-
 locales/ja/common.json                        |  4 +-
 locales/ko/common.json                        |  4 +-
 locales/lv/common.json                        |  4 +-
 locales/mn/common.json                        |  4 +-
 locales/nb/common.json                        |  4 +-
 locales/nl/common.json                        |  4 +-
 locales/pl/common.json                        |  4 +-
 locales/pt/common.json                        |  4 +-
 locales/ro/common.json                        |  4 +-
 locales/ru/common.json                        |  4 +-
 locales/sk/common.json                        |  4 +-
 locales/th/common.json                        |  4 +-
 locales/tr/common.json                        |  4 +-
 locales/uk/common.json                        |  4 +-
 locales/vi/common.json                        |  4 +-
 locales/zh-TW/common.json                     |  4 +-
 locales/zh/common.json                        |  4 +-
 35 files changed, 211 insertions(+), 48 deletions(-)
 create mode 100644 components/email/__tests__/viewer-quick-reply-words.test.tsx

diff --git a/components/email/__tests__/viewer-quick-reply-back.test.tsx b/components/email/__tests__/viewer-quick-reply-back.test.tsx
index 39fae9a39..b4717d125 100644
--- a/components/email/__tests__/viewer-quick-reply-back.test.tsx
+++ b/components/email/__tests__/viewer-quick-reply-back.test.tsx
@@ -42,7 +42,7 @@ beforeEach(() => clearAllHooks());
 async function typeAndSend(onQuickReply: (body: string) => Promise<boolean | void>) {
   render(<EmailViewer email={message} isLoading={false} mailboxes={mailboxes} selectedMailbox="inbox" currentMailboxRole="inbox" onQuickReply={onQuickReply} />);
   await act(async () => { await new Promise((r) => setTimeout(r, 10)); });
-  const box = screen.getByPlaceholderText('quick_reply_placeholder') as HTMLTextAreaElement;
+  const box = screen.getByPlaceholderText('quick_reply_to') as HTMLTextAreaElement;
   fireEvent.focus(box);
   fireEvent.change(box, { target: { value: 'My answer' } });
   fireEvent.click(screen.getByRole('button', { name: 'send' }));
@@ -77,7 +77,7 @@ describe('automatic sign-out while the external recipient question is open', ()
     render(<EmailViewer email={message} isLoading={false} mailboxes={mailboxes} selectedMailbox="inbox" currentMailboxRole="inbox"
       onQuickReply={onQuickReply} onSaveQuickReplyDraft={onSaveQuickReplyDraft} />);
     await act(async () => { await new Promise((r) => setTimeout(r, 10)); });
-    const box = screen.getByPlaceholderText('quick_reply_placeholder') as HTMLTextAreaElement;
+    const box = screen.getByPlaceholderText('quick_reply_to') as HTMLTextAreaElement;
     fireEvent.focus(box);
     fireEvent.change(box, { target: { value: 'My answer' } });
     fireEvent.click(screen.getByRole('button', { name: 'send' }));
diff --git a/components/email/__tests__/viewer-quick-reply-words.test.tsx b/components/email/__tests__/viewer-quick-reply-words.test.tsx
new file mode 100644
index 000000000..f980a7c93
--- /dev/null
+++ b/components/email/__tests__/viewer-quick-reply-words.test.tsx
@@ -0,0 +1,87 @@
+import { render, act, fireEvent, screen } from '@testing-library/react';
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import type { Email, Mailbox } from '@/lib/jmap/types';
+import { clearAllHooks } from '@/lib/plugin-hooks';
+import { useAuthStore } from '@/stores/auth-store';
+
+// The quick reply box counted characters, hid the full editor behind "More
+// options" and didn't say who the reply goes to. It now names the
+// recipients in its placeholder and offers "Open full editor".
+
+vi.mock('next-intl', () => ({
+  useTranslations: () => (key: string, values?: Record<string, unknown>) =>
+    values ? `${key}:${JSON.stringify(values)}` : key,
+  useLocale: () => 'en',
+  useFormatter: () => ({
+    dateTime: (d: Date | string) => String(d),
+    relativeTime: (d: Date | string) => String(d),
+    number: (n: number) => String(n),
+  }),
+}));
+vi.mock('@/hooks/use-media-query', () => ({
+  useDeviceDetection: () => ({ isMobile: false, isTablet: false, isDesktop: true }),
+  useMediaQuery: () => false,
+}));
+vi.mock('@/components/tour/tour-provider', () => ({
+  useTour: () => ({ activeTour: null, startTour: vi.fn(), endTour: vi.fn(), registerStep: vi.fn() }),
+}));
+vi.mock('@/components/plugins/plugin-slot', () => ({ PluginSlot: () => null }));
+vi.mock('@/hooks/use-plugin-slot-offers', () => ({ usePluginSlotOffers: () => [] }));
+
+class NoopResizeObserver {
+  observe() {}
+  unobserve() {}
+  disconnect() {}
+}
+vi.stubGlobal('ResizeObserver', NoopResizeObserver);
+
+const { EmailViewer } = await import('../email-viewer');
+
+const mailboxes = [
+  { id: 'inbox', name: 'Inbox', role: 'inbox', parentId: null, myRights: { mayAddItems: true } },
+] as unknown as Mailbox[];
+
+const message = {
+  id: 'm1', blobId: 'b1', threadId: 't1', mailboxIds: { inbox: true }, keywords: { $seen: true },
+  from: [{ name: 'Ben Carter', email: 'ben.carter@example.com' }], to: [{ name: 'Me', email: 'me@example.org' }],
+  subject: 'Hello', receivedAt: '2026-01-01T00:00:00Z', preview: 'Hello', hasAttachment: false, size: 100,
+  textBody: [{ partId: '1', type: 'text/plain' }], htmlBody: [{ partId: '1', type: 'text/plain' }], attachments: [],
+  bodyValues: { '1': { value: 'Plain body' } },
+} as unknown as Email;
+
+beforeEach(() => {
+  clearAllHooks();
+  useAuthStore.setState({ identities: [{ id: 'me', email: 'me@example.org', name: 'Me' }] } as never);
+});
+
+async function renderViewer(email: Email, onReply = vi.fn()) {
+  render(<EmailViewer email={email} isLoading={false} mailboxes={mailboxes} selectedMailbox="inbox" currentMailboxRole="inbox" onQuickReply={vi.fn()} onReply={onReply} />);
+  await act(async () => { await new Promise((r) => setTimeout(r, 10)); });
+}
+
+describe('quick reply wording', () => {
+  it('says who the reply goes to', async () => {
+    await renderViewer(message);
+    expect(screen.getByPlaceholderText('quick_reply_to:{"names":"Ben Carter"}')).toBeTruthy();
+  });
+
+  it('names the Reply-To address over the sender, by address when it has no name', async () => {
+    await renderViewer({ ...message, replyTo: [{ email: 'team@example.com' }] } as unknown as Email);
+    expect(screen.getByPlaceholderText('quick_reply_to:{"names":"team@example.com"}')).toBeTruthy();
+  });
+
+  it('drops the character count and opens the full editor with the typed text', async () => {
+    const onReply = vi.fn();
+    await renderViewer(message, onReply);
+    const box = screen.getByPlaceholderText(/^quick_reply_to/);
+    fireEvent.focus(box);
+    fireEvent.change(box, { target: { value: 'Thanks, will do' } });
+
+    expect(screen.queryByText(/characters_count/)).toBeNull();
+    expect(screen.queryByText('more_options')).toBeNull();
+    const full = screen.getByTestId('quick-reply-full-editor');
+    expect(full).toHaveTextContent('open_full_editor');
+    fireEvent.click(full);
+    expect(onReply).toHaveBeenCalledWith('Thanks, will do');
+  });
+});
diff --git a/components/email/__tests__/viewer-send-failures.test.tsx b/components/email/__tests__/viewer-send-failures.test.tsx
index fd95d5e73..b733976e1 100644
--- a/components/email/__tests__/viewer-send-failures.test.tsx
+++ b/components/email/__tests__/viewer-send-failures.test.tsx
@@ -92,9 +92,9 @@ describe('viewer send failures', () => {
     useSettingsStore.setState({ quickReplyEnabled: false });
     render(<EmailViewer email={makeEmail()} mailboxes={mailboxes} selectedMailbox="inbox" currentMailboxRole="inbox" />);
 
-    expect(screen.queryByPlaceholderText('quick_reply_placeholder')).not.toBeInTheDocument();
+    expect(screen.queryByPlaceholderText('quick_reply_to')).not.toBeInTheDocument();
     act(() => useSettingsStore.getState().updateSetting('quickReplyEnabled', true));
-    expect(screen.getByPlaceholderText('quick_reply_placeholder')).toBeInTheDocument();
+    expect(screen.getByPlaceholderText('quick_reply_to')).toBeInTheDocument();
   });
 
   it('reports a failed quick reply and keeps the text on Stalwart 1.0', async () => {
@@ -103,7 +103,7 @@ describe('viewer send failures', () => {
       <EmailViewer email={makeEmail()} mailboxes={mailboxes} selectedMailbox="inbox" currentMailboxRole="inbox" onQuickReply={onQuickReply} />,
     );
 
-    const box = screen.getByPlaceholderText('quick_reply_placeholder');
+    const box = screen.getByPlaceholderText('quick_reply_to');
     fireEvent.change(box, { target: { value: 'Thanks!' } });
     fireEvent.keyDown(box, { key: 'Enter', ctrlKey: true });
 
@@ -122,7 +122,7 @@ describe('viewer send failures', () => {
     await act(async () => { await flushComposers(1000); });
     expect(onSaveQuickReplyDraft).not.toHaveBeenCalled();
 
-    fireEvent.change(screen.getByPlaceholderText('quick_reply_placeholder'), { target: { value: 'On it.' } });
+    fireEvent.change(screen.getByPlaceholderText('quick_reply_to'), { target: { value: 'On it.' } });
     await act(async () => { await flushComposers(1000); });
     expect(onSaveQuickReplyDraft).toHaveBeenCalledWith('On it.');
   });
@@ -133,7 +133,7 @@ describe('viewer send failures', () => {
     render(<EmailViewer email={makeEmail()} mailboxes={mailboxes} selectedMailbox="inbox" currentMailboxRole="inbox" onQuickReply={vi.fn()} />);
     expect(useUIStore.getState().composingCount).toBe(0);
 
-    fireEvent.focus(screen.getByPlaceholderText('quick_reply_placeholder'));
+    fireEvent.focus(screen.getByPlaceholderText('quick_reply_to'));
     expect(useUIStore.getState().composingCount).toBe(1);
 
     fireEvent.click(screen.getByText('cancel'));
diff --git a/components/email/email-viewer.tsx b/components/email/email-viewer.tsx
index 0b1b5fac7..8bea1337e 100644
--- a/components/email/email-viewer.tsx
+++ b/components/email/email-viewer.tsx
@@ -46,7 +46,7 @@ import { onPanelRequest } from "@/lib/plugin-sandbox/panel-requests";
 import { PluginPanelToggle, panelLabelOf, panelShortcutOf } from "@/components/plugins/app-side-panel";
 import type { ComposerMetadata } from "@/lib/plugin-sandbox/composer-registry";
 import { QuickReplyPluginActions } from "./quick-reply-plugin-actions";
-import { quickReplyEnvelope } from "@/lib/outgoing/quick-reply-envelope";
+import { quickReplyEnvelope, quickReplyRecipients } from "@/lib/outgoing/quick-reply-envelope";
 import { formatFileSize, cn, formatDate, formatDateTime, formatRelativeAgo, generateUUID, cleanPreview, type MailboxNode } from "@/lib/utils";
 import { getEffectiveTimeZone, getWallClock } from "@/lib/timezone";
 import { itemsToHide } from "@/lib/toolbar-overflow";
@@ -1363,6 +1363,7 @@ export function EmailViewer({
   const archiveActionEnabled = useArchiveActionEnabled();
   const tWindows = useTranslations('pwaWindows');
   const tComposer = useTranslations('email_composer');
+  const tWords = useTranslations('compose_words');
   const tNotifications = useTranslations('notifications');
   const tImport = useTranslations('mail_import');
   const tCommon = useTranslations('common');
@@ -1648,6 +1649,13 @@ export function EmailViewer({
     if (isQuickReplyFocused) quickReplyBoxRef.current?.scrollIntoView?.({ block: 'nearest' });
   }, [isQuickReplyFocused]);
   const [isSendingQuickReply, setIsSendingQuickReply] = useState(false);
+  // "Reply to Ben Carter…": who the quick reply goes to, by name.
+  const quickReplyNames = email
+    ? quickReplyRecipients(email, identities).map((r) => r.name || r.email).join(', ')
+    : '';
+  const quickReplyPlaceholder = quickReplyNames
+    ? tWords('quick_reply_to', { names: quickReplyNames })
+    : t('quick_reply_placeholder');
   /** The recipients and identity the quick reply would be sent with. */
   const quickMetadata = (): ComposerMetadata => {
     if (!email) return { subject: '', to: [], attachments: [] };
@@ -6096,7 +6104,7 @@ ${printWatermark ? printWatermark.html : ''}
                         void handleSendQuickReply();
                       }
                     }}
-                    placeholder={t('quick_reply_placeholder')}
+                    placeholder={quickReplyPlaceholder}
                     className={cn(
                       "w-full px-3 py-2 text-sm border border-border bg-background text-foreground rounded-lg",
                       "hover:border-accent focus:border-primary focus:outline-hidden transition-all",
@@ -6108,10 +6116,7 @@ ${printWatermark ? printWatermark.html : ''}
 
                   {/* Action buttons - show when focused or has text */}
                   {(isQuickReplyFocused || quickReplyText) && (
-                    <div className="flex flex-wrap items-center justify-between gap-2 animate-in fade-in slide-in-from-top-1 duration-200">
-                      <div className="text-xs text-muted-foreground">
-                        {t('characters_count', { count: quickReplyText.length })}
-                      </div>
+                    <div className="flex flex-wrap items-center justify-end gap-2 animate-in fade-in slide-in-from-top-1 duration-200">
                       <div className="flex flex-wrap items-center gap-2 min-w-0">
                         <Button
                           variant="ghost"
@@ -6134,9 +6139,10 @@ ${printWatermark ? printWatermark.html : ''}
                           }}
                           disabled={isSendingQuickReply}
                           className="text-muted-foreground"
+                          data-testid="quick-reply-full-editor"
                         >
-                          <MoreVertical className="w-4 h-4 me-1" />
-                          {t('more_options')}
+                          <Maximize2 className="w-4 h-4 me-1" />
+                          {tWords('open_full_editor')}
                         </Button>
                         <QuickReplyPluginActions
                           key={JSON.stringify([email.id, activeAccountId, email.sourceClientAccountId, email.sourceAccountId])}
diff --git a/lib/outgoing/quick-reply-envelope.ts b/lib/outgoing/quick-reply-envelope.ts
index bbc5fb695..63b6f262b 100644
--- a/lib/outgoing/quick-reply-envelope.ts
+++ b/lib/outgoing/quick-reply-envelope.ts
@@ -29,9 +29,7 @@ export interface QuickReplyEnvelope {
 export function quickReplyEnvelope(email: ReplySource, identities: Identity[]): QuickReplyEnvelope {
   const ownIdentityEmails = identities.map((i) => i.email).filter(Boolean);
   const replySource = { from: email.from, replyToAddresses: email.replyTo, to: email.to, cc: email.cc };
-  const recipients = buildReplyRecipients(replySource, 'reply', ownIdentityEmails).to
-    .map((r) => r.email)
-    .filter((address): address is string => Boolean(address));
+  const recipients = quickReplyRecipients(email, identities).map((r) => r.email);
   const primaryIdentity = identities[0];
   const selfSentIdentityId = isSelfSent(replySource, ownIdentityEmails)
     ? findDraftIdentityId(identities, email.from?.[0])
@@ -46,6 +44,18 @@ export function quickReplyEnvelope(email: ReplySource, identities: Identity[]):
   return { recipients, sendingIdentity, primaryIdentity };
 }
 
+/**
+ * The people a quick reply goes to, with their names, by the same rules as
+ * quickReplyEnvelope: for the box's "Reply to Ben Carter…" placeholder.
+ */
+export function quickReplyRecipients(email: ReplySource, identities: Identity[]): { name?: string; email: string }[] {
+  const ownIdentityEmails = identities.map((i) => i.email).filter(Boolean);
+  const replySource = { from: email.from, replyToAddresses: email.replyTo, to: email.to, cc: email.cc };
+  return buildReplyRecipients(replySource, 'reply', ownIdentityEmails).to
+    .filter((r): r is typeof r & { email: string } => Boolean(r.email))
+    .map((r) => ({ name: r.name || undefined, email: r.email }));
+}
+
 /**
  * Saves the text typed into a quick reply as a draft reply, before an
  * automatic sign-out (lib/compose-flush-registry.ts). Plain text, threaded
diff --git a/locales/ar/common.json b/locales/ar/common.json
index ed6682970..08b672c45 100644
--- a/locales/ar/common.json
+++ b/locales/ar/common.json
@@ -6396,7 +6396,9 @@
     "require_tls": "التسليم عبر اتصال آمن فقط",
     "require_tls_hint": "الرسالة نفسها غير مشفّرة. تُرَد إذا لم يتمكن خادم من استخدام TLS.",
     "encrypt": "تشفير…",
-    "encrypt_hint": "يتطلب إضافة S/MIME أو PGP. يفتح الإعدادات."
+    "encrypt_hint": "يتطلب إضافة S/MIME أو PGP. يفتح الإعدادات.",
+    "quick_reply_to": "الرد على {names}…",
+    "open_full_editor": "فتح المحرر الكامل"
   },
   "plugin_list": {
     "filters": "المرشحات",
diff --git a/locales/ca/common.json b/locales/ca/common.json
index 7836a4f0e..79db8efdb 100644
--- a/locales/ca/common.json
+++ b/locales/ca/common.json
@@ -6396,7 +6396,9 @@
     "require_tls": "Lliura només per una connexió segura",
     "require_tls_hint": "El missatge en si no està xifrat. Es retorna si un servidor no pot fer servir TLS.",
     "encrypt": "Xifra…",
-    "encrypt_hint": "Cal un complement S/MIME o PGP. Obre la configuració."
+    "encrypt_hint": "Cal un complement S/MIME o PGP. Obre la configuració.",
+    "quick_reply_to": "Respon a {names}…",
+    "open_full_editor": "Obre l'editor complet"
   },
   "plugin_list": {
     "filters": "Filtres",
diff --git a/locales/cs/common.json b/locales/cs/common.json
index 301fbdacc..8bb772b79 100644
--- a/locales/cs/common.json
+++ b/locales/cs/common.json
@@ -6396,7 +6396,9 @@
     "require_tls": "Doručit jen přes zabezpečené spojení",
     "require_tls_hint": "Samotná zpráva šifrovaná není. Vrátí se, pokud server nemůže použít TLS.",
     "encrypt": "Šifrovat…",
-    "encrypt_hint": "Vyžaduje doplněk S/MIME nebo PGP. Otevře Nastavení."
+    "encrypt_hint": "Vyžaduje doplněk S/MIME nebo PGP. Otevře Nastavení.",
+    "quick_reply_to": "Odpověď pro {names}…",
+    "open_full_editor": "Otevřít v plném editoru"
   },
   "plugin_list": {
     "filters": "Filtry",
diff --git a/locales/da/common.json b/locales/da/common.json
index fd0a954df..a21a64b6a 100644
--- a/locales/da/common.json
+++ b/locales/da/common.json
@@ -6396,7 +6396,9 @@
     "require_tls": "Lever kun via en sikker forbindelse",
     "require_tls_hint": "Selve beskeden er ikke krypteret. Den sendes retur, hvis en server ikke kan bruge TLS.",
     "encrypt": "Krypter…",
-    "encrypt_hint": "Kræver en S/MIME- eller PGP-tilføjelse. Åbner Indstillinger."
+    "encrypt_hint": "Kræver en S/MIME- eller PGP-tilføjelse. Åbner Indstillinger.",
+    "quick_reply_to": "Svar til {names}…",
+    "open_full_editor": "Åbn fuld editor"
   },
   "plugin_list": {
     "filters": "Filtre",
diff --git a/locales/de/common.json b/locales/de/common.json
index 03b98526d..118e73984 100644
--- a/locales/de/common.json
+++ b/locales/de/common.json
@@ -6396,7 +6396,9 @@
     "require_tls": "Nur über eine sichere Verbindung zustellen",
     "require_tls_hint": "Die Nachricht selbst wird nicht verschlüsselt. Sie kommt zurück, wenn ein Server kein TLS nutzen kann.",
     "encrypt": "Verschlüsseln…",
-    "encrypt_hint": "Dafür brauchen Sie eine S/MIME- oder PGP-Erweiterung. Öffnet die Einstellungen."
+    "encrypt_hint": "Dafür brauchen Sie eine S/MIME- oder PGP-Erweiterung. Öffnet die Einstellungen.",
+    "quick_reply_to": "Antwort an {names}…",
+    "open_full_editor": "Im vollen Editor öffnen"
   },
   "plugin_list": {
     "filters": "Filter",
diff --git a/locales/en/common.json b/locales/en/common.json
index 4138b9b32..5c156b566 100644
--- a/locales/en/common.json
+++ b/locales/en/common.json
@@ -6396,7 +6396,9 @@
     "require_tls": "Only deliver over a secure connection",
     "require_tls_hint": "The message itself isn't encrypted. It bounces if a server can't use TLS.",
     "encrypt": "Encrypt…",
-    "encrypt_hint": "Needs an S/MIME or PGP add-on. Opens Settings."
+    "encrypt_hint": "Needs an S/MIME or PGP add-on. Opens Settings.",
+    "quick_reply_to": "Reply to {names}…",
+    "open_full_editor": "Open full editor"
   },
   "plugin_list": {
     "filters": "Filters",
diff --git a/locales/es/common.json b/locales/es/common.json
index fda797ee8..e2c5abe2c 100644
--- a/locales/es/common.json
+++ b/locales/es/common.json
@@ -6396,7 +6396,9 @@
     "require_tls": "Entregar solo por una conexión segura",
     "require_tls_hint": "El mensaje en sí no se cifra. Se devuelve si un servidor no puede usar TLS.",
     "encrypt": "Cifrar…",
-    "encrypt_hint": "Necesita un complemento S/MIME o PGP. Abre la Configuración."
+    "encrypt_hint": "Necesita un complemento S/MIME o PGP. Abre la Configuración.",
+    "quick_reply_to": "Responder a {names}…",
+    "open_full_editor": "Abrir el editor completo"
   },
   "plugin_list": {
     "filters": "Filtros",
diff --git a/locales/et/common.json b/locales/et/common.json
index 5793da0ee..7c10b5be3 100644
--- a/locales/et/common.json
+++ b/locales/et/common.json
@@ -6396,7 +6396,9 @@
     "require_tls": "Toimeta kohale ainult turvalise ühenduse kaudu",
     "require_tls_hint": "Kiri ise ei ole krüpteeritud. See tuleb tagasi, kui server ei saa TLS-i kasutada.",
     "encrypt": "Krüpteeri…",
-    "encrypt_hint": "Vajab S/MIME või PGP lisa. Avab seaded."
+    "encrypt_hint": "Vajab S/MIME või PGP lisa. Avab seaded.",
+    "quick_reply_to": "Vastus saajale {names}…",
+    "open_full_editor": "Ava täielik redaktor"
   },
   "plugin_list": {
     "filters": "Filtrid",
diff --git a/locales/fa/common.json b/locales/fa/common.json
index 730598745..6245bfe57 100644
--- a/locales/fa/common.json
+++ b/locales/fa/common.json
@@ -6396,7 +6396,9 @@
     "require_tls": "تحویل فقط از راه اتصال امن",
     "require_tls_hint": "خود پیام رمزگذاری نمی‌شود. اگر سروری نتواند از TLS استفاده کند، برگشت می‌خورد.",
     "encrypt": "رمزگذاری…",
-    "encrypt_hint": "به افزونهٔ S/MIME یا PGP نیاز دارد. تنظیمات را باز می‌کند."
+    "encrypt_hint": "به افزونهٔ S/MIME یا PGP نیاز دارد. تنظیمات را باز می‌کند.",
+    "quick_reply_to": "پاسخ به {names}…",
+    "open_full_editor": "باز کردن ویرایشگر کامل"
   },
   "plugin_list": {
     "filters": "فیلترها",
diff --git a/locales/fr/common.json b/locales/fr/common.json
index f76c76c4f..d1f479d10 100644
--- a/locales/fr/common.json
+++ b/locales/fr/common.json
@@ -6396,7 +6396,9 @@
     "require_tls": "Livrer uniquement par une connexion sécurisée",
     "require_tls_hint": "Le message lui-même n'est pas chiffré. Il est renvoyé si un serveur ne peut pas utiliser TLS.",
     "encrypt": "Chiffrer…",
-    "encrypt_hint": "Nécessite une extension S/MIME ou PGP. Ouvre les Paramètres."
+    "encrypt_hint": "Nécessite une extension S/MIME ou PGP. Ouvre les Paramètres.",
+    "quick_reply_to": "Répondre à {names}…",
+    "open_full_editor": "Ouvrir l'éditeur complet"
   },
   "plugin_list": {
     "filters": "Filtres",
diff --git a/locales/he/common.json b/locales/he/common.json
index 3662a919d..d71e21f53 100644
--- a/locales/he/common.json
+++ b/locales/he/common.json
@@ -6397,7 +6397,9 @@
     "require_tls": "מסירה רק דרך חיבור מאובטח",
     "require_tls_hint": "ההודעה עצמה אינה מוצפנת. היא תוחזר אם שרת לא יכול להשתמש ב-TLS.",
     "encrypt": "הצפנה…",
-    "encrypt_hint": "דורש תוסף S/MIME או PGP. פותח את ההגדרות."
+    "encrypt_hint": "דורש תוסף S/MIME או PGP. פותח את ההגדרות.",
+    "quick_reply_to": "תשובה אל {names}…",
+    "open_full_editor": "פתיחה בעורך המלא"
   },
   "plugin_list": {
     "filters": "מסננים",
diff --git a/locales/hu/common.json b/locales/hu/common.json
index 7dedc7a49..a1224176a 100644
--- a/locales/hu/common.json
+++ b/locales/hu/common.json
@@ -6396,7 +6396,9 @@
     "require_tls": "Kézbesítés csak biztonságos kapcsolaton át",
     "require_tls_hint": "Maga az üzenet nincs titkosítva. Visszapattan, ha egy szerver nem tud TLS-t használni.",
     "encrypt": "Titkosítás…",
-    "encrypt_hint": "S/MIME vagy PGP bővítmény kell hozzá. Megnyitja a Beállításokat."
+    "encrypt_hint": "S/MIME vagy PGP bővítmény kell hozzá. Megnyitja a Beállításokat.",
+    "quick_reply_to": "Válasz neki: {names}…",
+    "open_full_editor": "Megnyitás a teljes szerkesztőben"
   },
   "plugin_list": {
     "filters": "Szűrők",
diff --git a/locales/it/common.json b/locales/it/common.json
index ad285a749..cbe010633 100644
--- a/locales/it/common.json
+++ b/locales/it/common.json
@@ -6396,7 +6396,9 @@
     "require_tls": "Consegna solo tramite una connessione sicura",
     "require_tls_hint": "Il messaggio in sé non è cifrato. Viene respinto se un server non può usare TLS.",
     "encrypt": "Cifra…",
-    "encrypt_hint": "Serve un componente aggiuntivo S/MIME o PGP. Apre le Impostazioni."
+    "encrypt_hint": "Serve un componente aggiuntivo S/MIME o PGP. Apre le Impostazioni.",
+    "quick_reply_to": "Rispondi a {names}…",
+    "open_full_editor": "Apri l'editor completo"
   },
   "plugin_list": {
     "filters": "Filtri",
diff --git a/locales/ja/common.json b/locales/ja/common.json
index c5f44ee3e..14d4a3fc7 100644
--- a/locales/ja/common.json
+++ b/locales/ja/common.json
@@ -6396,7 +6396,9 @@
     "require_tls": "安全な接続でのみ配信",
     "require_tls_hint": "メッセージ自体は暗号化されません。サーバーが TLS を使えない場合は返送されます。",
     "encrypt": "暗号化…",
-    "encrypt_hint": "S/MIME または PGP のアドオンが必要です。設定を開きます。"
+    "encrypt_hint": "S/MIME または PGP のアドオンが必要です。設定を開きます。",
+    "quick_reply_to": "{names} に返信…",
+    "open_full_editor": "フルエディターで開く"
   },
   "plugin_list": {
     "filters": "フィルター",
diff --git a/locales/ko/common.json b/locales/ko/common.json
index d7a56c111..dd10f83c1 100644
--- a/locales/ko/common.json
+++ b/locales/ko/common.json
@@ -6396,7 +6396,9 @@
     "require_tls": "보안 연결로만 배달",
     "require_tls_hint": "메시지 자체는 암호화되지 않습니다. 서버가 TLS를 사용할 수 없으면 반송됩니다.",
     "encrypt": "암호화…",
-    "encrypt_hint": "S/MIME 또는 PGP 추가 기능이 필요합니다. 설정을 엽니다."
+    "encrypt_hint": "S/MIME 또는 PGP 추가 기능이 필요합니다. 설정을 엽니다.",
+    "quick_reply_to": "{names}에게 답장…",
+    "open_full_editor": "전체 편집기에서 열기"
   },
   "plugin_list": {
     "filters": "필터",
diff --git a/locales/lv/common.json b/locales/lv/common.json
index bcfadf592..f42e200e7 100644
--- a/locales/lv/common.json
+++ b/locales/lv/common.json
@@ -6396,7 +6396,9 @@
     "require_tls": "Piegādāt tikai pa drošu savienojumu",
     "require_tls_hint": "Pats ziņojums nav šifrēts. Tas tiek atgriezts, ja serveris nevar izmantot TLS.",
     "encrypt": "Šifrēt…",
-    "encrypt_hint": "Nepieciešams S/MIME vai PGP papildinājums. Atver iestatījumus."
+    "encrypt_hint": "Nepieciešams S/MIME vai PGP papildinājums. Atver iestatījumus.",
+    "quick_reply_to": "Atbilde: {names}…",
+    "open_full_editor": "Atvērt pilnajā redaktorā"
   },
   "plugin_list": {
     "filters": "Filtri",
diff --git a/locales/mn/common.json b/locales/mn/common.json
index 8d03df472..00f75758f 100644
--- a/locales/mn/common.json
+++ b/locales/mn/common.json
@@ -6396,7 +6396,9 @@
     "require_tls": "Зөвхөн аюулгүй холболтоор хүргэх",
     "require_tls_hint": "Мессеж өөрөө шифрлэгдэхгүй. Сервер TLS ашиглаж чадахгүй бол буцаагдана.",
     "encrypt": "Шифрлэх…",
-    "encrypt_hint": "S/MIME эсвэл PGP нэмэлт хэрэгтэй. Тохиргоог нээнэ."
+    "encrypt_hint": "S/MIME эсвэл PGP нэмэлт хэрэгтэй. Тохиргоог нээнэ.",
+    "quick_reply_to": "{names} руу хариу бичих…",
+    "open_full_editor": "Бүтэн засварлагчид нээх"
   },
   "plugin_list": {
     "filters": "Шүүлтүүр",
diff --git a/locales/nb/common.json b/locales/nb/common.json
index 589082828..c3ad75ca1 100644
--- a/locales/nb/common.json
+++ b/locales/nb/common.json
@@ -6396,7 +6396,9 @@
     "require_tls": "Lever bare over en sikker tilkobling",
     "require_tls_hint": "Selve meldingen er ikke kryptert. Den sendes i retur hvis en server ikke kan bruke TLS.",
     "encrypt": "Krypter…",
-    "encrypt_hint": "Krever et S/MIME- eller PGP-tillegg. Åpner Innstillinger."
+    "encrypt_hint": "Krever et S/MIME- eller PGP-tillegg. Åpner Innstillinger.",
+    "quick_reply_to": "Svar til {names}…",
+    "open_full_editor": "Åpne i full redigering"
   },
   "plugin_list": {
     "filters": "Filtre",
diff --git a/locales/nl/common.json b/locales/nl/common.json
index 3fd8ddc41..e2cb76904 100644
--- a/locales/nl/common.json
+++ b/locales/nl/common.json
@@ -6396,7 +6396,9 @@
     "require_tls": "Alleen via een beveiligde verbinding bezorgen",
     "require_tls_hint": "Het bericht zelf is niet versleuteld. Het komt terug als een server geen TLS kan gebruiken.",
     "encrypt": "Versleutelen…",
-    "encrypt_hint": "Vereist een S/MIME- of PGP-add-on. Opent Instellingen."
+    "encrypt_hint": "Vereist een S/MIME- of PGP-add-on. Opent Instellingen.",
+    "quick_reply_to": "Antwoord aan {names}…",
+    "open_full_editor": "Openen in volledige editor"
   },
   "plugin_list": {
     "filters": "Filters",
diff --git a/locales/pl/common.json b/locales/pl/common.json
index 1db35978a..d59272edd 100644
--- a/locales/pl/common.json
+++ b/locales/pl/common.json
@@ -6396,7 +6396,9 @@
     "require_tls": "Doręczaj tylko przez bezpieczne połączenie",
     "require_tls_hint": "Sama wiadomość nie jest szyfrowana. Zostanie zwrócona, jeśli serwer nie może użyć TLS.",
     "encrypt": "Zaszyfruj…",
-    "encrypt_hint": "Wymaga dodatku S/MIME lub PGP. Otwiera Ustawienia."
+    "encrypt_hint": "Wymaga dodatku S/MIME lub PGP. Otwiera Ustawienia.",
+    "quick_reply_to": "Odpowiedź do: {names}…",
+    "open_full_editor": "Otwórz w pełnym edytorze"
   },
   "plugin_list": {
     "filters": "Filtry",
diff --git a/locales/pt/common.json b/locales/pt/common.json
index 24db7fd80..b1ea6d35a 100644
--- a/locales/pt/common.json
+++ b/locales/pt/common.json
@@ -6396,7 +6396,9 @@
     "require_tls": "Entregar só por uma conexão segura",
     "require_tls_hint": "A mensagem em si não é cifrada. Ela volta se um servidor não puder usar TLS.",
     "encrypt": "Cifrar…",
-    "encrypt_hint": "Precisa de um extra S/MIME ou PGP. Abre as Configurações."
+    "encrypt_hint": "Precisa de um extra S/MIME ou PGP. Abre as Configurações.",
+    "quick_reply_to": "Responder a {names}…",
+    "open_full_editor": "Abrir no editor completo"
   },
   "plugin_list": {
     "filters": "Filtros",
diff --git a/locales/ro/common.json b/locales/ro/common.json
index 6b46ce602..f810811fa 100644
--- a/locales/ro/common.json
+++ b/locales/ro/common.json
@@ -6396,7 +6396,9 @@
     "require_tls": "Livrează doar printr-o conexiune sigură",
     "require_tls_hint": "Mesajul în sine nu este criptat. Este returnat dacă un server nu poate folosi TLS.",
     "encrypt": "Criptează…",
-    "encrypt_hint": "Necesită un supliment S/MIME sau PGP. Deschide Setările."
+    "encrypt_hint": "Necesită un supliment S/MIME sau PGP. Deschide Setările.",
+    "quick_reply_to": "Răspuns către {names}…",
+    "open_full_editor": "Deschide în editorul complet"
   },
   "plugin_list": {
     "filters": "Filtre",
diff --git a/locales/ru/common.json b/locales/ru/common.json
index 4ea47ede2..74a021762 100644
--- a/locales/ru/common.json
+++ b/locales/ru/common.json
@@ -6396,7 +6396,9 @@
     "require_tls": "Доставлять только по защищённому соединению",
     "require_tls_hint": "Само письмо не шифруется. Оно вернётся, если сервер не может использовать TLS.",
     "encrypt": "Зашифровать…",
-    "encrypt_hint": "Нужно дополнение S/MIME или PGP. Открывает настройки."
+    "encrypt_hint": "Нужно дополнение S/MIME или PGP. Открывает настройки.",
+    "quick_reply_to": "Ответ для {names}…",
+    "open_full_editor": "Открыть в полном редакторе"
   },
   "plugin_list": {
     "filters": "Фильтры",
diff --git a/locales/sk/common.json b/locales/sk/common.json
index c532d76e1..c491884a9 100644
--- a/locales/sk/common.json
+++ b/locales/sk/common.json
@@ -6396,7 +6396,9 @@
     "require_tls": "Doručiť len cez zabezpečené spojenie",
     "require_tls_hint": "Samotná správa nie je šifrovaná. Vráti sa, ak server nemôže použiť TLS.",
     "encrypt": "Šifrovať…",
-    "encrypt_hint": "Vyžaduje doplnok S/MIME alebo PGP. Otvorí Nastavenia."
+    "encrypt_hint": "Vyžaduje doplnok S/MIME alebo PGP. Otvorí Nastavenia.",
+    "quick_reply_to": "Odpoveď pre {names}…",
+    "open_full_editor": "Otvoriť v plnom editore"
   },
   "plugin_list": {
     "filters": "Filtre",
diff --git a/locales/th/common.json b/locales/th/common.json
index 9a5932b1a..f079d2742 100644
--- a/locales/th/common.json
+++ b/locales/th/common.json
@@ -3317,7 +3317,9 @@
     "require_tls": "ส่งผ่านการเชื่อมต่อที่ปลอดภัยเท่านั้น",
     "require_tls_hint": "ตัวข้อความเองไม่ได้ถูกเข้ารหัส ข้อความจะถูกตีกลับหากเซิร์ฟเวอร์ใช้ TLS ไม่ได้",
     "encrypt": "เข้ารหัส…",
-    "encrypt_hint": "ต้องใช้ส่วนเสริม S/MIME หรือ PGP จะเปิดการตั้งค่า"
+    "encrypt_hint": "ต้องใช้ส่วนเสริม S/MIME หรือ PGP จะเปิดการตั้งค่า",
+    "quick_reply_to": "ตอบกลับถึง {names}…",
+    "open_full_editor": "เปิดในตัวแก้ไขเต็มรูปแบบ"
   },
   "plugin_list": {
     "filters": "ตัวกรอง",
diff --git a/locales/tr/common.json b/locales/tr/common.json
index 38db522bf..8c060f63d 100644
--- a/locales/tr/common.json
+++ b/locales/tr/common.json
@@ -6396,7 +6396,9 @@
     "require_tls": "Yalnızca güvenli bağlantı üzerinden teslim et",
     "require_tls_hint": "İletinin kendisi şifrelenmez. Bir sunucu TLS kullanamazsa geri döner.",
     "encrypt": "Şifrele…",
-    "encrypt_hint": "S/MIME veya PGP eklentisi gerekir. Ayarlar'ı açar."
+    "encrypt_hint": "S/MIME veya PGP eklentisi gerekir. Ayarlar'ı açar.",
+    "quick_reply_to": "Yanıtla: {names}…",
+    "open_full_editor": "Tam düzenleyicide aç"
   },
   "plugin_list": {
     "filters": "Filtreler",
diff --git a/locales/uk/common.json b/locales/uk/common.json
index 946065a5f..b0d78303e 100644
--- a/locales/uk/common.json
+++ b/locales/uk/common.json
@@ -6396,7 +6396,9 @@
     "require_tls": "Доставляти лише захищеним з'єднанням",
     "require_tls_hint": "Сам лист не шифрується. Він повернеться, якщо сервер не може використати TLS.",
     "encrypt": "Зашифрувати…",
-    "encrypt_hint": "Потрібен додаток S/MIME або PGP. Відкриває налаштування."
+    "encrypt_hint": "Потрібен додаток S/MIME або PGP. Відкриває налаштування.",
+    "quick_reply_to": "Відповідь для {names}…",
+    "open_full_editor": "Відкрити в повному редакторі"
   },
   "plugin_list": {
     "filters": "Фільтри",
diff --git a/locales/vi/common.json b/locales/vi/common.json
index 0919080c0..6c864887b 100644
--- a/locales/vi/common.json
+++ b/locales/vi/common.json
@@ -6408,7 +6408,9 @@
     "require_tls": "Chỉ gửi qua kết nối an toàn",
     "require_tls_hint": "Bản thân thư không được mã hóa. Thư sẽ bị trả lại nếu máy chủ không dùng được TLS.",
     "encrypt": "Mã hóa…",
-    "encrypt_hint": "Cần tiện ích S/MIME hoặc PGP. Mở Cài đặt."
+    "encrypt_hint": "Cần tiện ích S/MIME hoặc PGP. Mở Cài đặt.",
+    "quick_reply_to": "Trả lời {names}…",
+    "open_full_editor": "Mở trong trình soạn thảo đầy đủ"
   },
   "plugin_list": {
     "filters": "Bộ lọc",
diff --git a/locales/zh-TW/common.json b/locales/zh-TW/common.json
index 1234d09e6..3ba374dd0 100644
--- a/locales/zh-TW/common.json
+++ b/locales/zh-TW/common.json
@@ -6396,7 +6396,9 @@
     "require_tls": "僅透過安全連線投遞",
     "require_tls_hint": "郵件本身不會加密。如果伺服器無法使用 TLS，郵件會被退回。",
     "encrypt": "加密…",
-    "encrypt_hint": "需要 S/MIME 或 PGP 附加元件。將開啟設定。"
+    "encrypt_hint": "需要 S/MIME 或 PGP 附加元件。將開啟設定。",
+    "quick_reply_to": "回覆給 {names}…",
+    "open_full_editor": "在完整編輯器中開啟"
   },
   "plugin_list": {
     "filters": "篩選",
diff --git a/locales/zh/common.json b/locales/zh/common.json
index fd354b278..4138f943a 100644
--- a/locales/zh/common.json
+++ b/locales/zh/common.json
@@ -6396,7 +6396,9 @@
     "require_tls": "仅通过安全连接投递",
     "require_tls_hint": "邮件本身不会加密。如果服务器无法使用 TLS，邮件会被退回。",
     "encrypt": "加密…",
-    "encrypt_hint": "需要 S/MIME 或 PGP 附加组件。将打开设置。"
+    "encrypt_hint": "需要 S/MIME 或 PGP 附加组件。将打开设置。",
+    "quick_reply_to": "回复 {names}…",
+    "open_full_editor": "在完整编辑器中打开"
   },
   "plugin_list": {
     "filters": "筛选",

From 48df0db1af5f682097a69b477c88576fdffb1a9c Mon Sep 17 00:00:00 2001
From: Linus Rath <139418639+rathlinus@users.noreply.github.com>
Date: Wed, 4 Nov 2026 07:34:29 +0100
Subject: [PATCH 20/34] feat: list To and Cc in the header of a forwarded
 message

---
 .../composer-reply-signature.test.tsx         | 36 +++++++++++++++++
 components/email/email-composer.tsx           | 10 +++--
 lib/__tests__/quote-header.test.ts            | 32 +++++++++++++++
 lib/quote-header.ts                           | 40 ++++++++++++++++++-
 locales/ar/common.json                        |  4 +-
 locales/ca/common.json                        |  4 +-
 locales/cs/common.json                        |  4 +-
 locales/da/common.json                        |  4 +-
 locales/de/common.json                        |  4 +-
 locales/en/common.json                        |  4 +-
 locales/es/common.json                        |  4 +-
 locales/et/common.json                        |  4 +-
 locales/fa/common.json                        |  4 +-
 locales/fr/common.json                        |  4 +-
 locales/he/common.json                        |  4 +-
 locales/hu/common.json                        |  4 +-
 locales/it/common.json                        |  4 +-
 locales/ja/common.json                        |  4 +-
 locales/ko/common.json                        |  4 +-
 locales/lv/common.json                        |  4 +-
 locales/mn/common.json                        |  4 +-
 locales/nb/common.json                        |  4 +-
 locales/nl/common.json                        |  4 +-
 locales/pl/common.json                        |  4 +-
 locales/pt/common.json                        |  4 +-
 locales/ro/common.json                        |  4 +-
 locales/ru/common.json                        |  4 +-
 locales/sk/common.json                        |  4 +-
 locales/th/common.json                        |  4 +-
 locales/tr/common.json                        |  4 +-
 locales/uk/common.json                        |  4 +-
 locales/vi/common.json                        |  4 +-
 locales/zh-TW/common.json                     |  4 +-
 locales/zh/common.json                        |  4 +-
 34 files changed, 203 insertions(+), 35 deletions(-)

diff --git a/components/email/__tests__/composer-reply-signature.test.tsx b/components/email/__tests__/composer-reply-signature.test.tsx
index 2198cec74..7cfc8a9d6 100644
--- a/components/email/__tests__/composer-reply-signature.test.tsx
+++ b/components/email/__tests__/composer-reply-signature.test.tsx
@@ -379,3 +379,39 @@ describe('reply quote attribution markers', () => {
     expect(html).toContain('<p data-reply-quote-start="true"><b>From:</b> Bob</p>');
   });
 });
+
+// The forwarded header had From, Date and Subject only; Gmail and Outlook
+// also say who the mail went to.
+describe('forwarded header recipients', () => {
+  afterEach(() => {
+    useSettingsStore.setState({ plainTextMode: false, signaturePosition: 'below_quote' });
+    setIdentities([ME]);
+  });
+  const FORWARDED = {
+    ...REPLY_TO,
+    to: [{ name: 'Anna Becker', email: 'anna@example.com' }, { email: 'team@example.com' }],
+    cc: [{ name: 'Carol', email: 'carol@example.com' }],
+  };
+
+  it('lists To and Cc in a plain text forward', async () => {
+    useSettingsStore.setState({ plainTextMode: true });
+    const onSend = vi.fn();
+    render(<EmailComposer mode="forward" replyTo={FORWARDED} prefill={{ to: ['dave@example.com'] }} onSend={onSend} />);
+    const sent = await send(onSend);
+    expect(sent.body).toContain('subject_label: Question\nforward_to_label: Anna Becker <anna@example.com>, team@example.com\nforward_cc_label: Carol <carol@example.com>\n\nOriginal text');
+  });
+
+  // escapeHtml is mocked to pass values through in this file.
+  it('lists To and Cc in an HTML forward', () => {
+    render(<EmailComposer mode="forward" replyTo={FORWARDED} />);
+    const html = screen.getByTestId('rich-text-editor').getAttribute('data-html')!;
+    expect(html).toContain('subject_label: Question<br>forward_to_label: Anna Becker <anna@example.com>, team@example.com<br>forward_cc_label: Carol <carol@example.com><br><br>');
+  });
+
+  it('leaves out a Cc line when nobody was copied', () => {
+    render(<EmailComposer mode="forward" replyTo={{ ...FORWARDED, cc: [] }} />);
+    const html = screen.getByTestId('rich-text-editor').getAttribute('data-html')!;
+    expect(html).toContain('forward_to_label: ');
+    expect(html).not.toContain('forward_cc_label');
+  });
+});
diff --git a/components/email/email-composer.tsx b/components/email/email-composer.tsx
index 3b0003861..6c8e8935e 100644
--- a/components/email/email-composer.tsx
+++ b/components/email/email-composer.tsx
@@ -53,6 +53,7 @@ import { plainOwnRange, readOwnContent, readSelection as readEditorSelection, re
 import { actionsFor, runAction } from "@/lib/plugin-sandbox/actions";
 import { matchesCombo } from "@/lib/plugin-sandbox/shortcuts";
 import { cn, formatFileSize, formatDateTime, generateUUID } from "@/lib/utils";
+import { forwardRecipientLines } from "@/lib/quote-header";
 import { ScheduleSendDialog } from "./schedule-send-dialog";
 import { debug } from "@/lib/debug";
 import { toast } from "@/stores/toast-store";
@@ -839,6 +840,7 @@ export function EmailComposer({
             ? `${from.name} <${from.email}>`
             : (from.email || from.name || tCommon('unknown')))
         : tCommon('unknown');
+      const forwardLines = forwardRecipientLines(replyTo, { toLabel: tWords('forward_to_label'), ccLabel: tWords('forward_cc_label') });
 
       const originalText = replyTo.body || (replyTo.htmlBody ? htmlToPlainText(replyTo.htmlBody) : '');
       const quotedText = originalText.split('\n').map(line => `> ${line}`).join('\n');
@@ -859,7 +861,7 @@ export function EmailComposer({
       }
 
       if (mode === 'forward') {
-        return `${prefix}${signatureBlock}\n\n${tQuote('forwarded_separator')}\n${tQuote('from_label')}: ${fromStrFull}\n${tQuote('date_label')}: ${date}\n${tQuote('subject_label')}: ${replyTo.subject || ''}\n\n${originalText}`;
+        return `${prefix}${signatureBlock}\n\n${tQuote('forwarded_separator')}\n${tQuote('from_label')}: ${fromStrFull}\n${tQuote('date_label')}: ${date}\n${tQuote('subject_label')}: ${replyTo.subject || ''}${forwardLines.map((line) => `\n${line.label}: ${line.value}`).join('')}\n\n${originalText}`;
       } else if (mode === 'reply' || mode === 'replyAll') {
         return `${prefix}${signatureBlock}\n\n${tQuote('reply_line', { date, from: fromStrFull })}\n${quotedText}`;
       }
@@ -889,6 +891,8 @@ export function EmailComposer({
           ? `${from.name} <${from.email}>`
           : (from.email || from.name || tCommon('unknown')))
       : tCommon('unknown');
+    const forwardLinesHtml = forwardRecipientLines(replyTo, { toLabel: tWords('forward_to_label'), ccLabel: tWords('forward_cc_label') })
+      .map((line) => `${line.label}: ${escapeHtml(line.value)}<br>`).join('');
 
     // Like a new mail, an empty line above the signature gives the cursor a
     // place for the reply. Without it the reply started on the "-- " line (#1503).
@@ -937,7 +941,7 @@ export function EmailComposer({
       // HTML-escape user-controlled values: an unescaped sender "Name <email>"
       // has its "<email>" eaten as a bogus HTML tag by the rich-text editor (#482).
       const quoteHeader = mode === 'forward'
-        ? `${tQuote('forwarded_separator')}<br>${tQuote('from_label')}: ${escapeHtml(fromStrFull)}<br>${tQuote('date_label')}: ${escapeHtml(date)}<br>${tQuote('subject_label')}: ${escapeHtml(replyTo.subject || '')}<br><br>`
+        ? `${tQuote('forwarded_separator')}<br>${tQuote('from_label')}: ${escapeHtml(fromStrFull)}<br>${tQuote('date_label')}: ${escapeHtml(date)}<br>${tQuote('subject_label')}: ${escapeHtml(replyTo.subject || '')}<br>${forwardLinesHtml}<br>`
         : `${tQuote('reply_line', { date: escapeHtml(date), from: escapeHtml(fromStrFull) })}<br>`;
       // Embed the original as a QuotedHtml island (verbatim, schema-free) so
       // its layout survives the editor round-trip. Sanitize first to strip
@@ -953,7 +957,7 @@ export function EmailComposer({
     if (replyTo.body) {
       const escapedOriginal = replyTo.body.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/\n/g, '<br>');
       if (mode === 'forward') {
-        return `${head}<br><br>${tQuote('forwarded_separator')}<br>${tQuote('from_label')}: ${escapeHtml(fromStrFull)}<br>${tQuote('date_label')}: ${escapeHtml(date)}<br>${tQuote('subject_label')}: ${escapeHtml(replyTo.subject || '')}<br><br>${escapedOriginal}`;
+        return `${head}<br><br>${tQuote('forwarded_separator')}<br>${tQuote('from_label')}: ${escapeHtml(fromStrFull)}<br>${tQuote('date_label')}: ${escapeHtml(date)}<br>${tQuote('subject_label')}: ${escapeHtml(replyTo.subject || '')}<br>${forwardLinesHtml}<br>${escapedOriginal}`;
       } else if (mode === 'reply' || mode === 'replyAll') {
         return `${head}<br><br>${replyHeader(`<p>${tQuote('reply_line', { date: escapeHtml(date), from: escapeHtml(fromStrFull) })}<br></p>`)}<blockquote style="margin:0 0 0 0.8ex;border-left:2px solid #ccc;padding-left:1ex">${escapedOriginal}</blockquote>`;
       }
diff --git a/lib/__tests__/quote-header.test.ts b/lib/__tests__/quote-header.test.ts
index 5493f646d..dced402e6 100644
--- a/lib/__tests__/quote-header.test.ts
+++ b/lib/__tests__/quote-header.test.ts
@@ -90,3 +90,35 @@ describe('buildQuoteHeader (#482 — sender address survives HTML rendering)', (
     expect(h.text).not.toContain('<noname@x.tld>');
   });
 });
+
+// Gmail and Outlook list who the forwarded mail went to.
+describe('buildQuoteHeader forward recipients', () => {
+  const email = {
+    from: [sender],
+    to: [{ name: 'Anna Becker', email: 'anna@example.com' }, { email: 'team@example.com' }],
+    cc: [{ name: 'Carol <x>', email: 'carol@example.com' }],
+    subject: 'Hello',
+    receivedAt: '2026-01-01T10:00:00Z',
+  };
+
+  it('adds To and Cc lines after the subject', async () => {
+    const h = await buildQuoteHeader({ mode: 'forward', email, ...base });
+    expect(h.text).toContain('Subject: Hello\nTo: Anna Becker <anna@example.com>, team@example.com\nCc: Carol <x> <carol@example.com>\n');
+    expect(h.html).toContain('To: Anna Becker &lt;anna@example.com&gt;, team@example.com<br>Cc: Carol &lt;x&gt; &lt;carol@example.com&gt;<br>');
+  });
+
+  it('uses the caller\'s To and Cc labels', async () => {
+    const labels = {
+      formatReplyLine: () => '', forwardedSeparator: '--', fromLabel: 'Von', dateLabel: 'Datum', subjectLabel: 'Betreff',
+      toLabel: 'An', ccLabel: 'Kopie',
+    };
+    const h = await buildQuoteHeader({ mode: 'forward', email, labels, ...base });
+    expect(h.text).toContain('\nAn: Anna Becker <anna@example.com>, team@example.com\nKopie: Carol <x> <carol@example.com>\n');
+  });
+
+  it('leaves out a line for an empty list', async () => {
+    const h = await buildQuoteHeader({ mode: 'forward', email: { ...email, cc: [] }, ...base });
+    expect(h.text).toContain('\nTo: ');
+    expect(h.text).not.toContain('Cc:');
+  });
+});
diff --git a/lib/quote-header.ts b/lib/quote-header.ts
index 686df5e13..92c56c9c1 100644
--- a/lib/quote-header.ts
+++ b/lib/quote-header.ts
@@ -20,6 +20,36 @@ export interface QuoteHeaderLabels {
   fromLabel: string;
   dateLabel: string;
   subjectLabel: string;
+  /** The forward header's To and Cc lines; left out when not given. */
+  toLabel?: string;
+  ccLabel?: string;
+}
+
+type HeaderAddress = { email?: string; name?: string };
+
+/** "Name <address>, address", as the forward header's From line writes one. */
+function formatAddressList(list: HeaderAddress[] | undefined): string {
+  return (list ?? [])
+    .filter((r) => r.email)
+    .map((r) => (r.name && r.name !== r.email ? `${r.name} <${r.email}>` : r.email as string))
+    .join(", ");
+}
+
+/**
+ * The To and Cc lines of a forward header, as Gmail and Outlook write them:
+ * one per list that has anyone on it, for a label the caller gave. Values
+ * are plain text; escape them for HTML.
+ */
+export function forwardRecipientLines(
+  email: { to?: HeaderAddress[]; cc?: HeaderAddress[] },
+  labels: { toLabel?: string; ccLabel?: string },
+): { label: string; value: string }[] {
+  const lines: { label: string; value: string }[] = [];
+  const to = formatAddressList(email.to);
+  const cc = formatAddressList(email.cc);
+  if (labels.toLabel && to) lines.push({ label: labels.toLabel, value: to });
+  if (labels.ccLabel && cc) lines.push({ label: labels.ccLabel, value: cc });
+  return lines;
 }
 
 interface BuildArgs {
@@ -49,6 +79,8 @@ const DEFAULT_LABELS: QuoteHeaderLabels = {
   fromLabel: "From",
   dateLabel: "Date",
   subjectLabel: "Subject",
+  toLabel: "To",
+  ccLabel: "Cc",
 };
 
 function defaultHeader(args: BuildArgs): QuoteHeader {
@@ -73,12 +105,16 @@ function defaultHeader(args: BuildArgs): QuoteHeader {
   const subject = email.subject || "";
 
   if (mode === "forward") {
-    const text = `${labels.forwardedSeparator}\n${labels.fromLabel}: ${fromStrFull}\n${labels.dateLabel}: ${date}\n${labels.subjectLabel}: ${subject}\n`;
+    const recipients = forwardRecipientLines(email, labels);
+    const text = `${labels.forwardedSeparator}\n${labels.fromLabel}: ${fromStrFull}\n${labels.dateLabel}: ${date}\n${labels.subjectLabel}: ${subject}\n`
+      + recipients.map((line) => `${line.label}: ${line.value}\n`).join("");
     // Escape the interpolated values for the HTML variant: the sender string is
     // "Name <email>", and the unescaped "<email>" would be parsed as an HTML tag
     // by the rich-text composer and silently dropped (#482). Subject/name are
     // likewise user-controlled. Label/separator strings are trusted i18n text.
-    const html = `<div>${labels.forwardedSeparator}<br>${labels.fromLabel}: ${escapeHtml(fromStrFull)}<br>${labels.dateLabel}: ${escapeHtml(date)}<br>${labels.subjectLabel}: ${escapeHtml(subject)}<br><br></div>`;
+    const html = `<div>${labels.forwardedSeparator}<br>${labels.fromLabel}: ${escapeHtml(fromStrFull)}<br>${labels.dateLabel}: ${escapeHtml(date)}<br>${labels.subjectLabel}: ${escapeHtml(subject)}<br>`
+      + recipients.map((line) => `${line.label}: ${escapeHtml(line.value)}<br>`).join("")
+      + `<br></div>`;
     return { html, text, wrapInBlockquote: false };
   }
 
diff --git a/locales/ar/common.json b/locales/ar/common.json
index 08b672c45..12b2d73d1 100644
--- a/locales/ar/common.json
+++ b/locales/ar/common.json
@@ -6398,7 +6398,9 @@
     "encrypt": "تشفير…",
     "encrypt_hint": "يتطلب إضافة S/MIME أو PGP. يفتح الإعدادات.",
     "quick_reply_to": "الرد على {names}…",
-    "open_full_editor": "فتح المحرر الكامل"
+    "open_full_editor": "فتح المحرر الكامل",
+    "forward_to_label": "إلى",
+    "forward_cc_label": "نسخة"
   },
   "plugin_list": {
     "filters": "المرشحات",
diff --git a/locales/ca/common.json b/locales/ca/common.json
index 79db8efdb..8611a20d0 100644
--- a/locales/ca/common.json
+++ b/locales/ca/common.json
@@ -6398,7 +6398,9 @@
     "encrypt": "Xifra…",
     "encrypt_hint": "Cal un complement S/MIME o PGP. Obre la configuració.",
     "quick_reply_to": "Respon a {names}…",
-    "open_full_editor": "Obre l'editor complet"
+    "open_full_editor": "Obre l'editor complet",
+    "forward_to_label": "Per a",
+    "forward_cc_label": "CC"
   },
   "plugin_list": {
     "filters": "Filtres",
diff --git a/locales/cs/common.json b/locales/cs/common.json
index 8bb772b79..c104a4ae4 100644
--- a/locales/cs/common.json
+++ b/locales/cs/common.json
@@ -6398,7 +6398,9 @@
     "encrypt": "Šifrovat…",
     "encrypt_hint": "Vyžaduje doplněk S/MIME nebo PGP. Otevře Nastavení.",
     "quick_reply_to": "Odpověď pro {names}…",
-    "open_full_editor": "Otevřít v plném editoru"
+    "open_full_editor": "Otevřít v plném editoru",
+    "forward_to_label": "Komu",
+    "forward_cc_label": "Kopie"
   },
   "plugin_list": {
     "filters": "Filtry",
diff --git a/locales/da/common.json b/locales/da/common.json
index a21a64b6a..8f3646620 100644
--- a/locales/da/common.json
+++ b/locales/da/common.json
@@ -6398,7 +6398,9 @@
     "encrypt": "Krypter…",
     "encrypt_hint": "Kræver en S/MIME- eller PGP-tilføjelse. Åbner Indstillinger.",
     "quick_reply_to": "Svar til {names}…",
-    "open_full_editor": "Åbn fuld editor"
+    "open_full_editor": "Åbn fuld editor",
+    "forward_to_label": "Til",
+    "forward_cc_label": "Cc"
   },
   "plugin_list": {
     "filters": "Filtre",
diff --git a/locales/de/common.json b/locales/de/common.json
index 118e73984..f071eda62 100644
--- a/locales/de/common.json
+++ b/locales/de/common.json
@@ -6398,7 +6398,9 @@
     "encrypt": "Verschlüsseln…",
     "encrypt_hint": "Dafür brauchen Sie eine S/MIME- oder PGP-Erweiterung. Öffnet die Einstellungen.",
     "quick_reply_to": "Antwort an {names}…",
-    "open_full_editor": "Im vollen Editor öffnen"
+    "open_full_editor": "Im vollen Editor öffnen",
+    "forward_to_label": "An",
+    "forward_cc_label": "Cc"
   },
   "plugin_list": {
     "filters": "Filter",
diff --git a/locales/en/common.json b/locales/en/common.json
index 5c156b566..ab1f2707c 100644
--- a/locales/en/common.json
+++ b/locales/en/common.json
@@ -6398,7 +6398,9 @@
     "encrypt": "Encrypt…",
     "encrypt_hint": "Needs an S/MIME or PGP add-on. Opens Settings.",
     "quick_reply_to": "Reply to {names}…",
-    "open_full_editor": "Open full editor"
+    "open_full_editor": "Open full editor",
+    "forward_to_label": "To",
+    "forward_cc_label": "Cc"
   },
   "plugin_list": {
     "filters": "Filters",
diff --git a/locales/es/common.json b/locales/es/common.json
index e2c5abe2c..2aadeb752 100644
--- a/locales/es/common.json
+++ b/locales/es/common.json
@@ -6398,7 +6398,9 @@
     "encrypt": "Cifrar…",
     "encrypt_hint": "Necesita un complemento S/MIME o PGP. Abre la Configuración.",
     "quick_reply_to": "Responder a {names}…",
-    "open_full_editor": "Abrir el editor completo"
+    "open_full_editor": "Abrir el editor completo",
+    "forward_to_label": "Para",
+    "forward_cc_label": "CC"
   },
   "plugin_list": {
     "filters": "Filtros",
diff --git a/locales/et/common.json b/locales/et/common.json
index 7c10b5be3..7ad6a8e04 100644
--- a/locales/et/common.json
+++ b/locales/et/common.json
@@ -6398,7 +6398,9 @@
     "encrypt": "Krüpteeri…",
     "encrypt_hint": "Vajab S/MIME või PGP lisa. Avab seaded.",
     "quick_reply_to": "Vastus saajale {names}…",
-    "open_full_editor": "Ava täielik redaktor"
+    "open_full_editor": "Ava täielik redaktor",
+    "forward_to_label": "Saajale",
+    "forward_cc_label": "Koopia"
   },
   "plugin_list": {
     "filters": "Filtrid",
diff --git a/locales/fa/common.json b/locales/fa/common.json
index 6245bfe57..1d2dd6c1e 100644
--- a/locales/fa/common.json
+++ b/locales/fa/common.json
@@ -6398,7 +6398,9 @@
     "encrypt": "رمزگذاری…",
     "encrypt_hint": "به افزونهٔ S/MIME یا PGP نیاز دارد. تنظیمات را باز می‌کند.",
     "quick_reply_to": "پاسخ به {names}…",
-    "open_full_editor": "باز کردن ویرایشگر کامل"
+    "open_full_editor": "باز کردن ویرایشگر کامل",
+    "forward_to_label": "به",
+    "forward_cc_label": "رونوشت"
   },
   "plugin_list": {
     "filters": "فیلترها",
diff --git a/locales/fr/common.json b/locales/fr/common.json
index d1f479d10..6b4d1c3e4 100644
--- a/locales/fr/common.json
+++ b/locales/fr/common.json
@@ -6398,7 +6398,9 @@
     "encrypt": "Chiffrer…",
     "encrypt_hint": "Nécessite une extension S/MIME ou PGP. Ouvre les Paramètres.",
     "quick_reply_to": "Répondre à {names}…",
-    "open_full_editor": "Ouvrir l'éditeur complet"
+    "open_full_editor": "Ouvrir l'éditeur complet",
+    "forward_to_label": "À",
+    "forward_cc_label": "Cc"
   },
   "plugin_list": {
     "filters": "Filtres",
diff --git a/locales/he/common.json b/locales/he/common.json
index d71e21f53..7e1679e6b 100644
--- a/locales/he/common.json
+++ b/locales/he/common.json
@@ -6399,7 +6399,9 @@
     "encrypt": "הצפנה…",
     "encrypt_hint": "דורש תוסף S/MIME או PGP. פותח את ההגדרות.",
     "quick_reply_to": "תשובה אל {names}…",
-    "open_full_editor": "פתיחה בעורך המלא"
+    "open_full_editor": "פתיחה בעורך המלא",
+    "forward_to_label": "אל",
+    "forward_cc_label": "עותק"
   },
   "plugin_list": {
     "filters": "מסננים",
diff --git a/locales/hu/common.json b/locales/hu/common.json
index a1224176a..5dce2bb87 100644
--- a/locales/hu/common.json
+++ b/locales/hu/common.json
@@ -6398,7 +6398,9 @@
     "encrypt": "Titkosítás…",
     "encrypt_hint": "S/MIME vagy PGP bővítmény kell hozzá. Megnyitja a Beállításokat.",
     "quick_reply_to": "Válasz neki: {names}…",
-    "open_full_editor": "Megnyitás a teljes szerkesztőben"
+    "open_full_editor": "Megnyitás a teljes szerkesztőben",
+    "forward_to_label": "Címzett",
+    "forward_cc_label": "Másolat"
   },
   "plugin_list": {
     "filters": "Szűrők",
diff --git a/locales/it/common.json b/locales/it/common.json
index cbe010633..f7f210938 100644
--- a/locales/it/common.json
+++ b/locales/it/common.json
@@ -6398,7 +6398,9 @@
     "encrypt": "Cifra…",
     "encrypt_hint": "Serve un componente aggiuntivo S/MIME o PGP. Apre le Impostazioni.",
     "quick_reply_to": "Rispondi a {names}…",
-    "open_full_editor": "Apri l'editor completo"
+    "open_full_editor": "Apri l'editor completo",
+    "forward_to_label": "A",
+    "forward_cc_label": "Cc"
   },
   "plugin_list": {
     "filters": "Filtri",
diff --git a/locales/ja/common.json b/locales/ja/common.json
index 14d4a3fc7..838d04b89 100644
--- a/locales/ja/common.json
+++ b/locales/ja/common.json
@@ -6398,7 +6398,9 @@
     "encrypt": "暗号化…",
     "encrypt_hint": "S/MIME または PGP のアドオンが必要です。設定を開きます。",
     "quick_reply_to": "{names} に返信…",
-    "open_full_editor": "フルエディターで開く"
+    "open_full_editor": "フルエディターで開く",
+    "forward_to_label": "宛先",
+    "forward_cc_label": "CC"
   },
   "plugin_list": {
     "filters": "フィルター",
diff --git a/locales/ko/common.json b/locales/ko/common.json
index dd10f83c1..95c50a7dd 100644
--- a/locales/ko/common.json
+++ b/locales/ko/common.json
@@ -6398,7 +6398,9 @@
     "encrypt": "암호화…",
     "encrypt_hint": "S/MIME 또는 PGP 추가 기능이 필요합니다. 설정을 엽니다.",
     "quick_reply_to": "{names}에게 답장…",
-    "open_full_editor": "전체 편집기에서 열기"
+    "open_full_editor": "전체 편집기에서 열기",
+    "forward_to_label": "받는 사람",
+    "forward_cc_label": "참조"
   },
   "plugin_list": {
     "filters": "필터",
diff --git a/locales/lv/common.json b/locales/lv/common.json
index f42e200e7..a0c3ec9e4 100644
--- a/locales/lv/common.json
+++ b/locales/lv/common.json
@@ -6398,7 +6398,9 @@
     "encrypt": "Šifrēt…",
     "encrypt_hint": "Nepieciešams S/MIME vai PGP papildinājums. Atver iestatījumus.",
     "quick_reply_to": "Atbilde: {names}…",
-    "open_full_editor": "Atvērt pilnajā redaktorā"
+    "open_full_editor": "Atvērt pilnajā redaktorā",
+    "forward_to_label": "Kam",
+    "forward_cc_label": "Kopija"
   },
   "plugin_list": {
     "filters": "Filtri",
diff --git a/locales/mn/common.json b/locales/mn/common.json
index 00f75758f..dde99c21d 100644
--- a/locales/mn/common.json
+++ b/locales/mn/common.json
@@ -6398,7 +6398,9 @@
     "encrypt": "Шифрлэх…",
     "encrypt_hint": "S/MIME эсвэл PGP нэмэлт хэрэгтэй. Тохиргоог нээнэ.",
     "quick_reply_to": "{names} руу хариу бичих…",
-    "open_full_editor": "Бүтэн засварлагчид нээх"
+    "open_full_editor": "Бүтэн засварлагчид нээх",
+    "forward_to_label": "Хэнд",
+    "forward_cc_label": "Хуулбар"
   },
   "plugin_list": {
     "filters": "Шүүлтүүр",
diff --git a/locales/nb/common.json b/locales/nb/common.json
index c3ad75ca1..49816a157 100644
--- a/locales/nb/common.json
+++ b/locales/nb/common.json
@@ -6398,7 +6398,9 @@
     "encrypt": "Krypter…",
     "encrypt_hint": "Krever et S/MIME- eller PGP-tillegg. Åpner Innstillinger.",
     "quick_reply_to": "Svar til {names}…",
-    "open_full_editor": "Åpne i full redigering"
+    "open_full_editor": "Åpne i full redigering",
+    "forward_to_label": "Til",
+    "forward_cc_label": "Kopi"
   },
   "plugin_list": {
     "filters": "Filtre",
diff --git a/locales/nl/common.json b/locales/nl/common.json
index e2cb76904..cf9d351d3 100644
--- a/locales/nl/common.json
+++ b/locales/nl/common.json
@@ -6398,7 +6398,9 @@
     "encrypt": "Versleutelen…",
     "encrypt_hint": "Vereist een S/MIME- of PGP-add-on. Opent Instellingen.",
     "quick_reply_to": "Antwoord aan {names}…",
-    "open_full_editor": "Openen in volledige editor"
+    "open_full_editor": "Openen in volledige editor",
+    "forward_to_label": "Aan",
+    "forward_cc_label": "CC"
   },
   "plugin_list": {
     "filters": "Filters",
diff --git a/locales/pl/common.json b/locales/pl/common.json
index d59272edd..367b75fe9 100644
--- a/locales/pl/common.json
+++ b/locales/pl/common.json
@@ -6398,7 +6398,9 @@
     "encrypt": "Zaszyfruj…",
     "encrypt_hint": "Wymaga dodatku S/MIME lub PGP. Otwiera Ustawienia.",
     "quick_reply_to": "Odpowiedź do: {names}…",
-    "open_full_editor": "Otwórz w pełnym edytorze"
+    "open_full_editor": "Otwórz w pełnym edytorze",
+    "forward_to_label": "Do",
+    "forward_cc_label": "DW"
   },
   "plugin_list": {
     "filters": "Filtry",
diff --git a/locales/pt/common.json b/locales/pt/common.json
index b1ea6d35a..92082c690 100644
--- a/locales/pt/common.json
+++ b/locales/pt/common.json
@@ -6398,7 +6398,9 @@
     "encrypt": "Cifrar…",
     "encrypt_hint": "Precisa de um extra S/MIME ou PGP. Abre as Configurações.",
     "quick_reply_to": "Responder a {names}…",
-    "open_full_editor": "Abrir no editor completo"
+    "open_full_editor": "Abrir no editor completo",
+    "forward_to_label": "Para",
+    "forward_cc_label": "Cc"
   },
   "plugin_list": {
     "filters": "Filtros",
diff --git a/locales/ro/common.json b/locales/ro/common.json
index f810811fa..ea2e68370 100644
--- a/locales/ro/common.json
+++ b/locales/ro/common.json
@@ -6398,7 +6398,9 @@
     "encrypt": "Criptează…",
     "encrypt_hint": "Necesită un supliment S/MIME sau PGP. Deschide Setările.",
     "quick_reply_to": "Răspuns către {names}…",
-    "open_full_editor": "Deschide în editorul complet"
+    "open_full_editor": "Deschide în editorul complet",
+    "forward_to_label": "Către",
+    "forward_cc_label": "Cc"
   },
   "plugin_list": {
     "filters": "Filtre",
diff --git a/locales/ru/common.json b/locales/ru/common.json
index 74a021762..e7d197426 100644
--- a/locales/ru/common.json
+++ b/locales/ru/common.json
@@ -6398,7 +6398,9 @@
     "encrypt": "Зашифровать…",
     "encrypt_hint": "Нужно дополнение S/MIME или PGP. Открывает настройки.",
     "quick_reply_to": "Ответ для {names}…",
-    "open_full_editor": "Открыть в полном редакторе"
+    "open_full_editor": "Открыть в полном редакторе",
+    "forward_to_label": "Кому",
+    "forward_cc_label": "Копия"
   },
   "plugin_list": {
     "filters": "Фильтры",
diff --git a/locales/sk/common.json b/locales/sk/common.json
index c491884a9..f3b956c6f 100644
--- a/locales/sk/common.json
+++ b/locales/sk/common.json
@@ -6398,7 +6398,9 @@
     "encrypt": "Šifrovať…",
     "encrypt_hint": "Vyžaduje doplnok S/MIME alebo PGP. Otvorí Nastavenia.",
     "quick_reply_to": "Odpoveď pre {names}…",
-    "open_full_editor": "Otvoriť v plnom editore"
+    "open_full_editor": "Otvoriť v plnom editore",
+    "forward_to_label": "Komu",
+    "forward_cc_label": "Kópia"
   },
   "plugin_list": {
     "filters": "Filtre",
diff --git a/locales/th/common.json b/locales/th/common.json
index f079d2742..3ba1fb2b9 100644
--- a/locales/th/common.json
+++ b/locales/th/common.json
@@ -3319,7 +3319,9 @@
     "encrypt": "เข้ารหัส…",
     "encrypt_hint": "ต้องใช้ส่วนเสริม S/MIME หรือ PGP จะเปิดการตั้งค่า",
     "quick_reply_to": "ตอบกลับถึง {names}…",
-    "open_full_editor": "เปิดในตัวแก้ไขเต็มรูปแบบ"
+    "open_full_editor": "เปิดในตัวแก้ไขเต็มรูปแบบ",
+    "forward_to_label": "ถึง",
+    "forward_cc_label": "สำเนา"
   },
   "plugin_list": {
     "filters": "ตัวกรอง",
diff --git a/locales/tr/common.json b/locales/tr/common.json
index 8c060f63d..5daf2a82e 100644
--- a/locales/tr/common.json
+++ b/locales/tr/common.json
@@ -6398,7 +6398,9 @@
     "encrypt": "Şifrele…",
     "encrypt_hint": "S/MIME veya PGP eklentisi gerekir. Ayarlar'ı açar.",
     "quick_reply_to": "Yanıtla: {names}…",
-    "open_full_editor": "Tam düzenleyicide aç"
+    "open_full_editor": "Tam düzenleyicide aç",
+    "forward_to_label": "Kime",
+    "forward_cc_label": "Cc"
   },
   "plugin_list": {
     "filters": "Filtreler",
diff --git a/locales/uk/common.json b/locales/uk/common.json
index b0d78303e..2fd4c08ca 100644
--- a/locales/uk/common.json
+++ b/locales/uk/common.json
@@ -6398,7 +6398,9 @@
     "encrypt": "Зашифрувати…",
     "encrypt_hint": "Потрібен додаток S/MIME або PGP. Відкриває налаштування.",
     "quick_reply_to": "Відповідь для {names}…",
-    "open_full_editor": "Відкрити в повному редакторі"
+    "open_full_editor": "Відкрити в повному редакторі",
+    "forward_to_label": "Кому",
+    "forward_cc_label": "Копія"
   },
   "plugin_list": {
     "filters": "Фільтри",
diff --git a/locales/vi/common.json b/locales/vi/common.json
index 6c864887b..6a689656f 100644
--- a/locales/vi/common.json
+++ b/locales/vi/common.json
@@ -6410,7 +6410,9 @@
     "encrypt": "Mã hóa…",
     "encrypt_hint": "Cần tiện ích S/MIME hoặc PGP. Mở Cài đặt.",
     "quick_reply_to": "Trả lời {names}…",
-    "open_full_editor": "Mở trong trình soạn thảo đầy đủ"
+    "open_full_editor": "Mở trong trình soạn thảo đầy đủ",
+    "forward_to_label": "Đến",
+    "forward_cc_label": "CC"
   },
   "plugin_list": {
     "filters": "Bộ lọc",
diff --git a/locales/zh-TW/common.json b/locales/zh-TW/common.json
index 3ba374dd0..856c877dc 100644
--- a/locales/zh-TW/common.json
+++ b/locales/zh-TW/common.json
@@ -6398,7 +6398,9 @@
     "encrypt": "加密…",
     "encrypt_hint": "需要 S/MIME 或 PGP 附加元件。將開啟設定。",
     "quick_reply_to": "回覆給 {names}…",
-    "open_full_editor": "在完整編輯器中開啟"
+    "open_full_editor": "在完整編輯器中開啟",
+    "forward_to_label": "收件者",
+    "forward_cc_label": "副本"
   },
   "plugin_list": {
     "filters": "篩選",
diff --git a/locales/zh/common.json b/locales/zh/common.json
index 4138f943a..48add2912 100644
--- a/locales/zh/common.json
+++ b/locales/zh/common.json
@@ -6398,7 +6398,9 @@
     "encrypt": "加密…",
     "encrypt_hint": "需要 S/MIME 或 PGP 附加组件。将打开设置。",
     "quick_reply_to": "回复 {names}…",
-    "open_full_editor": "在完整编辑器中打开"
+    "open_full_editor": "在完整编辑器中打开",
+    "forward_to_label": "收件人",
+    "forward_cc_label": "抄送"
   },
   "plugin_list": {
     "filters": "筛选",

From ad7ff4fc6bb11d41084c6c561f075e94f960f0f8 Mon Sep 17 00:00:00 2001
From: Linus Rath <139418639+rathlinus@users.noreply.github.com>
Date: Wed, 4 Nov 2026 07:37:26 +0100
Subject: [PATCH 21/34] fix: label the Attach from Files dialog's X as Close

---
 components/files/__tests__/file-picker-dialog.test.tsx | 10 ++++++++++
 components/files/file-picker-dialog.tsx                |  3 ++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/components/files/__tests__/file-picker-dialog.test.tsx b/components/files/__tests__/file-picker-dialog.test.tsx
index 75933339e..8991dca32 100644
--- a/components/files/__tests__/file-picker-dialog.test.tsx
+++ b/components/files/__tests__/file-picker-dialog.test.tsx
@@ -44,6 +44,16 @@ function renderPicker(list: () => Promise<FileNode[]> = async () => TREE) {
 }
 
 describe('FilePickerDialog', () => {
+  // The X in the header was labelled "Cancel" like the footer button.
+  it('names the header X "Close" and keeps one Cancel button, both closing', async () => {
+    const { onClose } = renderPicker();
+    await screen.findByText('invoice.pdf');
+    expect(screen.getAllByRole('button', { name: 'cancel' })).toHaveLength(1);
+    fireEvent.click(screen.getByRole('button', { name: 'close' }));
+    fireEvent.click(screen.getByRole('button', { name: 'cancel' }));
+    expect(onClose).toHaveBeenCalledTimes(2);
+  });
+
   it('lists the root without hidden or shared nodes, and offers Shared with me', async () => {
     renderPicker();
     expect(await screen.findByText('invoice.pdf')).toBeInTheDocument();
diff --git a/components/files/file-picker-dialog.tsx b/components/files/file-picker-dialog.tsx
index 92d4168cb..a6dbf1fbb 100644
--- a/components/files/file-picker-dialog.tsx
+++ b/components/files/file-picker-dialog.tsx
@@ -45,6 +45,7 @@ function byFolderThenName(a: FileNode, b: FileNode): number {
 export function FilePickerDialog({ client, onClose, onPick }: FilePickerDialogProps) {
   const t = useTranslations("files");
   const tComposer = useTranslations("email_composer");
+  const tCommon = useTranslations("common");
   const [nodes, setNodes] = useState<FileNode[] | null>(null);
   const [failed, setFailed] = useState(false);
   const [attempt, setAttempt] = useState(0);
@@ -245,7 +246,7 @@ export function FilePickerDialog({ client, onClose, onPick }: FilePickerDialogPr
           <button
             type="button"
             onClick={onClose}
-            aria-label={t("cancel")}
+            aria-label={tCommon("close")}
             className="p-1.5 rounded-md hover:bg-muted transition-colors text-muted-foreground hover:text-foreground"
           >
             <X className="w-4 h-4" />

From d98132b8e1e6c46c30c5b0fb7a0a0b4cd199b9bc Mon Sep 17 00:00:00 2001
From: Linus Rath <139418639+rathlinus@users.noreply.github.com>
Date: Wed, 4 Nov 2026 08:22:56 +0100
Subject: [PATCH 22/34] fix: close every composer the same way, keeping the
 draft with Draft saved and Discard

X, Escape, clicking another message and Escape in a pop-out window
now all save the draft and close, with a "Draft saved" toast that has
Discard (with Undo). The Save or discard question shows only when that
save fails. A Reply or Forward closed before the user changed anything
leaves no draft. Undo send being on by default no longer asks "Send
without a delay?" on servers without delayed sending; only a delay the
user picked does.

Changed test assertions: the close-guard, priority, account-switch,
threading, sign-out, mention, draft-attachments, discard-uploads and
save-pending-attachments tests reached saving or discarding through the
Save or discard dialog on close, which now only appears after a failed
save. They now close directly, or use the Discard button, or check the
failed-save question. The send-delay test marks its delay as chosen.
---
 .../composer-account-switch.test.tsx          |   3 +-
 .../__tests__/composer-close-guard.test.tsx   | 179 +++++-----
 .../composer-discard-uploads.test.tsx         |  10 +-
 .../composer-draft-attachments.test.tsx       |   6 +-
 .../email/__tests__/composer-mention.test.tsx |   8 +-
 .../__tests__/composer-own-window.test.tsx    |  14 +
 .../__tests__/composer-priority.test.tsx      |   3 +-
 .../composer-reply-draft-threading.test.tsx   |   5 +-
 ...composer-save-pending-attachments.test.tsx |   5 +-
 .../__tests__/composer-send-failure.test.tsx  |  17 +-
 .../composer-sign-out-flush.test.tsx          |   9 +-
 .../composer-untouched-reply.test.tsx         | 314 ++++++++++++++++++
 components/email/email-composer.tsx           | 110 +++++-
 .../popout/__tests__/popout-host.test.tsx     |  11 +
 components/popout/popout-compose-app.tsx      |   5 +-
 components/popout/popout-host.tsx             |  23 ++
 .../__tests__/draft-close-toast.test.ts       |  57 ++++
 lib/compose/draft-close-toast.ts              |  56 ++++
 lib/popout/channel.ts                         |  17 +
 locales/ar/common.json                        |   7 +
 locales/ca/common.json                        |   7 +
 locales/cs/common.json                        |   7 +
 locales/da/common.json                        |   7 +
 locales/de/common.json                        |   7 +
 locales/en/common.json                        |   7 +
 locales/es/common.json                        |   7 +
 locales/et/common.json                        |   7 +
 locales/fa/common.json                        |   7 +
 locales/fr/common.json                        |   7 +
 locales/he/common.json                        |   7 +
 locales/hu/common.json                        |   7 +
 locales/it/common.json                        |   7 +
 locales/ja/common.json                        |   7 +
 locales/ko/common.json                        |   7 +
 locales/lv/common.json                        |   7 +
 locales/mn/common.json                        |   7 +
 locales/nb/common.json                        |   7 +
 locales/nl/common.json                        |   7 +
 locales/pl/common.json                        |   7 +
 locales/pt/common.json                        |   7 +
 locales/ro/common.json                        |   7 +
 locales/ru/common.json                        |   7 +
 locales/sk/common.json                        |   7 +
 locales/th/common.json                        |   7 +
 locales/tr/common.json                        |   7 +
 locales/uk/common.json                        |   7 +
 locales/vi/common.json                        |   7 +
 locales/zh-TW/common.json                     |   7 +
 locales/zh/common.json                        |   7 +
 49 files changed, 944 insertions(+), 118 deletions(-)
 create mode 100644 components/email/__tests__/composer-untouched-reply.test.tsx
 create mode 100644 lib/compose/__tests__/draft-close-toast.test.ts
 create mode 100644 lib/compose/draft-close-toast.ts

diff --git a/components/email/__tests__/composer-account-switch.test.tsx b/components/email/__tests__/composer-account-switch.test.tsx
index a5dfc270e..4ecb6fb34 100644
--- a/components/email/__tests__/composer-account-switch.test.tsx
+++ b/components/email/__tests__/composer-account-switch.test.tsx
@@ -233,9 +233,8 @@ describe('composer across an account switch', () => {
     useAuthStore.setState({ client: clientB as never, activeAccountId: 'acct-B' as never });
     view.rerender(<EmailComposer {...props} />);
 
+    // Closing saves the draft; no question unless the save fails.
     act(() => requestCloseRef.current!(vi.fn()));
-    const dialog = await screen.findByRole('alertdialog');
-    fireEvent.click(within(dialog).getByText('save'));
 
     await waitFor(() => expect(clientA.createDraft).toHaveBeenCalled());
     expect(clientB.createDraft).not.toHaveBeenCalled();
diff --git a/components/email/__tests__/composer-close-guard.test.tsx b/components/email/__tests__/composer-close-guard.test.tsx
index fda2b7909..3eab0edba 100644
--- a/components/email/__tests__/composer-close-guard.test.tsx
+++ b/components/email/__tests__/composer-close-guard.test.tsx
@@ -135,6 +135,9 @@ vi.mock('@/stores/toast-store', () => ({
   toast: { info: () => {}, error: () => {}, success: () => {} },
 }));
 
+const draftToast = vi.hoisted(() => ({ showDraftSavedToast: vi.fn() }));
+vi.mock('@/lib/compose/draft-close-toast', () => draftToast);
+
 vi.mock('@/lib/plugin-hooks', () => ({
   identityHooks: {
     onSignatureRender: { size: 0, transform: async (value: unknown) => value },
@@ -164,6 +167,7 @@ vi.mock('@/lib/plugin-hooks', () => ({
 vi.mock('@/lib/email-sanitization', () => ({
   sanitizeSignatureHtml: (v: string) => v,
   sanitizeEmailHtml: (v: string) => v,
+  escapeHtml: (v: string) => v.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;'),
   parseHtmlSafely: (html: string) => new DOMParser().parseFromString(html, 'text/html'),
 }));
 
@@ -213,8 +217,9 @@ describe('a message row dragged over the composer', () => {
 /**
  * A host that replaces the compose session - a mailto: click, say - must not
  * drop text the user has not sent. It hands a follow-up to requestCloseRef and
- * the composer runs it only once it has really closed, so "Save" and "Discard"
- * continue into the new session while "Cancel" leaves the draft standing.
+ * the composer runs it only once it has really closed. Closing saves the draft
+ * without asking; only a failed save asks, and there "Discard" continues into
+ * the new session while "Cancel" leaves the draft standing.
  */
 
 const DIRTY_DRAFT = {
@@ -253,13 +258,40 @@ function renderWithCloseRef(props: Record<string, unknown> = {}) {
 beforeEach(resetAnnouncerForTests);
 
 describe('composer close guard with a follow-up', () => {
-  it('asks before replacing an unsaved draft instead of dropping it', async () => {
-    const { requestCloseRef, afterClose } = renderWithCloseRef();
+  const savingClient = (createDraft = vi.fn().mockResolvedValue('draft-9')) => {
+    useAuthStore.setState({
+      client: { createDraft, getEmail: vi.fn(), hasDelayedSend: () => false, getMaxDelayedSend: () => 0 } as never,
+    });
+    return createDraft;
+  };
+  afterEach(() => {
+    useAuthStore.setState({ client: null });
+  });
+
+  it('saves the draft and runs the follow-up, without asking', async () => {
+    const createDraft = savingClient();
+    const { requestCloseRef, afterClose, onClose } = renderWithCloseRef();
 
     act(() => requestCloseRef.current!(afterClose));
 
-    expect(await screen.findByText('close_draft_title')).toBeInTheDocument();
+    await waitFor(() => expect(afterClose).toHaveBeenCalledTimes(1));
+    expect(createDraft).toHaveBeenCalledTimes(1);
+    expect(onClose).toHaveBeenCalledTimes(1);
+    expect(screen.queryByRole('alertdialog')).toBeNull();
+  });
+
+  it('asks only when the save fails, and keeps the text', async () => {
+    // No connection to save through: the save fails.
+    const { requestCloseRef, afterClose, onClose } = renderWithCloseRef();
+
+    act(() => requestCloseRef.current!(afterClose));
+
+    const dialog = await screen.findByRole('alertdialog');
+    expect(dialog).toHaveTextContent('save_failed_close');
+    expect(within(dialog).getByRole('button', { name: /try_again/ })).toBeInTheDocument();
     expect(afterClose).not.toHaveBeenCalled();
+    expect(onClose).not.toHaveBeenCalled();
+    expect(screen.getByDisplayValue('Half-written more')).toBeInTheDocument();
   });
 
   describe('in the desktop app', () => {
@@ -273,12 +305,12 @@ describe('composer close guard with a follow-up', () => {
       return confirm;
     };
 
-    it('asks through the OS, and shows no dialog of its own', async () => {
+    it('asks through the OS when the save fails, and shows no dialog of its own', async () => {
       const confirm = nativeBridge(2);
       const { requestCloseRef, afterClose, onClose } = renderWithCloseRef();
       act(() => requestCloseRef.current!(afterClose));
       await waitFor(() => expect(confirm).toHaveBeenCalledTimes(1));
-      expect(confirm.mock.calls[0]).toMatchObject([{ message: 'close_draft_title', buttons: ['save', 'discard', 'cancel'], defaultId: 0 }]);
+      expect(confirm.mock.calls[0]).toMatchObject([{ message: 'close_draft_title', detail: 'save_failed_close', buttons: ['try_again', 'discard', 'cancel'], defaultId: 0 }]);
       expect(screen.queryByText('close_draft_title')).not.toBeInTheDocument();
       // The last button is Cancel: nothing happens.
       await act(async () => {});
@@ -293,9 +325,18 @@ describe('composer close guard with a follow-up', () => {
       await waitFor(() => expect(onClose).toHaveBeenCalledTimes(1));
       await waitFor(() => expect(afterClose).toHaveBeenCalledTimes(1));
     });
+
+    it('saves without asking when the save works', async () => {
+      const confirm = nativeBridge(2);
+      savingClient();
+      const { requestCloseRef, afterClose } = renderWithCloseRef();
+      act(() => requestCloseRef.current!(afterClose));
+      await waitFor(() => expect(afterClose).toHaveBeenCalledTimes(1));
+      expect(confirm).not.toHaveBeenCalled();
+    });
   });
 
-  it('runs the follow-up after discarding', async () => {
+  it('runs the follow-up after discarding a draft that could not be saved', async () => {
     const { requestCloseRef, afterClose, onClose } = renderWithCloseRef();
 
     act(() => requestCloseRef.current!(afterClose));
@@ -327,44 +368,51 @@ describe('composer close guard with a follow-up', () => {
     expect(afterClose).not.toHaveBeenCalled();
   });
 
-  it('closes without asking once autosave has stored every change', async () => {
-    const createDraft = vi.fn().mockResolvedValue('draft-9');
-    useAuthStore.setState({
-      client: { createDraft, getEmail: vi.fn(), hasDelayedSend: () => false, getMaxDelayedSend: () => 0 } as never,
-    });
-    try {
-      const { requestCloseRef, afterClose } = renderWithCloseRef();
-      await waitFor(() => expect(createDraft).toHaveBeenCalledTimes(1), { timeout: 4000 });
-      await act(async () => {});
+  it('closes without saving again once autosave has stored every change', async () => {
+    const createDraft = savingClient();
+    const { requestCloseRef, afterClose } = renderWithCloseRef();
+    await waitFor(() => expect(createDraft).toHaveBeenCalledTimes(1), { timeout: 4000 });
+    await act(async () => {});
 
-      act(() => requestCloseRef.current!(afterClose));
+    act(() => requestCloseRef.current!(afterClose));
 
-      await waitFor(() => expect(afterClose).toHaveBeenCalledTimes(1));
-      expect(screen.queryByText('close_draft_title')).not.toBeInTheDocument();
-    } finally {
-      useAuthStore.setState({ client: null });
-    }
+    await waitFor(() => expect(afterClose).toHaveBeenCalledTimes(1));
+    expect(createDraft).toHaveBeenCalledTimes(1);
+    expect(screen.queryByText('close_draft_title')).not.toBeInTheDocument();
   });
 
-  it('still asks when there are edits since the last autosave', async () => {
-    const createDraft = vi.fn().mockResolvedValue('draft-9');
-    useAuthStore.setState({
-      client: { createDraft, getEmail: vi.fn(), hasDelayedSend: () => false, getMaxDelayedSend: () => 0 } as never,
-    });
-    try {
-      const { requestCloseRef, afterClose } = renderWithCloseRef();
-      await waitFor(() => expect(createDraft).toHaveBeenCalledTimes(1), { timeout: 4000 });
-      fireEvent.change(screen.getByDisplayValue('Half-written more'), { target: { value: 'Half-written more and more' } });
+  it('saves the edits made since the last autosave when it closes', async () => {
+    const createDraft = savingClient();
+    const { requestCloseRef, afterClose } = renderWithCloseRef();
+    await waitFor(() => expect(createDraft).toHaveBeenCalledTimes(1), { timeout: 4000 });
+    fireEvent.change(screen.getByDisplayValue('Half-written more'), { target: { value: 'Half-written more and more' } });
 
-      act(() => requestCloseRef.current!(afterClose));
+    act(() => requestCloseRef.current!(afterClose));
 
-      expect(await screen.findByText('close_draft_title')).toBeInTheDocument();
-    } finally {
-      useAuthStore.setState({ client: null });
-    }
+    await waitFor(() => expect(afterClose).toHaveBeenCalledTimes(1));
+    expect(createDraft).toHaveBeenCalledTimes(2);
+    expect(createDraft.mock.calls[1][1]).toBe('Half-written more and more');
+    expect(screen.queryByText('close_draft_title')).not.toBeInTheDocument();
+  });
+
+  it('says the draft was kept, with a Discard that deletes it through the host', async () => {
+    savingClient();
+    draftToast.showDraftSavedToast.mockClear();
+    const onDiscardDraft = vi.fn();
+    const { requestCloseRef, afterClose } = renderWithCloseRef({ onDiscardDraft });
+
+    act(() => requestCloseRef.current!(afterClose));
+
+    await waitFor(() => expect(afterClose).toHaveBeenCalledTimes(1));
+    expect(draftToast.showDraftSavedToast).toHaveBeenCalledTimes(1);
+    const [discard, labels] = draftToast.showDraftSavedToast.mock.calls[0];
+    expect(labels).toMatchObject({ saved: 'draft_saved', discard: 'discard' });
+    discard();
+    expect(onDiscardDraft).toHaveBeenCalledWith('draft-9', expect.anything());
   });
 
   it('closes straight through when there is nothing to lose', async () => {
+    draftToast.showDraftSavedToast.mockClear();
     const requestCloseRef = { current: null } as React.MutableRefObject<((afterClose?: () => void) => void) | null>;
     const afterClose = vi.fn();
     render(<EmailComposer requestCloseRef={requestCloseRef} onClose={vi.fn()} />);
@@ -373,67 +421,37 @@ describe('composer close guard with a follow-up', () => {
 
     await waitFor(() => expect(afterClose).toHaveBeenCalledTimes(1));
     expect(screen.queryByText('close_draft_title')).not.toBeInTheDocument();
+    expect(draftToast.showDraftSavedToast).not.toHaveBeenCalled();
   });
 
-  it('runs the follow-up after saving the draft', async () => {
-    const createDraft = vi.fn().mockResolvedValue('draft-9');
-    useAuthStore.setState({
-      client: { createDraft, getEmail: vi.fn(), hasDelayedSend: () => false, getMaxDelayedSend: () => 0 } as never,
-    });
-    try {
-      const { requestCloseRef, afterClose } = renderWithCloseRef();
-      act(() => requestCloseRef.current!(afterClose));
-      const dialog = await screen.findByRole('alertdialog');
-      fireEvent.click(within(dialog).getByText('save'));
-
-      await waitFor(() => expect(afterClose).toHaveBeenCalledTimes(1));
-      expect(createDraft).toHaveBeenCalledTimes(1);
-    } finally {
-      useAuthStore.setState({ client: null });
-    }
-  });
-
-  it('tells screen readers the draft was saved when the user saves, not on autosave', async () => {
-    const createDraft = vi.fn().mockResolvedValue('draft-9');
-    useAuthStore.setState({
-      client: { createDraft, getEmail: vi.fn(), hasDelayedSend: () => false, getMaxDelayedSend: () => 0 } as never,
-    });
+  it('tells screen readers the draft was saved when the user closes, not on autosave', async () => {
+    const createDraft = savingClient();
     const polite = () => document.getElementById(LIVE_REGION_IDS.polite);
-    try {
-      const { requestCloseRef, afterClose } = renderWithCloseRef();
-      await waitFor(() => expect(createDraft).toHaveBeenCalledTimes(1), { timeout: 4000 });
-      await new Promise((r) => setTimeout(r, 200));
-      expect(polite()?.textContent ?? '').not.toContain('draft_saved');
+    const { requestCloseRef, afterClose } = renderWithCloseRef();
+    await waitFor(() => expect(createDraft).toHaveBeenCalledTimes(1), { timeout: 4000 });
+    await new Promise((r) => setTimeout(r, 200));
+    expect(polite()?.textContent ?? '').not.toContain('draft_saved');
 
-      fireEvent.change(screen.getByDisplayValue('Half-written more'), { target: { value: 'Half-written more and more' } });
-      act(() => requestCloseRef.current!(afterClose));
-      fireEvent.click(within(await screen.findByRole('alertdialog')).getByText('save'));
+    fireEvent.change(screen.getByDisplayValue('Half-written more'), { target: { value: 'Half-written more and more' } });
+    act(() => requestCloseRef.current!(afterClose));
 
-      await waitFor(() => expect(polite()?.textContent).toContain('draft_saved'));
-    } finally {
-      useAuthStore.setState({ client: null });
-    }
+    await waitFor(() => expect(polite()?.textContent).toContain('draft_saved'));
   });
 
-  it('keeps the composer open and drops the follow-up when the save fails', async () => {
+  it('keeps the composer open, says why and drops the follow-up when the save fails', async () => {
     // A refused save keeps the live composer recoverable. Replacing it via a
     // close follow-up would bury the unsaved text. Navigation can still stash
     // that text through the existing unmount path.
-    const createDraft = vi.fn().mockRejectedValue(new Error('server refused'));
-    useAuthStore.setState({
-      client: { createDraft, hasDelayedSend: () => false, getMaxDelayedSend: () => 0 } as never,
-    });
+    const createDraft = savingClient(vi.fn().mockRejectedValue(new Error('server refused')));
     const consoleError = vi.spyOn(console, 'error').mockImplementation(() => {});
     try {
       const onSaveState = vi.fn();
       const { requestCloseRef, afterClose, onClose, unmount } = renderWithCloseRef({ onSaveState });
 
       act(() => requestCloseRef.current!(afterClose));
-      const dialog = await screen.findByRole('alertdialog');
-      fireEvent.click(within(dialog).getByText('save'));
 
       await waitFor(() => expect(createDraft).toHaveBeenCalled());
-      await act(async () => {});
+      expect(await screen.findByRole('alertdialog')).toHaveTextContent('save_failed_close');
       expect(onClose).not.toHaveBeenCalled();
       expect(screen.getByDisplayValue('Half-written more')).toBeInTheDocument();
       expect(afterClose).not.toHaveBeenCalled();
@@ -444,7 +462,6 @@ describe('composer close guard with a follow-up', () => {
         expect.objectContaining({ subject: 'Half-written more' }),
       );
     } finally {
-      useAuthStore.setState({ client: null });
       consoleError.mockRestore();
     }
   });
diff --git a/components/email/__tests__/composer-discard-uploads.test.tsx b/components/email/__tests__/composer-discard-uploads.test.tsx
index 2dd6cfb40..36cfc0199 100644
--- a/components/email/__tests__/composer-discard-uploads.test.tsx
+++ b/components/email/__tests__/composer-discard-uploads.test.tsx
@@ -107,7 +107,7 @@ afterEach(async () => {
   vi.restoreAllMocks(); vi.unstubAllGlobals(); vi.clearAllTimers(); vi.useRealTimers();
 });
 
-type Control = 'close' | 'toolbar';
+type Control = 'toolbar';
 async function openComposer(strict = false) {
   const closed = vi.fn();
   let reopen!: () => void;
@@ -135,7 +135,7 @@ async function openComposer(strict = false) {
       fireEvent.change(document.querySelector('input[type="file"]')!, { target: { files } }); await advance();
     },
     dialog: (control: Control) => {
-      fireEvent.click(screen.getByTestId(control === 'close' ? 'composer-close' : 'composer-discard'));
+      fireEvent.click(screen.getByTestId(control === 'toolbar' ? 'composer-discard' : 'composer-close'));
       return within(screen.getByRole('alertdialog'));
     },
     reopen: async () => { act(() => reopen()); await advance(); },
@@ -148,7 +148,9 @@ function expectNewComposer() {
   expect(screen.queryByRole('progressbar')).toBeNull();
   expect(screen.queryByText('A.txt')).toBeNull(); expect(screen.queryByText('C.txt')).toBeNull();
 }
-const modes = (['close', 'toolbar'] as const).flatMap(control => [false, true].map(strict => ({ control, strict })));
+// The X no longer asks Save or Discard: it saves (composer-save-pending-attachments).
+// Discard is the toolbar's.
+const modes = (['toolbar'] as const).flatMap(control => [false, true].map(strict => ({ control, strict })));
 
 describe('explicit Discard with pending attachment uploads', () => {
   describe.each(modes)('$control control, Strict Mode=$strict', ({ control, strict }) => {
@@ -232,7 +234,7 @@ describe('explicit Discard with pending attachment uploads', () => {
     await c.add(file('A.txt'), file('C.txt'));
     if (method === 'deleteFile') await complete(0);
     expect(entered).toHaveBeenCalledOnce();
-    fireEvent.click(c.dialog('close').getByRole('button', { name: /^Discard$/ })); await advance();
+    fireEvent.click(c.dialog('toolbar').getByRole('button', { name: /^Discard$/ })); await advance();
     await c.reopen();
     await act(async () => { gate.resolve(); }); await advance();
     await c.add(file('B.txt')); await complete(UploadXHR.instances.findIndex(xhr => xhr.body?.name === 'B.txt'));
diff --git a/components/email/__tests__/composer-draft-attachments.test.tsx b/components/email/__tests__/composer-draft-attachments.test.tsx
index 7fd66bf6e..b3667e961 100644
--- a/components/email/__tests__/composer-draft-attachments.test.tsx
+++ b/components/email/__tests__/composer-draft-attachments.test.tsx
@@ -376,7 +376,8 @@ describe('a re-opened draft that lives in a group account', () => {
     render(<EmailComposer initialData={GROUP_DRAFT} onDiscardDraft={onDiscardDraft} requestCloseRef={requestCloseRef} onClose={vi.fn()} />);
 
     fireEvent.change(screen.getByDisplayValue('Quarterly numbers'), { target: { value: 'Quarterly numbers v2' } });
-    act(() => requestCloseRef.current!());
+    // Closing keeps the draft now; Discard is the way to delete it.
+    fireEvent.click(screen.getAllByTestId('composer-discard')[0]);
     fireEvent.click(within(screen.getByRole('alertdialog')).getByText('discard'));
 
     expect(onDiscardDraft).toHaveBeenCalledWith('eaaaaab', { accountId: 'c', localAccountId: undefined });
@@ -393,7 +394,8 @@ describe('a re-opened draft that lives in a group account', () => {
     expect(createDraft.mock.calls[0][13]?.previousDraftAccountId).toBeUndefined();
 
     fireEvent.change(screen.getByDisplayValue('Quarterly numbers v2'), { target: { value: 'Quarterly numbers v3' } });
-    act(() => requestCloseRef.current!());
+    // Closing keeps the draft now; Discard is the way to delete it.
+    fireEvent.click(screen.getAllByTestId('composer-discard')[0]);
     fireEvent.click(within(screen.getByRole('alertdialog')).getByText('discard'));
     expect(onDiscardDraft).toHaveBeenCalledWith('draft-v2', { accountId: undefined, localAccountId: undefined });
   });
diff --git a/components/email/__tests__/composer-mention.test.tsx b/components/email/__tests__/composer-mention.test.tsx
index 42c312b12..b3e8a9be7 100644
--- a/components/email/__tests__/composer-mention.test.tsx
+++ b/components/email/__tests__/composer-mention.test.tsx
@@ -302,7 +302,7 @@ describe('composer with the @ recipient list', () => {
     }
   });
 
-  it('lets Escape close the open list, not the composer; the next Escape asks to close', async () => {
+  it('lets Escape close the open list, not the composer; the next Escape closes that', async () => {
     const { editor, onClose } = await renderComposer();
     await typeInto(editor, ' @');
     await screen.findByRole('listbox', { name: 'mention_recipients' });
@@ -312,8 +312,10 @@ describe('composer with the @ recipient list', () => {
     expect(screen.queryByRole('alertdialog')).toBeNull();
     expect(onClose).not.toHaveBeenCalled();
 
+    // The composer's close runs: with no connection here its save fails,
+    // which is when it asks.
     press(editor, 'Escape');
-    expect(await screen.findByRole('alertdialog')).toHaveTextContent('close_draft_title');
+    expect(await screen.findByRole('alertdialog')).toHaveTextContent('save_failed_close');
   });
 
   it('keeps Ctrl+Enter as the send shortcut while the list is open', async () => {
@@ -358,7 +360,7 @@ describe('composer with the @ recipient list', () => {
     await waitFor(() => expect(mentionList()).toBeNull());
 
     fireEvent.keyDown(subject, { key: 'Escape' });
-    expect(await screen.findByRole('alertdialog')).toHaveTextContent('close_draft_title');
+    expect(await screen.findByRole('alertdialog')).toHaveTextContent('save_failed_close');
   });
 
   it('closes the list on a click elsewhere, but not on a click on the list itself', async () => {
diff --git a/components/email/__tests__/composer-own-window.test.tsx b/components/email/__tests__/composer-own-window.test.tsx
index ab200fb56..2731b6a23 100644
--- a/components/email/__tests__/composer-own-window.test.tsx
+++ b/components/email/__tests__/composer-own-window.test.tsx
@@ -325,6 +325,20 @@ describe('a composer that is all its window shows', () => {
     }
   });
 
+  // Escape in a pop-out or quick compose window: the same as anywhere,
+  // saved and kept, and the main window says so (this one is gone).
+  it('saves on Escape, closes, and hands "Draft saved" to the main window', async () => {
+    const onDraftKept = vi.fn();
+    const onClose = vi.fn();
+    mount({ ownWindow: { onDraftKept }, onClose });
+    fireEvent.change(subjectField(), { target: { value: 'Kept on Escape' } });
+    fireEvent.keyDown(subjectField(), { key: 'Escape' });
+    await waitFor(() => expect(onClose).toHaveBeenCalledTimes(1));
+    expect(creations.map((draft) => draft.subject)).toEqual(['Kept on Escape']);
+    expect(onDraftKept).toHaveBeenCalledWith('saved-1', expect.objectContaining({ localAccountId: expect.anything() }));
+    expect(screen.queryByRole('alertdialog')).toBeNull();
+  });
+
   it('lets an untouched composer go without a word', () => {
     mount({ ownWindow: {} });
     expect(unload().defaultPrevented).toBe(false);
diff --git a/components/email/__tests__/composer-priority.test.tsx b/components/email/__tests__/composer-priority.test.tsx
index c0b6c73fe..8fc867d9d 100644
--- a/components/email/__tests__/composer-priority.test.tsx
+++ b/components/email/__tests__/composer-priority.test.tsx
@@ -232,9 +232,8 @@ function mockClient() {
 }
 
 async function saveViaCloseDialog(requestCloseRef: React.MutableRefObject<((afterClose?: () => void) => void) | null>) {
+  // Closing saves the draft; no question unless the save fails.
   act(() => requestCloseRef.current!(vi.fn()));
-  const dialog = await screen.findByRole('alertdialog');
-  fireEvent.click(within(dialog).getByText('save'));
 }
 
 describe('composer message priority (#970)', () => {
diff --git a/components/email/__tests__/composer-reply-draft-threading.test.tsx b/components/email/__tests__/composer-reply-draft-threading.test.tsx
index 2e34434c0..17289b674 100644
--- a/components/email/__tests__/composer-reply-draft-threading.test.tsx
+++ b/components/email/__tests__/composer-reply-draft-threading.test.tsx
@@ -1,4 +1,4 @@
-import { render, screen, fireEvent, waitFor, act, within } from '@testing-library/react';
+import { render, screen, fireEvent, waitFor, act } from '@testing-library/react';
 import { describe, it, expect, vi } from 'vitest';
 import React from 'react';
 import { EmailComposer } from '../email-composer';
@@ -226,9 +226,8 @@ describe('re-opened reply draft', () => {
     render(<EmailComposer initialData={REOPENED_REPLY} requestCloseRef={requestCloseRef} onClose={vi.fn()} />);
     fireEvent.change(screen.getByDisplayValue('Re: Plans'), { target: { value: 'Re: Plans, edited' } });
 
+    // Closing saves the draft; no question unless the save fails.
     act(() => requestCloseRef.current!(vi.fn()));
-    const dialog = await screen.findByRole('alertdialog');
-    fireEvent.click(within(dialog).getByText('save'));
 
     await waitFor(() => expect(createDraft).toHaveBeenCalled());
     const args = createDraft.mock.calls[0];
diff --git a/components/email/__tests__/composer-save-pending-attachments.test.tsx b/components/email/__tests__/composer-save-pending-attachments.test.tsx
index 270839b63..4bb4a0d5b 100644
--- a/components/email/__tests__/composer-save-pending-attachments.test.tsx
+++ b/components/email/__tests__/composer-save-pending-attachments.test.tsx
@@ -164,9 +164,9 @@ async function openComposer() {
     add: async (...files: File[]) => {
       fireEvent.change(document.querySelector('input[type="file"]')!, { target: { files } }); await flush();
     },
+    // Closing saves the draft without asking (it asks only when that fails).
     chooseSave: async () => {
       fireEvent.click(screen.getByTestId('composer-close'));
-      fireEvent.click(within(await screen.findByRole('alertdialog')).getByRole('button', { name: /^Save$/ }));
       await flush();
     },
     reopen: async () => { act(() => reopen()); await flush(); },
@@ -229,7 +229,8 @@ describe('Save and close with attachment uploads', () => {
     await c.chooseSave(); await expectSaved(['A.txt']); await waitFor(() => expect(c.closed).toHaveBeenCalledOnce());
   });
   it('can discard during the wait without a later save or close follow-up', async () => {
-    const c = await openComposer(); await c.add(file()); await c.chooseSave(); c.closeAgain();
+    const c = await openComposer(); await c.add(file()); await c.chooseSave();
+    fireEvent.click(screen.getAllByTestId('composer-discard')[0]);
     fireEvent.click(within(await screen.findByRole('alertdialog')).getByRole('button', { name: /^Discard$/ }));
     await complete(0); await new Promise(resolve => setTimeout(resolve, 200));
     expect(creations).toEqual([]); expect(c.closed).toHaveBeenCalledOnce();
diff --git a/components/email/__tests__/composer-send-failure.test.tsx b/components/email/__tests__/composer-send-failure.test.tsx
index 3fc292ae3..bb4c6111a 100644
--- a/components/email/__tests__/composer-send-failure.test.tsx
+++ b/components/email/__tests__/composer-send-failure.test.tsx
@@ -252,7 +252,7 @@ describe('composer send failures', () => {
   // window.confirm, before the message goes out at once.
   it('asks in a dialog before sending without the delay the account lacks', async () => {
     const nativeConfirm = vi.spyOn(window, 'confirm');
-    useSettingsStore.setState({ sendDelaySeconds: 10 } as never);
+    useSettingsStore.setState({ sendDelaySeconds: 10, explicitSettings: ['sendDelaySeconds'] } as never);
     try {
       const onSend = vi.fn().mockResolvedValue(undefined);
       render(<EmailComposer initialData={DRAFT} onSend={onSend} />);
@@ -262,6 +262,21 @@ describe('composer send failures', () => {
       expect(onSend).not.toHaveBeenCalled();
       fireEvent.click(within(dialog).getByRole('button', { name: 'send' }));
       await waitFor(() => expect(onSend).toHaveBeenCalledTimes(1));
+    } finally {
+      useSettingsStore.setState({ sendDelaySeconds: 0, explicitSettings: [] } as never);
+    }
+  });
+
+  // Undo send is on by default: an account that can't delay just sends.
+  it('sends at once, without asking, when the delay is only the default', async () => {
+    useSettingsStore.setState({ sendDelaySeconds: 5, explicitSettings: [] } as never);
+    try {
+      const onSend = vi.fn().mockResolvedValue(undefined);
+      render(<EmailComposer initialData={DRAFT} onSend={onSend} />);
+      fireEvent.click(screen.getAllByTestId('composer-send')[0]);
+      await waitFor(() => expect(onSend).toHaveBeenCalledTimes(1));
+      expect(onSend.mock.calls[0][0].delayedUntil).toBeUndefined();
+      expect(screen.queryByRole('alertdialog', { name: 'send_delay_unsupported_title' })).toBeNull();
     } finally {
       useSettingsStore.setState({ sendDelaySeconds: 0 } as never);
     }
diff --git a/components/email/__tests__/composer-sign-out-flush.test.tsx b/components/email/__tests__/composer-sign-out-flush.test.tsx
index 8fac873cc..37fa64755 100644
--- a/components/email/__tests__/composer-sign-out-flush.test.tsx
+++ b/components/email/__tests__/composer-sign-out-flush.test.tsx
@@ -246,15 +246,18 @@ describe('composer flush before an automatic sign-out', () => {
     expect(createDraft.mock.calls[0][1]).toBe('Half-written');
   });
 
-  it('asks before closing a composer opened with stashed edits', async () => {
+  // Closing keeps the draft without asking: the stashed edits are saved first.
+  it('saves a composer opened with stashed edits before it closes', async () => {
     const onClose = vi.fn();
     const requestCloseRef: { current: ((afterClose?: () => void) => void) | null } = { current: null };
     render(<EmailComposer initialData={{ ...DRAFT, unsaved: true }} onClose={onClose} requestCloseRef={requestCloseRef} />);
 
     act(() => requestCloseRef.current?.());
 
-    expect(await screen.findByRole('alertdialog')).toBeTruthy();
-    expect(onClose).not.toHaveBeenCalled();
+    await waitFor(() => expect(onClose).toHaveBeenCalled());
+    expect(createDraft).toHaveBeenCalledTimes(1);
+    expect(createDraft.mock.calls[0][1]).toBe('Half-written');
+    expect(screen.queryByRole('alertdialog')).toBeNull();
   });
 
   it('closes a composer opened with text the server already has without asking', () => {
diff --git a/components/email/__tests__/composer-untouched-reply.test.tsx b/components/email/__tests__/composer-untouched-reply.test.tsx
new file mode 100644
index 000000000..4deb80492
--- /dev/null
+++ b/components/email/__tests__/composer-untouched-reply.test.tsx
@@ -0,0 +1,314 @@
+import { render, screen, fireEvent, waitFor, act } from '@testing-library/react';
+import { describe, it, expect, vi, afterEach } from 'vitest';
+import React from 'react';
+import { EmailComposer } from '../email-composer';
+import { useSettingsStore } from '@/stores/settings-store';
+import { useIdentityStore } from '@/stores/identity-store';
+import type { Identity } from '@/lib/jmap/types';
+import { useAuthStore } from '@/stores/auth-store';
+
+// ─── Heavy component mocks (as composer-reply-signature.test.tsx) ─
+
+// A stand-in for the TipTap editor: it hands the composer an editor object
+// whose content is whatever the composer last rendered into it, the way the
+// real editor reports itself ready from an effect after mounting.
+const editorState = vi.hoisted(() => ({ html: '' }));
+vi.mock('@/components/email/rich-text-editor', () => ({
+  RichTextEditor: ({ content, onChange, onEditorReady }: {
+    content: string;
+    onChange: (html: string) => void;
+    onEditorReady?: (editor: unknown) => void;
+  }) => {
+    editorState.html = content;
+    const onChangeRef = React.useRef(onChange);
+    onChangeRef.current = onChange;
+    React.useEffect(() => {
+      onEditorReady?.({
+        isDestroyed: false,
+        commands: {
+          focus: () => {},
+          setContent: (html: string) => {
+            editorState.html = html;
+            onChangeRef.current(html);
+          },
+        },
+      });
+      // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, []);
+    return React.createElement('div', { 'data-testid': 'rich-text-editor', 'data-html': content });
+  },
+}));
+
+vi.mock('@/components/plugins/plugin-slot', () => ({ PluginSlot: () => null }));
+vi.mock('@/components/identity/sub-address-helper', () => ({ SubAddressHelper: () => null }));
+vi.mock('@/components/templates/template-picker', () => ({ TemplatePicker: () => null }));
+vi.mock('@/components/templates/template-form', () => ({ TemplateForm: () => null }));
+vi.mock('@/components/files/file-preview-modal', () => ({ FilePreviewModal: () => null }));
+vi.mock('@/hooks/use-focus-trap', () => ({
+  useFocusTrap: () => ({ current: null }),
+}));
+vi.mock('@/hooks/use-pro-multi-account-identities', () => ({
+  useProMultiAccountIdentities: () => ({ enabled: false, groups: [], allIdentities: [] }),
+  stripCrossAccountIdentityPrefix: (id: string) => ({ localAccountId: null, rawId: id }),
+}));
+
+// ─── Store mocks ──────────────────────────────────────────────────────────────
+
+vi.mock('@/stores/auth-store', () => {
+  const state = {
+    client: null,
+    identities: [],
+    primaryIdentity: null,
+    isAuthenticated: false,
+    isDemoMode: false,
+    activeAccountId: null,
+    connectionLost: false,
+    getClientForAccount: () => undefined,
+    getAllConnectedClients: () => new Map(),
+    syncIdentities: () => {},
+    refreshIdentities: async () => {},
+  };
+  const hook = (sel?: (s: typeof state) => unknown) =>
+    typeof sel === 'function' ? sel(state) : state;
+  hook.getState = () => state;
+  hook.setState = (p: Partial<typeof state>) => Object.assign(state, p);
+  return { useAuthStore: hook };
+});
+
+vi.mock('@/stores/identity-store', () => {
+  const state = {
+    identities: [
+      { id: 'id-me', email: 'me@example.com', name: 'Me', htmlSignature: '<b>Alice</b>', textSignature: 'Alice' },
+      { id: 'id-team', email: 'team@example.com', name: 'Team', htmlSignature: '', textSignature: '' },
+    ] as Array<Record<string, unknown>>,
+    defaultIdentityId: 'id-me',
+  };
+  const hook = (sel?: (s: typeof state) => unknown) =>
+    typeof sel === 'function' ? sel(state) : state;
+  hook.getState = () => state;
+  hook.setState = (p: Partial<typeof state>) => Object.assign(state, p);
+  return { useIdentityStore: hook, notifyIdentitySelected: () => {} };
+});
+
+vi.mock('@/stores/account-store', () => {
+  const state = { accounts: [], getAccountById: () => undefined };
+  const hook = (sel?: (s: typeof state) => unknown) =>
+    typeof sel === 'function' ? sel(state) : state;
+  hook.getState = () => state;
+  hook.setState = (p: Partial<typeof state>) => Object.assign(state, p);
+  return { useAccountStore: hook };
+});
+
+vi.mock('@/stores/email-store', () => {
+  const state = {
+    draftSaveEnabled: false,
+    sendRawEmail: async () => ({ sent: true }),
+  };
+  const hook = (sel?: (s: typeof state) => unknown) =>
+    typeof sel === 'function' ? sel(state) : state;
+  hook.getState = () => state;
+  hook.setState = (p: Partial<typeof state>) => Object.assign(state, p);
+  return { useEmailStore: hook };
+});
+
+vi.mock('@/stores/settings-store', () => {
+  const state = {
+    timeFormat: '24h',
+    plainTextMode: false,
+    subAddressDelimiter: '+',
+    autoSelectReplyIdentity: true,
+    attachmentReminderEnabled: false,
+    attachmentReminderKeywords: [],
+    emptySubjectWarningEnabled: true,
+    sendDelaySeconds: 0,
+    // The default position: replies/forwards get the signature appended at
+    // send time rather than embedded above the quote.
+    signaturePosition: 'below_quote',
+    signatureNewMailEnabled: true,
+    signatureReplyForwardEnabled: true,
+    signatureSeparatorEnabled: true,
+    requestReadReceiptDefault: false,
+    addTrustedSender: () => {},
+    externalContentPolicy: 'block',
+    isSenderTrusted: () => false,
+    trustedSendersAddressBook: null,
+    updateSetting: () => {},
+  };
+  const hook = (sel?: (s: typeof state) => unknown) =>
+    typeof sel === 'function' ? sel(state) : state;
+  hook.getState = () => state;
+  hook.setState = (p: Partial<typeof state>) => Object.assign(state, p);
+  return { useSettingsStore: hook };
+});
+
+vi.mock('@/stores/contact-store', () => {
+  const state = {
+    contacts: [],
+    getAutocomplete: async () => [],
+    addToTrustedSendersBook: async () => {},
+  };
+  const hook = (sel?: (s: typeof state) => unknown) =>
+    typeof sel === 'function' ? sel(state) : state;
+  hook.getState = () => state;
+  hook.setState = (p: Partial<typeof state>) => Object.assign(state, p);
+  return { useContactStore: hook };
+});
+
+vi.mock('@/stores/template-store', () => {
+  const state = { templates: [], addTemplate: async () => {} };
+  const hook = (sel?: (s: typeof state) => unknown) =>
+    typeof sel === 'function' ? sel(state) : state;
+  hook.getState = () => state;
+  hook.setState = (p: Partial<typeof state>) => Object.assign(state, p);
+  return { useTemplateStore: hook };
+});
+
+// ─── Misc dependency mocks ────────────────────────────────────────────────────
+
+vi.mock('@/stores/toast-store', () => ({
+  toast: { info: () => {}, error: () => {}, success: () => {} },
+}));
+
+vi.mock('@/lib/plugin-hooks', () => ({
+  identityHooks: {
+    onSignatureRender: { size: 0, transform: async (value: unknown) => value },
+    onIdentitySelect: { size: 0, emit: async () => {} },
+  },
+  templateHooks: {
+    onTemplateRender: { size: 0, transform: async (value: unknown) => value },
+    onTemplateApply: { size: 0, emit: async () => {} },
+  },
+  emailHooks: {
+    onComposerOpen: { call: async () => [] },
+    onRecipientChange: { call: async () => [] },
+    getRecipientSuggestions: { call: async () => [] },
+    onRecipientChipsChange: { transform: async (chips: unknown) => chips },
+    onDraftChange: { emit: () => {} },
+    onBeforeDraftAutoSave: { transform: async (draft: unknown) => draft },
+    onBeforeEmailSend: { intercept: async () => true, interceptOutcome: async () => 'allowed' },
+    onComposeSend: { takeOver: async () => 'default' },
+    onTransformOutgoingEmail: { transform: async (email: unknown) => email },
+  },
+  contactHooks: {
+    search: { call: async () => [] },
+    onProvideRecipientSuggestions: { transform: async (initial: unknown) => initial },
+  },
+}));
+
+vi.mock('@/lib/email-sanitization', () => ({
+  sanitizeSignatureHtml: (v: string) => v,
+  sanitizeSignatureHtmlForDisplay: (v: string) => v,
+  sanitizeEmailHtml: (v: string) => v,
+  sanitizePluginBodyHtml: (v: string) => v,
+  escapeHtml: (v: string) => v,
+  parseHtmlSafely: (html: string) => new DOMParser().parseFromString(html, 'text/html'),
+}));
+
+vi.mock('@/lib/email-threading', () => ({
+  computeReplyThreadingHeaders: () => ({ inReplyTo: [], references: [] }),
+}));
+vi.mock('@/lib/sub-addressing', () => ({ generateSubAddress: () => '' }));
+vi.mock('@/lib/debug', () => ({ debug: { log: () => {}, warn: () => {}, error: () => {} } }));
+vi.mock('@/components/email/quoted-html', () => ({
+  buildQuotedHtmlBlock: (html: string) => `<div data-quoted-html="">${html}</div>`,
+  serializeEditorContent: () => editorState.html,
+}));
+vi.mock('@/lib/template-utils', () => ({ substitutePlaceholders: (s: string) => s }));
+
+// ─── Tests ────────────────────────────────────────────────────────────────────
+
+/**
+ * A Reply or Forward opened and closed again, with nothing typed or changed,
+ * leaves no draft: the quote and the signature it starts with are no edit,
+ * nor is a signature that follows the identity the reply resolves to later.
+ */
+
+const ME = { id: 'id-me', email: 'me@example.com', name: 'Me', htmlSignature: '<b>Alice</b>', textSignature: 'Alice' };
+const SALES = { id: 'id-sales', email: 'sales@example.com', name: 'Sales', htmlSignature: '<i>Sales team</i>', textSignature: 'Sales team' };
+const REPLY_TO = {
+  from: [{ name: 'Bob', email: 'bob@example.com' }],
+  to: [{ email: 'sales@example.com' }],
+  subject: 'Question',
+  body: 'Original text',
+  htmlBody: '<p>Original text</p>',
+  receivedAt: '2026-08-01T10:00:00Z',
+};
+
+function savingClient() {
+  const createDraft = vi.fn().mockResolvedValue('draft-9');
+  useAuthStore.setState({
+    client: { createDraft, getEmail: vi.fn(), hasDelayedSend: () => false, getMaxDelayedSend: () => 0 } as never,
+  });
+  return createDraft;
+}
+
+function renderReply(mode: 'reply' | 'replyAll' | 'forward') {
+  const requestCloseRef = { current: null } as React.MutableRefObject<((afterClose?: () => void) => void) | null>;
+  const onClose = vi.fn();
+  render(<EmailComposer mode={mode} replyTo={REPLY_TO} requestCloseRef={requestCloseRef} onClose={onClose} />);
+  return { requestCloseRef, onClose };
+}
+
+const pastAutosave = () => act(async () => { await new Promise((r) => setTimeout(r, 2600)); });
+
+describe('an untouched reply or forward', () => {
+  afterEach(() => {
+    useAuthStore.setState({ client: null });
+    useSettingsStore.setState({ signaturePosition: 'below_quote' });
+    useIdentityStore.setState({ identities: [ME] as Identity[] });
+  });
+
+  for (const mode of ['reply', 'replyAll', 'forward'] as const) {
+    it(`saves nothing, also not by autosave, and closes without asking (${mode})`, async () => {
+      const createDraft = savingClient();
+      const { requestCloseRef, onClose } = renderReply(mode);
+
+      await pastAutosave();
+      expect(createDraft).not.toHaveBeenCalled();
+
+      act(() => requestCloseRef.current!());
+      await waitFor(() => expect(onClose).toHaveBeenCalledTimes(1));
+      expect(createDraft).not.toHaveBeenCalled();
+      expect(screen.queryByRole('alertdialog')).toBeNull();
+    });
+  }
+
+  // The host builds the quote header after the composer opened (a plugin
+  // may rewrite it), so the body changes once by itself.
+  it('stays untouched when the quote header arrives after it opened', async () => {
+    const createDraft = savingClient();
+    const requestCloseRef = { current: null } as React.MutableRefObject<((afterClose?: () => void) => void) | null>;
+    const onClose = vi.fn();
+    const props = { mode: 'reply' as const, requestCloseRef, onClose };
+    const view = render(<EmailComposer {...props} replyTo={REPLY_TO} />);
+    view.rerender(<EmailComposer {...props} replyTo={{ ...REPLY_TO, quoteHeaderHtml: '<p>Bob wrote:</p>', quoteHeaderText: 'Bob wrote:' }} />);
+
+    await pastAutosave();
+    expect(createDraft).not.toHaveBeenCalled();
+    act(() => requestCloseRef.current!());
+    await waitFor(() => expect(onClose).toHaveBeenCalledTimes(1));
+    expect(createDraft).not.toHaveBeenCalled();
+  });
+
+  it('stays untouched when its signature follows the identity it resolves to', async () => {
+    useSettingsStore.setState({ signaturePosition: 'above_quote' });
+    useIdentityStore.setState({ identities: [ME, SALES] as Identity[] });
+    const createDraft = savingClient();
+    const { requestCloseRef, onClose } = renderReply('reply');
+
+    await pastAutosave();
+    act(() => requestCloseRef.current!());
+    await waitFor(() => expect(onClose).toHaveBeenCalledTimes(1));
+    expect(createDraft).not.toHaveBeenCalled();
+  });
+
+  it('saves once the user changes something', async () => {
+    const createDraft = savingClient();
+    const { requestCloseRef, onClose } = renderReply('reply');
+    fireEvent.change(screen.getByDisplayValue(/Question/), { target: { value: 'Question, answered' } });
+
+    act(() => requestCloseRef.current!());
+    await waitFor(() => expect(onClose).toHaveBeenCalledTimes(1));
+    expect(createDraft).toHaveBeenCalledTimes(1);
+  });
+});
diff --git a/components/email/email-composer.tsx b/components/email/email-composer.tsx
index ef1a8a99d..a8511b4f8 100644
--- a/components/email/email-composer.tsx
+++ b/components/email/email-composer.tsx
@@ -68,6 +68,7 @@ import { isFilePreviewable } from "@/lib/file-preview";
 import { isEditableEventTarget } from "@/lib/keyboard";
 import { isSingleKeyShortcutOff } from "@/lib/single-key-shortcuts";
 import { markReplyQuoteHeader } from "@/components/email/reply-quote-collapse";
+import { showDraftSavedToast } from "@/lib/compose/draft-close-toast";
 import { buildQuotedHtmlBlock, serializeEditorContent } from "@/components/email/quoted-html";
 import { containsEmbeddedSignature } from "@/components/email/signature-block";
 import {
@@ -429,6 +430,11 @@ interface EmailComposerProps {
      * started now wouldn't survive. False when that can't be done safely.
      */
     rescueDraft?: (draft: RescuedDraft) => boolean;
+    /**
+     * The window closes with its draft kept: another window says so, as
+     * this one is gone before a toast here could be read.
+     */
+    onDraftKept?: (draftId: string, where: { accountId?: string; localAccountId?: string }) => void;
   };
   /** The subject as typed, for a host that shows it (a Pro compose tab's title). */
   onSubjectChange?: (subject: string) => void;
@@ -618,6 +624,7 @@ export function EmailComposer({
   const tOfflineNotes = useTranslations('offlineConflicts');
   const tSendGuards = useTranslations('send_guards');
   const tWords = useTranslations('compose_words');
+  const tUx = useTranslations('compose_ux');
   const router = useRouter();
   const showAdvancedSettings = useSettingsStore((state) => state.showAdvancedSettings);
   const timeFormat = useSettingsStore((state) => state.timeFormat);
@@ -1076,6 +1083,12 @@ export function EmailComposer({
     const nextCc = getInitialCc();
     if (same(nextTo, auto.to) && same(nextCc, auto.cc)) return;
     autoRecipientsRef.current = { to: nextTo, cc: nextCc };
+    // Not the user's change: an untouched reply stays untouched.
+    initialValuesRef.current = {
+      ...initialValuesRef.current,
+      to: formatRecipientList(withInput(nextTo, toInput)),
+      cc: formatRecipientList(withInput(nextCc, ccInput)),
+    };
     setTo(nextTo);
     setCc(nextCc);
     if (nextCc.length > 0) setShowCc(true);
@@ -1229,6 +1242,8 @@ export function EmailComposer({
   // "close" (X, Escape): save or discard. "discard" (the Discard button): the
   // user already chose, so only confirm it.
   const [closeDialogKind, setCloseDialogKind] = useState<'close' | 'discard'>('close');
+  // Closing saves without asking; the question comes only when that save failed.
+  const [closeSaveFailed, setCloseSaveFailed] = useState(false);
   const [showAllAttachments, setShowAllAttachments] = useState(false);
   const [previewAttachment, setPreviewAttachment] = useState<ComposerAttachment | null>(null);
   // What the checks before sending found (no subject, no text, placeholders,
@@ -1429,6 +1444,8 @@ export function EmailComposer({
   // when the user switches identity in "above quote" mode without rebuilding
   // the whole body (which would lose user edits to the surrounding draft).
   const editorRef = useRef<Editor | null>(null);
+  // Set while the composer itself swaps the signature in the editor.
+  const signatureSwapRef = useRef(false);
   // Set once a reply's body got its initial focus, so switching formats later
   // does not move the caret back to the start.
   const replyFocusedRef = useRef(false);
@@ -1501,7 +1518,14 @@ export function EmailComposer({
       separator: signatureSeparatorEnabled,
     }), { quoteHeader: getQuoteHeaderLine() });
     if (nextHtml !== currentHtml) {
-      editor.commands.setContent(nextHtml, { emitUpdate: true });
+      // The signature following From is no edit of the user's: an untouched
+      // reply whose identity resolves late must stay untouched.
+      signatureSwapRef.current = true;
+      try {
+        editor.commands.setContent(nextHtml, { emitUpdate: true });
+      } finally {
+        signatureSwapRef.current = false;
+      }
     }
     // Intentionally keyed to the signature-relevant fields plus the internal
     // prev*Ref guards above; depending on the whole `signatureIdentity` object
@@ -1889,7 +1913,12 @@ export function EmailComposer({
   // Handed-in text and files aren't the user's until they touch them. Nothing
   // counts as dirty until then, so autosave, the page-close save and the flush
   // before a sign-out all leave them alone.
-  const uneditedRef = useRef(initialData?.unedited === true);
+  // So does a fresh composer, a reply or forward above all: the quote and the
+  // signature it starts with are no reason to keep a draft. Closed before the
+  // user changes anything, it leaves nothing behind.
+  const uneditedRef = useRef(initialData?.unedited === true || (
+    !initialDataProp && !prefill && !initialDraftTextProp && !(initialFiles && initialFiles.length > 0)
+  ));
   const [firstEditSeen, setFirstEditSeen] = useState(false);
   const markEdited = useCallback(() => {
     if (!uneditedRef.current) return;
@@ -3645,6 +3674,9 @@ export function EmailComposer({
     if (composerClient?.hasDelayedSend()) {
       return new Date(Date.now() + sendDelaySeconds * 1000).toISOString();
     }
+    // Undo send is on by default; a server without delayed sending just
+    // sends. Only a delay the user picked is worth a question.
+    if (!useSettingsStore.getState().explicitSettings.includes('sendDelaySeconds')) return undefined;
     const confirmed = await confirmNoDelay({
       title: t('send_delay_unsupported_title'),
       message: t('send_delay_unsupported_confirm'),
@@ -4458,7 +4490,28 @@ export function EmailComposer({
     setIsSavingAndClosing(false);
   };
 
-  const handleSaveDraftAndClose = async () => {
+  // "Draft saved" with Discard, once the composer closed and kept its draft.
+  // Read before the close resets the refs; the Discard runs after unmount,
+  // through the host's own discard, as the composer's Discard does.
+  const announceKeptDraft = () => {
+    const draftId = draftIdRef.current;
+    if (!draftId) return;
+    const where = { accountId: draftAccountIdRef.current, localAccountId: draftLocalAccountIdRef.current };
+    const ownWindowKept = ownWindowRef.current?.onDraftKept;
+    if (ownWindowKept) {
+      ownWindowKept(draftId, where);
+      return;
+    }
+    const discard = onDiscardDraft;
+    showDraftSavedToast(() => discard?.(draftId, where), {
+      saved: t('draft_saved'),
+      discard: t('discard'),
+      discarded: tUx('draft_discarded'),
+      undo: tUx('undo'),
+    });
+  };
+
+  const handleSaveDraftAndClose = async (opts: { fromClose?: boolean } = {}) => {
     if (saveCloseAttemptRef.current) return;
     const attempt = { cancelled: false, saving: false };
     saveCloseAttemptRef.current = attempt;
@@ -4482,7 +4535,12 @@ export function EmailComposer({
       setIsWaitingToSave(false);
       if (result === 'failed') {
         toast.error(t('save_failed'));
-        afterCloseRef.current = null;
+        if (opts.fromClose) {
+          setCloseSaveFailed(true);
+          openCloseDialog('close');
+        } else {
+          afterCloseRef.current = null;
+        }
         return;
       }
 
@@ -4492,10 +4550,21 @@ export function EmailComposer({
       const savedId = await saveDraftRef.current({ announce: true });
       if (attempt.cancelled) return;
       if (saveFailedRef.current || !savedId) {
+        // Nothing to save (no recipient, subject, text or file) isn't a failure.
+        if (!saveFailedRef.current && !draftIdRef.current && !draftHasContent(draftRecipients().toAddresses)) {
+          cleanClose();
+          return;
+        }
         toast.error(t('save_failed'));
-        afterCloseRef.current = null;
+        if (opts.fromClose) {
+          setCloseSaveFailed(true);
+          openCloseDialog('close');
+        } else {
+          afterCloseRef.current = null;
+        }
         return;
       }
+      announceKeptDraft();
       explicitCloseRef.current = true;
       stateRef.current = { to: '', cc: '', bcc: '', subject: '', body: '', showCc: false, showBcc: false, selectedIdentityId: null, subAddressTag: '', draftId: null, draftAccountId: undefined, draftLocalAccountId: undefined, fromOverrideEnabled: false, fromOverrideEmail: '', fromOverrideName: '', attachments: [], plainTextMode };
       emitClose();
@@ -4611,16 +4680,16 @@ export function EmailComposer({
       return;
     }
     const discarding = kind === 'discard';
-    const buttons = discarding ? [t('discard'), t('cancel')] : [tCommon('save'), t('discard'), t('cancel')];
+    const buttons = discarding ? [t('discard'), t('cancel')] : [tUx('try_again'), t('discard'), t('cancel')];
     void dialogs.confirm({
       type: 'warning',
       message: discarding ? t('discard_draft_title') : t('close_draft_title'),
-      detail: discarding ? t('discard_draft_message') : t('close_draft_message'),
+      detail: discarding ? t('discard_draft_message') : tUx('save_failed_close'),
       buttons,
       defaultId: discarding ? 1 : 0,
     }).then((choice) => {
       if (buttons[choice] === t('discard')) handleDiscardAndClose();
-      else if (!discarding && choice === 0) void handleSaveDraftAndClose();
+      else if (!discarding && choice === 0) void handleSaveDraftAndClose({ fromClose: true });
       else afterCloseRef.current = null;
     });
   };
@@ -4639,19 +4708,29 @@ export function EmailComposer({
     openCloseDialog('discard');
   };
 
+  // X, Escape, another message, a host's tab: one rule, as drafts save
+  // themselves. Closing keeps the draft and says so, with Discard on the
+  // toast; it asks only when the save fails. A message the user hasn't
+  // touched (a reply opened and closed again) leaves nothing behind.
   const handleClose = (afterClose?: () => void) => {
     if (saveCloseAttemptRef.current?.saving) return;
     cancelSaveAndClose();
     afterCloseRef.current = afterClose ?? null;
+    setCloseSaveFailed(false);
+    if (uneditedRef.current || (!isDirtyRef.current && !draftIdRef.current)) {
+      cleanClose();
+      return;
+    }
     const savedAlready = draftIdRef.current !== null
       && changeVersionRef.current === savedVersionRef.current
       && !saveFailedRef.current
       && !attachmentsRef.current.some(att => att.uploading || att.error);
-    if (isDirtyRef.current && !savedAlready) {
-      openCloseDialog('close');
-    } else {
+    if (!isDirtyRef.current || savedAlready) {
+      announceKeptDraft();
       cleanClose();
+      return;
     }
+    void handleSaveDraftAndClose({ fromClose: true });
   };
 
   // Expose the dirty-aware close handler so external hosts (e.g. the Pro tab
@@ -5387,6 +5466,9 @@ export function EmailComposer({
               content={body}
               onChange={(html) => {
                 setBody(html);
+                // Only edits made in the editor get here: toolbar commands,
+                // a pasted or dropped image, typing; and the signature swap.
+                if (!signatureSwapRef.current) markEdited();
                 if (validationErrors.body) setValidationErrors(prev => ({ ...prev, body: false }));
               }}
               onImageUpload={handleImageUpload}
@@ -6027,7 +6109,7 @@ export function EmailComposer({
         role="alertdialog"
         showClose={false}
         title={closeDialogKind === 'discard' ? t('discard_draft_title') : t('close_draft_title')}
-        description={closeDialogKind === 'discard' ? t('discard_draft_message') : t('close_draft_message')}
+        description={closeDialogKind === 'discard' ? t('discard_draft_message') : closeSaveFailed ? tUx('save_failed_close') : t('close_draft_message')}
         footer={
           <>
             <Button variant="outline" onClick={() => dismissCloseDialog()}>
@@ -6037,9 +6119,9 @@ export function EmailComposer({
               {t('discard')}
             </Button>
             {closeDialogKind === 'close' && (
-              <Button onClick={handleSaveDraftAndClose}>
+              <Button onClick={() => void handleSaveDraftAndClose({ fromClose: closeSaveFailed })}>
                 <Save className="w-4 h-4 me-2" />
-                {tCommon('save')}
+                {closeSaveFailed ? tUx('try_again') : tCommon('save')}
               </Button>
             )}
           </>
diff --git a/components/popout/__tests__/popout-host.test.tsx b/components/popout/__tests__/popout-host.test.tsx
index 1627d07a7..485fa5f6d 100644
--- a/components/popout/__tests__/popout-host.test.tsx
+++ b/components/popout/__tests__/popout-host.test.tsx
@@ -308,6 +308,17 @@ describe('PopoutHost', () => {
     expect(useToastStore.getState().toasts).toHaveLength(1);
   });
 
+  it('says once that a closed pop-out kept its draft, with Discard', async () => {
+    render(<><PopoutHost /><PopoutHost /></>);
+    await settle();
+    popout.post({ type: 'draft-kept', requestId: 'k1', notice: { draftId: 'd1', localAccountId: 'alice' } });
+    await settle();
+    const toasts = useToastStore.getState().toasts;
+    expect(toasts).toHaveLength(1);
+    expect(toasts[0].title).toBe('email_composer.draft_saved');
+    expect(toasts[0].action?.label).toBe('email_composer.discard');
+  });
+
   it('refreshes the list and counts when a pop-out changed mail, once for a burst', async () => {
     render(<PopoutHost />);
     await settle();
diff --git a/components/popout/popout-compose-app.tsx b/components/popout/popout-compose-app.tsx
index e29b8810d..5f8f5433b 100644
--- a/components/popout/popout-compose-app.tsx
+++ b/components/popout/popout-compose-app.tsx
@@ -15,7 +15,7 @@ import { debug } from "@/lib/debug";
 import { composerSendOptions } from "@/lib/outgoing/composer-send-options";
 import { announceSent, cancelAnnouncedSend, releaseAnnouncedSend } from "@/lib/plugin-after-send";
 import { cancelFailureToast } from "@/lib/send-failure-message";
-import { announceMailChanged, announceSentToMainWindow, askRescuedDraftId, watchMainWindow, type PopoutSentNotice, type RescuedDraft } from "@/lib/popout/channel";
+import { announceDraftKept, announceMailChanged, announceSentToMainWindow, askRescuedDraftId, watchMainWindow, type PopoutSentNotice, type RescuedDraft } from "@/lib/popout/channel";
 import { acknowledgeComposeHandoff, forgetComposePayload, receiveComposeHandoff, rememberComposePayload, rememberedComposePayload, watchHandoffCancel } from "@/lib/popout/compose-handoff";
 import type { ComposePopoutPayload } from "@/lib/popout/compose-payload";
 import { returnComposerToMain, type ReturnResult } from "@/lib/popout/return-to-main";
@@ -484,6 +484,9 @@ function PopoutComposer({ payload, handoffId, onReopen }: {
     onUnloadState: (state: ComposerDraftData) => {
       if (handoffId) rememberComposePayload(handoffId, { ...payload, initialData: state, prefill: null });
     },
+    onDraftKept: (draftId: string, where: { accountId?: string; localAccountId?: string }) => {
+      announceDraftKept({ draftId, ...where, localAccountId: where.localAccountId ?? useAuthStore.getState().activeAccountId ?? undefined });
+    },
     onDraftSaved: (draftId: string, where: { accountId?: string; localAccountId?: string } = {}) => {
       const active = useAuthStore.getState().activeAccountId;
       announceMailChanged(active);
diff --git a/components/popout/popout-host.tsx b/components/popout/popout-host.tsx
index fc7305e60..33c1d2159 100644
--- a/components/popout/popout-host.tsx
+++ b/components/popout/popout-host.tsx
@@ -8,6 +8,7 @@ import { useAccountStore } from "@/stores/account-store";
 import { useAuthStore } from "@/stores/auth-store";
 import { useEmailStore } from "@/stores/email-store";
 import { toast } from "@/stores/toast-store";
+import { showDraftSavedToast } from "@/lib/compose/draft-close-toast";
 import { newPopoutId, openPopoutChannel, type PopoutChannel, type PopoutMessage, type PopoutSentNotice, type RescuedDraft, type SharedAccountSession } from "@/lib/popout/channel";
 import { keepRescuedDraft } from "@/lib/popout/rescued-drafts";
 import { commitReturnedComposer, dropReturnedComposer, offerReturnedComposer } from "@/lib/popout/return-to-main";
@@ -168,6 +169,28 @@ export function PopoutHost() {
         case "draft-rescue":
           startRescue(message.draft);
           break;
+        case "draft-kept": {
+          // Said here, as the pop-out closes with its Escape or X.
+          const { draftId, accountId, localAccountId } = message.notice;
+          claimOnce(`bulwark-popout-kept:${message.requestId}`, () => {
+            const tr = tRef.current;
+            showDraftSavedToast(() => {
+              const auth = useAuthStore.getState();
+              const login = localAccountId ? auth.getClientForAccount(localAccountId) : auth.client;
+              if (!login) {
+                toast.error(tr("email_composer.discard_signed_out"));
+                return;
+              }
+              void login.deleteEmail(draftId, accountId).catch((error: unknown) => console.error("Failed to discard draft:", error));
+            }, {
+              saved: tr("email_composer.draft_saved"),
+              discard: tr("email_composer.discard"),
+              discarded: tr("compose_ux.draft_discarded"),
+              undo: tr("compose_ux.undo"),
+            });
+          });
+          break;
+        }
         case "rescue-query": {
           const rescue = rescues.get(message.rescueKey);
           if (rescue) void rescue.then((draftId) => channel?.post({ type: "rescue-answer", rescueKey: message.rescueKey, draftId }));
diff --git a/lib/compose/__tests__/draft-close-toast.test.ts b/lib/compose/__tests__/draft-close-toast.test.ts
new file mode 100644
index 000000000..a0a8098ea
--- /dev/null
+++ b/lib/compose/__tests__/draft-close-toast.test.ts
@@ -0,0 +1,57 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import { discardWithUndo, showDraftSavedToast } from '../draft-close-toast';
+import { useToastStore } from '@/stores/toast-store';
+
+const labels = { saved: 'Draft saved', discard: 'Discard', discarded: 'Draft discarded', undo: 'Undo' };
+const shown = () => useToastStore.getState().toasts;
+
+describe('closing a composer that kept its draft', () => {
+  beforeEach(() => {
+    vi.useFakeTimers();
+    useToastStore.getState().clearToasts();
+  });
+  afterEach(() => {
+    vi.useRealTimers();
+    useToastStore.getState().clearToasts();
+  });
+
+  it('says "Draft saved" and offers Discard', () => {
+    const discard = vi.fn();
+    showDraftSavedToast(discard, labels);
+    expect(shown()).toHaveLength(1);
+    expect(shown()[0].title).toBe('Draft saved');
+    expect(shown()[0].action?.label).toBe('Discard');
+    expect(discard).not.toHaveBeenCalled();
+  });
+
+  it('deletes only once the Undo window is over', () => {
+    const discard = vi.fn();
+    showDraftSavedToast(discard, labels);
+    shown()[0].action!.onClick();
+    const undoToast = shown().find((t) => t.title === 'Draft discarded')!;
+    expect(undoToast.action?.label).toBe('Undo');
+    expect(undoToast.pauseOnHover).toBe(false);
+    expect(discard).not.toHaveBeenCalled();
+    vi.advanceTimersByTime(undoToast.duration!);
+    expect(discard).toHaveBeenCalledTimes(1);
+  });
+
+  it('keeps the draft on Undo and puts back what was taken away', () => {
+    const discard = vi.fn();
+    const restore = vi.fn();
+    discardWithUndo(discard, labels, restore);
+    shown()[0].action!.onClick();
+    vi.advanceTimersByTime(60_000);
+    expect(discard).not.toHaveBeenCalled();
+    expect(restore).toHaveBeenCalledTimes(1);
+  });
+
+  it('deletes at once when the page goes away during the Undo window', () => {
+    const discard = vi.fn();
+    discardWithUndo(discard, labels);
+    window.dispatchEvent(new Event('pagehide'));
+    expect(discard).toHaveBeenCalledTimes(1);
+    vi.advanceTimersByTime(60_000);
+    expect(discard).toHaveBeenCalledTimes(1);
+  });
+});
diff --git a/lib/compose/draft-close-toast.ts b/lib/compose/draft-close-toast.ts
new file mode 100644
index 000000000..f57dc407d
--- /dev/null
+++ b/lib/compose/draft-close-toast.ts
@@ -0,0 +1,56 @@
+import { toast, useToastStore } from "@/stores/toast-store";
+import { UNDO_TOAST_DURATION } from "@/lib/email-action-toast";
+
+export interface DiscardToastLabels {
+  discarded: string;
+  undo: string;
+}
+
+export interface DraftSavedToastLabels extends DiscardToastLabels {
+  saved: string;
+  discard: string;
+}
+
+/**
+ * "Draft discarded" with Undo. `discard` runs once the toast is gone without
+ * an Undo (or the page goes away), so Undo needs nothing from the server:
+ * the draft is still there. `restore` puts back what the caller took off
+ * screen.
+ */
+export function discardWithUndo(discard: () => void, labels: DiscardToastLabels, restore?: () => void): void {
+  let settled = false;
+  let timer: ReturnType<typeof setTimeout> | null = null;
+  const commit = () => {
+    if (settled) return;
+    settled = true;
+    if (timer) clearTimeout(timer);
+    window.removeEventListener("pagehide", commit);
+    discard();
+  };
+  const id = toast.success(labels.discarded, {
+    action: {
+      label: labels.undo,
+      onClick: () => {
+        if (settled) return;
+        settled = true;
+        if (timer) clearTimeout(timer);
+        window.removeEventListener("pagehide", commit);
+        restore?.();
+      },
+    },
+    duration: UNDO_TOAST_DURATION,
+    // The toast and the delete end together: a pause on hover would leave
+    // an Undo on screen for a draft that is already gone.
+    pauseOnHover: false,
+  });
+  const shown = useToastStore.getState().toasts.find((t) => t.id === id)?.duration;
+  timer = setTimeout(commit, shown && shown > 0 ? shown : UNDO_TOAST_DURATION);
+  window.addEventListener("pagehide", commit);
+}
+
+/** After a composer closed and kept its draft: "Draft saved", with Discard. */
+export function showDraftSavedToast(discard: () => void, labels: DraftSavedToastLabels): void {
+  toast.success(labels.saved, {
+    action: { label: labels.discard, onClick: () => discardWithUndo(discard, labels) },
+  });
+}
diff --git a/lib/popout/channel.ts b/lib/popout/channel.ts
index f2d64a312..2fca47ecc 100644
--- a/lib/popout/channel.ts
+++ b/lib/popout/channel.ts
@@ -92,6 +92,7 @@ export type PopoutMessage =
   | { type: 'sent'; requestId: string; notice: PopoutSentNotice }
   | { type: 'sent-ack'; requestId: string }
   | { type: 'mail-changed'; accountId: string | null }
+  | { type: 'draft-kept'; requestId: string; notice: DraftKeptNotice }
   | { type: 'state-change' }
   | { type: 'draft-rescue'; draft: RescuedDraft }
   | { type: 'rescue-query'; rescueKey: string }
@@ -106,6 +107,15 @@ export type PopoutMessage =
   | { type: 'main-gone'; windowId: string }
   | { type: 'account-removed'; accountId: string };
 
+/** A pop-out closed and kept its draft: the main window says so, with Discard. */
+export interface DraftKeptNotice {
+  draftId: string;
+  /** The account it lives in, when not the login's own. */
+  accountId?: string;
+  /** The login it was saved through. */
+  localAccountId?: string;
+}
+
 export interface PopoutChannel {
   post(message: PopoutMessage): void;
   close(): void;
@@ -224,6 +234,13 @@ export function announceMailChanged(accountId: string | null): void {
   channel?.close();
 }
 
+/** Tells the main window that a closing pop-out kept its draft. */
+export function announceDraftKept(notice: DraftKeptNotice): void {
+  const channel = openPopoutChannel(() => {});
+  channel?.post({ type: 'draft-kept', requestId: newId(), notice });
+  channel?.close();
+}
+
 /**
  * The draft id a closing window's text was saved under, for the same window
  * after a reload, whose own copy still names the version that replaced. Null
diff --git a/locales/ar/common.json b/locales/ar/common.json
index 58c7fe5a6..cb0736760 100644
--- a/locales/ar/common.json
+++ b/locales/ar/common.json
@@ -1212,6 +1212,13 @@
       "plain_text": "[صورة: {alt}]"
     }
   },
+  "compose_ux": {
+    "draft_discarded": "تم تجاهل المسودة",
+    "undo": "تراجع",
+    "discard_draft": "تجاهل المسودة",
+    "save_failed_close": "تعذّر حفظ المسودة. حاول مرة أخرى أو تجاهلها.",
+    "try_again": "حاول مرة أخرى"
+  },
   "confirm_dialog": {
     "confirm": "تأكيد",
     "cancel": "إلغاء"
diff --git a/locales/ca/common.json b/locales/ca/common.json
index e1da6608f..28e6ac887 100644
--- a/locales/ca/common.json
+++ b/locales/ca/common.json
@@ -1212,6 +1212,13 @@
       "plain_text": "[Imatge: {alt}]"
     }
   },
+  "compose_ux": {
+    "draft_discarded": "Esborrany descartat",
+    "undo": "Desfés",
+    "discard_draft": "Descarta l'esborrany",
+    "save_failed_close": "No s'ha pogut desar l'esborrany. Torneu-ho a provar o descarteu-lo.",
+    "try_again": "Torna-ho a provar"
+  },
   "confirm_dialog": {
     "confirm": "Confirma",
     "cancel": "Cancel·la"
diff --git a/locales/cs/common.json b/locales/cs/common.json
index fa9b5d3c8..f1d8ed92f 100644
--- a/locales/cs/common.json
+++ b/locales/cs/common.json
@@ -1212,6 +1212,13 @@
       "plain_text": "[Obrázek: {alt}]"
     }
   },
+  "compose_ux": {
+    "draft_discarded": "Koncept zahozen",
+    "undo": "Zpět",
+    "discard_draft": "Zahodit koncept",
+    "save_failed_close": "Koncept se nepodařilo uložit. Zkuste to znovu, nebo ho zahoďte.",
+    "try_again": "Zkusit znovu"
+  },
   "confirm_dialog": {
     "confirm": "Potvrdit",
     "cancel": "Zrušit"
diff --git a/locales/da/common.json b/locales/da/common.json
index 656cadee7..a820dfaf4 100644
--- a/locales/da/common.json
+++ b/locales/da/common.json
@@ -1212,6 +1212,13 @@
       "plain_text": "[Billede: {alt}]"
     }
   },
+  "compose_ux": {
+    "draft_discarded": "Kladde kasseret",
+    "undo": "Fortryd",
+    "discard_draft": "Kassér kladde",
+    "save_failed_close": "Kladden kunne ikke gemmes. Prøv igen, eller kassér den.",
+    "try_again": "Prøv igen"
+  },
   "confirm_dialog": {
     "confirm": "Bekræft",
     "cancel": "Annuller"
diff --git a/locales/de/common.json b/locales/de/common.json
index 55853ac55..c23337444 100644
--- a/locales/de/common.json
+++ b/locales/de/common.json
@@ -1212,6 +1212,13 @@
       "plain_text": "[Bild: {alt}]"
     }
   },
+  "compose_ux": {
+    "draft_discarded": "Entwurf verworfen",
+    "undo": "Rückgängig",
+    "discard_draft": "Entwurf verwerfen",
+    "save_failed_close": "Der Entwurf konnte nicht gespeichert werden. Versuchen Sie es erneut oder verwerfen Sie ihn.",
+    "try_again": "Erneut versuchen"
+  },
   "confirm_dialog": {
     "confirm": "Bestätigen",
     "cancel": "Abbrechen"
diff --git a/locales/en/common.json b/locales/en/common.json
index d3304d888..ea741cca9 100644
--- a/locales/en/common.json
+++ b/locales/en/common.json
@@ -1212,6 +1212,13 @@
       "plain_text": "[Image: {alt}]"
     }
   },
+  "compose_ux": {
+    "draft_discarded": "Draft discarded",
+    "undo": "Undo",
+    "discard_draft": "Discard draft",
+    "save_failed_close": "The draft could not be saved. Try again, or discard it.",
+    "try_again": "Try again"
+  },
   "confirm_dialog": {
     "confirm": "Confirm",
     "cancel": "Cancel"
diff --git a/locales/es/common.json b/locales/es/common.json
index f36dde45f..0405a0dbf 100644
--- a/locales/es/common.json
+++ b/locales/es/common.json
@@ -1212,6 +1212,13 @@
       "plain_text": "[Imagen: {alt}]"
     }
   },
+  "compose_ux": {
+    "draft_discarded": "Borrador descartado",
+    "undo": "Deshacer",
+    "discard_draft": "Descartar borrador",
+    "save_failed_close": "No se pudo guardar el borrador. Inténtelo de nuevo o descártelo.",
+    "try_again": "Reintentar"
+  },
   "confirm_dialog": {
     "confirm": "Confirmar",
     "cancel": "Cancelar"
diff --git a/locales/et/common.json b/locales/et/common.json
index 696254787..4e9f89304 100644
--- a/locales/et/common.json
+++ b/locales/et/common.json
@@ -1212,6 +1212,13 @@
       "plain_text": "[Pilt: {alt}]"
     }
   },
+  "compose_ux": {
+    "draft_discarded": "Mustand loobutud",
+    "undo": "Võta tagasi",
+    "discard_draft": "Loobu mustandist",
+    "save_failed_close": "Mustandit ei saanud salvestada. Proovige uuesti või loobuge sellest.",
+    "try_again": "Proovi uuesti"
+  },
   "confirm_dialog": {
     "confirm": "Kinnita",
     "cancel": "Tühista"
diff --git a/locales/fa/common.json b/locales/fa/common.json
index ea0ca72a2..bfe6d3cbb 100644
--- a/locales/fa/common.json
+++ b/locales/fa/common.json
@@ -1212,6 +1212,13 @@
       "plain_text": "[تصویر: {alt}]"
     }
   },
+  "compose_ux": {
+    "draft_discarded": "پیش‌نویس دور انداخته شد",
+    "undo": "واگرد",
+    "discard_draft": "دور انداختن پیش‌نویس",
+    "save_failed_close": "پیش‌نویس ذخیره نشد. دوباره تلاش کنید یا آن را دور بیندازید.",
+    "try_again": "تلاش دوباره"
+  },
   "confirm_dialog": {
     "confirm": "تأیید",
     "cancel": "انصراف"
diff --git a/locales/fr/common.json b/locales/fr/common.json
index 0cb389ffd..be7312951 100644
--- a/locales/fr/common.json
+++ b/locales/fr/common.json
@@ -1212,6 +1212,13 @@
       "plain_text": "[Image : {alt}]"
     }
   },
+  "compose_ux": {
+    "draft_discarded": "Brouillon supprimé",
+    "undo": "Annuler",
+    "discard_draft": "Supprimer le brouillon",
+    "save_failed_close": "Le brouillon n'a pas pu être enregistré. Réessayez ou supprimez-le.",
+    "try_again": "Réessayer"
+  },
   "confirm_dialog": {
     "confirm": "Confirmer",
     "cancel": "Annuler"
diff --git a/locales/he/common.json b/locales/he/common.json
index d2b2dcbe6..60853894b 100644
--- a/locales/he/common.json
+++ b/locales/he/common.json
@@ -1155,6 +1155,13 @@
       "plain_text": "[תמונה: {alt}]"
     }
   },
+  "compose_ux": {
+    "draft_discarded": "הטיוטה נמחקה",
+    "undo": "ביטול",
+    "discard_draft": "מחיקת הטיוטה",
+    "save_failed_close": "לא ניתן היה לשמור את הטיוטה. נסו שוב או מחקו אותה.",
+    "try_again": "ניסיון נוסף"
+  },
   "confirm_dialog": {
     "confirm": "אשר",
     "cancel": "לְבַטֵל"
diff --git a/locales/hu/common.json b/locales/hu/common.json
index 6ddc16963..79efccd53 100644
--- a/locales/hu/common.json
+++ b/locales/hu/common.json
@@ -1212,6 +1212,13 @@
       "plain_text": "[Kép: {alt}]"
     }
   },
+  "compose_ux": {
+    "draft_discarded": "Piszkozat elvetve",
+    "undo": "Visszavonás",
+    "discard_draft": "Piszkozat elvetése",
+    "save_failed_close": "A piszkozatot nem sikerült menteni. Próbálja újra, vagy vesse el.",
+    "try_again": "Újra"
+  },
   "confirm_dialog": {
     "confirm": "Megerősítés",
     "cancel": "Mégse"
diff --git a/locales/it/common.json b/locales/it/common.json
index 199d681a8..dbe2f779d 100644
--- a/locales/it/common.json
+++ b/locales/it/common.json
@@ -1212,6 +1212,13 @@
       "plain_text": "[Immagine: {alt}]"
     }
   },
+  "compose_ux": {
+    "draft_discarded": "Bozza eliminata",
+    "undo": "Annulla",
+    "discard_draft": "Elimina bozza",
+    "save_failed_close": "Impossibile salvare la bozza. Riprova o eliminala.",
+    "try_again": "Riprova"
+  },
   "confirm_dialog": {
     "confirm": "Conferma",
     "cancel": "Annulla"
diff --git a/locales/ja/common.json b/locales/ja/common.json
index fd47c9e9b..271e3d791 100644
--- a/locales/ja/common.json
+++ b/locales/ja/common.json
@@ -1212,6 +1212,13 @@
       "plain_text": "[画像: {alt}]"
     }
   },
+  "compose_ux": {
+    "draft_discarded": "下書きを破棄しました",
+    "undo": "元に戻す",
+    "discard_draft": "下書きを破棄",
+    "save_failed_close": "下書きを保存できませんでした。もう一度試すか、破棄してください。",
+    "try_again": "再試行"
+  },
   "confirm_dialog": {
     "confirm": "確認",
     "cancel": "キャンセル"
diff --git a/locales/ko/common.json b/locales/ko/common.json
index a6fde0874..5e9bc4957 100644
--- a/locales/ko/common.json
+++ b/locales/ko/common.json
@@ -1212,6 +1212,13 @@
       "plain_text": "[이미지: {alt}]"
     }
   },
+  "compose_ux": {
+    "draft_discarded": "임시 보관 메일을 삭제했습니다",
+    "undo": "실행 취소",
+    "discard_draft": "임시 보관 메일 삭제",
+    "save_failed_close": "임시 보관 메일을 저장하지 못했습니다. 다시 시도하거나 삭제하세요.",
+    "try_again": "다시 시도"
+  },
   "confirm_dialog": {
     "confirm": "확인",
     "cancel": "취소"
diff --git a/locales/lv/common.json b/locales/lv/common.json
index 4b822a22c..57d08584b 100644
--- a/locales/lv/common.json
+++ b/locales/lv/common.json
@@ -1212,6 +1212,13 @@
       "plain_text": "[Attēls: {alt}]"
     }
   },
+  "compose_ux": {
+    "draft_discarded": "Melnraksts atmests",
+    "undo": "Atsaukt",
+    "discard_draft": "Atmest melnrakstu",
+    "save_failed_close": "Melnrakstu neizdevās saglabāt. Mēģiniet vēlreiz vai atmetiet to.",
+    "try_again": "Mēģināt vēlreiz"
+  },
   "confirm_dialog": {
     "confirm": "Apstiprināt",
     "cancel": "Atcelt"
diff --git a/locales/mn/common.json b/locales/mn/common.json
index a0a492b57..4d10e767b 100644
--- a/locales/mn/common.json
+++ b/locales/mn/common.json
@@ -1212,6 +1212,13 @@
       "plain_text": "[Зураг: {alt}]"
     }
   },
+  "compose_ux": {
+    "draft_discarded": "Ноорог устгагдлаа",
+    "undo": "Буцаах",
+    "discard_draft": "Ноорог устгах",
+    "save_failed_close": "Ноорогийг хадгалж чадсангүй. Дахин оролдох эсвэл устгана уу.",
+    "try_again": "Дахин оролдох"
+  },
   "confirm_dialog": {
     "confirm": "Баталгаажуулах",
     "cancel": "Цуцлах"
diff --git a/locales/nb/common.json b/locales/nb/common.json
index 64bd1d76f..d77f2071e 100644
--- a/locales/nb/common.json
+++ b/locales/nb/common.json
@@ -1212,6 +1212,13 @@
       "plain_text": "[Bilde: {alt}]"
     }
   },
+  "compose_ux": {
+    "draft_discarded": "Utkast forkastet",
+    "undo": "Angre",
+    "discard_draft": "Forkast utkast",
+    "save_failed_close": "Utkastet kunne ikke lagres. Prøv igjen, eller forkast det.",
+    "try_again": "Prøv igjen"
+  },
   "confirm_dialog": {
     "confirm": "Bekreft",
     "cancel": "Avbryt"
diff --git a/locales/nl/common.json b/locales/nl/common.json
index 8d98a7a6b..a52de8a28 100644
--- a/locales/nl/common.json
+++ b/locales/nl/common.json
@@ -1212,6 +1212,13 @@
       "plain_text": "[Afbeelding: {alt}]"
     }
   },
+  "compose_ux": {
+    "draft_discarded": "Concept verwijderd",
+    "undo": "Ongedaan maken",
+    "discard_draft": "Concept verwijderen",
+    "save_failed_close": "Het concept kon niet worden opgeslagen. Probeer het opnieuw of verwijder het.",
+    "try_again": "Opnieuw proberen"
+  },
   "confirm_dialog": {
     "confirm": "Bevestigen",
     "cancel": "Annuleren"
diff --git a/locales/pl/common.json b/locales/pl/common.json
index 517637d99..886c5c7d0 100644
--- a/locales/pl/common.json
+++ b/locales/pl/common.json
@@ -1212,6 +1212,13 @@
       "plain_text": "[Obraz: {alt}]"
     }
   },
+  "compose_ux": {
+    "draft_discarded": "Wersja robocza odrzucona",
+    "undo": "Cofnij",
+    "discard_draft": "Odrzuć wersję roboczą",
+    "save_failed_close": "Nie udało się zapisać wersji roboczej. Spróbuj ponownie lub ją odrzuć.",
+    "try_again": "Spróbuj ponownie"
+  },
   "confirm_dialog": {
     "confirm": "Potwierdź",
     "cancel": "Anuluj"
diff --git a/locales/pt/common.json b/locales/pt/common.json
index 192489a92..daaebc388 100644
--- a/locales/pt/common.json
+++ b/locales/pt/common.json
@@ -1212,6 +1212,13 @@
       "plain_text": "[Imagem: {alt}]"
     }
   },
+  "compose_ux": {
+    "draft_discarded": "Rascunho descartado",
+    "undo": "Desfazer",
+    "discard_draft": "Descartar rascunho",
+    "save_failed_close": "Não foi possível guardar o rascunho. Tente novamente ou descarte-o.",
+    "try_again": "Tentar novamente"
+  },
   "confirm_dialog": {
     "confirm": "Confirmar",
     "cancel": "Cancelar"
diff --git a/locales/ro/common.json b/locales/ro/common.json
index fb9a52ef6..ba56d909e 100644
--- a/locales/ro/common.json
+++ b/locales/ro/common.json
@@ -1212,6 +1212,13 @@
       "plain_text": "[Imagine: {alt}]"
     }
   },
+  "compose_ux": {
+    "draft_discarded": "Ciornă renunțată",
+    "undo": "Anulează",
+    "discard_draft": "Renunță la ciornă",
+    "save_failed_close": "Ciorna nu a putut fi salvată. Încercați din nou sau renunțați la ea.",
+    "try_again": "Încearcă din nou"
+  },
   "confirm_dialog": {
     "confirm": "Confirmare",
     "cancel": "Anulează"
diff --git a/locales/ru/common.json b/locales/ru/common.json
index c6f29fd16..6a1a7ff6a 100644
--- a/locales/ru/common.json
+++ b/locales/ru/common.json
@@ -1212,6 +1212,13 @@
       "plain_text": "[Изображение: {alt}]"
     }
   },
+  "compose_ux": {
+    "draft_discarded": "Черновик удалён",
+    "undo": "Отменить",
+    "discard_draft": "Удалить черновик",
+    "save_failed_close": "Не удалось сохранить черновик. Попробуйте ещё раз или удалите его.",
+    "try_again": "Повторить"
+  },
   "confirm_dialog": {
     "confirm": "Подтвердить",
     "cancel": "Отмена"
diff --git a/locales/sk/common.json b/locales/sk/common.json
index 91eaacf94..0d700da9a 100644
--- a/locales/sk/common.json
+++ b/locales/sk/common.json
@@ -1212,6 +1212,13 @@
       "plain_text": "[Obrázok: {alt}]"
     }
   },
+  "compose_ux": {
+    "draft_discarded": "Koncept zahodený",
+    "undo": "Späť",
+    "discard_draft": "Zahodiť koncept",
+    "save_failed_close": "Koncept sa nepodarilo uložiť. Skúste to znova alebo ho zahoďte.",
+    "try_again": "Skúsiť znova"
+  },
   "confirm_dialog": {
     "confirm": "Potvrdiť",
     "cancel": "Zrušiť"
diff --git a/locales/th/common.json b/locales/th/common.json
index f065a2157..467f5ebf4 100644
--- a/locales/th/common.json
+++ b/locales/th/common.json
@@ -1560,6 +1560,13 @@
       "plain_text": "[รูปภาพ: {alt}]"
     }
   },
+  "compose_ux": {
+    "draft_discarded": "ทิ้งฉบับร่างแล้ว",
+    "undo": "เลิกทำ",
+    "discard_draft": "ทิ้งฉบับร่าง",
+    "save_failed_close": "บันทึกฉบับร่างไม่ได้ ลองอีกครั้งหรือทิ้งไป",
+    "try_again": "ลองอีกครั้ง"
+  },
   "email_viewer": {
     "read_receipt": {
       "prompt": "ผู้ส่งขอรับใบตอบรับการอ่านเมื่อคุณเปิดข้อความนี้",
diff --git a/locales/tr/common.json b/locales/tr/common.json
index a57478d98..6fed03150 100644
--- a/locales/tr/common.json
+++ b/locales/tr/common.json
@@ -1212,6 +1212,13 @@
       "plain_text": "[Görsel: {alt}]"
     }
   },
+  "compose_ux": {
+    "draft_discarded": "Taslak silindi",
+    "undo": "Geri al",
+    "discard_draft": "Taslağı sil",
+    "save_failed_close": "Taslak kaydedilemedi. Yeniden deneyin ya da silin.",
+    "try_again": "Yeniden dene"
+  },
   "confirm_dialog": {
     "confirm": "Onayla",
     "cancel": "İptal"
diff --git a/locales/uk/common.json b/locales/uk/common.json
index 78662b5a1..5a3b31482 100644
--- a/locales/uk/common.json
+++ b/locales/uk/common.json
@@ -1212,6 +1212,13 @@
       "plain_text": "[Зображення: {alt}]"
     }
   },
+  "compose_ux": {
+    "draft_discarded": "Чернетку видалено",
+    "undo": "Скасувати",
+    "discard_draft": "Видалити чернетку",
+    "save_failed_close": "Не вдалося зберегти чернетку. Спробуйте ще раз або видаліть її.",
+    "try_again": "Спробувати ще раз"
+  },
   "confirm_dialog": {
     "confirm": "Підтвердити",
     "cancel": "Скасувати"
diff --git a/locales/vi/common.json b/locales/vi/common.json
index bcf9b2f50..df09e67d0 100644
--- a/locales/vi/common.json
+++ b/locales/vi/common.json
@@ -1224,6 +1224,13 @@
       "plain_text": "[Hình ảnh: {alt}]"
     }
   },
+  "compose_ux": {
+    "draft_discarded": "Đã hủy bản nháp",
+    "undo": "Hoàn tác",
+    "discard_draft": "Hủy bản nháp",
+    "save_failed_close": "Không lưu được bản nháp. Hãy thử lại hoặc hủy bản nháp.",
+    "try_again": "Thử lại"
+  },
   "confirm_dialog": {
     "confirm": "Xác nhận",
     "cancel": "Hủy"
diff --git a/locales/zh-TW/common.json b/locales/zh-TW/common.json
index 845487676..ede70a153 100644
--- a/locales/zh-TW/common.json
+++ b/locales/zh-TW/common.json
@@ -1212,6 +1212,13 @@
       "plain_text": "[圖片：{alt}]"
     }
   },
+  "compose_ux": {
+    "draft_discarded": "草稿已捨棄",
+    "undo": "復原",
+    "discard_draft": "捨棄草稿",
+    "save_failed_close": "無法儲存草稿。請再試一次或捨棄草稿。",
+    "try_again": "再試一次"
+  },
   "confirm_dialog": {
     "confirm": "確認",
     "cancel": "取消"
diff --git a/locales/zh/common.json b/locales/zh/common.json
index 12cfc890b..ccd831040 100644
--- a/locales/zh/common.json
+++ b/locales/zh/common.json
@@ -1212,6 +1212,13 @@
       "plain_text": "[图片：{alt}]"
     }
   },
+  "compose_ux": {
+    "draft_discarded": "草稿已舍弃",
+    "undo": "撤销",
+    "discard_draft": "舍弃草稿",
+    "save_failed_close": "无法保存草稿。请重试或舍弃草稿。",
+    "try_again": "重试"
+  },
   "confirm_dialog": {
     "confirm": "确认",
     "cancel": "取消"

From 7517b024ec4222b1ac9cd6af60a8bd897b949c15 Mon Sep 17 00:00:00 2001
From: Linus Rath <139418639+rathlinus@users.noreply.github.com>
Date: Wed, 4 Nov 2026 08:23:01 +0100
Subject: [PATCH 23/34] fix: make Discard on the Continue draft bar delete the
 draft, with Undo, and reach it by keyboard

---
 .../mail-app-continue-draft.test.tsx          | 178 ++++++++++++++++++
 components/mail/mail-app.tsx                  |  78 ++++----
 2 files changed, 222 insertions(+), 34 deletions(-)
 create mode 100644 components/mail/__tests__/mail-app-continue-draft.test.tsx

diff --git a/components/mail/__tests__/mail-app-continue-draft.test.tsx b/components/mail/__tests__/mail-app-continue-draft.test.tsx
new file mode 100644
index 000000000..0c4aaf306
--- /dev/null
+++ b/components/mail/__tests__/mail-app-continue-draft.test.tsx
@@ -0,0 +1,178 @@
+import React from 'react';
+import { act, fireEvent, render, screen, waitFor } from '@testing-library/react';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import type { Mailbox } from '@/lib/jmap/types';
+import { useAuthStore } from '@/stores/auth-store';
+import { useEmailStore } from '@/stores/email-store';
+import { useSettingsStore } from '@/stores/settings-store';
+import { usePluginStore } from '@/stores/plugin-store';
+import { useThemeStore } from '@/stores/theme-store';
+import { useToastStore } from '@/stores/toast-store';
+import { DEFAULT_SEARCH_FILTERS } from '@/lib/jmap/search-utils';
+
+// The "Continue draft" bar and clicking another message while writing: the
+// bar's X is its own button and deletes the saved draft, with Undo; another
+// message closes the composer the way its X does (it keeps the draft).
+
+const device = vi.hoisted(() => ({ current: { isMobile: false, isTablet: false, isDesktop: true } }));
+const stub = vi.hoisted(() => ({ requestClose: null as null | ((afterClose?: () => void) => void) }));
+
+vi.mock('@/components/layout/mv-top-bar', () => ({ MvTopBar: () => null }));
+vi.mock('@/components/layout/sidebar', () => ({
+  Sidebar: ({ onCompose }: { onCompose: () => void }) => <button onClick={onCompose}>stub compose</button>,
+}));
+// The composer hands its draft to the host as it unmounts, and offers the
+// host its close when the test says so.
+vi.mock('@/components/email/email-composer', async () => {
+  const { useEffect } = await import('react');
+  return {
+    EmailComposer: ({ onSaveState, requestCloseRef }: {
+      onSaveState: (data: Record<string, unknown>) => void;
+      requestCloseRef?: { current: unknown };
+    }) => {
+      useEffect(() => {
+        if (requestCloseRef && stub.requestClose) requestCloseRef.current = stub.requestClose;
+        return () => {
+          if (requestCloseRef) requestCloseRef.current = null;
+          onSaveState({ subject: 'Parked', draftId: 'draft-7', draftAccountId: 'acc', mode: 'compose' });
+        };
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+      }, []);
+      return <div>stub composer</div>;
+    },
+  };
+});
+vi.mock('@/components/search/mv-search-form', () => ({
+  MvSearchForm: ({ onSearch }: { onSearch: () => void }) => <button onClick={onSearch}>stub filter search</button>,
+}));
+vi.mock('@/components/email/email-viewer', () => ({ EmailViewer: () => <div>message viewer</div> }));
+vi.mock('@/components/layout/navigation-rail', () => ({ NavigationRail: () => null }));
+vi.mock('@/components/layout/calendar-event-notification-toaster', () => ({ CalendarEventNotificationToaster: () => null }));
+vi.mock('@/components/layout/share-notification-toaster', () => ({ ShareNotificationToaster: () => null }));
+vi.mock('@/components/layout/mobile-header', () => ({ MobileHeader: () => null }));
+vi.mock('@/components/layout/mv-side-panel', () => ({ MvSidePanel: () => null }));
+vi.mock('@/components/email/message-list-tabs', () => ({ useMessageListPanelProps: (id: string) => ({ id }), MessageListTabs: () => null }));
+vi.mock('@/components/search/search-box', () => ({ SearchBox: () => null }));
+vi.mock('@/components/tour/tour-provider', () => ({ useTour: () => ({ activeTour: null, registerStep: vi.fn() }) }));
+vi.mock('@/components/plugins/plugin-slot', () => ({ PluginSlot: () => null }));
+vi.mock('@/hooks/use-plugin-slot-offers', () => ({ usePluginSlotOffers: () => [] }));
+vi.mock('@/hooks/use-config', () => ({ useConfig: () => ({ appName: 'Mail' }) }));
+vi.mock('@/hooks/use-identity-sync', () => ({ useIdentitySync: () => {} }));
+vi.mock('@/hooks/use-pro-multi-account-identities', () => ({ useProMultiAccountIdentities: () => [] }));
+vi.mock('@/hooks/use-pro-multi-account-mailboxes', () => ({ useProMultiAccountMailboxes: () => {} }));
+vi.mock('@/hooks/use-wopi-status', () => ({ useWopiStatus: () => null, canWopiOpen: () => false }));
+vi.mock('@/hooks/use-browser-navigation', () => ({ useBrowserNavigation: () => {} }));
+vi.mock('@/hooks/use-media-query', () => ({
+  useDeviceDetection: () => device.current,
+  useMediaQuery: () => false,
+  useIsDesktop: () => true,
+}));
+vi.mock('@/lib/push-bindings', () => ({ reconcilePushBindings: () => {}, releasePushBindings: () => {} }));
+vi.mock('@/components/email/email-list', () => ({
+  EmailList: ({ onEmailSelect }: { onEmailSelect: (email: { id: string }) => void }) => (
+    <button onClick={() => void onEmailSelect({ id: 'other-mail' })}>stub other mail</button>
+  ),
+}));
+
+
+const { MailApp } = await import('../mail-app');
+
+const inbox = { id: 'inbox', name: 'Inbox', role: 'inbox', totalEmails: 0, unreadEmails: 0 } as Mailbox;
+let deleteEmail: ReturnType<typeof vi.fn>;
+
+beforeEach(() => {
+  device.current = { isMobile: false, isTablet: false, isDesktop: true };
+  stub.requestClose = null;
+  vi.stubGlobal('fetch', vi.fn().mockRejectedValue(new Error('Unexpected network request')));
+  vi.stubGlobal('ResizeObserver', class { observe() {} unobserve() {} disconnect() {} });
+  usePluginStore.setState({ initializePlugins: vi.fn().mockResolvedValue(undefined) });
+  useThemeStore.setState({ syncServerThemes: vi.fn().mockResolvedValue(undefined) });
+  deleteEmail = vi.fn().mockResolvedValue(undefined);
+  const client = {
+    getAccountId: () => 'acc', getUsername: () => 'a@example.org',
+    getSieveAccountId: () => null, hasDelayedSend: () => false, getSession: () => null,
+    deleteEmail,
+    getEmail: vi.fn().mockResolvedValue(null),
+  };
+  useAuthStore.setState({
+    isAuthenticated: true, isLoading: false, client: client as never, activeAccountId: 'login-a', identities: [],
+    getClientForAccount: () => client as never,
+    getAllConnectedClients: () => new Map([['login-a', client]]) as never,
+  });
+  useSettingsStore.setState({ enableUnifiedMailbox: false, interfaceLayout: 'default', mailLayout: 'split' } as never);
+  useEmailStore.setState({
+    emails: [], selectedEmail: null, selectedMailbox: 'inbox', selectedKeyword: null, mailboxes: [inbox],
+    viewingAccountId: null, accountMailboxes: {}, isUnifiedView: false, unifiedRole: null,
+    isScheduledView: false, isLoadingEmail: false, isLoading: false, searchQuery: '',
+    searchFilters: { ...DEFAULT_SEARCH_FILTERS }, searchMailboxId: '', isAdvancedSearchOpen: false,
+    selectedEmailKeys: new Set(), unreadSection: null,
+    fetchMailboxes: vi.fn().mockResolvedValue(undefined), fetchEmails: vi.fn().mockResolvedValue(undefined),
+    fetchQuota: vi.fn().mockResolvedValue(undefined), fetchTagCounts: vi.fn().mockResolvedValue(undefined),
+    refreshScheduledMetadata: vi.fn().mockResolvedValue(undefined),
+  } as never);
+  useToastStore.getState().clearToasts();
+});
+afterEach(() => {
+  vi.useRealTimers();
+  vi.restoreAllMocks();
+  vi.unstubAllGlobals();
+  useToastStore.getState().clearToasts();
+});
+
+async function parkDraft() {
+  render(<MailApp />);
+  fireEvent.click(screen.getByText('stub compose'));
+  await screen.findByText('stub composer');
+  // No close offered: the composer unmounts and parks its draft.
+  fireEvent.click(screen.getByText('stub other mail'));
+  await screen.findByText('email_composer.continue_draft');
+}
+
+const discardButton = () => screen.getByRole('button', { name: 'discard_draft' });
+
+describe('the Continue draft bar', () => {
+  it('has a Discard button of its own, outside the bar button', async () => {
+    await parkDraft();
+    expect(discardButton().parentElement?.closest('button')).toBeNull();
+  });
+
+  it('deletes the saved draft once the Undo window is over', async () => {
+    await parkDraft();
+    vi.useFakeTimers({ shouldAdvanceTime: true });
+    fireEvent.click(discardButton());
+    expect(screen.queryByText('email_composer.continue_draft')).toBeNull();
+    const undoToast = useToastStore.getState().toasts.find((t) => t.title === 'draft_discarded');
+    expect(undoToast?.action?.label).toBe('undo');
+    expect(deleteEmail).not.toHaveBeenCalled();
+    await act(async () => { await vi.advanceTimersByTimeAsync(undoToast!.duration! + 10); });
+    expect(deleteEmail).toHaveBeenCalledWith('draft-7', 'acc');
+  });
+
+  it('brings the bar back on Undo and keeps the draft', async () => {
+    await parkDraft();
+    vi.useFakeTimers({ shouldAdvanceTime: true });
+    fireEvent.click(discardButton());
+    const undoToast = useToastStore.getState().toasts.find((t) => t.title === 'draft_discarded')!;
+    act(() => undoToast.action!.onClick());
+    expect(await screen.findByText('email_composer.continue_draft')).toBeInTheDocument();
+    await act(async () => { await vi.advanceTimersByTimeAsync(60_000); });
+    expect(deleteEmail).not.toHaveBeenCalled();
+  });
+});
+
+describe('another message clicked while writing', () => {
+  it('closes the composer through its own close, which keeps the draft', async () => {
+    const requestClose = vi.fn();
+    stub.requestClose = requestClose;
+    render(<MailApp />);
+    fireEvent.click(screen.getByText('stub compose'));
+    await screen.findByText('stub composer');
+
+    fireEvent.click(screen.getByText('stub other mail'));
+
+    await waitFor(() => expect(requestClose).toHaveBeenCalledTimes(1));
+    // Still there until it has saved and closes itself; no bar.
+    expect(screen.getByText('stub composer')).toBeInTheDocument();
+    expect(screen.queryByText('email_composer.continue_draft')).toBeNull();
+  });
+});
diff --git a/components/mail/mail-app.tsx b/components/mail/mail-app.tsx
index 68922ddfd..13d3efd05 100644
--- a/components/mail/mail-app.tsx
+++ b/components/mail/mail-app.tsx
@@ -42,6 +42,7 @@ import { findDraftIdentityIdForLogin, listRowSource, resolveDraftSource, type Dr
 import { useRemoveFromFolder } from "@/hooks/use-remove-from-folder";
 import { groupSearchScopeFolders, SEARCH_SCOPE_ALL_FOLDERS } from "@/lib/search-scope-folders";
 import { toast } from "@/stores/toast-store";
+import { discardWithUndo } from "@/lib/compose/draft-close-toast";
 import { cancelFailureToast, partlyRefusedWarning, rescheduleFailureToast, rescheduledToast } from "@/lib/send-failure-message";
 import { formatScheduledSendAt } from "@/lib/scheduled-send-label";
 import { startSendProgress } from "@/lib/outgoing/send-progress-toast";
@@ -262,6 +263,7 @@ export function MailApp({ linkSegments: routeSegments }: MailAppProps = {}) {
   // "Confirm before deleting / archiving" (lib/mail-removal-confirm).
   const tRemove = useTranslations('email_list.confirm_remove');
   const tCommon = useTranslations('common');
+  const tComposeUx = useTranslations('compose_ux');
   const appName = productName(useConfig().appName);
   const tQuote = useTranslations('quote_header');
   const tComposer = useTranslations('email_composer');
@@ -4536,7 +4538,8 @@ export function MailApp({ linkSegments: routeSegments }: MailAppProps = {}) {
     let delayedUntil: string | undefined;
     if (sendDelaySeconds > 0) {
       if (!client.hasDelayedSend()) {
-        const confirmed = await confirmDialog({
+        // As in the composer: only a delay the user picked asks.
+        const confirmed = !useSettingsStore.getState().explicitSettings.includes('sendDelaySeconds') || await confirmDialog({
           title: t('email_composer.send_delay_unsupported_title'),
           message: t('email_composer.send_delay_unsupported_confirm'),
           confirmText: t('email_composer.send'),
@@ -4910,11 +4913,13 @@ export function MailApp({ linkSegments: routeSegments }: MailAppProps = {}) {
     if (!client || !email) return new Error('the mail page is not ready');
     setCursorOnly(false);
 
-    // If composing, suspend the composer (unmount will trigger onSaveState).
-    // Mountain View's compose window stays open while other mail is read,
-    // as Gmail's does. (#1229)
+    // If composing, close the composer the way its X does: it keeps the
+    // draft and says so. Mountain View's compose window stays open while
+    // other mail is read, as Gmail's does. (#1229)
     if (showComposer && !floatingComposer) {
-      setShowComposer(false);
+      const requestClose = composerRequestCloseRef.current;
+      if (requestClose) requestClose();
+      else setShowComposer(false);
     }
 
     // Find the list-level email for metadata (accountId, scheduled flags, etc.).
@@ -5968,36 +5973,41 @@ export function MailApp({ linkSegments: routeSegments }: MailAppProps = {}) {
             <>
             {/* Pending draft banner */}
             {pendingDraft && (
-              <button
-                onClick={() => {
-                  setShowComposer(true);
-                  if (isMobile) setActiveView('viewer');
-                }}
-                className="flex items-center gap-3 px-4 py-2.5 bg-primary/10 border-b border-primary/20 hover:bg-primary/15 transition-colors cursor-pointer w-full text-start"
-              >
-                <PenSquare className="w-4 h-4 text-primary shrink-0" />
-                <div className="flex-1 min-w-0">
-                  <span className="text-sm font-medium text-primary">{t('email_composer.continue_draft')}</span>
-                  {pendingDraft.subject && (
-                    <span className="text-xs text-muted-foreground ms-2 truncate">{pendingDraft.subject}</span>
-                  )}
-                </div>
-                <X
-                  className="w-4 h-4 text-muted-foreground hover:text-foreground shrink-0"
-                  onClick={async (e) => {
-                    e.stopPropagation();
-                    const confirmed = await confirmDialog({
-                      title: t('email_composer.discard_draft_title'),
-                      message: t('email_composer.discard_draft_confirm'),
-                      confirmText: t('email_composer.discard'),
-                      variant: "destructive",
-                    });
-                    if (confirmed) {
-                      setPendingDraft(null);
-                    }
+              <div className="flex items-center bg-primary/10 border-b border-primary/20" data-testid="continue-draft-bar">
+                <button
+                  onClick={() => {
+                    setShowComposer(true);
+                    if (isMobile) setActiveView('viewer');
                   }}
-                />
-              </button>
+                  className="flex flex-1 min-w-0 items-center gap-3 ps-4 pe-2 py-2.5 hover:bg-primary/15 transition-colors cursor-pointer text-start"
+                >
+                  <PenSquare className="w-4 h-4 text-primary shrink-0" />
+                  <div className="flex-1 min-w-0">
+                    <span className="text-sm font-medium text-primary">{t('email_composer.continue_draft')}</span>
+                    {pendingDraft.subject && (
+                      <span className="text-xs text-muted-foreground ms-2 truncate">{pendingDraft.subject}</span>
+                    )}
+                  </div>
+                </button>
+                {/* Its own button, so the keyboard reaches it. Deletes the saved
+                    draft too, with Undo instead of a question. */}
+                <button
+                  type="button"
+                  aria-label={tComposeUx('discard_draft')}
+                  title={tComposeUx('discard_draft')}
+                  data-testid="continue-draft-discard"
+                  onClick={() => {
+                    const draft = pendingDraft;
+                    setPendingDraft(null);
+                    discardWithUndo(() => {
+                      if (draft.draftId) void handleDiscardDraft(draft.draftId, { accountId: draft.draftAccountId, localAccountId: draft.draftLocalAccountId });
+                    }, { discarded: tComposeUx('draft_discarded'), undo: tComposeUx('undo') }, () => setPendingDraft(draft));
+                  }}
+                  className="grid h-9 w-9 shrink-0 place-items-center me-2 rounded-md text-muted-foreground hover:text-foreground hover:bg-primary/15 transition-colors"
+                >
+                  <X className="w-4 h-4" />
+                </button>
+              </div>
             )}
             {/* Mobile Conversation View - shown when thread is selected on mobile */}
             {isMobile && !conversationThread && deepLinkPane === 'thread' ? (

From ad0b238e3d1250e631322b62014dbb1f5a647f45 Mon Sep 17 00:00:00 2001
From: Linus Rath <139418639+rathlinus@users.noreply.github.com>
Date: Wed, 4 Nov 2026 08:32:05 +0100
Subject: [PATCH 24/34] feat: open a reply under the message it answers, which
 stays readable above it

---
 components/email/email-viewer.tsx             |   5 +-
 .../__tests__/mail-app-docked-reply.test.tsx  | 151 ++++++++++++++++++
 components/mail/mail-app.tsx                  |  23 ++-
 3 files changed, 175 insertions(+), 4 deletions(-)
 create mode 100644 components/mail/__tests__/mail-app-docked-reply.test.tsx

diff --git a/components/email/email-viewer.tsx b/components/email/email-viewer.tsx
index 8bea1337e..44f6a08a1 100644
--- a/components/email/email-viewer.tsx
+++ b/components/email/email-viewer.tsx
@@ -278,6 +278,8 @@ interface EmailViewerProps {
   onReplyAllConversationEmail?: (email: Email) => void;
   /** Mountain View: a reply being written in place, shown under the conversation instead of the reply buttons. */
   mvInlineComposer?: React.ReactNode;
+  /** A reply or forward to this message is open under it: no quick reply box as well. */
+  replyComposerOpen?: boolean;
   onShowShortcuts?: () => void;
   onEditDraft?: () => void;
   onCancelScheduledForEdit?: () => void;
@@ -1341,6 +1343,7 @@ export function EmailViewer({
   onReplyConversationEmail,
   onReplyAllConversationEmail,
   mvInlineComposer,
+  replyComposerOpen,
   onShowShortcuts,
   onEditDraft,
   onCancelScheduledForEdit,
@@ -3456,7 +3459,7 @@ export function EmailViewer({
   const [iframeReadyFor, setIframeReadyFor] = useState<string | null>(null);
   const latestSrcDocRef = useRef<string | null>(null);
   const iframeReady = iframeReadyFor !== null && iframeReadyFor === emailIframeSrcDoc;
-  const showQuickReply = !!email && quickReplyEnabled && !mvReplyRow && !isDraft && !isScheduled && !isBodyLoading
+  const showQuickReply = !!email && quickReplyEnabled && !mvReplyRow && !replyComposerOpen && !isDraft && !isScheduled && !isBodyLoading
     && (!effectiveEmailContent.isHtml || iframeReady);
   // The plain-text body, where reader-above-quote mounts between text and quote.
   const [plainBodyEl, setPlainBodyEl] = useState<HTMLDivElement | null>(null);
diff --git a/components/mail/__tests__/mail-app-docked-reply.test.tsx b/components/mail/__tests__/mail-app-docked-reply.test.tsx
new file mode 100644
index 000000000..3afb57df8
--- /dev/null
+++ b/components/mail/__tests__/mail-app-docked-reply.test.tsx
@@ -0,0 +1,151 @@
+import React from 'react';
+import { fireEvent, render, screen } from '@testing-library/react';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import type { Mailbox } from '@/lib/jmap/types';
+import { useAuthStore } from '@/stores/auth-store';
+import { useEmailStore } from '@/stores/email-store';
+import { useSettingsStore } from '@/stores/settings-store';
+import { usePluginStore } from '@/stores/plugin-store';
+import { useThemeStore } from '@/stores/theme-store';
+import { useToastStore } from '@/stores/toast-store';
+import { DEFAULT_SEARCH_FILTERS } from '@/lib/jmap/search-utils';
+
+// Reply in the standard layout on a computer: the composer docks under the
+// message it answers, which stays on screen above it, as in Gmail and Outlook.
+
+const device = vi.hoisted(() => ({ current: { isMobile: false, isTablet: false, isDesktop: true } }));
+const stub = vi.hoisted(() => ({ requestClose: null as null | ((afterClose?: () => void) => void) }));
+
+vi.mock('@/components/layout/mv-top-bar', () => ({ MvTopBar: () => null }));
+vi.mock('@/components/layout/sidebar', () => ({
+  Sidebar: ({ onCompose }: { onCompose: () => void }) => <button onClick={onCompose}>stub compose</button>,
+}));
+// The composer hands its draft to the host as it unmounts, and offers the
+// host its close when the test says so.
+vi.mock('@/components/email/email-composer', async () => {
+  const { useEffect } = await import('react');
+  return {
+    EmailComposer: ({ onSaveState, requestCloseRef }: {
+      onSaveState: (data: Record<string, unknown>) => void;
+      requestCloseRef?: { current: unknown };
+    }) => {
+      useEffect(() => {
+        if (requestCloseRef && stub.requestClose) requestCloseRef.current = stub.requestClose;
+        return () => {
+          if (requestCloseRef) requestCloseRef.current = null;
+          onSaveState({ subject: 'Parked', draftId: 'draft-7', draftAccountId: 'acc', mode: 'compose' });
+        };
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+      }, []);
+      return <div>stub composer</div>;
+    },
+  };
+});
+vi.mock('@/components/search/mv-search-form', () => ({
+  MvSearchForm: ({ onSearch }: { onSearch: () => void }) => <button onClick={onSearch}>stub filter search</button>,
+}));
+vi.mock('@/components/email/email-viewer', () => ({
+  EmailViewer: ({ onReply, onForward, replyComposerOpen }: { onReply: () => void; onForward: () => void; replyComposerOpen?: boolean }) => (
+    <div data-testid="viewer" data-reply-open={replyComposerOpen ? 'yes' : 'no'}>
+      message viewer
+      <button onClick={() => onReply()}>stub reply</button>
+      <button onClick={() => onForward()}>stub forward</button>
+    </div>
+  ),
+}));
+vi.mock('@/components/layout/navigation-rail', () => ({ NavigationRail: () => null }));
+vi.mock('@/components/layout/calendar-event-notification-toaster', () => ({ CalendarEventNotificationToaster: () => null }));
+vi.mock('@/components/layout/share-notification-toaster', () => ({ ShareNotificationToaster: () => null }));
+vi.mock('@/components/layout/mobile-header', () => ({ MobileHeader: () => null }));
+vi.mock('@/components/layout/mv-side-panel', () => ({ MvSidePanel: () => null }));
+vi.mock('@/components/email/message-list-tabs', () => ({ useMessageListPanelProps: (id: string) => ({ id }), MessageListTabs: () => null }));
+vi.mock('@/components/search/search-box', () => ({ SearchBox: () => null }));
+vi.mock('@/components/tour/tour-provider', () => ({ useTour: () => ({ activeTour: null, registerStep: vi.fn() }) }));
+vi.mock('@/components/plugins/plugin-slot', () => ({ PluginSlot: () => null }));
+vi.mock('@/hooks/use-plugin-slot-offers', () => ({ usePluginSlotOffers: () => [] }));
+vi.mock('@/hooks/use-config', () => ({ useConfig: () => ({ appName: 'Mail' }) }));
+vi.mock('@/hooks/use-identity-sync', () => ({ useIdentitySync: () => {} }));
+vi.mock('@/hooks/use-pro-multi-account-identities', () => ({ useProMultiAccountIdentities: () => [] }));
+vi.mock('@/hooks/use-pro-multi-account-mailboxes', () => ({ useProMultiAccountMailboxes: () => {} }));
+vi.mock('@/hooks/use-wopi-status', () => ({ useWopiStatus: () => null, canWopiOpen: () => false }));
+vi.mock('@/hooks/use-browser-navigation', () => ({ useBrowserNavigation: () => {} }));
+vi.mock('@/hooks/use-media-query', () => ({
+  useDeviceDetection: () => device.current,
+  useMediaQuery: () => false,
+  useIsDesktop: () => true,
+}));
+vi.mock('@/lib/push-bindings', () => ({ reconcilePushBindings: () => {}, releasePushBindings: () => {} }));
+vi.mock('@/components/email/email-list', () => ({
+  EmailList: ({ onEmailSelect }: { onEmailSelect: (email: { id: string }) => void }) => (
+    <button onClick={() => void onEmailSelect({ id: 'other-mail' })}>stub other mail</button>
+  ),
+}));
+
+
+const { MailApp } = await import('../mail-app');
+
+const inbox = { id: 'inbox', name: 'Inbox', role: 'inbox', totalEmails: 0, unreadEmails: 0 } as Mailbox;
+const MESSAGE = {
+  id: 'm1', threadId: 't1', mailboxIds: { inbox: true }, keywords: { $seen: true },
+  from: [{ name: 'Ann', email: 'ann@example.org' }], to: [{ email: 'a@example.org' }],
+  subject: 'Plans', receivedAt: '2026-11-01T10:00:00Z', preview: 'Hi', size: 10,
+  hasAttachment: false, textBody: [], htmlBody: [], bodyValues: {},
+} as never;
+
+beforeEach(() => {
+  device.current = { isMobile: false, isTablet: false, isDesktop: true };
+  stub.requestClose = null;
+  vi.stubGlobal('fetch', vi.fn().mockRejectedValue(new Error('Unexpected network request')));
+  vi.stubGlobal('ResizeObserver', class { observe() {} unobserve() {} disconnect() {} });
+  usePluginStore.setState({ initializePlugins: vi.fn().mockResolvedValue(undefined) });
+  useThemeStore.setState({ syncServerThemes: vi.fn().mockResolvedValue(undefined) });
+  const client = {
+    getAccountId: () => 'acc', getUsername: () => 'a@example.org',
+    getSieveAccountId: () => null, hasDelayedSend: () => false, getSession: () => null,
+    getEmail: vi.fn().mockResolvedValue(null),
+  };
+  useAuthStore.setState({
+    isAuthenticated: true, isLoading: false, client: client as never, activeAccountId: 'login-a', identities: [],
+    getClientForAccount: () => client as never,
+    getAllConnectedClients: () => new Map([['login-a', client]]) as never,
+  });
+  useSettingsStore.setState({ enableUnifiedMailbox: false, interfaceLayout: 'default', mailLayout: 'split' } as never);
+  useEmailStore.setState({
+    emails: [MESSAGE], selectedEmail: MESSAGE, selectedMailbox: 'inbox', selectedKeyword: null, mailboxes: [inbox],
+    viewingAccountId: null, accountMailboxes: {}, isUnifiedView: false, unifiedRole: null,
+    isScheduledView: false, isLoadingEmail: false, isLoading: false, searchQuery: '',
+    searchFilters: { ...DEFAULT_SEARCH_FILTERS }, searchMailboxId: '', isAdvancedSearchOpen: false,
+    selectedEmailKeys: new Set(), unreadSection: null,
+    fetchMailboxes: vi.fn().mockResolvedValue(undefined), fetchEmails: vi.fn().mockResolvedValue(undefined),
+    fetchQuota: vi.fn().mockResolvedValue(undefined), fetchTagCounts: vi.fn().mockResolvedValue(undefined),
+    refreshScheduledMetadata: vi.fn().mockResolvedValue(undefined),
+  } as never);
+  useToastStore.getState().clearToasts();
+});
+afterEach(() => {
+  vi.useRealTimers();
+  vi.restoreAllMocks();
+  vi.unstubAllGlobals();
+  useToastStore.getState().clearToasts();
+});
+
+describe('a reply in the standard layout', () => {
+  for (const action of ['stub reply', 'stub forward']) {
+    it(`docks under the message, which stays on screen (${action})`, async () => {
+      render(<MailApp />);
+      fireEvent.click(await screen.findByText(action));
+      const composer = await screen.findByText('stub composer');
+      expect(screen.getByTestId('viewer')).toBeInTheDocument();
+      expect(composer.closest('[data-reply-dock]')).not.toBeNull();
+      // No quick reply box under the message as well.
+      expect(screen.getByTestId('viewer')).toHaveAttribute('data-reply-open', 'yes');
+    });
+  }
+
+  it('takes the whole pane for a new message', async () => {
+    render(<MailApp />);
+    fireEvent.click(screen.getByText('stub compose'));
+    await screen.findByText('stub composer');
+    expect(screen.queryByTestId('viewer')).toBeNull();
+  });
+});
diff --git a/components/mail/mail-app.tsx b/components/mail/mail-app.tsx
index 13d3efd05..26b31502a 100644
--- a/components/mail/mail-app.tsx
+++ b/components/mail/mail-app.tsx
@@ -294,6 +294,8 @@ export function MailApp({ linkSegments: routeSegments }: MailAppProps = {}) {
   const composerSessionRef = useRef(composerSessionId);
   composerSessionRef.current = composerSessionId;
   const composerHostRef = useRef('pane');
+  // The compose session docked under its message (dockedReply).
+  const dockedSessionRef = useRef<number | null>(null);
   const showComposerRef = useRef(showComposer);
   showComposerRef.current = showComposer;
   // Fields a plugin filled in through onBeforeCompose for the composer about
@@ -4882,7 +4884,16 @@ export function MailApp({ linkSegments: routeSegments }: MailAppProps = {}) {
   const mvInlineReply = mvShell && showComposer && !isEmbedded && !mvReplyPoppedOut
     && (pendingDraft?.mode ?? composerMode) !== 'compose' && Boolean(selectedEmail);
   const floatingComposer = mvShell && showComposer && !isEmbedded && !mvInlineReply;
-  const composerHost = floatingComposer ? 'window' : mvInlineReply ? 'inline' : 'pane';
+  // Elsewhere on a computer a reply or forward docks under the message it
+  // answers, which stays readable above it, as in Gmail and Outlook. Not
+  // for a draft being edited: that message is the draft itself.
+  // Decided as it opens and kept for the session: moving it would mount it
+  // anew when the message goes away (another folder opened meanwhile).
+  const dockCandidate = !mvShell && !isMobile && showComposer && !isEmbedded && !floatingComposer
+    && (pendingDraft?.mode ?? composerMode) !== 'compose';
+  if (dockCandidate && selectedEmail && !selectedEmail.keywords?.$draft) dockedSessionRef.current = composerSessionId;
+  const dockedReply = dockCandidate && dockedSessionRef.current === composerSessionId;
+  const composerHost = floatingComposer ? 'window' : mvInlineReply ? 'inline' : dockedReply ? 'dock' : 'pane';
   composerHostRef.current = composerHost;
   const hasViewerContent = (showComposer && !floatingComposer) || Boolean(conversationThread)
     || Boolean(selectedEmail && !(mvShell && cursorOnly)) || deepLinkPane !== null;
@@ -5969,10 +5980,10 @@ export function MailApp({ linkSegments: routeSegments }: MailAppProps = {}) {
             {/* Inline Composer - shown in viewer pane.
                 In Pro/embedded mode the composer is hoisted into its own
                 Pro tab (see the effect below), so we never render it inline. */}
-            {(showComposer && !isEmbedded && !floatingComposer && !mvInlineReply) ? composerNode : (
+            {(showComposer && !isEmbedded && !floatingComposer && !mvInlineReply && !dockedReply) ? composerNode : (
             <>
             {/* Pending draft banner */}
-            {pendingDraft && (
+            {pendingDraft && !dockedReply && (
               <div className="flex items-center bg-primary/10 border-b border-primary/20" data-testid="continue-draft-bar">
                 <button
                   onClick={() => {
@@ -6146,6 +6157,7 @@ export function MailApp({ linkSegments: routeSegments }: MailAppProps = {}) {
                       await handleConversationReplyAll(full ?? e);
                     } : undefined}
                     mvInlineComposer={mvInlineReply ? <MvComposeInline onPopOut={handleMvPopOut}>{composerNode}</MvComposeInline> : undefined}
+                    replyComposerOpen={dockedReply}
                     onToggleFullscreen={!isEmbedded && !isMobile ? () => setFullscreenReading((v) => !v) : undefined}
                     onOpenInWindow={!isEmbedded && !isMobile && openEmailInWindow && selectedEmail ? () => openEmailInWindow(selectedEmail) : undefined}
                     isFullscreen={fullscreenReading}
@@ -6196,6 +6208,11 @@ export function MailApp({ linkSegments: routeSegments }: MailAppProps = {}) {
                 </ErrorBoundary>
               </>
             )}
+            {dockedReply && (
+              <div className="flex basis-[62%] min-h-[18rem] shrink-0 flex-col border-t border-border" data-reply-dock="">
+                {composerNode}
+              </div>
+            )}
             </>
             )}
           </section>

From 472ee53d88459c3ecf35b0cca2178be6a169fd5c Mon Sep 17 00:00:00 2001
From: Linus Rath <139418639+rathlinus@users.noreply.github.com>
Date: Wed, 4 Nov 2026 08:36:25 +0100
Subject: [PATCH 25/34] fix: insert pasted and dropped images without a dialog,
 with an optional Add description chip

The image description tests now open the dialog from the chip on the image, since a drop no longer opens it by itself.
---
 .../__tests__/rich-text-editor-a11y.test.tsx  |  8 ++++-
 .../__tests__/rich-text-editor-drop.test.tsx  | 31 ++++++++++++++++++-
 components/email/resizable-image.tsx          | 25 +++++++++++++--
 components/email/rich-text-editor.tsx         |  8 +++--
 locales/ar/common.json                        |  3 +-
 locales/ca/common.json                        |  3 +-
 locales/cs/common.json                        |  3 +-
 locales/da/common.json                        |  3 +-
 locales/de/common.json                        |  3 +-
 locales/en/common.json                        |  3 +-
 locales/es/common.json                        |  3 +-
 locales/et/common.json                        |  3 +-
 locales/fa/common.json                        |  3 +-
 locales/fr/common.json                        |  3 +-
 locales/he/common.json                        |  3 +-
 locales/hu/common.json                        |  3 +-
 locales/it/common.json                        |  3 +-
 locales/ja/common.json                        |  3 +-
 locales/ko/common.json                        |  3 +-
 locales/lv/common.json                        |  3 +-
 locales/mn/common.json                        |  3 +-
 locales/nb/common.json                        |  3 +-
 locales/nl/common.json                        |  3 +-
 locales/pl/common.json                        |  3 +-
 locales/pt/common.json                        |  3 +-
 locales/ro/common.json                        |  3 +-
 locales/ru/common.json                        |  3 +-
 locales/sk/common.json                        |  3 +-
 locales/th/common.json                        |  3 +-
 locales/tr/common.json                        |  3 +-
 locales/uk/common.json                        |  3 +-
 locales/vi/common.json                        |  3 +-
 locales/zh-TW/common.json                     |  3 +-
 locales/zh/common.json                        |  3 +-
 34 files changed, 125 insertions(+), 37 deletions(-)

diff --git a/components/email/__tests__/rich-text-editor-a11y.test.tsx b/components/email/__tests__/rich-text-editor-a11y.test.tsx
index 12931f3a3..af348308e 100644
--- a/components/email/__tests__/rich-text-editor-a11y.test.tsx
+++ b/components/email/__tests__/rich-text-editor-a11y.test.tsx
@@ -164,8 +164,11 @@ describe('RichTextEditor image descriptions (MA-02)', () => {
   const altDialog = () => screen.getByRole('dialog', { name: 'title' });
   const html = (editor: Editor) => editor.getHTML();
 
-  it('asks for a description when an image is dropped in, and never uses the file name', async () => {
+  it('offers a description for a dropped image, and never uses the file name', async () => {
     const { editor } = await dropImage();
+    // Nothing asks on the drop; the chip on the image does, when clicked.
+    expect(screen.queryByRole('dialog', { name: 'title' })).toBeNull();
+    fireEvent.click(await screen.findByTestId('image-alt-add'));
     const dialog = await waitFor(() => altDialog());
     expect(html(editor)).not.toContain('IMG_2041');
     expect(html(editor)).not.toMatch(/alt=/);
@@ -178,6 +181,9 @@ describe('RichTextEditor image descriptions (MA-02)', () => {
 
   it('marks an image decorative with an empty alt', async () => {
     const { editor } = await dropImage();
+    // Nothing asks on the drop; the chip on the image does, when clicked.
+    expect(screen.queryByRole('dialog', { name: 'title' })).toBeNull();
+    fireEvent.click(await screen.findByTestId('image-alt-add'));
     const dialog = await waitFor(() => altDialog());
     fireEvent.click(within(dialog).getByLabelText('decorative'));
     expect(within(dialog).getByLabelText('label')).toBeDisabled();
diff --git a/components/email/__tests__/rich-text-editor-drop.test.tsx b/components/email/__tests__/rich-text-editor-drop.test.tsx
index 235cffce7..215b153b2 100644
--- a/components/email/__tests__/rich-text-editor-drop.test.tsx
+++ b/components/email/__tests__/rich-text-editor-drop.test.tsx
@@ -1,4 +1,4 @@
-import { act, render, waitFor } from '@testing-library/react';
+import { act, fireEvent, render, screen, waitFor } from '@testing-library/react';
 import { describe, expect, it, vi } from 'vitest';
 import React from 'react';
 import type { Editor } from '@tiptap/core';
@@ -72,4 +72,33 @@ describe('RichTextEditor file drop', () => {
     expect(editor.getText()).toBe('Hello');
     expect(onDrop).not.toHaveBeenCalled();
   });
+
+  // A pasted or dropped image asks nothing: an optional chip on it offers a description.
+  it('opens no dialog for a dropped image, and offers "Add description" on it', async () => {
+    const { editor } = await setup(async () => ({ src: 'data:image/png;base64,AAAA' }));
+    const file = new File(['png'], 'photo.png', { type: 'image/png' });
+
+    act(() => { editor.view.dom.dispatchEvent(fileDrop(file)); });
+
+    const chip = await screen.findByTestId('image-alt-add');
+    expect(chip).toHaveTextContent('add_description');
+    expect(screen.queryByRole('dialog')).toBeNull();
+
+    fireEvent.click(chip);
+    expect(await screen.findByRole('dialog')).toBeInTheDocument();
+  });
+
+  it('shows no chip on an image marked decorative', async () => {
+    let editor: Editor | null = null;
+    render(
+      <RichTextEditor
+        content={'<p>Hi <img src="data:image/png;base64,AAAA" alt=""></p>'}
+        onChange={() => {}}
+        onImageUpload={async () => null}
+        onEditorReady={(ed) => { editor = ed as unknown as Editor; }}
+      />
+    );
+    await waitFor(() => expect(editor).not.toBeNull());
+    expect(screen.queryByTestId('image-alt-add')).toBeNull();
+  });
 });
diff --git a/components/email/resizable-image.tsx b/components/email/resizable-image.tsx
index bbed84d3c..fbe3ffc20 100644
--- a/components/email/resizable-image.tsx
+++ b/components/email/resizable-image.tsx
@@ -12,10 +12,14 @@ export interface ResizableImageOptions {
   onEditAlt?: (pos: number) => void;
   /** The name of the button that does it ("Image description"). */
   editAltLabel?: string;
+  /** The chip on an image that has no description yet ("Add description"). */
+  addAltLabel?: string;
 }
 
 function ResizableImageView({ node, updateAttributes, selected, extension, getPos }: NodeViewProps) {
-  const { onEditAlt, editAltLabel } = extension.options as ResizableImageOptions;
+  const { onEditAlt, editAltLabel, addAltLabel } = extension.options as ResizableImageOptions;
+  // No description and not marked decorative (""): an optional chip asks for one.
+  const undescribed = node.attrs.alt === null || node.attrs.alt === undefined;
   const imgRef = useRef<HTMLImageElement>(null);
   const [resizing, setResizing] = useState(false);
   // A remote image (a draft from another client, pasted web content) stays
@@ -93,6 +97,23 @@ function ResizableImageView({ node, updateAttributes, selected, extension, getPo
           style={{ width: "100%", height: "auto", display: "block" }}
           draggable={false}
         />
+        {undescribed && onEditAlt && addAltLabel && !selected && (
+          // Optional, never in the way: pasting or dropping an image asks nothing.
+          <button
+            type="button"
+            contentEditable={false}
+            data-testid="image-alt-add"
+            onMouseDown={(e) => e.preventDefault()}
+            onClick={(e) => {
+              e.stopPropagation();
+              const pos = typeof getPos === "function" ? getPos() : undefined;
+              if (typeof pos === "number") onEditAlt(pos);
+            }}
+            className="absolute bottom-1 start-1 rounded-full bg-background/90 px-2 py-0.5 text-xs font-medium text-foreground shadow border border-border hover:bg-background"
+          >
+            {addAltLabel}
+          </button>
+        )}
         {selected && onEditAlt && (
           // Edit what the image says to screen readers. Reachable with Tab
           // while the image is selected, and from the toolbar.
@@ -140,7 +161,7 @@ export const ResizableImage = Node.create<ResizableImageOptions>({
   name: "image",
 
   addOptions() {
-    return { onEditAlt: undefined, editAltLabel: undefined };
+    return { onEditAlt: undefined, editAltLabel: undefined, addAltLabel: undefined };
   },
   group: "inline",
   inline: true,
diff --git a/components/email/rich-text-editor.tsx b/components/email/rich-text-editor.tsx
index d4e4ac6cd..532291294 100644
--- a/components/email/rich-text-editor.tsx
+++ b/components/email/rich-text-editor.tsx
@@ -471,6 +471,7 @@ export function RichTextEditor({
 }: RichTextEditorProps) {
   const rtlEditingSupport = useSettingsStore((st) => st.rtlEditingSupport);
   const tComposer = useTranslations("email_composer");
+  const tUx = useTranslations("compose_ux");
   const tQuote = useTranslations("email_viewer");
   const onImageUploadRef = React.useRef(onImageUpload);
   onImageUploadRef.current = onImageUpload;
@@ -521,6 +522,7 @@ export function RichTextEditor({
       ResizableImage.configure({
         onEditAlt: (pos: number) => setAltQueue((queue) => [...queue, { pos }]),
         editAltLabel: tComposer("image_alt.edit"),
+        addAltLabel: tUx("add_description"),
       }),
       Placeholder.configure({
         placeholder,
@@ -615,11 +617,11 @@ export function RichTextEditor({
             if (result) {
               const { state } = view;
               const pos = view.posAtCoords({ left: event.clientX, top: event.clientY });
-              // No alt yet (never the file name): the user is asked next.
+              // No alt yet (never the file name).
               const node = state.schema.nodes.image.create({ src: result.src, alt: null, cid: result.cid });
               const tr = state.tr.insert(pos?.pos ?? state.selection.anchor, node);
               view.dispatch(tr);
-              setAltQueue((queue) => [...queue, { src: result.src }]);
+              // No dialog: the image offers "Add description" itself.
             }
           });
         }
@@ -638,7 +640,7 @@ export function RichTextEditor({
               const node = state.schema.nodes.image.create({ src: result.src, alt: null, cid: result.cid });
               const tr = state.tr.replaceSelectionWith(node);
               view.dispatch(tr);
-              setAltQueue((queue) => [...queue, { src: result.src }]);
+              // No dialog: the image offers "Add description" itself.
             }
           });
         }
diff --git a/locales/ar/common.json b/locales/ar/common.json
index cb0736760..26c0c6673 100644
--- a/locales/ar/common.json
+++ b/locales/ar/common.json
@@ -1217,7 +1217,8 @@
     "undo": "تراجع",
     "discard_draft": "تجاهل المسودة",
     "save_failed_close": "تعذّر حفظ المسودة. حاول مرة أخرى أو تجاهلها.",
-    "try_again": "حاول مرة أخرى"
+    "try_again": "حاول مرة أخرى",
+    "add_description": "إضافة وصف"
   },
   "confirm_dialog": {
     "confirm": "تأكيد",
diff --git a/locales/ca/common.json b/locales/ca/common.json
index 28e6ac887..ccaf06e04 100644
--- a/locales/ca/common.json
+++ b/locales/ca/common.json
@@ -1217,7 +1217,8 @@
     "undo": "Desfés",
     "discard_draft": "Descarta l'esborrany",
     "save_failed_close": "No s'ha pogut desar l'esborrany. Torneu-ho a provar o descarteu-lo.",
-    "try_again": "Torna-ho a provar"
+    "try_again": "Torna-ho a provar",
+    "add_description": "Afegeix una descripció"
   },
   "confirm_dialog": {
     "confirm": "Confirma",
diff --git a/locales/cs/common.json b/locales/cs/common.json
index f1d8ed92f..151416cd7 100644
--- a/locales/cs/common.json
+++ b/locales/cs/common.json
@@ -1217,7 +1217,8 @@
     "undo": "Zpět",
     "discard_draft": "Zahodit koncept",
     "save_failed_close": "Koncept se nepodařilo uložit. Zkuste to znovu, nebo ho zahoďte.",
-    "try_again": "Zkusit znovu"
+    "try_again": "Zkusit znovu",
+    "add_description": "Přidat popis"
   },
   "confirm_dialog": {
     "confirm": "Potvrdit",
diff --git a/locales/da/common.json b/locales/da/common.json
index a820dfaf4..bd60f75bf 100644
--- a/locales/da/common.json
+++ b/locales/da/common.json
@@ -1217,7 +1217,8 @@
     "undo": "Fortryd",
     "discard_draft": "Kassér kladde",
     "save_failed_close": "Kladden kunne ikke gemmes. Prøv igen, eller kassér den.",
-    "try_again": "Prøv igen"
+    "try_again": "Prøv igen",
+    "add_description": "Tilføj beskrivelse"
   },
   "confirm_dialog": {
     "confirm": "Bekræft",
diff --git a/locales/de/common.json b/locales/de/common.json
index c23337444..b8a6eee95 100644
--- a/locales/de/common.json
+++ b/locales/de/common.json
@@ -1217,7 +1217,8 @@
     "undo": "Rückgängig",
     "discard_draft": "Entwurf verwerfen",
     "save_failed_close": "Der Entwurf konnte nicht gespeichert werden. Versuchen Sie es erneut oder verwerfen Sie ihn.",
-    "try_again": "Erneut versuchen"
+    "try_again": "Erneut versuchen",
+    "add_description": "Beschreibung hinzufügen"
   },
   "confirm_dialog": {
     "confirm": "Bestätigen",
diff --git a/locales/en/common.json b/locales/en/common.json
index ea741cca9..d5fffaad2 100644
--- a/locales/en/common.json
+++ b/locales/en/common.json
@@ -1217,7 +1217,8 @@
     "undo": "Undo",
     "discard_draft": "Discard draft",
     "save_failed_close": "The draft could not be saved. Try again, or discard it.",
-    "try_again": "Try again"
+    "try_again": "Try again",
+    "add_description": "Add description"
   },
   "confirm_dialog": {
     "confirm": "Confirm",
diff --git a/locales/es/common.json b/locales/es/common.json
index 0405a0dbf..98cd6c2d3 100644
--- a/locales/es/common.json
+++ b/locales/es/common.json
@@ -1217,7 +1217,8 @@
     "undo": "Deshacer",
     "discard_draft": "Descartar borrador",
     "save_failed_close": "No se pudo guardar el borrador. Inténtelo de nuevo o descártelo.",
-    "try_again": "Reintentar"
+    "try_again": "Reintentar",
+    "add_description": "Añadir descripción"
   },
   "confirm_dialog": {
     "confirm": "Confirmar",
diff --git a/locales/et/common.json b/locales/et/common.json
index 4e9f89304..3b9e3d6be 100644
--- a/locales/et/common.json
+++ b/locales/et/common.json
@@ -1217,7 +1217,8 @@
     "undo": "Võta tagasi",
     "discard_draft": "Loobu mustandist",
     "save_failed_close": "Mustandit ei saanud salvestada. Proovige uuesti või loobuge sellest.",
-    "try_again": "Proovi uuesti"
+    "try_again": "Proovi uuesti",
+    "add_description": "Lisa kirjeldus"
   },
   "confirm_dialog": {
     "confirm": "Kinnita",
diff --git a/locales/fa/common.json b/locales/fa/common.json
index bfe6d3cbb..a73b4df95 100644
--- a/locales/fa/common.json
+++ b/locales/fa/common.json
@@ -1217,7 +1217,8 @@
     "undo": "واگرد",
     "discard_draft": "دور انداختن پیش‌نویس",
     "save_failed_close": "پیش‌نویس ذخیره نشد. دوباره تلاش کنید یا آن را دور بیندازید.",
-    "try_again": "تلاش دوباره"
+    "try_again": "تلاش دوباره",
+    "add_description": "افزودن توضیح"
   },
   "confirm_dialog": {
     "confirm": "تأیید",
diff --git a/locales/fr/common.json b/locales/fr/common.json
index be7312951..5ddb3438e 100644
--- a/locales/fr/common.json
+++ b/locales/fr/common.json
@@ -1217,7 +1217,8 @@
     "undo": "Annuler",
     "discard_draft": "Supprimer le brouillon",
     "save_failed_close": "Le brouillon n'a pas pu être enregistré. Réessayez ou supprimez-le.",
-    "try_again": "Réessayer"
+    "try_again": "Réessayer",
+    "add_description": "Ajouter une description"
   },
   "confirm_dialog": {
     "confirm": "Confirmer",
diff --git a/locales/he/common.json b/locales/he/common.json
index 60853894b..a57187038 100644
--- a/locales/he/common.json
+++ b/locales/he/common.json
@@ -1160,7 +1160,8 @@
     "undo": "ביטול",
     "discard_draft": "מחיקת הטיוטה",
     "save_failed_close": "לא ניתן היה לשמור את הטיוטה. נסו שוב או מחקו אותה.",
-    "try_again": "ניסיון נוסף"
+    "try_again": "ניסיון נוסף",
+    "add_description": "הוספת תיאור"
   },
   "confirm_dialog": {
     "confirm": "אשר",
diff --git a/locales/hu/common.json b/locales/hu/common.json
index 79efccd53..cfccee90d 100644
--- a/locales/hu/common.json
+++ b/locales/hu/common.json
@@ -1217,7 +1217,8 @@
     "undo": "Visszavonás",
     "discard_draft": "Piszkozat elvetése",
     "save_failed_close": "A piszkozatot nem sikerült menteni. Próbálja újra, vagy vesse el.",
-    "try_again": "Újra"
+    "try_again": "Újra",
+    "add_description": "Leírás hozzáadása"
   },
   "confirm_dialog": {
     "confirm": "Megerősítés",
diff --git a/locales/it/common.json b/locales/it/common.json
index dbe2f779d..926421531 100644
--- a/locales/it/common.json
+++ b/locales/it/common.json
@@ -1217,7 +1217,8 @@
     "undo": "Annulla",
     "discard_draft": "Elimina bozza",
     "save_failed_close": "Impossibile salvare la bozza. Riprova o eliminala.",
-    "try_again": "Riprova"
+    "try_again": "Riprova",
+    "add_description": "Aggiungi descrizione"
   },
   "confirm_dialog": {
     "confirm": "Conferma",
diff --git a/locales/ja/common.json b/locales/ja/common.json
index 271e3d791..1a48da88b 100644
--- a/locales/ja/common.json
+++ b/locales/ja/common.json
@@ -1217,7 +1217,8 @@
     "undo": "元に戻す",
     "discard_draft": "下書きを破棄",
     "save_failed_close": "下書きを保存できませんでした。もう一度試すか、破棄してください。",
-    "try_again": "再試行"
+    "try_again": "再試行",
+    "add_description": "説明を追加"
   },
   "confirm_dialog": {
     "confirm": "確認",
diff --git a/locales/ko/common.json b/locales/ko/common.json
index 5e9bc4957..7fbd42927 100644
--- a/locales/ko/common.json
+++ b/locales/ko/common.json
@@ -1217,7 +1217,8 @@
     "undo": "실행 취소",
     "discard_draft": "임시 보관 메일 삭제",
     "save_failed_close": "임시 보관 메일을 저장하지 못했습니다. 다시 시도하거나 삭제하세요.",
-    "try_again": "다시 시도"
+    "try_again": "다시 시도",
+    "add_description": "설명 추가"
   },
   "confirm_dialog": {
     "confirm": "확인",
diff --git a/locales/lv/common.json b/locales/lv/common.json
index 57d08584b..a99b90bb1 100644
--- a/locales/lv/common.json
+++ b/locales/lv/common.json
@@ -1217,7 +1217,8 @@
     "undo": "Atsaukt",
     "discard_draft": "Atmest melnrakstu",
     "save_failed_close": "Melnrakstu neizdevās saglabāt. Mēģiniet vēlreiz vai atmetiet to.",
-    "try_again": "Mēģināt vēlreiz"
+    "try_again": "Mēģināt vēlreiz",
+    "add_description": "Pievienot aprakstu"
   },
   "confirm_dialog": {
     "confirm": "Apstiprināt",
diff --git a/locales/mn/common.json b/locales/mn/common.json
index 4d10e767b..204cc8105 100644
--- a/locales/mn/common.json
+++ b/locales/mn/common.json
@@ -1217,7 +1217,8 @@
     "undo": "Буцаах",
     "discard_draft": "Ноорог устгах",
     "save_failed_close": "Ноорогийг хадгалж чадсангүй. Дахин оролдох эсвэл устгана уу.",
-    "try_again": "Дахин оролдох"
+    "try_again": "Дахин оролдох",
+    "add_description": "Тайлбар нэмэх"
   },
   "confirm_dialog": {
     "confirm": "Баталгаажуулах",
diff --git a/locales/nb/common.json b/locales/nb/common.json
index d77f2071e..755bcbc45 100644
--- a/locales/nb/common.json
+++ b/locales/nb/common.json
@@ -1217,7 +1217,8 @@
     "undo": "Angre",
     "discard_draft": "Forkast utkast",
     "save_failed_close": "Utkastet kunne ikke lagres. Prøv igjen, eller forkast det.",
-    "try_again": "Prøv igjen"
+    "try_again": "Prøv igjen",
+    "add_description": "Legg til beskrivelse"
   },
   "confirm_dialog": {
     "confirm": "Bekreft",
diff --git a/locales/nl/common.json b/locales/nl/common.json
index a52de8a28..c9ed9c8dd 100644
--- a/locales/nl/common.json
+++ b/locales/nl/common.json
@@ -1217,7 +1217,8 @@
     "undo": "Ongedaan maken",
     "discard_draft": "Concept verwijderen",
     "save_failed_close": "Het concept kon niet worden opgeslagen. Probeer het opnieuw of verwijder het.",
-    "try_again": "Opnieuw proberen"
+    "try_again": "Opnieuw proberen",
+    "add_description": "Beschrijving toevoegen"
   },
   "confirm_dialog": {
     "confirm": "Bevestigen",
diff --git a/locales/pl/common.json b/locales/pl/common.json
index 886c5c7d0..74467a752 100644
--- a/locales/pl/common.json
+++ b/locales/pl/common.json
@@ -1217,7 +1217,8 @@
     "undo": "Cofnij",
     "discard_draft": "Odrzuć wersję roboczą",
     "save_failed_close": "Nie udało się zapisać wersji roboczej. Spróbuj ponownie lub ją odrzuć.",
-    "try_again": "Spróbuj ponownie"
+    "try_again": "Spróbuj ponownie",
+    "add_description": "Dodaj opis"
   },
   "confirm_dialog": {
     "confirm": "Potwierdź",
diff --git a/locales/pt/common.json b/locales/pt/common.json
index daaebc388..9e2b2d331 100644
--- a/locales/pt/common.json
+++ b/locales/pt/common.json
@@ -1217,7 +1217,8 @@
     "undo": "Desfazer",
     "discard_draft": "Descartar rascunho",
     "save_failed_close": "Não foi possível guardar o rascunho. Tente novamente ou descarte-o.",
-    "try_again": "Tentar novamente"
+    "try_again": "Tentar novamente",
+    "add_description": "Adicionar descrição"
   },
   "confirm_dialog": {
     "confirm": "Confirmar",
diff --git a/locales/ro/common.json b/locales/ro/common.json
index ba56d909e..db1ed7bce 100644
--- a/locales/ro/common.json
+++ b/locales/ro/common.json
@@ -1217,7 +1217,8 @@
     "undo": "Anulează",
     "discard_draft": "Renunță la ciornă",
     "save_failed_close": "Ciorna nu a putut fi salvată. Încercați din nou sau renunțați la ea.",
-    "try_again": "Încearcă din nou"
+    "try_again": "Încearcă din nou",
+    "add_description": "Adaugă o descriere"
   },
   "confirm_dialog": {
     "confirm": "Confirmare",
diff --git a/locales/ru/common.json b/locales/ru/common.json
index 6a1a7ff6a..810933d38 100644
--- a/locales/ru/common.json
+++ b/locales/ru/common.json
@@ -1217,7 +1217,8 @@
     "undo": "Отменить",
     "discard_draft": "Удалить черновик",
     "save_failed_close": "Не удалось сохранить черновик. Попробуйте ещё раз или удалите его.",
-    "try_again": "Повторить"
+    "try_again": "Повторить",
+    "add_description": "Добавить описание"
   },
   "confirm_dialog": {
     "confirm": "Подтвердить",
diff --git a/locales/sk/common.json b/locales/sk/common.json
index 0d700da9a..72badccba 100644
--- a/locales/sk/common.json
+++ b/locales/sk/common.json
@@ -1217,7 +1217,8 @@
     "undo": "Späť",
     "discard_draft": "Zahodiť koncept",
     "save_failed_close": "Koncept sa nepodarilo uložiť. Skúste to znova alebo ho zahoďte.",
-    "try_again": "Skúsiť znova"
+    "try_again": "Skúsiť znova",
+    "add_description": "Pridať popis"
   },
   "confirm_dialog": {
     "confirm": "Potvrdiť",
diff --git a/locales/th/common.json b/locales/th/common.json
index 467f5ebf4..75960886f 100644
--- a/locales/th/common.json
+++ b/locales/th/common.json
@@ -1565,7 +1565,8 @@
     "undo": "เลิกทำ",
     "discard_draft": "ทิ้งฉบับร่าง",
     "save_failed_close": "บันทึกฉบับร่างไม่ได้ ลองอีกครั้งหรือทิ้งไป",
-    "try_again": "ลองอีกครั้ง"
+    "try_again": "ลองอีกครั้ง",
+    "add_description": "เพิ่มคำอธิบาย"
   },
   "email_viewer": {
     "read_receipt": {
diff --git a/locales/tr/common.json b/locales/tr/common.json
index 6fed03150..c98b22e1a 100644
--- a/locales/tr/common.json
+++ b/locales/tr/common.json
@@ -1217,7 +1217,8 @@
     "undo": "Geri al",
     "discard_draft": "Taslağı sil",
     "save_failed_close": "Taslak kaydedilemedi. Yeniden deneyin ya da silin.",
-    "try_again": "Yeniden dene"
+    "try_again": "Yeniden dene",
+    "add_description": "Açıklama ekle"
   },
   "confirm_dialog": {
     "confirm": "Onayla",
diff --git a/locales/uk/common.json b/locales/uk/common.json
index 5a3b31482..61190aba0 100644
--- a/locales/uk/common.json
+++ b/locales/uk/common.json
@@ -1217,7 +1217,8 @@
     "undo": "Скасувати",
     "discard_draft": "Видалити чернетку",
     "save_failed_close": "Не вдалося зберегти чернетку. Спробуйте ще раз або видаліть її.",
-    "try_again": "Спробувати ще раз"
+    "try_again": "Спробувати ще раз",
+    "add_description": "Додати опис"
   },
   "confirm_dialog": {
     "confirm": "Підтвердити",
diff --git a/locales/vi/common.json b/locales/vi/common.json
index df09e67d0..7f1cdde96 100644
--- a/locales/vi/common.json
+++ b/locales/vi/common.json
@@ -1229,7 +1229,8 @@
     "undo": "Hoàn tác",
     "discard_draft": "Hủy bản nháp",
     "save_failed_close": "Không lưu được bản nháp. Hãy thử lại hoặc hủy bản nháp.",
-    "try_again": "Thử lại"
+    "try_again": "Thử lại",
+    "add_description": "Thêm mô tả"
   },
   "confirm_dialog": {
     "confirm": "Xác nhận",
diff --git a/locales/zh-TW/common.json b/locales/zh-TW/common.json
index ede70a153..02b7f47bb 100644
--- a/locales/zh-TW/common.json
+++ b/locales/zh-TW/common.json
@@ -1217,7 +1217,8 @@
     "undo": "復原",
     "discard_draft": "捨棄草稿",
     "save_failed_close": "無法儲存草稿。請再試一次或捨棄草稿。",
-    "try_again": "再試一次"
+    "try_again": "再試一次",
+    "add_description": "新增描述"
   },
   "confirm_dialog": {
     "confirm": "確認",
diff --git a/locales/zh/common.json b/locales/zh/common.json
index ccd831040..0b033d382 100644
--- a/locales/zh/common.json
+++ b/locales/zh/common.json
@@ -1217,7 +1217,8 @@
     "undo": "撤销",
     "discard_draft": "舍弃草稿",
     "save_failed_close": "无法保存草稿。请重试或舍弃草稿。",
-    "try_again": "重试"
+    "try_again": "重试",
+    "add_description": "添加描述"
   },
   "confirm_dialog": {
     "confirm": "确认",

From 1fdfffad455e962be53f09fe52d4481e4f4b2616 Mon Sep 17 00:00:00 2001
From: Linus Rath <139418639+rathlinus@users.noreply.github.com>
Date: Wed, 4 Nov 2026 08:42:39 +0100
Subject: [PATCH 26/34] fix: read the send hook count safely in the composer's
 Options menu

---
 components/email/email-composer.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/email/email-composer.tsx b/components/email/email-composer.tsx
index a8511b4f8..dbe0f2adc 100644
--- a/components/email/email-composer.tsx
+++ b/components/email/email-composer.tsx
@@ -5841,7 +5841,7 @@ export function EmailComposer({
                 )}
                 {/* Encrypting is a crypto plugin's job (S/MIME, PGP). Without
                     one, say where to get it rather than offer nothing. */}
-                {emailHooks.onComposeSend.size === 0 && isFeatureEnabled('pluginsEnabled') && !ownWindow && (
+                {(emailHooks.onComposeSend?.size ?? 0) === 0 && isFeatureEnabled('pluginsEnabled') && !ownWindow && (
                   <ComposerToolbarMenuItem
                     icon={Lock}
                     muted

From 69ec26fe333990444eeed68d06199d875a8ef00a Mon Sep 17 00:00:00 2001
From: Linus Rath <139418639+rathlinus@users.noreply.github.com>
Date: Wed, 4 Nov 2026 08:43:29 +0100
Subject: [PATCH 27/34] fix: remove a recipient whole on the second Backspace
 instead of turning it into text

The mention test's Backspace check now expects the chip to be selected, not put back into the field as text.
---
 .../email/__tests__/composer-a11y.test.tsx    | 40 +++++++++++++++++++
 .../email/__tests__/composer-mention.test.tsx |  6 ++-
 components/email/email-composer.tsx           | 40 +++++++++++++++----
 3 files changed, 77 insertions(+), 9 deletions(-)

diff --git a/components/email/__tests__/composer-a11y.test.tsx b/components/email/__tests__/composer-a11y.test.tsx
index 9e9207abd..f71f24a0d 100644
--- a/components/email/__tests__/composer-a11y.test.tsx
+++ b/components/email/__tests__/composer-a11y.test.tsx
@@ -307,6 +307,46 @@ describe('recipient fields (SR-06, CV-02)', () => {
     }
   });
 
+  // compose-6: Backspace never leaves half an address behind.
+  it('selects the last chip on the first Backspace and removes it whole on the second', () => {
+    render(<EmailComposer initialData={{ ...DRAFT, to: 'Anna Berg <anna@example.com>, Zoe Fischer <zoe@example.com>' }} />);
+    const input = screen.getByRole('combobox', { name: 'to:' }) as HTMLInputElement;
+    input.focus();
+    fireEvent.keyDown(input, { key: 'Backspace' });
+    let chips = within(screen.getByRole('list', { name: 'to:' })).getAllByRole('listitem');
+    expect(chips).toHaveLength(2);
+    expect(document.activeElement).toBe(chips[1]);
+    expect(input.value).toBe('');
+
+    fireEvent.keyDown(chips[1], { key: 'Backspace' });
+    chips = within(screen.getByRole('list', { name: 'to:' })).getAllByRole('listitem');
+    expect(chips).toHaveLength(1);
+    expect(chips[0]).toHaveTextContent('Anna Berg');
+    expect(input.value).toBe('');
+    expect(document.activeElement).toBe(input);
+
+    // Three presses take out two recipients, never part of one.
+    fireEvent.keyDown(input, { key: 'Backspace' });
+    fireEvent.keyDown(document.activeElement!, { key: 'Backspace' });
+    expect(screen.queryAllByRole('listitem')).toHaveLength(0);
+    expect(input.value).toBe('');
+  });
+
+  it('lets go of a selected chip on Escape and keeps the composer open', () => {
+    const onClose = vi.fn();
+    render(<EmailComposer initialData={{ ...DRAFT, to: 'anna@example.com' }} onClose={onClose} />);
+    const input = screen.getByRole('combobox', { name: 'to:' }) as HTMLInputElement;
+    input.focus();
+    fireEvent.keyDown(input, { key: 'Backspace' });
+    const chip = within(screen.getByRole('list', { name: 'to:' })).getByRole('listitem');
+    expect(document.activeElement).toBe(chip);
+    fireEvent.keyDown(chip, { key: 'Escape' });
+    expect(document.activeElement).toBe(input);
+    expect(screen.getAllByRole('listitem')).toHaveLength(1);
+    expect(onClose).not.toHaveBeenCalled();
+    expect(screen.queryByRole('alertdialog')).toBeNull();
+  });
+
   it('announces a recipient added by typing', () => {
     render(<EmailComposer initialData={DRAFT} />);
     expect(liveRegion()).toHaveTextContent('');
diff --git a/components/email/__tests__/composer-mention.test.tsx b/components/email/__tests__/composer-mention.test.tsx
index b3e8a9be7..ef4e15f1b 100644
--- a/components/email/__tests__/composer-mention.test.tsx
+++ b/components/email/__tests__/composer-mention.test.tsx
@@ -541,12 +541,14 @@ describe('composer with the @ recipient list', () => {
     expect(onClose).not.toHaveBeenCalled();
   });
 
-  it('pulls the last recipient back whole on Backspace, without the key deleting its last character', async () => {
+  // The first Backspace selects the last recipient, it doesn't turn it into text.
+  it('selects the last recipient on Backspace, without the key deleting anything', async () => {
     await renderComposer({ to: 'Sarah Kim <sarah@example.com>' });
     const to = within(screen.getByTestId('composer-to')).getByRole('combobox') as HTMLInputElement;
     // fireEvent returns false when the handler stopped the key's default action.
     expect(fireEvent.keyDown(to, { key: 'Backspace' })).toBe(false);
-    expect(to.value).toBe('Sarah Kim <sarah@example.com>');
+    expect(to.value).toBe('');
+    expect(document.activeElement).toHaveAttribute('data-recipient-chip');
   });
 
   // compose-17: the button was there only with a server directory, so
diff --git a/components/email/email-composer.tsx b/components/email/email-composer.tsx
index dbe0f2adc..e55816505 100644
--- a/components/email/email-composer.tsx
+++ b/components/email/email-composer.tsx
@@ -4811,6 +4811,8 @@ export function EmailComposer({
 
     if (isPlainEscape) {
       if (activeAutoField) return;
+      // A selected recipient: Escape only lets go of it (its own handler).
+      if (e.target instanceof Element && e.target.closest('[data-recipient-chip]')) return;
       // Same for the "@" recipient list in the body: this handler runs in the
       // capture phase, before the editor could close the list itself.
       if (isRecipientMentionActive(editorRef.current)) return;
@@ -6283,6 +6285,9 @@ export function RecipientChipInput({
   // one by default: Shift+Tab from the input lands next to it.
   const [rovingChip, setRovingChip] = useState<number | null>(null);
   const chipRefs = useRef<Array<HTMLElement | null>>([]);
+  // The chip a Backspace in the empty input selected: a second one removes it
+  // and goes back to typing.
+  const backspaceChipRef = useRef<number | null>(null);
   const errorId = `${labelId}-error`;
   const chipHintId = `${labelId}-chip-hint`;
   const fieldNames: Record<'to' | 'cc' | 'bcc', string> = { to: t('to'), cc: t('cc'), bcc: t('bcc') };
@@ -6316,6 +6321,25 @@ export function RecipientChipInput({
 
   const handleChipKeyDown = (e: React.KeyboardEvent<HTMLElement>, index: number) => {
     if (e.target !== e.currentTarget) return;
+    const fromInput = backspaceChipRef.current === index;
+    backspaceChipRef.current = null;
+    // Escape lets go of the chip (the composer stays open); typing goes on in the input.
+    if (e.key === 'Escape') {
+      e.preventDefault();
+      inputRef.current?.focus();
+      return;
+    }
+    if (fromInput && (e.key === 'Backspace' || e.key === 'Delete')) {
+      e.preventDefault();
+      onChipsChange(chips.filter((_, i) => i !== index));
+      setRovingChip(null);
+      inputRef.current?.focus();
+      return;
+    }
+    if (e.key.length === 1 && !e.ctrlKey && !e.metaKey && !e.altKey && e.key !== ' ') {
+      inputRef.current?.focus();
+      return;
+    }
     const rtl = typeof window !== 'undefined' && getComputedStyle(e.currentTarget).direction === 'rtl';
     const back = rtl ? 'ArrowRight' : 'ArrowLeft';
     const forward = rtl ? 'ArrowLeft' : 'ArrowRight';
@@ -6500,14 +6524,13 @@ export function RecipientChipInput({
       return;
     }
 
-    // Backspace on an empty input pulls the last chip back into the input for
-    // quick editing.
+    // Backspace on an empty input selects the last chip; the next one removes
+    // it whole. It used to put the address back as text, so a few presses
+    // left half an address behind. Editing is a double-click, Enter or F2.
     if (e.key === 'Backspace' && !inputText && chips.length > 0) {
-      // Or the key goes on to delete the closing ">" of what was just put back.
       e.preventDefault();
-      const lastChip = chips[chips.length - 1];
-      onChipsChange(chips.slice(0, -1));
-      onInputChange(formatRecipient(lastChip.name, lastChip.email));
+      backspaceChipRef.current = chips.length - 1;
+      focusChip(chips.length - 1);
       return;
     }
   };
@@ -6702,12 +6725,15 @@ export function RecipientChipInput({
                   : ( customColor && colorStyles[customColor]
                       ? `${colorStyles[customColor]} cursor-grab active:cursor-grabbing`
                       :  "bg-secondary text-secondary-foreground hover:bg-accent cursor-grab active:cursor-grabbing"),
-                !isEditing && draggingIndex === i && "opacity-50"
+                !isEditing && draggingIndex === i && "opacity-50",
+                // Selected: by Backspace in the field, arrows or Tab.
+                !isEditing && "focus:outline-none focus:ring-2 focus:ring-primary focus:border-primary"
               )}
               onContextMenu={isEditing ? undefined : (e) => handleContextMenu(e, i, chip)}
               data-invalid={isInvalid || undefined}
               title={isInvalid ? t('invalid_recipient') : undefined}
               role="listitem"
+              data-recipient-chip=""
               ref={(el) => { chipRefs.current[i] = el; }}
               tabIndex={isEditing ? undefined : i === tabChip ? 0 : -1}
               aria-describedby={isEditing ? undefined : chipHintId}

From 2b2b7b8298d63d0913134be28c08aa4f4086a001 Mon Sep 17 00:00:00 2001
From: Linus Rath <139418639+rathlinus@users.noreply.github.com>
Date: Wed, 4 Nov 2026 09:01:04 +0100
Subject: [PATCH 28/34] fix: show every attachment in the composer, with type
 icons and a total, failed and uploading files first

The attachment list test now expects every chip and a bounded, scrolling row instead of three chips and a +N counter.
---
 .../composer-attachment-list-scroll.test.tsx  | 41 ++++++----------
 components/email/email-composer.tsx           | 48 +++++++++----------
 .../__tests__/attachment-order.test.ts        | 18 +++++++
 lib/compose/attachment-order.ts               | 14 ++++++
 locales/ar/common.json                        |  9 +++-
 locales/ca/common.json                        |  9 +++-
 locales/cs/common.json                        |  9 +++-
 locales/da/common.json                        |  9 +++-
 locales/de/common.json                        |  9 +++-
 locales/en/common.json                        |  9 +++-
 locales/es/common.json                        |  9 +++-
 locales/et/common.json                        |  9 +++-
 locales/fa/common.json                        |  9 +++-
 locales/fr/common.json                        |  9 +++-
 locales/he/common.json                        |  9 +++-
 locales/hu/common.json                        |  9 +++-
 locales/it/common.json                        |  9 +++-
 locales/ja/common.json                        |  9 +++-
 locales/ko/common.json                        |  9 +++-
 locales/lv/common.json                        |  9 +++-
 locales/mn/common.json                        |  9 +++-
 locales/nb/common.json                        |  9 +++-
 locales/nl/common.json                        |  9 +++-
 locales/pl/common.json                        |  9 +++-
 locales/pt/common.json                        |  9 +++-
 locales/ro/common.json                        |  9 +++-
 locales/ru/common.json                        |  9 +++-
 locales/sk/common.json                        |  9 +++-
 locales/th/common.json                        |  9 +++-
 locales/tr/common.json                        |  9 +++-
 locales/uk/common.json                        |  9 +++-
 locales/vi/common.json                        |  9 +++-
 locales/zh-TW/common.json                     |  9 +++-
 locales/zh/common.json                        |  9 +++-
 34 files changed, 309 insertions(+), 82 deletions(-)
 create mode 100644 lib/compose/__tests__/attachment-order.test.ts
 create mode 100644 lib/compose/attachment-order.ts

diff --git a/components/email/__tests__/composer-attachment-list-scroll.test.tsx b/components/email/__tests__/composer-attachment-list-scroll.test.tsx
index af1d5673f..04bc59023 100644
--- a/components/email/__tests__/composer-attachment-list-scroll.test.tsx
+++ b/components/email/__tests__/composer-attachment-list-scroll.test.tsx
@@ -218,21 +218,20 @@ const DRAFT = {
   attachments: ATTACHMENTS,
 };
 
-/** The wrapping flex row that holds every chip and the expand button. */
+/** The wrapping flex row that holds every chip. */
 function chipRow() {
-  return screen.getByText('invoice-0.pdf').closest('[class*="flex-wrap"]') as HTMLElement;
+  return screen.getByTestId('composer-attachments');
 }
 
 /**
  * The attachment row is a shrink-0 sibling of the body's scroll container,
  * so whatever height it takes is taken from the composer and from nothing
- * else. Collapsed that is three chips. Expanded it is one row per two
- * attachments, and with a few dozen files it grew past the bottom of the
- * composer: the send toolbar was pushed off-screen and no ancestor
- * scrolled, so neither the rest of the list nor Send could be reached.
- * Expanding therefore has to bound the row and scroll it itself.
+ * else. With a few dozen files it grew past the bottom of the composer: the
+ * send toolbar was pushed off-screen and no ancestor scrolled. It used to
+ * show three chips and "+N", which hid the fourth file's upload. Now every
+ * chip shows, wrapping, and the row is bounded and scrolls itself.
  */
-describe('expanded attachment list', () => {
+describe('attachment list', () => {
   beforeEach(() => {
     observers.length = 0;
     vi.stubGlobal('ResizeObserver', ResizeObserverStub);
@@ -242,39 +241,27 @@ describe('expanded attachment list', () => {
     vi.unstubAllGlobals();
   });
 
-  it('does not scroll while collapsed', () => {
+  it('shows every attachment, with no counter to expand', () => {
     render(<EmailComposer initialData={DRAFT} />);
 
-    expect(chipRow().className).not.toContain('overflow-y-auto');
+    expect(screen.getByText('invoice-3.pdf')).toBeInTheDocument();
+    expect(screen.getByText('invoice-11.pdf')).toBeInTheDocument();
+    expect(screen.queryByText(`+${ATTACHMENTS.length - 3}`)).toBeNull();
   });
 
-  it('shows only the first three attachments and a counter for the rest', () => {
+  it('caps its height and scrolls itself', () => {
     render(<EmailComposer initialData={DRAFT} />);
 
-    expect(screen.getByText('invoice-2.pdf')).toBeInTheDocument();
-    expect(screen.queryByText('invoice-3.pdf')).not.toBeInTheDocument();
-    expect(screen.getByText(`+${ATTACHMENTS.length - 3}`)).toBeInTheDocument();
-  });
-
-  it('caps its height and scrolls once expanded', () => {
-    render(<EmailComposer initialData={DRAFT} />);
-
-    fireEvent.click(screen.getByText(`+${ATTACHMENTS.length - 3}`));
-
     const row = chipRow();
-    expect(screen.getByText('invoice-11.pdf')).toBeInTheDocument();
     expect(row.className).toContain('overflow-y-auto');
     // Bounded, or the row grows with the attachment count again and takes
     // the send toolbar off the bottom of the composer with it.
     expect(row.className).toContain('max-h-[');
   });
 
-  it('stops scrolling again when collapsed back', () => {
+  it('says how many files and how much they weigh', () => {
     render(<EmailComposer initialData={DRAFT} />);
 
-    fireEvent.click(screen.getByText(`+${ATTACHMENTS.length - 3}`));
-    fireEvent.click(screen.getByText('show_less'));
-
-    expect(chipRow().className).not.toContain('overflow-y-auto');
+    expect(screen.getByTestId('composer-attachments-summary')).toHaveTextContent('attachments_summary');
   });
 });
diff --git a/components/email/email-composer.tsx b/components/email/email-composer.tsx
index e55816505..9f3c13640 100644
--- a/components/email/email-composer.tsx
+++ b/components/email/email-composer.tsx
@@ -68,6 +68,8 @@ import { isFilePreviewable } from "@/lib/file-preview";
 import { isEditableEventTarget } from "@/lib/keyboard";
 import { isSingleKeyShortcutOff } from "@/lib/single-key-shortcuts";
 import { markReplyQuoteHeader } from "@/components/email/reply-quote-collapse";
+import { attachmentIcon } from "@/components/email/attachment-chips";
+import { attachmentsForDisplay } from "@/lib/compose/attachment-order";
 import { showDraftSavedToast } from "@/lib/compose/draft-close-toast";
 import { buildQuotedHtmlBlock, serializeEditorContent } from "@/components/email/quoted-html";
 import { containsEmbeddedSignature } from "@/components/email/signature-block";
@@ -1244,7 +1246,6 @@ export function EmailComposer({
   const [closeDialogKind, setCloseDialogKind] = useState<'close' | 'discard'>('close');
   // Closing saves without asking; the question comes only when that save failed.
   const [closeSaveFailed, setCloseSaveFailed] = useState(false);
-  const [showAllAttachments, setShowAllAttachments] = useState(false);
   const [previewAttachment, setPreviewAttachment] = useState<ComposerAttachment | null>(null);
   // What the checks before sending found (no subject, no text, placeholders,
   // a missing attachment, open proofreading issues), asked about in one dialog.
@@ -5538,21 +5539,24 @@ export function EmailComposer({
         {/* Attachments */}
         {attachments.length > 0 && (
           <div className="px-4 py-2 border-t shrink-0">
+            {attachments.length > 1 && (
+              <p className="mb-1.5 text-xs text-muted-foreground tabular-nums" data-testid="composer-attachments-summary">
+                {tUx('attachments_summary', {
+                  count: attachments.length,
+                  size: formatFileSize(attachments.reduce((sum, att) => sum + (att.size || 0), 0)),
+                })}
+              </p>
+            )}
             <div
-              className={cn(
-                "flex flex-wrap gap-2",
-                // Collapsed this is three chips and a counter, so it stays
-                // small. Expanded it is as tall as the attachment count
-                // makes it, and it sits outside the body's scroll container
-                // and cannot shrink - so a few dozen files grew it past the
-                // composer, pushed the send toolbar off the bottom and left
-                // nothing that scrolled: the list was stuck with its last
-                // rows and the Send button both unreachable. Cap the
-                // expanded list and give it a scroller of its own.
-                showAllAttachments && "max-h-[30vh] overflow-y-auto overscroll-contain",
-              )}
+              // Every file shows, wrapping. Past about two rows the list
+              // scrolls by itself: it sits outside the body's scroller and
+              // can't shrink, and a few dozen files pushed Send off the
+              // bottom. Files still uploading or failed come first, so their
+              // progress and errors are never out of sight.
+              className="flex flex-wrap gap-2 max-h-[5.25rem] overflow-y-auto overscroll-contain"
+              data-testid="composer-attachments"
             >
-              {(showAllAttachments ? attachments : attachments.slice(0, 3)).map((att, index) => {
+              {attachmentsForDisplay(attachments).map(({ att, index }) => {
                 // Clickable to preview only once it has content (local File or an
                 // uploaded blob) and the type is previewable; never mid-upload.
                 const canPreview = !att.uploading && !att.error
@@ -5612,9 +5616,11 @@ export function EmailComposer({
                       <Loader2 className="w-3 h-3 animate-spin flex-shrink-0" />
                     ) : att.error ? (
                       <AlertCircle className="w-3 h-3 flex-shrink-0" />
-                    ) : (
-                      <Paperclip className="w-3 h-3 flex-shrink-0" />
-                    )}
+                    ) : (() => {
+                      // The file's type, as the reader shows it.
+                      const { icon: TypeIcon, className: typeIconClass } = attachmentIcon(att.type, att.name);
+                      return <TypeIcon className={cn("w-3.5 h-3.5 flex-shrink-0", typeIconClass)} aria-hidden />;
+                    })()}
                     {canPreview ? (
                       <button
                         type="button"
@@ -5661,14 +5667,6 @@ export function EmailComposer({
                 </div>
                 );
               })}
-              {attachments.length > 3 && (
-                <button
-                  onClick={() => setShowAllAttachments(prev => !prev)}
-                  className="flex items-center gap-1 px-3 py-1.5 rounded-md text-sm bg-muted text-muted-foreground hover:text-foreground transition-colors"
-                >
-                  {showAllAttachments ? t('show_less') : `+${attachments.length - 3}`}
-                </button>
-              )}
             </div>
           </div>
         )}
diff --git a/lib/compose/__tests__/attachment-order.test.ts b/lib/compose/__tests__/attachment-order.test.ts
new file mode 100644
index 000000000..d5337caea
--- /dev/null
+++ b/lib/compose/__tests__/attachment-order.test.ts
@@ -0,0 +1,18 @@
+import { describe, expect, it } from 'vitest';
+import { attachmentsForDisplay } from '../attachment-order';
+
+describe('the order of the composer attachment chips', () => {
+  it('puts failed, then uploading files first, and keeps the rest in the order added', () => {
+    const files = [
+      { name: 'a.pdf' },
+      { name: 'b.pdf', uploading: true },
+      { name: 'c.pdf' },
+      { name: 'big.zip', uploading: true },
+      { name: 'broken.png', error: 'failed' },
+    ];
+    const shown = attachmentsForDisplay(files);
+    expect(shown.map(({ att }) => att.name)).toEqual(['broken.png', 'b.pdf', 'big.zip', 'a.pdf', 'c.pdf']);
+    // Each keeps its place in the composer's list, for Remove.
+    expect(shown.map(({ index }) => index)).toEqual([4, 1, 3, 0, 2]);
+  });
+});
diff --git a/lib/compose/attachment-order.ts b/lib/compose/attachment-order.ts
new file mode 100644
index 000000000..158d340d6
--- /dev/null
+++ b/lib/compose/attachment-order.ts
@@ -0,0 +1,14 @@
+/**
+ * The composer's attachment chips in the order they're shown: failed first,
+ * then still uploading, then the rest, each group in the order added. The
+ * list scrolls past about two rows, so the files that need an eye on them
+ * are the ones always in view. `index` is the place in the composer's list.
+ */
+export function attachmentsForDisplay<T extends { error?: unknown; uploading?: boolean }>(
+  attachments: readonly T[],
+): Array<{ att: T; index: number }> {
+  const rank = (att: T) => (att.error ? 0 : att.uploading ? 1 : 2);
+  return attachments
+    .map((att, index) => ({ att, index }))
+    .sort((a, b) => rank(a.att) - rank(b.att) || a.index - b.index);
+}
diff --git a/locales/ar/common.json b/locales/ar/common.json
index 26c0c6673..8d4f16780 100644
--- a/locales/ar/common.json
+++ b/locales/ar/common.json
@@ -1218,7 +1218,14 @@
     "discard_draft": "تجاهل المسودة",
     "save_failed_close": "تعذّر حفظ المسودة. حاول مرة أخرى أو تجاهلها.",
     "try_again": "حاول مرة أخرى",
-    "add_description": "إضافة وصف"
+    "add_description": "إضافة وصف",
+    "attachments_summary": "المرفقات: {count}، {size}",
+    "from_sub_address": "استخدام عنوان فرعي…",
+    "from_edit_sender": "تعديل المرسل…",
+    "shortcut_insert_link": "إدراج رابط",
+    "shortcut_save_draft": "حفظ المسودة",
+    "shortcut_show_cc": "إظهار نسخة",
+    "shortcut_show_bcc": "إظهار نسخة مخفية"
   },
   "confirm_dialog": {
     "confirm": "تأكيد",
diff --git a/locales/ca/common.json b/locales/ca/common.json
index ccaf06e04..7c2c8eea4 100644
--- a/locales/ca/common.json
+++ b/locales/ca/common.json
@@ -1218,7 +1218,14 @@
     "discard_draft": "Descarta l'esborrany",
     "save_failed_close": "No s'ha pogut desar l'esborrany. Torneu-ho a provar o descarteu-lo.",
     "try_again": "Torna-ho a provar",
-    "add_description": "Afegeix una descripció"
+    "add_description": "Afegeix una descripció",
+    "attachments_summary": "Adjunts: {count}, {size}",
+    "from_sub_address": "Fes servir una subadreça…",
+    "from_edit_sender": "Edita el remitent…",
+    "shortcut_insert_link": "Insereix un enllaç",
+    "shortcut_save_draft": "Desa l'esborrany",
+    "shortcut_show_cc": "Mostra Cc",
+    "shortcut_show_bcc": "Mostra Cco"
   },
   "confirm_dialog": {
     "confirm": "Confirma",
diff --git a/locales/cs/common.json b/locales/cs/common.json
index 151416cd7..4208fdfe2 100644
--- a/locales/cs/common.json
+++ b/locales/cs/common.json
@@ -1218,7 +1218,14 @@
     "discard_draft": "Zahodit koncept",
     "save_failed_close": "Koncept se nepodařilo uložit. Zkuste to znovu, nebo ho zahoďte.",
     "try_again": "Zkusit znovu",
-    "add_description": "Přidat popis"
+    "add_description": "Přidat popis",
+    "attachments_summary": "Přílohy: {count}, {size}",
+    "from_sub_address": "Použít podadresu…",
+    "from_edit_sender": "Upravit odesílatele…",
+    "shortcut_insert_link": "Vložit odkaz",
+    "shortcut_save_draft": "Uložit koncept",
+    "shortcut_show_cc": "Zobrazit kopii",
+    "shortcut_show_bcc": "Zobrazit skrytou kopii"
   },
   "confirm_dialog": {
     "confirm": "Potvrdit",
diff --git a/locales/da/common.json b/locales/da/common.json
index bd60f75bf..ae6dae03a 100644
--- a/locales/da/common.json
+++ b/locales/da/common.json
@@ -1218,7 +1218,14 @@
     "discard_draft": "Kassér kladde",
     "save_failed_close": "Kladden kunne ikke gemmes. Prøv igen, eller kassér den.",
     "try_again": "Prøv igen",
-    "add_description": "Tilføj beskrivelse"
+    "add_description": "Tilføj beskrivelse",
+    "attachments_summary": "Vedhæftede filer: {count}, {size}",
+    "from_sub_address": "Brug en underadresse…",
+    "from_edit_sender": "Rediger afsender…",
+    "shortcut_insert_link": "Indsæt link",
+    "shortcut_save_draft": "Gem kladde",
+    "shortcut_show_cc": "Vis Cc",
+    "shortcut_show_bcc": "Vis Bcc"
   },
   "confirm_dialog": {
     "confirm": "Bekræft",
diff --git a/locales/de/common.json b/locales/de/common.json
index b8a6eee95..ca3e06e95 100644
--- a/locales/de/common.json
+++ b/locales/de/common.json
@@ -1218,7 +1218,14 @@
     "discard_draft": "Entwurf verwerfen",
     "save_failed_close": "Der Entwurf konnte nicht gespeichert werden. Versuchen Sie es erneut oder verwerfen Sie ihn.",
     "try_again": "Erneut versuchen",
-    "add_description": "Beschreibung hinzufügen"
+    "add_description": "Beschreibung hinzufügen",
+    "attachments_summary": "Anhänge: {count}, {size}",
+    "from_sub_address": "Unteradresse verwenden…",
+    "from_edit_sender": "Absender bearbeiten…",
+    "shortcut_insert_link": "Link einfügen",
+    "shortcut_save_draft": "Entwurf speichern",
+    "shortcut_show_cc": "Cc anzeigen",
+    "shortcut_show_bcc": "Bcc anzeigen"
   },
   "confirm_dialog": {
     "confirm": "Bestätigen",
diff --git a/locales/en/common.json b/locales/en/common.json
index d5fffaad2..575b05e1a 100644
--- a/locales/en/common.json
+++ b/locales/en/common.json
@@ -1218,7 +1218,14 @@
     "discard_draft": "Discard draft",
     "save_failed_close": "The draft could not be saved. Try again, or discard it.",
     "try_again": "Try again",
-    "add_description": "Add description"
+    "add_description": "Add description",
+    "attachments_summary": "Attachments: {count}, {size}",
+    "from_sub_address": "Use a sub-address…",
+    "from_edit_sender": "Edit sender…",
+    "shortcut_insert_link": "Insert link",
+    "shortcut_save_draft": "Save draft",
+    "shortcut_show_cc": "Show Cc",
+    "shortcut_show_bcc": "Show Bcc"
   },
   "confirm_dialog": {
     "confirm": "Confirm",
diff --git a/locales/es/common.json b/locales/es/common.json
index 98cd6c2d3..8340b464f 100644
--- a/locales/es/common.json
+++ b/locales/es/common.json
@@ -1218,7 +1218,14 @@
     "discard_draft": "Descartar borrador",
     "save_failed_close": "No se pudo guardar el borrador. Inténtelo de nuevo o descártelo.",
     "try_again": "Reintentar",
-    "add_description": "Añadir descripción"
+    "add_description": "Añadir descripción",
+    "attachments_summary": "Adjuntos: {count}, {size}",
+    "from_sub_address": "Usar una subdirección…",
+    "from_edit_sender": "Editar remitente…",
+    "shortcut_insert_link": "Insertar enlace",
+    "shortcut_save_draft": "Guardar borrador",
+    "shortcut_show_cc": "Mostrar CC",
+    "shortcut_show_bcc": "Mostrar CCO"
   },
   "confirm_dialog": {
     "confirm": "Confirmar",
diff --git a/locales/et/common.json b/locales/et/common.json
index 3b9e3d6be..ab0c73e9c 100644
--- a/locales/et/common.json
+++ b/locales/et/common.json
@@ -1218,7 +1218,14 @@
     "discard_draft": "Loobu mustandist",
     "save_failed_close": "Mustandit ei saanud salvestada. Proovige uuesti või loobuge sellest.",
     "try_again": "Proovi uuesti",
-    "add_description": "Lisa kirjeldus"
+    "add_description": "Lisa kirjeldus",
+    "attachments_summary": "Manused: {count}, {size}",
+    "from_sub_address": "Kasuta alamaadressi…",
+    "from_edit_sender": "Muuda saatjat…",
+    "shortcut_insert_link": "Lisa link",
+    "shortcut_save_draft": "Salvesta mustand",
+    "shortcut_show_cc": "Näita koopiat",
+    "shortcut_show_bcc": "Näita pimekoopiat"
   },
   "confirm_dialog": {
     "confirm": "Kinnita",
diff --git a/locales/fa/common.json b/locales/fa/common.json
index a73b4df95..6d8f3808d 100644
--- a/locales/fa/common.json
+++ b/locales/fa/common.json
@@ -1218,7 +1218,14 @@
     "discard_draft": "دور انداختن پیش‌نویس",
     "save_failed_close": "پیش‌نویس ذخیره نشد. دوباره تلاش کنید یا آن را دور بیندازید.",
     "try_again": "تلاش دوباره",
-    "add_description": "افزودن توضیح"
+    "add_description": "افزودن توضیح",
+    "attachments_summary": "پیوست‌ها: {count}، {size}",
+    "from_sub_address": "استفاده از زیرنشانی…",
+    "from_edit_sender": "ویرایش فرستنده…",
+    "shortcut_insert_link": "درج پیوند",
+    "shortcut_save_draft": "ذخیرهٔ پیش‌نویس",
+    "shortcut_show_cc": "نمایش رونوشت",
+    "shortcut_show_bcc": "نمایش رونوشت پنهان"
   },
   "confirm_dialog": {
     "confirm": "تأیید",
diff --git a/locales/fr/common.json b/locales/fr/common.json
index 5ddb3438e..4ea0d6429 100644
--- a/locales/fr/common.json
+++ b/locales/fr/common.json
@@ -1218,7 +1218,14 @@
     "discard_draft": "Supprimer le brouillon",
     "save_failed_close": "Le brouillon n'a pas pu être enregistré. Réessayez ou supprimez-le.",
     "try_again": "Réessayer",
-    "add_description": "Ajouter une description"
+    "add_description": "Ajouter une description",
+    "attachments_summary": "Pièces jointes : {count}, {size}",
+    "from_sub_address": "Utiliser une sous-adresse…",
+    "from_edit_sender": "Modifier l'expéditeur…",
+    "shortcut_insert_link": "Insérer un lien",
+    "shortcut_save_draft": "Enregistrer le brouillon",
+    "shortcut_show_cc": "Afficher Cc",
+    "shortcut_show_bcc": "Afficher Cci"
   },
   "confirm_dialog": {
     "confirm": "Confirmer",
diff --git a/locales/he/common.json b/locales/he/common.json
index a57187038..56d8e7588 100644
--- a/locales/he/common.json
+++ b/locales/he/common.json
@@ -1161,7 +1161,14 @@
     "discard_draft": "מחיקת הטיוטה",
     "save_failed_close": "לא ניתן היה לשמור את הטיוטה. נסו שוב או מחקו אותה.",
     "try_again": "ניסיון נוסף",
-    "add_description": "הוספת תיאור"
+    "add_description": "הוספת תיאור",
+    "attachments_summary": "קבצים מצורפים: {count}, {size}",
+    "from_sub_address": "שימוש בכתובת משנה…",
+    "from_edit_sender": "עריכת השולח…",
+    "shortcut_insert_link": "הוספת קישור",
+    "shortcut_save_draft": "שמירת טיוטה",
+    "shortcut_show_cc": "הצגת עותק",
+    "shortcut_show_bcc": "הצגת עותק מוסתר"
   },
   "confirm_dialog": {
     "confirm": "אשר",
diff --git a/locales/hu/common.json b/locales/hu/common.json
index cfccee90d..fb7181012 100644
--- a/locales/hu/common.json
+++ b/locales/hu/common.json
@@ -1218,7 +1218,14 @@
     "discard_draft": "Piszkozat elvetése",
     "save_failed_close": "A piszkozatot nem sikerült menteni. Próbálja újra, vagy vesse el.",
     "try_again": "Újra",
-    "add_description": "Leírás hozzáadása"
+    "add_description": "Leírás hozzáadása",
+    "attachments_summary": "Mellékletek: {count}, {size}",
+    "from_sub_address": "Alcím használata…",
+    "from_edit_sender": "Feladó szerkesztése…",
+    "shortcut_insert_link": "Hivatkozás beszúrása",
+    "shortcut_save_draft": "Piszkozat mentése",
+    "shortcut_show_cc": "Másolat megjelenítése",
+    "shortcut_show_bcc": "Titkos másolat megjelenítése"
   },
   "confirm_dialog": {
     "confirm": "Megerősítés",
diff --git a/locales/it/common.json b/locales/it/common.json
index 926421531..9ebe976e4 100644
--- a/locales/it/common.json
+++ b/locales/it/common.json
@@ -1218,7 +1218,14 @@
     "discard_draft": "Elimina bozza",
     "save_failed_close": "Impossibile salvare la bozza. Riprova o eliminala.",
     "try_again": "Riprova",
-    "add_description": "Aggiungi descrizione"
+    "add_description": "Aggiungi descrizione",
+    "attachments_summary": "Allegati: {count}, {size}",
+    "from_sub_address": "Usa un sottoindirizzo…",
+    "from_edit_sender": "Modifica mittente…",
+    "shortcut_insert_link": "Inserisci link",
+    "shortcut_save_draft": "Salva bozza",
+    "shortcut_show_cc": "Mostra Cc",
+    "shortcut_show_bcc": "Mostra Ccn"
   },
   "confirm_dialog": {
     "confirm": "Conferma",
diff --git a/locales/ja/common.json b/locales/ja/common.json
index 1a48da88b..15718b0e4 100644
--- a/locales/ja/common.json
+++ b/locales/ja/common.json
@@ -1218,7 +1218,14 @@
     "discard_draft": "下書きを破棄",
     "save_failed_close": "下書きを保存できませんでした。もう一度試すか、破棄してください。",
     "try_again": "再試行",
-    "add_description": "説明を追加"
+    "add_description": "説明を追加",
+    "attachments_summary": "添付ファイル: {count} 件、{size}",
+    "from_sub_address": "サブアドレスを使用…",
+    "from_edit_sender": "差出人を編集…",
+    "shortcut_insert_link": "リンクを挿入",
+    "shortcut_save_draft": "下書きを保存",
+    "shortcut_show_cc": "Cc を表示",
+    "shortcut_show_bcc": "Bcc を表示"
   },
   "confirm_dialog": {
     "confirm": "確認",
diff --git a/locales/ko/common.json b/locales/ko/common.json
index 7fbd42927..d8ff98a31 100644
--- a/locales/ko/common.json
+++ b/locales/ko/common.json
@@ -1218,7 +1218,14 @@
     "discard_draft": "임시 보관 메일 삭제",
     "save_failed_close": "임시 보관 메일을 저장하지 못했습니다. 다시 시도하거나 삭제하세요.",
     "try_again": "다시 시도",
-    "add_description": "설명 추가"
+    "add_description": "설명 추가",
+    "attachments_summary": "첨부 파일: {count}개, {size}",
+    "from_sub_address": "하위 주소 사용…",
+    "from_edit_sender": "보낸 사람 편집…",
+    "shortcut_insert_link": "링크 삽입",
+    "shortcut_save_draft": "임시 저장",
+    "shortcut_show_cc": "참조 표시",
+    "shortcut_show_bcc": "숨은 참조 표시"
   },
   "confirm_dialog": {
     "confirm": "확인",
diff --git a/locales/lv/common.json b/locales/lv/common.json
index a99b90bb1..44ab51ba8 100644
--- a/locales/lv/common.json
+++ b/locales/lv/common.json
@@ -1218,7 +1218,14 @@
     "discard_draft": "Atmest melnrakstu",
     "save_failed_close": "Melnrakstu neizdevās saglabāt. Mēģiniet vēlreiz vai atmetiet to.",
     "try_again": "Mēģināt vēlreiz",
-    "add_description": "Pievienot aprakstu"
+    "add_description": "Pievienot aprakstu",
+    "attachments_summary": "Pielikumi: {count}, {size}",
+    "from_sub_address": "Izmantot apakšadresi…",
+    "from_edit_sender": "Rediģēt sūtītāju…",
+    "shortcut_insert_link": "Ievietot saiti",
+    "shortcut_save_draft": "Saglabāt melnrakstu",
+    "shortcut_show_cc": "Rādīt kopiju",
+    "shortcut_show_bcc": "Rādīt diskrēto kopiju"
   },
   "confirm_dialog": {
     "confirm": "Apstiprināt",
diff --git a/locales/mn/common.json b/locales/mn/common.json
index 204cc8105..7622f6763 100644
--- a/locales/mn/common.json
+++ b/locales/mn/common.json
@@ -1218,7 +1218,14 @@
     "discard_draft": "Ноорог устгах",
     "save_failed_close": "Ноорогийг хадгалж чадсангүй. Дахин оролдох эсвэл устгана уу.",
     "try_again": "Дахин оролдох",
-    "add_description": "Тайлбар нэмэх"
+    "add_description": "Тайлбар нэмэх",
+    "attachments_summary": "Хавсралт: {count}, {size}",
+    "from_sub_address": "Дэд хаяг ашиглах…",
+    "from_edit_sender": "Илгээгчийг засах…",
+    "shortcut_insert_link": "Холбоос оруулах",
+    "shortcut_save_draft": "Ноорог хадгалах",
+    "shortcut_show_cc": "Хуулбар харуулах",
+    "shortcut_show_bcc": "Нууц хуулбар харуулах"
   },
   "confirm_dialog": {
     "confirm": "Баталгаажуулах",
diff --git a/locales/nb/common.json b/locales/nb/common.json
index 755bcbc45..1ac662c08 100644
--- a/locales/nb/common.json
+++ b/locales/nb/common.json
@@ -1218,7 +1218,14 @@
     "discard_draft": "Forkast utkast",
     "save_failed_close": "Utkastet kunne ikke lagres. Prøv igjen, eller forkast det.",
     "try_again": "Prøv igjen",
-    "add_description": "Legg til beskrivelse"
+    "add_description": "Legg til beskrivelse",
+    "attachments_summary": "Vedlegg: {count}, {size}",
+    "from_sub_address": "Bruk en underadresse…",
+    "from_edit_sender": "Rediger avsender…",
+    "shortcut_insert_link": "Sett inn lenke",
+    "shortcut_save_draft": "Lagre utkast",
+    "shortcut_show_cc": "Vis kopi",
+    "shortcut_show_bcc": "Vis blindkopi"
   },
   "confirm_dialog": {
     "confirm": "Bekreft",
diff --git a/locales/nl/common.json b/locales/nl/common.json
index c9ed9c8dd..7394b78a5 100644
--- a/locales/nl/common.json
+++ b/locales/nl/common.json
@@ -1218,7 +1218,14 @@
     "discard_draft": "Concept verwijderen",
     "save_failed_close": "Het concept kon niet worden opgeslagen. Probeer het opnieuw of verwijder het.",
     "try_again": "Opnieuw proberen",
-    "add_description": "Beschrijving toevoegen"
+    "add_description": "Beschrijving toevoegen",
+    "attachments_summary": "Bijlagen: {count}, {size}",
+    "from_sub_address": "Subadres gebruiken…",
+    "from_edit_sender": "Afzender bewerken…",
+    "shortcut_insert_link": "Link invoegen",
+    "shortcut_save_draft": "Concept opslaan",
+    "shortcut_show_cc": "Cc tonen",
+    "shortcut_show_bcc": "Bcc tonen"
   },
   "confirm_dialog": {
     "confirm": "Bevestigen",
diff --git a/locales/pl/common.json b/locales/pl/common.json
index 74467a752..e688a1cd4 100644
--- a/locales/pl/common.json
+++ b/locales/pl/common.json
@@ -1218,7 +1218,14 @@
     "discard_draft": "Odrzuć wersję roboczą",
     "save_failed_close": "Nie udało się zapisać wersji roboczej. Spróbuj ponownie lub ją odrzuć.",
     "try_again": "Spróbuj ponownie",
-    "add_description": "Dodaj opis"
+    "add_description": "Dodaj opis",
+    "attachments_summary": "Załączniki: {count}, {size}",
+    "from_sub_address": "Użyj podadresu…",
+    "from_edit_sender": "Edytuj nadawcę…",
+    "shortcut_insert_link": "Wstaw link",
+    "shortcut_save_draft": "Zapisz wersję roboczą",
+    "shortcut_show_cc": "Pokaż DW",
+    "shortcut_show_bcc": "Pokaż UDW"
   },
   "confirm_dialog": {
     "confirm": "Potwierdź",
diff --git a/locales/pt/common.json b/locales/pt/common.json
index 9e2b2d331..54c0438d0 100644
--- a/locales/pt/common.json
+++ b/locales/pt/common.json
@@ -1218,7 +1218,14 @@
     "discard_draft": "Descartar rascunho",
     "save_failed_close": "Não foi possível guardar o rascunho. Tente novamente ou descarte-o.",
     "try_again": "Tentar novamente",
-    "add_description": "Adicionar descrição"
+    "add_description": "Adicionar descrição",
+    "attachments_summary": "Anexos: {count}, {size}",
+    "from_sub_address": "Usar um subendereço…",
+    "from_edit_sender": "Editar remetente…",
+    "shortcut_insert_link": "Inserir ligação",
+    "shortcut_save_draft": "Guardar rascunho",
+    "shortcut_show_cc": "Mostrar Cc",
+    "shortcut_show_bcc": "Mostrar Bcc"
   },
   "confirm_dialog": {
     "confirm": "Confirmar",
diff --git a/locales/ro/common.json b/locales/ro/common.json
index db1ed7bce..8c2fcd50e 100644
--- a/locales/ro/common.json
+++ b/locales/ro/common.json
@@ -1218,7 +1218,14 @@
     "discard_draft": "Renunță la ciornă",
     "save_failed_close": "Ciorna nu a putut fi salvată. Încercați din nou sau renunțați la ea.",
     "try_again": "Încearcă din nou",
-    "add_description": "Adaugă o descriere"
+    "add_description": "Adaugă o descriere",
+    "attachments_summary": "Atașamente: {count}, {size}",
+    "from_sub_address": "Folosește o subadresă…",
+    "from_edit_sender": "Editează expeditorul…",
+    "shortcut_insert_link": "Inserează un link",
+    "shortcut_save_draft": "Salvează ciorna",
+    "shortcut_show_cc": "Afișează Cc",
+    "shortcut_show_bcc": "Afișează Bcc"
   },
   "confirm_dialog": {
     "confirm": "Confirmare",
diff --git a/locales/ru/common.json b/locales/ru/common.json
index 810933d38..76f168826 100644
--- a/locales/ru/common.json
+++ b/locales/ru/common.json
@@ -1218,7 +1218,14 @@
     "discard_draft": "Удалить черновик",
     "save_failed_close": "Не удалось сохранить черновик. Попробуйте ещё раз или удалите его.",
     "try_again": "Повторить",
-    "add_description": "Добавить описание"
+    "add_description": "Добавить описание",
+    "attachments_summary": "Вложения: {count}, {size}",
+    "from_sub_address": "Использовать подадрес…",
+    "from_edit_sender": "Изменить отправителя…",
+    "shortcut_insert_link": "Вставить ссылку",
+    "shortcut_save_draft": "Сохранить черновик",
+    "shortcut_show_cc": "Показать копию",
+    "shortcut_show_bcc": "Показать скрытую копию"
   },
   "confirm_dialog": {
     "confirm": "Подтвердить",
diff --git a/locales/sk/common.json b/locales/sk/common.json
index 72badccba..93a3322cf 100644
--- a/locales/sk/common.json
+++ b/locales/sk/common.json
@@ -1218,7 +1218,14 @@
     "discard_draft": "Zahodiť koncept",
     "save_failed_close": "Koncept sa nepodarilo uložiť. Skúste to znova alebo ho zahoďte.",
     "try_again": "Skúsiť znova",
-    "add_description": "Pridať popis"
+    "add_description": "Pridať popis",
+    "attachments_summary": "Prílohy: {count}, {size}",
+    "from_sub_address": "Použiť podadresu…",
+    "from_edit_sender": "Upraviť odosielateľa…",
+    "shortcut_insert_link": "Vložiť odkaz",
+    "shortcut_save_draft": "Uložiť koncept",
+    "shortcut_show_cc": "Zobraziť kópiu",
+    "shortcut_show_bcc": "Zobraziť skrytú kópiu"
   },
   "confirm_dialog": {
     "confirm": "Potvrdiť",
diff --git a/locales/th/common.json b/locales/th/common.json
index 75960886f..b527b8a89 100644
--- a/locales/th/common.json
+++ b/locales/th/common.json
@@ -1566,7 +1566,14 @@
     "discard_draft": "ทิ้งฉบับร่าง",
     "save_failed_close": "บันทึกฉบับร่างไม่ได้ ลองอีกครั้งหรือทิ้งไป",
     "try_again": "ลองอีกครั้ง",
-    "add_description": "เพิ่มคำอธิบาย"
+    "add_description": "เพิ่มคำอธิบาย",
+    "attachments_summary": "ไฟล์แนบ: {count} ไฟล์, {size}",
+    "from_sub_address": "ใช้ที่อยู่ย่อย…",
+    "from_edit_sender": "แก้ไขผู้ส่ง…",
+    "shortcut_insert_link": "แทรกลิงก์",
+    "shortcut_save_draft": "บันทึกฉบับร่าง",
+    "shortcut_show_cc": "แสดงสำเนา",
+    "shortcut_show_bcc": "แสดงสำเนาลับ"
   },
   "email_viewer": {
     "read_receipt": {
diff --git a/locales/tr/common.json b/locales/tr/common.json
index c98b22e1a..9b6097ad9 100644
--- a/locales/tr/common.json
+++ b/locales/tr/common.json
@@ -1218,7 +1218,14 @@
     "discard_draft": "Taslağı sil",
     "save_failed_close": "Taslak kaydedilemedi. Yeniden deneyin ya da silin.",
     "try_again": "Yeniden dene",
-    "add_description": "Açıklama ekle"
+    "add_description": "Açıklama ekle",
+    "attachments_summary": "Ekler: {count}, {size}",
+    "from_sub_address": "Alt adres kullan…",
+    "from_edit_sender": "Göndereni düzenle…",
+    "shortcut_insert_link": "Bağlantı ekle",
+    "shortcut_save_draft": "Taslağı kaydet",
+    "shortcut_show_cc": "Bilgiyi göster",
+    "shortcut_show_bcc": "Gizli bilgiyi göster"
   },
   "confirm_dialog": {
     "confirm": "Onayla",
diff --git a/locales/uk/common.json b/locales/uk/common.json
index 61190aba0..2b82927e1 100644
--- a/locales/uk/common.json
+++ b/locales/uk/common.json
@@ -1218,7 +1218,14 @@
     "discard_draft": "Видалити чернетку",
     "save_failed_close": "Не вдалося зберегти чернетку. Спробуйте ще раз або видаліть її.",
     "try_again": "Спробувати ще раз",
-    "add_description": "Додати опис"
+    "add_description": "Додати опис",
+    "attachments_summary": "Вкладення: {count}, {size}",
+    "from_sub_address": "Використати підадресу…",
+    "from_edit_sender": "Змінити відправника…",
+    "shortcut_insert_link": "Вставити посилання",
+    "shortcut_save_draft": "Зберегти чернетку",
+    "shortcut_show_cc": "Показати копію",
+    "shortcut_show_bcc": "Показати приховану копію"
   },
   "confirm_dialog": {
     "confirm": "Підтвердити",
diff --git a/locales/vi/common.json b/locales/vi/common.json
index 7f1cdde96..a00fb57c3 100644
--- a/locales/vi/common.json
+++ b/locales/vi/common.json
@@ -1230,7 +1230,14 @@
     "discard_draft": "Hủy bản nháp",
     "save_failed_close": "Không lưu được bản nháp. Hãy thử lại hoặc hủy bản nháp.",
     "try_again": "Thử lại",
-    "add_description": "Thêm mô tả"
+    "add_description": "Thêm mô tả",
+    "attachments_summary": "Tệp đính kèm: {count}, {size}",
+    "from_sub_address": "Dùng địa chỉ phụ…",
+    "from_edit_sender": "Sửa người gửi…",
+    "shortcut_insert_link": "Chèn liên kết",
+    "shortcut_save_draft": "Lưu bản nháp",
+    "shortcut_show_cc": "Hiện Cc",
+    "shortcut_show_bcc": "Hiện Bcc"
   },
   "confirm_dialog": {
     "confirm": "Xác nhận",
diff --git a/locales/zh-TW/common.json b/locales/zh-TW/common.json
index 02b7f47bb..e0530e39f 100644
--- a/locales/zh-TW/common.json
+++ b/locales/zh-TW/common.json
@@ -1218,7 +1218,14 @@
     "discard_draft": "捨棄草稿",
     "save_failed_close": "無法儲存草稿。請再試一次或捨棄草稿。",
     "try_again": "再試一次",
-    "add_description": "新增描述"
+    "add_description": "新增描述",
+    "attachments_summary": "附件：{count} 個，{size}",
+    "from_sub_address": "使用子地址…",
+    "from_edit_sender": "編輯寄件者…",
+    "shortcut_insert_link": "插入連結",
+    "shortcut_save_draft": "儲存草稿",
+    "shortcut_show_cc": "顯示副本",
+    "shortcut_show_bcc": "顯示密件副本"
   },
   "confirm_dialog": {
     "confirm": "確認",
diff --git a/locales/zh/common.json b/locales/zh/common.json
index 0b033d382..789d31678 100644
--- a/locales/zh/common.json
+++ b/locales/zh/common.json
@@ -1218,7 +1218,14 @@
     "discard_draft": "舍弃草稿",
     "save_failed_close": "无法保存草稿。请重试或舍弃草稿。",
     "try_again": "重试",
-    "add_description": "添加描述"
+    "add_description": "添加描述",
+    "attachments_summary": "附件：{count} 个，{size}",
+    "from_sub_address": "使用子地址…",
+    "from_edit_sender": "编辑发件人…",
+    "shortcut_insert_link": "插入链接",
+    "shortcut_save_draft": "保存草稿",
+    "shortcut_show_cc": "显示抄送",
+    "shortcut_show_bcc": "显示密送"
   },
   "confirm_dialog": {
     "confirm": "确认",

From 76c0bd1d4187eb471e39eaeb94ed1dbe435a76f6 Mon Sep 17 00:00:00 2001
From: Linus Rath <139418639+rathlinus@users.noreply.github.com>
Date: Wed, 4 Nov 2026 09:08:09 +0100
Subject: [PATCH 29/34] test: save a subject-less draft by closing, as closing
 now saves without asking

---
 components/email/__tests__/empty-subject-warning.test.tsx | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/components/email/__tests__/empty-subject-warning.test.tsx b/components/email/__tests__/empty-subject-warning.test.tsx
index 26b50b734..bba41c478 100644
--- a/components/email/__tests__/empty-subject-warning.test.tsx
+++ b/components/email/__tests__/empty-subject-warning.test.tsx
@@ -378,9 +378,8 @@ describe('composer empty subject warning', () => {
     );
     fireEvent.change(screen.getByDisplayValue('Lunch'), { target: { value: '' } });
 
+    // Closing saves the draft; no question unless the save fails.
     act(() => requestCloseRef.current!(vi.fn()));
-    const dialog = await screen.findByRole('alertdialog');
-    fireEvent.click(within(dialog).getByText('save'));
 
     await waitFor(() => expect(createDraft).toHaveBeenCalled());
     expect(createDraft.mock.calls[0][1]).toBe('');

From b509ce067f02d93e6a12783a46622bc6baed34f2 Mon Sep 17 00:00:00 2001
From: Linus Rath <139418639+rathlinus@users.noreply.github.com>
Date: Wed, 4 Nov 2026 09:08:17 +0100
Subject: [PATCH 30/34] fix: move Use a sub-address and Edit sender into the
 From list instead of buttons on every message

The custom From gate tests now look for the Edit sender entry in the From list instead of the Override button.
---
 .../composer-from-override-envelope.test.tsx  | 44 ++++++++++++++++---
 components/email/email-composer.tsx           | 40 +++++++++++++----
 components/identity/sub-address-helper.tsx    | 41 +++++++++++------
 3 files changed, 97 insertions(+), 28 deletions(-)

diff --git a/components/email/__tests__/composer-from-override-envelope.test.tsx b/components/email/__tests__/composer-from-override-envelope.test.tsx
index c6d39338e..261eff0af 100644
--- a/components/email/__tests__/composer-from-override-envelope.test.tsx
+++ b/components/email/__tests__/composer-from-override-envelope.test.tsx
@@ -11,7 +11,10 @@ vi.mock('@/components/email/rich-text-editor', () => ({
 }));
 
 vi.mock('@/components/plugins/plugin-slot', () => ({ PluginSlot: () => null }));
-vi.mock('@/components/identity/sub-address-helper', () => ({ SubAddressHelper: () => null }));
+vi.mock('@/components/identity/sub-address-helper', () => ({
+  SubAddressHelper: ({ open, hideTrigger }: { open?: boolean; hideTrigger?: boolean }) =>
+    open ? <div role="dialog">sub-address popover</div> : hideTrigger ? null : <button type="button">sub-address button</button>,
+}));
 vi.mock('@/components/templates/template-picker', () => ({ TemplatePicker: () => null }));
 vi.mock('@/components/templates/template-form', () => ({ TemplateForm: () => null }));
 vi.mock('@/components/files/file-preview-modal', () => ({ FilePreviewModal: () => null }));
@@ -268,17 +271,46 @@ describe('composer From override envelope (#1009)', () => {
       expect(sent.envelopeMailFrom).toBeUndefined();
     });
 
-    it('offers no Custom button', () => {
+    it('offers no Edit sender', () => {
       render(<EmailComposer />);
-      expect(screen.queryByText('from_override.toggle_off')).not.toBeInTheDocument();
+      expect(screen.queryByRole('option', { name: 'from_edit_sender' })).not.toBeInTheDocument();
     });
 
-    // Control: the button is there with the gate on, so the test above is not
+    // Control: the entry is there with the gate on, so the test above is not
     // passing on a renamed label.
-    it('offers the Custom button with the gate on', () => {
+    it('offers Edit sender with the gate on', () => {
       setCustomFrom(true);
       render(<EmailComposer />);
-      expect(screen.getByText('from_override.toggle_off')).toBeInTheDocument();
+      expect(screen.getByRole('option', { name: 'from_edit_sender' })).toBeInTheDocument();
     });
   });
 });
+
+// compose-20: the rare sender options live at the end of the From list, not
+// as buttons on every message.
+describe('the From list', () => {
+  const from = () => screen.getByTestId('composer-from') as HTMLSelectElement;
+
+  it('has no sub-address or Override button in the row', () => {
+    render(<EmailComposer />);
+    expect(screen.queryByText('sub-address button')).not.toBeInTheDocument();
+    expect(screen.queryByText('from_override.toggle_off')).not.toBeInTheDocument();
+    expect(screen.getByRole('option', { name: 'from_sub_address' })).toBeInTheDocument();
+  });
+
+  it('opens the sub-address popover from the list and keeps the identity', () => {
+    render(<EmailComposer />);
+    const before = from().value;
+    fireEvent.change(from(), { target: { value: '__sub_address' } });
+    expect(screen.getByRole('dialog')).toHaveTextContent('sub-address popover');
+    expect(from().value).toBe(before);
+  });
+
+  it('turns From into fields to edit from the list, with a way back', () => {
+    render(<EmailComposer />);
+    fireEvent.change(from(), { target: { value: '__edit_sender' } });
+    expect(screen.getByLabelText('from_override.email_label')).toHaveValue('me@example.com');
+    fireEvent.click(screen.getByText('from_override.toggle_on'));
+    expect(screen.queryByLabelText('from_override.email_label')).not.toBeInTheDocument();
+  });
+});
diff --git a/components/email/email-composer.tsx b/components/email/email-composer.tsx
index 9f3c13640..0f0da05c1 100644
--- a/components/email/email-composer.tsx
+++ b/components/email/email-composer.tsx
@@ -247,6 +247,10 @@ function createChipDragPreview(label: string): HTMLElement {
 // inserts as a single chip and expands into its members on send.
 type SuggestionItem = { name: string; email: string; group?: { id: string; memberCount: number } };
 
+/** The From list's entries that aren't identities. */
+const FROM_SUB_ADDRESS = '__sub_address';
+const FROM_EDIT_SENDER = '__edit_sender';
+
 // Which `initialFiles` arrays are attached: a remount gets the same array.
 const attachedInitialFiles = new WeakSet<File[]>();
 
@@ -1244,6 +1248,8 @@ export function EmailComposer({
   // "close" (X, Escape): save or discard. "discard" (the Discard button): the
   // user already chose, so only confirm it.
   const [closeDialogKind, setCloseDialogKind] = useState<'close' | 'discard'>('close');
+  // The sub-address popover, opened from the From list.
+  const [subAddressOpen, setSubAddressOpen] = useState(false);
   // Closing saves without asking; the question comes only when that save failed.
   const [closeSaveFailed, setCloseSaveFailed] = useState(false);
   const [previewAttachment, setPreviewAttachment] = useState<ComposerAttachment | null>(null);
@@ -4774,6 +4780,14 @@ export function EmailComposer({
   // Only asked while offline: it reads the organisation's policy and the store's support.
   const offlineHint = browserOnline ? '' : tComposeWindows(offlineActive(composingAccountId ?? null) ? 'offline_hint_outbox' : 'offline_hint');
 
+  // "Edit sender…": From becomes a name and an address to type, starting
+  // from the identity's.
+  const startFromOverride = () => {
+    setFromOverrideEnabled(true);
+    if (!fromOverrideEmail && currentIdentity?.email) setFromOverrideEmail(currentIdentity.email);
+    if (!fromOverrideName && currentIdentity?.name) setFromOverrideName(currentIdentity.name);
+  };
+
   const handleComposerKeyDown = (e: React.KeyboardEvent<HTMLDivElement>) => {
     if (e.defaultPrevented) return;
     // Keys from a dialog the composer opened (Insert link, ...) reach here
@@ -5112,11 +5126,20 @@ export function EmailComposer({
                     aria-label={t('from_override.email_label')}
                   />
                 </div>
-              ) : identities.length > 1 ? (
+              ) : identities.length > 0 ? (
                 <select
                   data-testid="composer-from"
                   value={selectedIdentityId || primaryIdentity?.id || ''}
                   onChange={(e) => {
+                    // The sender's rarer options sit at the end of the list.
+                    if (e.target.value === FROM_SUB_ADDRESS) {
+                      setSubAddressOpen(true);
+                      return;
+                    }
+                    if (e.target.value === FROM_EDIT_SENDER) {
+                      startFromOverride();
+                      return;
+                    }
                     setSelectedIdentityId(e.target.value);
                     setIdentityPickedByUser(true);
                     notifyIdentitySelected(identities, e.target.value);
@@ -5148,6 +5171,8 @@ export function EmailComposer({
                           </option>
                         );
                       })}
+                  <option value={FROM_SUB_ADDRESS}>{tUx('from_sub_address')}</option>
+                  {customFromEnabled && <option value={FROM_EDIT_SENDER}>{tUx('from_edit_sender')}</option>}
                 </select>
               ) : (
                 <span data-testid="composer-from" className="text-sm text-foreground flex-1 truncate">
@@ -5166,6 +5191,9 @@ export function EmailComposer({
               )}
               {!fromOverrideEnabled && (
                 <SubAddressHelper
+                  hideTrigger={identities.length > 0}
+                  open={identities.length > 0 ? subAddressOpen : undefined}
+                  onOpenChange={setSubAddressOpen}
                   baseEmail={
                     (selectedIdentityId
                       ? identities.find(id => id.id === selectedIdentityId)?.email
@@ -5187,7 +5215,7 @@ export function EmailComposer({
                   <X className="w-3 h-3" />
                 </Button>
               )}
-              {customFromEnabled && (
+              {customFromEnabled && (fromOverrideEnabled || identities.length === 0) && (
                 <Button
                   type="button"
                   variant={fromOverrideEnabled ? 'outline' : 'ghost'}
@@ -5196,13 +5224,7 @@ export function EmailComposer({
                     if (fromOverrideEnabled) {
                       setFromOverrideEnabled(false);
                     } else {
-                      setFromOverrideEnabled(true);
-                      if (!fromOverrideEmail && currentIdentity?.email) {
-                        setFromOverrideEmail(currentIdentity.email);
-                      }
-                      if (!fromOverrideName && currentIdentity?.name) {
-                        setFromOverrideName(currentIdentity.name);
-                      }
+                      startFromOverride();
                     }
                   }}
                   className="h-6 px-2 text-xs shrink-0"
diff --git a/components/identity/sub-address-helper.tsx b/components/identity/sub-address-helper.tsx
index 3a91fb524..124595ba3 100644
--- a/components/identity/sub-address-helper.tsx
+++ b/components/identity/sub-address-helper.tsx
@@ -22,6 +22,11 @@ interface SubAddressHelperProps {
   recipientEmails: string[];
   onSelectTag: (tag: string) => void;
   disabled?: boolean;
+  /** Opened from elsewhere (the composer's From list) instead of its own button. */
+  open?: boolean;
+  onOpenChange?: (open: boolean) => void;
+  /** No button of its own: the host opens it. */
+  hideTrigger?: boolean;
 }
 
 export function SubAddressHelper({
@@ -29,9 +34,17 @@ export function SubAddressHelper({
   recipientEmails,
   onSelectTag,
   disabled = false,
+  open,
+  onOpenChange,
+  hideTrigger = false,
 }: SubAddressHelperProps) {
   const t = useTranslations('identities.sub_address');
-  const [isOpen, setIsOpen] = useState(false);
+  const [ownOpen, setOwnOpen] = useState(false);
+  const isOpen = open ?? ownOpen;
+  const setIsOpen = (next: boolean) => {
+    if (open === undefined) setOwnOpen(next);
+    onOpenChange?.(next);
+  };
   const [tag, setTag] = useState('');
   const [error, setError] = useState<string | null>(null);
   const popoverRef = useRef<HTMLDivElement>(null);
@@ -128,18 +141,20 @@ export function SubAddressHelper({
   return (
     <div className="relative">
       {/* Trigger Button */}
-      <Button
-        type="button"
-        variant="ghost"
-        size="sm"
-        onClick={() => setIsOpen(!isOpen)}
-        disabled={disabled}
-        title={t('button_tooltip')}
-        className="h-8 px-2"
-      >
-        <Plus className="w-4 h-4 me-1" />
-        <Tag className="w-4 h-4" />
-      </Button>
+      {!hideTrigger && (
+        <Button
+          type="button"
+          variant="ghost"
+          size="sm"
+          onClick={() => setIsOpen(!isOpen)}
+          disabled={disabled}
+          title={t('button_tooltip')}
+          className="h-8 px-2"
+        >
+          <Plus className="w-4 h-4 me-1" />
+          <Tag className="w-4 h-4" />
+        </Button>
+      )}
 
       {/* Popover */}
       {isOpen && (

From 2ca4946c6e644f378aaa36816107ee9013df3389 Mon Sep 17 00:00:00 2001
From: Linus Rath <139418639+rathlinus@users.noreply.github.com>
Date: Wed, 4 Nov 2026 09:13:05 +0100
Subject: [PATCH 31/34] feat: add Ctrl+K for a link, Ctrl+S to save the draft
 and Ctrl+Shift+C or B for Cc and Bcc in the composer

---
 .../__tests__/composer-close-guard.test.tsx   | 18 ++++++++++++++++++
 .../rich-text-editor-link-dialog.test.tsx     | 11 +++++++++++
 components/email/email-composer.tsx           | 19 +++++++++++++++++++
 components/email/rich-text-editor.tsx         |  9 +++++++++
 lib/keyboard-shortcuts/mail.ts                |  6 +++++-
 5 files changed, 62 insertions(+), 1 deletion(-)

diff --git a/components/email/__tests__/composer-close-guard.test.tsx b/components/email/__tests__/composer-close-guard.test.tsx
index 3eab0edba..b1524987e 100644
--- a/components/email/__tests__/composer-close-guard.test.tsx
+++ b/components/email/__tests__/composer-close-guard.test.tsx
@@ -411,6 +411,24 @@ describe('composer close guard with a follow-up', () => {
     expect(onDiscardDraft).toHaveBeenCalledWith('draft-9', expect.anything());
   });
 
+  // compose-19: the keys people bring from other mail apps.
+  it('saves the draft on Ctrl+S, and keeps the browser from saving the page', async () => {
+    const createDraft = savingClient();
+    renderWithCloseRef();
+    const subject = screen.getByDisplayValue('Half-written more');
+    expect(fireEvent.keyDown(subject, { key: 's', ctrlKey: true })).toBe(false);
+    await waitFor(() => expect(createDraft).toHaveBeenCalledTimes(1));
+  });
+
+  it('shows Cc on Ctrl+Shift+C and Bcc on Ctrl+Shift+B, and puts the cursor there', async () => {
+    renderWithCloseRef();
+    const subject = screen.getByDisplayValue('Half-written more');
+    expect(fireEvent.keyDown(subject, { key: 'C', ctrlKey: true, shiftKey: true })).toBe(false);
+    await waitFor(() => expect(document.activeElement).toBe(screen.getByRole('combobox', { name: 'cc_label' })));
+    expect(fireEvent.keyDown(subject, { key: 'B', ctrlKey: true, shiftKey: true })).toBe(false);
+    await waitFor(() => expect(document.activeElement).toBe(screen.getByRole('combobox', { name: 'bcc_label' })));
+  });
+
   it('closes straight through when there is nothing to lose', async () => {
     draftToast.showDraftSavedToast.mockClear();
     const requestCloseRef = { current: null } as React.MutableRefObject<((afterClose?: () => void) => void) | null>;
diff --git a/components/email/__tests__/rich-text-editor-link-dialog.test.tsx b/components/email/__tests__/rich-text-editor-link-dialog.test.tsx
index e815efa53..c15a51ce4 100644
--- a/components/email/__tests__/rich-text-editor-link-dialog.test.tsx
+++ b/components/email/__tests__/rich-text-editor-link-dialog.test.tsx
@@ -36,6 +36,17 @@ describe('Insert link', () => {
     expect(editor.getHTML()).toContain('href="https://example.com/docs"');
   });
 
+  it('opens on Ctrl+K in the text, as in Gmail, Outlook and Word', async () => {
+    const editor = await setup('<p>docs here</p>');
+    act(() => { editor.commands.setTextSelection({ from: 1, to: 5 }); });
+
+    const event = new KeyboardEvent('keydown', { key: 'k', ctrlKey: true, bubbles: true, cancelable: true });
+    act(() => { editor.view.dom.dispatchEvent(event); });
+
+    expect(event.defaultPrevented).toBe(true);
+    expect(screen.getByRole('dialog', { name: 'insert_link' })).toBeInTheDocument();
+  });
+
   it('removes a link from the dialog', async () => {
     const editor = await setup('<p><a href="https://example.com">docs</a> here</p>');
     act(() => { editor.commands.setTextSelection(2); });
diff --git a/components/email/email-composer.tsx b/components/email/email-composer.tsx
index 0f0da05c1..05c4fb78c 100644
--- a/components/email/email-composer.tsx
+++ b/components/email/email-composer.tsx
@@ -4805,6 +4805,25 @@ export function EmailComposer({
     const isSendShortcut = e.key === 'Enter' && hasPrimaryModifier && !e.altKey && !e.shiftKey;
     const isScheduleShortcut = e.key === 'Enter' && hasPrimaryModifier && !e.altKey && e.shiftKey;
     if (!isPlainEscape && !isSendShortcut && !isScheduleShortcut) {
+      // Ctrl+S saves the draft (Outlook, Thunderbird, Apple Mail), not the
+      // page; Ctrl+Shift+C and Ctrl+Shift+B show Cc and Bcc (Gmail).
+      const key = e.key.toLowerCase();
+      if (hasPrimaryModifier && !e.altKey && !e.shiftKey && key === 's') {
+        e.preventDefault();
+        if (!isSavingAndClosing) void saveDraft({ announce: true });
+        return;
+      }
+      if (hasPrimaryModifier && !e.altKey && e.shiftKey && (key === 'c' || key === 'b')) {
+        e.preventDefault();
+        if (key === 'c') {
+          setShowCc(true);
+          setTimeout(() => ccInputRef.current?.focus(), 0);
+        } else {
+          setShowBcc(true);
+          setTimeout(() => bccInputRef.current?.focus(), 0);
+        }
+        return;
+      }
       // A plugin's composer button with a shortcut (composer-toolbar-actions)
       // works while the composer has focus, also while typing.
       if (!e.altKey && !hasPrimaryModifier) return;
diff --git a/components/email/rich-text-editor.tsx b/components/email/rich-text-editor.tsx
index 532291294..a18d8252e 100644
--- a/components/email/rich-text-editor.tsx
+++ b/components/email/rich-text-editor.tsx
@@ -496,6 +496,8 @@ export function RichTextEditor({
   // Images waiting for a description, one dialog at a time: a new image is
   // found by its src (it has no alt yet), an existing one by its position.
   const [altQueue, setAltQueue] = useState<AltRequest[]>([]);
+  // Insert link, for the key handler set up with the editor.
+  const addLinkRef = useRef<(() => void) | null>(null);
 
   const editor = useEditor({
     extensions: [
@@ -598,6 +600,12 @@ export function RichTextEditor({
           event.preventDefault();
           return true;
         }
+        // Ctrl+K inserts a link, as in Gmail, Outlook and Word.
+        if ((event.ctrlKey || event.metaKey) && !event.shiftKey && !event.altKey && event.key.toLowerCase() === "k" && addLinkRef.current) {
+          event.preventDefault();
+          addLinkRef.current();
+          return true;
+        }
         return false;
       },
       handleDrop: (view, event) => {
@@ -727,6 +735,7 @@ export function RichTextEditor({
     const { from, to } = editor.state.selection;
     setLinkDialog({ href: previousUrl ?? "", from, to });
   }, [editor]);
+  addLinkRef.current = addLink;
   const applyLink = useCallback((url: string) => {
     if (!editor || !linkDialog) return;
     editor
diff --git a/lib/keyboard-shortcuts/mail.ts b/lib/keyboard-shortcuts/mail.ts
index bfc88af5e..9d39a0008 100644
--- a/lib/keyboard-shortcuts/mail.ts
+++ b/lib/keyboard-shortcuts/mail.ts
@@ -38,7 +38,11 @@ export const MAIL_SHORTCUTS = {
   composer: [
     { key: "Mod + Enter", description: "shortcuts.composer.send" },
     { key: "Mod + Shift + Enter", description: "shortcuts.composer.schedule_send" },
-    { key: "t", description: "shortcuts.composer.template_picker" },
+    // "t" opens templates only outside a text field, so it isn't listed: in the composer it types a t.
+    { key: "Mod + S", description: "compose_ux.shortcut_save_draft" },
+    { key: "Mod + K", description: "compose_ux.shortcut_insert_link" },
+    { key: "Mod + Shift + C", description: "compose_ux.shortcut_show_cc" },
+    { key: "Mod + Shift + B", description: "compose_ux.shortcut_show_bcc" },
     // Proofreading (components/email/proofreading); shown even without a checker.
     { key: "Mod + '", description: "proofreading.shortcuts.next_issue" },
     { key: "Mod + ;", description: "proofreading.shortcuts.previous_issue" },

From a0dca055851cb6a84c3873f70391cadc976da092 Mon Sep 17 00:00:00 2001
From: Linus Rath <139418639+rathlinus@users.noreply.github.com>
Date: Wed, 4 Nov 2026 09:13:46 +0100
Subject: [PATCH 32/34] test: keep single letters out of the composer's
 shortcut list

---
 lib/__tests__/shortcut-keys.test.ts | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/lib/__tests__/shortcut-keys.test.ts b/lib/__tests__/shortcut-keys.test.ts
index 7e6d97a05..db7319ac3 100644
--- a/lib/__tests__/shortcut-keys.test.ts
+++ b/lib/__tests__/shortcut-keys.test.ts
@@ -1,6 +1,7 @@
 import { describe, expect, it } from 'vitest';
 import { formatShortcutCombo, shortcutAlternatives } from '../shortcut-keys';
 import { GENERAL_SHORTCUTS, SHORTCUT_APPS, sectionsWithGeneral, shortcutAppForPath } from '../keyboard-shortcuts';
+import { MAIL_SHORTCUTS } from '../keyboard-shortcuts/mail';
 
 describe('shortcut notation', () => {
   it('writes Mod as ⌘ on Apple devices and Ctrl elsewhere, Alt as ⌥', () => {
@@ -37,3 +38,12 @@ describe('shortcut sections', () => {
     expect(empty).toEqual([expect.objectContaining({ id: 'global', entries: GENERAL_SHORTCUTS })]);
   });
 });
+
+describe('the composer section of the shortcut list', () => {
+  // compose-19: "t" types a t while writing, so it isn't a composer key.
+  it('lists the editing keys of other mail apps and no single letter', () => {
+    const keys = MAIL_SHORTCUTS.composer.map((entry) => entry.key);
+    expect(keys).toEqual(expect.arrayContaining(['Mod + S', 'Mod + K', 'Mod + Shift + C', 'Mod + Shift + B']));
+    expect(keys.filter((key) => /^[a-z]$/i.test(key))).toEqual([]);
+  });
+});

From f1266889edc10dc5c96e7cf188631cdaf40d93fd Mon Sep 17 00:00:00 2001
From: Linus Rath <139418639+rathlinus@users.noreply.github.com>
Date: Wed, 4 Nov 2026 09:15:42 +0100
Subject: [PATCH 33/34] fix: list To and Cc in the header of a message
 forwarded from the reader

---
 .../mail/__tests__/mail-app-docked-reply.test.tsx  | 14 +++++++++++---
 components/mail/mail-app.tsx                       |  6 +++++-
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/components/mail/__tests__/mail-app-docked-reply.test.tsx b/components/mail/__tests__/mail-app-docked-reply.test.tsx
index 3afb57df8..4c5630b23 100644
--- a/components/mail/__tests__/mail-app-docked-reply.test.tsx
+++ b/components/mail/__tests__/mail-app-docked-reply.test.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { fireEvent, render, screen } from '@testing-library/react';
+import { fireEvent, render, screen, waitFor } from '@testing-library/react';
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 import type { Mailbox } from '@/lib/jmap/types';
 import { useAuthStore } from '@/stores/auth-store';
@@ -25,9 +25,10 @@ vi.mock('@/components/layout/sidebar', () => ({
 vi.mock('@/components/email/email-composer', async () => {
   const { useEffect } = await import('react');
   return {
-    EmailComposer: ({ onSaveState, requestCloseRef }: {
+    EmailComposer: ({ onSaveState, requestCloseRef, replyTo }: {
       onSaveState: (data: Record<string, unknown>) => void;
       requestCloseRef?: { current: unknown };
+      replyTo?: { quoteHeaderHtml?: string };
     }) => {
       useEffect(() => {
         if (requestCloseRef && stub.requestClose) requestCloseRef.current = stub.requestClose;
@@ -37,7 +38,7 @@ vi.mock('@/components/email/email-composer', async () => {
         };
         // eslint-disable-next-line react-hooks/exhaustive-deps
       }, []);
-      return <div>stub composer</div>;
+      return <div data-testid="stub-composer" data-quote={replyTo?.quoteHeaderHtml ?? ''}>stub composer</div>;
     },
   };
 });
@@ -142,6 +143,13 @@ describe('a reply in the standard layout', () => {
     });
   }
 
+  // compose-30: a forward says who the message went to.
+  it('gives a forward a header with To', async () => {
+    render(<MailApp />);
+    fireEvent.click(await screen.findByText('stub forward'));
+    await waitFor(() => expect(screen.getByTestId('stub-composer').getAttribute('data-quote')).toContain('forward_to_label'));
+  });
+
   it('takes the whole pane for a new message', async () => {
     render(<MailApp />);
     fireEvent.click(screen.getByText('stub compose'));
diff --git a/components/mail/mail-app.tsx b/components/mail/mail-app.tsx
index 26b31502a..0547d6e45 100644
--- a/components/mail/mail-app.tsx
+++ b/components/mail/mail-app.tsx
@@ -264,6 +264,7 @@ export function MailApp({ linkSegments: routeSegments }: MailAppProps = {}) {
   const tRemove = useTranslations('email_list.confirm_remove');
   const tCommon = useTranslations('common');
   const tComposeUx = useTranslations('compose_ux');
+  const tComposeWords = useTranslations('compose_words');
   const appName = productName(useConfig().appName);
   const tQuote = useTranslations('quote_header');
   const tComposer = useTranslations('email_composer');
@@ -2744,6 +2745,9 @@ export function MailApp({ linkSegments: routeSegments }: MailAppProps = {}) {
           fromLabel: tQuote('from_label'),
           dateLabel: tQuote('date_label'),
           subjectLabel: tQuote('subject_label'),
+          // A forward says who the message went to, as Gmail and Outlook do.
+          toLabel: tComposeWords('forward_to_label'),
+          ccLabel: tComposeWords('forward_cc_label'),
         },
       });
       setComposerQuoteHeader(header);
@@ -2751,7 +2755,7 @@ export function MailApp({ linkSegments: routeSegments }: MailAppProps = {}) {
       console.warn('[quote-header] plugin transform failed; using default', err);
       setComposerQuoteHeader(null);
     }
-  }, [tCommon, tQuote]);
+  }, [tCommon, tQuote, tComposeWords]);
 
   // Force a clean composer remount on every fresh entry point so prior
   // compose state can't bleed into the new session (#329 C). The composer is

From d91b8a879cea9cf7cd486686aa6d3751439ecb4d Mon Sep 17 00:00:00 2001
From: Linus Rath <139418639+rathlinus@users.noreply.github.com>
Date: Wed, 4 Nov 2026 09:42:40 +0100
Subject: [PATCH 34/34] fix: say Draft saved on Ctrl+S also when autosave
 already had everything

The shortcut help test now counts two Ctrl + K entries (command palette and Insert link), and the Cc/Bcc key test waits for the To field's opening focus first.
---
 .../__tests__/keyboard-shortcuts-sections.test.tsx       | 4 +++-
 components/email/__tests__/composer-close-guard.test.tsx | 8 ++++++++
 components/email/email-composer.tsx                      | 9 ++++++++-
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/components/__tests__/keyboard-shortcuts-sections.test.tsx b/components/__tests__/keyboard-shortcuts-sections.test.tsx
index 635511557..27f4c9ba4 100644
--- a/components/__tests__/keyboard-shortcuts-sections.test.tsx
+++ b/components/__tests__/keyboard-shortcuts-sections.test.tsx
@@ -37,7 +37,9 @@ describe('keyboard shortcuts help per app', () => {
     nav.pathname = '/';
     render(<KeyboardShortcutsModal isOpen onClose={() => {}} />);
     expect(screen.getAllByText('or').length).toBeGreaterThan(0);
-    expect(screen.getAllByText('Ctrl + K').length).toBe(1);
+    // The command palette, and Insert link in the composer.
+    expect(screen.getAllByText('Ctrl + K').length).toBe(2);
+    expect(screen.queryByText('⌘ + K')).toBeNull();
   });
 });
 
diff --git a/components/email/__tests__/composer-close-guard.test.tsx b/components/email/__tests__/composer-close-guard.test.tsx
index b1524987e..d6f877d86 100644
--- a/components/email/__tests__/composer-close-guard.test.tsx
+++ b/components/email/__tests__/composer-close-guard.test.tsx
@@ -418,10 +418,18 @@ describe('composer close guard with a follow-up', () => {
     const subject = screen.getByDisplayValue('Half-written more');
     expect(fireEvent.keyDown(subject, { key: 's', ctrlKey: true })).toBe(false);
     await waitFor(() => expect(createDraft).toHaveBeenCalledTimes(1));
+
+    // Nothing new to save: it still says so.
+    await waitFor(() => expect(screen.getByTestId('composer-save-status')).toHaveAttribute('data-status', 'idle'), { timeout: 4000 });
+    fireEvent.keyDown(subject, { key: 's', ctrlKey: true });
+    await waitFor(() => expect(screen.getByTestId('composer-save-status')).toHaveAttribute('data-status', 'saved'));
+    expect(createDraft).toHaveBeenCalledTimes(1);
   });
 
   it('shows Cc on Ctrl+Shift+C and Bcc on Ctrl+Shift+B, and puts the cursor there', async () => {
     renderWithCloseRef();
+    // A new message puts the cursor in To shortly after it opens; let that pass.
+    await act(async () => { await new Promise((r) => setTimeout(r, 250)); });
     const subject = screen.getByDisplayValue('Half-written more');
     expect(fireEvent.keyDown(subject, { key: 'C', ctrlKey: true, shiftKey: true })).toBe(false);
     await waitFor(() => expect(document.activeElement).toBe(screen.getByRole('combobox', { name: 'cc_label' })));
diff --git a/components/email/email-composer.tsx b/components/email/email-composer.tsx
index c32143122..fc292094a 100644
--- a/components/email/email-composer.tsx
+++ b/components/email/email-composer.tsx
@@ -4846,7 +4846,14 @@ export function EmailComposer({
       const key = e.key.toLowerCase();
       if (hasPrimaryModifier && !e.altKey && !e.shiftKey && key === 's') {
         e.preventDefault();
-        if (!isSavingAndClosing) void saveDraft({ announce: true });
+        // Says "Draft saved" also when autosave already had everything.
+        if (!isSavingAndClosing) {
+          void saveDraft({ announce: true }).then((id) => {
+            if (!id || saveFailedRef.current) return;
+            setSaveStatus('saved');
+            setTimeout(() => setSaveStatus((status) => (status === 'saved' ? 'idle' : status)), 2000);
+          });
+        }
         return;
       }
       if (hasPrimaryModifier && !e.altKey && e.shiftKey && (key === 'c' || key === 'b')) {