diff --git a/src/components/settings/ComposingSettings.tsx b/src/components/settings/ComposingSettings.tsx
index 28a8f46c..50d49c30 100644
--- a/src/components/settings/ComposingSettings.tsx
+++ b/src/components/settings/ComposingSettings.tsx
@@ -14,6 +14,7 @@ export function ComposingSettings() {
   const styles = React.useMemo(() => makeStyles(c), [c]);
   const autoSelectReplyIdentity = useSettingsStore((s) => s.autoSelectReplyIdentity);
   const replyIdentityMatch = useSettingsStore((s) => s.replyIdentityMatch);
+  const quickReplyEnabled = useSettingsStore((s) => s.quickReplyEnabled);
   const t = useLocaleStore((s) => s.t);
   const setAutoSelectReplyIdentity = useSettingsStore((s) => s.setAutoSelectReplyIdentity);
   const attachmentReminderEnabled = useSettingsStore((s) => s.attachmentReminderEnabled);
@@ -104,6 +105,13 @@ export function ComposingSettings() {
       title={t('settings.composer.title', "Composer")}
       description={t('settings.composer.description', "Configure email composition settings")}
     >
+      <SettingItem
+        label={t('settings.email_behavior.quick_reply.label', 'Quick reply')}
+        description={t('settings.email_behavior.quick_reply.description', 'Show the quick reply box below messages.')}
+      >
+        <ToggleSwitch checked={quickReplyEnabled} onChange={(v) => updateSetting('quickReplyEnabled', v)} />
+      </SettingItem>
+
       <SettingItem
         label={t('settings.email_behavior.auto_select_reply_identity.label', "Reply From Received Address")}
         description={t('settings.email_behavior.auto_select_reply_identity.description_mobile', "Replies always come from the identity a message was sent to. With this on, a reply to another address on your domains (a catch-all alias) is sent from that address too.")}
diff --git a/src/lib/__tests__/settings-search.test.ts b/src/lib/__tests__/settings-search.test.ts
index 5623cac1..1e93829f 100644
--- a/src/lib/__tests__/settings-search.test.ts
+++ b/src/lib/__tests__/settings-search.test.ts
@@ -122,6 +122,7 @@ describe('settings search index (English catalog)', () => {
     expect(labelsFor('notifications')).toContain('Parse email invitations');
     expect(labelsFor('calendar')).toContain('Show week numbers');
     expect(labelsFor('reading')).toContain('Clear search when switching folders');
+    expect(labelsFor('composing')).toContain('Quick reply');
     expect(labelsFor('notifications')).toContain('Unread count on app icon');
     // Webmail-only settings are not offered.
     expect(labelsFor('calendar')).not.toContain('Free scrolling');
diff --git a/src/lib/settings-search.ts b/src/lib/settings-search.ts
index a8927529..f3df5e96 100644
--- a/src/lib/settings-search.ts
+++ b/src/lib/settings-search.ts
@@ -104,6 +104,7 @@ export const SETTINGS_SEARCH_PATHS: Record<SettingsTabId, string[]> = {
     'settings.email_behavior.clear_search_on_folder_change',
   ],
   composing: [
+    'settings.email_behavior.quick_reply',
     'settings.email_behavior.auto_select_reply_identity',
     'settings.email_behavior.reply_identity_match',
     'settings.email_behavior.plain_text_mode',