From 56e4a1e051573fad6a2e009b5a5ec0dd20b5e450 Mon Sep 17 00:00:00 2001
From: Linus Rath <139418639+rathlinus@users.noreply.github.com>
Date: Sat, 31 Oct 2026 04:53:48 +0100
Subject: [PATCH] feat: let the quick reply under a conversation be turned off
 (bulwarkmail/webmail#1370)

---
 src/screens/EmailThreadScreen.tsx                  |  4 +++-
 src/stores/__tests__/settings-store-reader.test.ts | 13 +++++++++++++
 src/stores/settings-store.ts                       |  7 +++++++
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/src/screens/EmailThreadScreen.tsx b/src/screens/EmailThreadScreen.tsx
index f4ef59e6..65eb18f5 100644
--- a/src/screens/EmailThreadScreen.tsx
+++ b/src/screens/EmailThreadScreen.tsx
@@ -1032,6 +1032,8 @@ function EmailPane({
 }: EmailPaneProps) {
   const c = useColors();
   const t = useLocaleStore((s) => s.t);
+  // The quick reply box can be turned off (webmail #1370).
+  const quickReplyEnabled = useSettingsStore((s) => s.quickReplyEnabled);
   // Freeze the pane's vertical scroll while a pinch is in flight so a two-
   // finger zoom can't fling the page.
   const [pinching, setPinching] = React.useState(false);
@@ -1286,7 +1288,7 @@ function EmailPane({
       </View>
 
       <View style={styles.quickReplySlot}>
-        {newest && newestLoaded && (
+        {quickReplyEnabled && newest && newestLoaded && (
           <QuickReplyBox
             email={newest}
             jmapAccountId={jmapAccountId}
diff --git a/src/stores/__tests__/settings-store-reader.test.ts b/src/stores/__tests__/settings-store-reader.test.ts
index 9ff990fe..225cbbf0 100644
--- a/src/stores/__tests__/settings-store-reader.test.ts
+++ b/src/stores/__tests__/settings-store-reader.test.ts
@@ -17,4 +17,17 @@ describe('settings defaults (reader pass)', () => {
     // proxies them through its own server, so its default doesn't carry over.
     expect(useSettingsStore.getState().senderFavicons).toBe(false);
   });
+
+  // Quick reply could not be turned off (webmail #1370). On by default like
+  // the webmail, under the webmail's key so export and import carry it.
+  it('keeps the quick reply on by default and lets it be turned off', async () => {
+    expect(useSettingsStore.getState().quickReplyEnabled).toBe(true);
+    const { mergeWithDefaults, toExportShape } = await import('../settings-store');
+    expect(mergeWithDefaults({ quickReplyEnabled: false }).quickReplyEnabled).toBe(false);
+    expect(toExportShape(useSettingsStore.getState())).toHaveProperty('quickReplyEnabled', true);
+    const fs = await import('node:fs');
+    const path = await import('node:path');
+    const screen = fs.readFileSync(path.resolve(__dirname, '../../screens/EmailThreadScreen.tsx'), 'utf8');
+    expect(screen).toMatch(/\{quickReplyEnabled && newest && newestLoaded && \(/);
+  });
 });
diff --git a/src/stores/settings-store.ts b/src/stores/settings-store.ts
index 674a2fa3..15cc4ce2 100644
--- a/src/stores/settings-store.ts
+++ b/src/stores/settings-store.ts
@@ -309,6 +309,10 @@ interface PersistedSettings {
   // Hard cap on the on-disk body cache, in megabytes. When a sync pushes the
   // cache past this, the oldest messages are evicted to fit.
   offlineCacheMaxMB: number;
+
+  // reader: the quick reply box under a conversation can be turned off
+  // (webmail #1370, same key as the webmail's for export/import).
+  quickReplyEnabled: boolean;
 }
 
 const DEFAULT_PERSISTED: PersistedSettings = {
@@ -463,6 +467,9 @@ const DEFAULT_PERSISTED: PersistedSettings = {
   offlineCacheEnabled: false,
   offlineCacheDays: 7,
   offlineCacheMaxMB: 50,
+
+  // reader:
+  quickReplyEnabled: true,
 };
 
 export interface SettingsState extends PersistedSettings {