From 721608962980918bbf5fecc7b3d1aaa018305a54 Mon Sep 17 00:00:00 2001
From: Max Hao <max@maxhao.org>
Date: Mon, 26 Oct 2026 11:33:45 -0400
Subject: [PATCH] feat: add quick reply feature with toggle in settings and
 tests

---
 .../email/__tests__/viewer-send-failures.test.tsx      | 10 ++++++++++
 components/email/email-viewer.tsx                      |  3 ++-
 components/settings/composing-settings.tsx             |  8 ++++++++
 locales/en/common.json                                 |  4 ++++
 stores/__tests__/settings-store-attachments.test.ts    |  8 ++++++++
 stores/settings-store.ts                               |  3 +++
 6 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/components/email/__tests__/viewer-send-failures.test.tsx b/components/email/__tests__/viewer-send-failures.test.tsx
index 2d0f66e30..54328dfa6 100644
--- a/components/email/__tests__/viewer-send-failures.test.tsx
+++ b/components/email/__tests__/viewer-send-failures.test.tsx
@@ -75,6 +75,7 @@ function makeEmail(overrides: Record<string, unknown> = {}): Email {
 let toastError: ReturnType<typeof vi.spyOn>;
 
 beforeEach(() => {
+  useSettingsStore.setState({ quickReplyEnabled: true });
   toastError = vi.spyOn(toast, 'error').mockImplementation(() => {});
   vi.spyOn(console, 'error').mockImplementation(() => {});
 });
@@ -84,6 +85,15 @@ afterEach(() => {
 });
 
 describe('viewer send failures', () => {
+  it('hides quick reply when disabled and restores it when enabled', () => {
+    useSettingsStore.setState({ quickReplyEnabled: false });
+    render(<EmailViewer email={makeEmail()} mailboxes={mailboxes} selectedMailbox="inbox" currentMailboxRole="inbox" />);
+
+    expect(screen.queryByPlaceholderText('quick_reply_placeholder')).not.toBeInTheDocument();
+    act(() => useSettingsStore.getState().updateSetting('quickReplyEnabled', true));
+    expect(screen.getByPlaceholderText('quick_reply_placeholder')).toBeInTheDocument();
+  });
+
   it('reports a failed quick reply and keeps the text on Stalwart 1.0', async () => {
     const onQuickReply = vi.fn().mockRejectedValue(new SubmissionQuotaError(QUOTA, true));
     render(
diff --git a/components/email/email-viewer.tsx b/components/email/email-viewer.tsx
index cc179c90f..65ae975ee 100644
--- a/components/email/email-viewer.tsx
+++ b/components/email/email-viewer.tsx
@@ -1084,6 +1084,7 @@ export function EmailViewer({
   const tContextMenu = useTranslations('context_menu');
   const copyLink = useCopyLink();
   const tWelcome = useTranslations('welcome');
+  const quickReplyEnabled = useSettingsStore((state) => state.quickReplyEnabled);
   const externalContentPolicy = useSettingsStore((state) => state.externalContentPolicy);
   const messageSpacing = useSettingsStore((state) => state.messageSpacing);
   const plainTextFont = useSettingsStore((state) => state.plainTextFont);
@@ -6384,7 +6385,7 @@ export function EmailViewer({
           )}
 
           {/* Quick Reply Section - hidden for drafts and while loading a new email */}
-          {!mvReplyRow && !isDraft && !isScheduled && !isBodyLoading && (effectiveEmailContent.isHtml ? iframeReady : true) && (<div className="bg-background border-t border-border px-6 mt-auto" style={{ paddingBlock: 'var(--density-header-py)' }}>
+          {quickReplyEnabled && !mvReplyRow && !isDraft && !isScheduled && !isBodyLoading && (effectiveEmailContent.isHtml ? iframeReady : true) && (<div className="bg-background border-t border-border px-6 mt-auto" style={{ paddingBlock: 'var(--density-header-py)' }}>
             <div className="flex items-start" style={{ gap: 'var(--density-item-gap)' }}>
               <div className="flex-shrink-0">
                 <Avatar
diff --git a/components/settings/composing-settings.tsx b/components/settings/composing-settings.tsx
index e68ab4304..ed6849c61 100644
--- a/components/settings/composing-settings.tsx
+++ b/components/settings/composing-settings.tsx
@@ -23,6 +23,7 @@ export function ComposingSettings() {
   const [newKeyword, setNewKeyword] = useState('');
 
   const {
+    quickReplyEnabled,
     autoSelectReplyIdentity,
     replyIdentityMatch,
     plainTextMode,
@@ -84,6 +85,13 @@ export function ComposingSettings() {
       </SettingsSection>
 
       <SettingsSection id="replying" title={tPage('sections.replying')}>
+        <SettingItem label={t('quick_reply.label')} description={t('quick_reply.description')}>
+          <ToggleSwitch
+            checked={quickReplyEnabled}
+            onChange={(checked) => updateSetting('quickReplyEnabled', checked)}
+          />
+        </SettingItem>
+
         <SettingItem label={t('auto_select_reply_identity.label')} description={t('auto_select_reply_identity.description')}>
           <ToggleSwitch
             checked={autoSelectReplyIdentity}
diff --git a/locales/en/common.json b/locales/en/common.json
index b9d547a9c..b31cf9825 100644
--- a/locales/en/common.json
+++ b/locales/en/common.json
@@ -1532,6 +1532,10 @@
         "label": "Plain Text Only",
         "description": "Disable the rich text editor and send all emails as plain text only, including replies and forwards"
       },
+      "quick_reply": {
+        "label": "Quick Reply",
+        "description": "Show the quick reply box below messages."
+      },
       "auto_select_reply_identity": {
         "label": "Reply From Received Address",
         "description": "When replying, send from the address the message was originally sent to. Your configured identities always match; whether other addresses on your domains count too (catch-all) is set by “Received Address Matching” below."
diff --git a/stores/__tests__/settings-store-attachments.test.ts b/stores/__tests__/settings-store-attachments.test.ts
index 5bff57a99..4c9b658ca 100644
--- a/stores/__tests__/settings-store-attachments.test.ts
+++ b/stores/__tests__/settings-store-attachments.test.ts
@@ -6,6 +6,14 @@ describe('settings-store attachment action', () => {
     useSettingsStore.getState().resetToDefaults();
   });
 
+  it('enables quick reply by default and exports the disabled preference', () => {
+    expect(useSettingsStore.getState().quickReplyEnabled).toBe(true);
+    useSettingsStore.getState().updateSetting('quickReplyEnabled', false);
+    expect(JSON.parse(useSettingsStore.getState().exportSettings()).quickReplyEnabled).toBe(false);
+    useSettingsStore.getState().resetToDefaults();
+    expect(useSettingsStore.getState().quickReplyEnabled).toBe(true);
+  });
+
   it('defaults to preview when settings are reset', () => {
     expect(useSettingsStore.getState().mailAttachmentAction).toBe('preview');
   });
diff --git a/stores/settings-store.ts b/stores/settings-store.ts
index 217931e2f..c1fafd300 100644
--- a/stores/settings-store.ts
+++ b/stores/settings-store.ts
@@ -528,6 +528,7 @@ interface SettingsState {
   // Composer
   autoSaveDraftInterval: number; // milliseconds
   sendConfirmation: boolean;
+  quickReplyEnabled: boolean;
   defaultReplyMode: ReplyMode;
   autoSelectReplyIdentity: boolean;
   replyIdentityMatch: ReplyIdentityMatch; // With autoSelectReplyIdentity on: 'exact' = configured identities only, 'domain' = also same-domain catch-all addresses (rewrites From) #1000
@@ -836,6 +837,7 @@ const DEFAULT_SETTINGS = {
   // Composer
   autoSaveDraftInterval: 60000, // 1 minute
   sendConfirmation: false,
+  quickReplyEnabled: true,
   defaultReplyMode: 'reply' as ReplyMode,
   autoSelectReplyIdentity: false,
   replyIdentityMatch: 'domain' as ReplyIdentityMatch,
@@ -1202,6 +1204,7 @@ export const useSettingsStore = create<SettingsState>()(
           trustedSenders: state.trustedSenders,
           autoSaveDraftInterval: state.autoSaveDraftInterval,
           sendConfirmation: state.sendConfirmation,
+          quickReplyEnabled: state.quickReplyEnabled,
           defaultReplyMode: state.defaultReplyMode,
           autoSelectReplyIdentity: state.autoSelectReplyIdentity,
           replyIdentityMatch: state.replyIdentityMatch,