From acc61db6f2d8554009094913548fa82e700a9186 Mon Sep 17 00:00:00 2001
From: Shuki Vaknin <shukivaknin@gmail.com>
Date: Tue, 23 Jun 2026 21:39:21 +0300
Subject: [PATCH] feat(settings): make return-to-list-after-action configurable
 (default on)

Per review: gate the return-to-list behaviour behind a setting,
returnToListAfterAction, defaulting to true (the Gmail/Yahoo default). When off,
deleting the open message keeps the previous auto-advance-to-next behaviour.

Adds the setting to the store (persisted), a toggle under Reading settings, and
i18n keys across all locales (English; non-English need translation). The same
setting will govern mark-as-unread (#468).
---
 app/(main)/[locale]/page.tsx             | 10 ++++++----
 components/settings/reading-settings.tsx |  8 ++++++++
 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/fr/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/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/tr/common.json                   |  4 ++++
 locales/uk/common.json                   |  4 ++++
 locales/zh/common.json                   |  4 ++++
 stores/settings-store.ts                 |  3 +++
 22 files changed, 93 insertions(+), 4 deletions(-)

diff --git a/app/(main)/[locale]/page.tsx b/app/(main)/[locale]/page.tsx
index f7896154..c07514fe 100644
--- a/app/(main)/[locale]/page.tsx
+++ b/app/(main)/[locale]/page.tsx
@@ -3101,11 +3101,13 @@ export default function Home() {
                     onForward={handleForward}
                     onDelete={() => {
                       // Deleting the open message returns to the list (Gmail-style),
-                      // not the next email. Deselect first so the store's
-                      // remove-and-advance sees no selection and doesn't auto-open
-                      // the next message; then delete the captured email.
+                      // not the next email — unless the user turned the setting off.
+                      // Deselect first so the store's remove-and-advance sees no
+                      // selection and doesn't auto-open the next message.
                       const target = selectedEmail;
-                      handleMobileBack();
+                      if (useSettingsStore.getState().returnToListAfterAction) {
+                        handleMobileBack();
+                      }
                       handleDelete(target);
                     }}
                     onArchive={() => handleArchive()}
diff --git a/components/settings/reading-settings.tsx b/components/settings/reading-settings.tsx
index f74aa045..1a54f8f1 100644
--- a/components/settings/reading-settings.tsx
+++ b/components/settings/reading-settings.tsx
@@ -22,6 +22,7 @@ export function ReadingSettings() {
     markAsReadDelay,
     deleteAction,
     permanentlyDeleteJunk,
+    returnToListAfterAction,
     showPreview,
     mailLayout,
     disableThreading,
@@ -176,6 +177,13 @@ export function ReadingSettings() {
         />
       </SettingItem>
 
+      <SettingItem label={t('return_to_list_after_action.label')} description={t('return_to_list_after_action.description')}>
+        <ToggleSwitch
+          checked={returnToListAfterAction}
+          onChange={(checked) => updateSetting('returnToListAfterAction', checked)}
+        />
+      </SettingItem>
+
       {!isSettingHidden('showPreview') && (
       <SettingItem
         label={t('show_preview.label')}
diff --git a/locales/cs/common.json b/locales/cs/common.json
index 01ca20f9..1772e60c 100644
--- a/locales/cs/common.json
+++ b/locales/cs/common.json
@@ -1226,6 +1226,10 @@
         "off": "Vypnuto",
         "seconds": "{seconds} sekund",
         "unsupported": "Aktuální účet neoznamuje podporu odloženého odeslání. Nastavení zůstane uloženo pro jiné účty."
+      },
+      "return_to_list_after_action": {
+        "label": "Return to list after delete or mark unread",
+        "description": "After deleting or marking the open message unread, go back to the message list instead of opening the next message."
       }
     },
     "composer": {
diff --git a/locales/da/common.json b/locales/da/common.json
index 4365f880..d6987861 100644
--- a/locales/da/common.json
+++ b/locales/da/common.json
@@ -1229,6 +1229,10 @@
         "off": "Fra",
         "seconds": "{seconds} sekunder",
         "unsupported": "Den aktuelle konto annoncerer ikke understøttelse af forsinket afsendelse. Indstillingen gemmes stadig for andre konti."
+      },
+      "return_to_list_after_action": {
+        "label": "Return to list after delete or mark unread",
+        "description": "After deleting or marking the open message unread, go back to the message list instead of opening the next message."
       }
     },
     "composer": {
diff --git a/locales/de/common.json b/locales/de/common.json
index a0f81efc..3e8e8d57 100644
--- a/locales/de/common.json
+++ b/locales/de/common.json
@@ -1226,6 +1226,10 @@
         "off": "Aus",
         "seconds": "{seconds} Sekunden",
         "unsupported": "Das aktuelle Konto meldet keine Unterstützung für verzögertes Senden. Die Einstellung bleibt für andere Konten gespeichert."
+      },
+      "return_to_list_after_action": {
+        "label": "Return to list after delete or mark unread",
+        "description": "After deleting or marking the open message unread, go back to the message list instead of opening the next message."
       }
     },
     "composer": {
diff --git a/locales/en/common.json b/locales/en/common.json
index ca1d0f8d..c2cace8c 100644
--- a/locales/en/common.json
+++ b/locales/en/common.json
@@ -1229,6 +1229,10 @@
         "off": "Off",
         "seconds": "{seconds} seconds",
         "unsupported": "The current account does not advertise delayed-send support. The setting is still saved for other accounts."
+      },
+      "return_to_list_after_action": {
+        "label": "Return to list after delete or mark unread",
+        "description": "After deleting or marking the open message unread, go back to the message list instead of opening the next message."
       }
     },
     "composer": {
diff --git a/locales/es/common.json b/locales/es/common.json
index b88ffa1c..9c136e5c 100644
--- a/locales/es/common.json
+++ b/locales/es/common.json
@@ -1226,6 +1226,10 @@
         "off": "Desactivado",
         "seconds": "{seconds} segundos",
         "unsupported": "La cuenta actual no anuncia compatibilidad con envío demorado. La opción seguirá guardada para otras cuentas."
+      },
+      "return_to_list_after_action": {
+        "label": "Return to list after delete or mark unread",
+        "description": "After deleting or marking the open message unread, go back to the message list instead of opening the next message."
       }
     },
     "composer": {
diff --git a/locales/fr/common.json b/locales/fr/common.json
index 95c74a1e..aaa889cb 100644
--- a/locales/fr/common.json
+++ b/locales/fr/common.json
@@ -1226,6 +1226,10 @@
         "off": "Désactivé",
         "seconds": "{seconds} secondes",
         "unsupported": "Le compte actuel n’annonce pas la prise en charge de l’envoi différé. Le réglage reste enregistré pour d’autres comptes."
+      },
+      "return_to_list_after_action": {
+        "label": "Return to list after delete or mark unread",
+        "description": "After deleting or marking the open message unread, go back to the message list instead of opening the next message."
       }
     },
     "composer": {
diff --git a/locales/hu/common.json b/locales/hu/common.json
index 1a5aed9f..380a03d4 100644
--- a/locales/hu/common.json
+++ b/locales/hu/common.json
@@ -1229,6 +1229,10 @@
         "off": "Kikapcsolva",
         "seconds": "{seconds} másodperc",
         "unsupported": "A jelenlegi fiók nem támogatja a késleltetett küldést. A beállítás más fiókokhoz elmentésre kerül."
+      },
+      "return_to_list_after_action": {
+        "label": "Return to list after delete or mark unread",
+        "description": "After deleting or marking the open message unread, go back to the message list instead of opening the next message."
       }
     },
     "composer": {
diff --git a/locales/it/common.json b/locales/it/common.json
index 0566a8a0..295a2df2 100644
--- a/locales/it/common.json
+++ b/locales/it/common.json
@@ -1226,6 +1226,10 @@
         "off": "Disattivato",
         "seconds": "{seconds} secondi",
         "unsupported": "L’account corrente non dichiara il supporto all’invio ritardato. L’impostazione resta salvata per altri account."
+      },
+      "return_to_list_after_action": {
+        "label": "Return to list after delete or mark unread",
+        "description": "After deleting or marking the open message unread, go back to the message list instead of opening the next message."
       }
     },
     "composer": {
diff --git a/locales/ja/common.json b/locales/ja/common.json
index 91c67b66..14a786d6 100644
--- a/locales/ja/common.json
+++ b/locales/ja/common.json
@@ -1226,6 +1226,10 @@
         "off": "オフ",
         "seconds": "{seconds} 秒",
         "unsupported": "現在のアカウントは遅延送信のサポートを通知していません。この設定は他のアカウント用に保存されます。"
+      },
+      "return_to_list_after_action": {
+        "label": "Return to list after delete or mark unread",
+        "description": "After deleting or marking the open message unread, go back to the message list instead of opening the next message."
       }
     },
     "composer": {
diff --git a/locales/ko/common.json b/locales/ko/common.json
index bbe92263..f99baaaf 100644
--- a/locales/ko/common.json
+++ b/locales/ko/common.json
@@ -1226,6 +1226,10 @@
         "off": "끔",
         "seconds": "{seconds}초",
         "unsupported": "현재 계정은 지연 보내기 지원을 알리지 않습니다. 설정은 다른 계정을 위해 계속 저장됩니다."
+      },
+      "return_to_list_after_action": {
+        "label": "Return to list after delete or mark unread",
+        "description": "After deleting or marking the open message unread, go back to the message list instead of opening the next message."
       }
     },
     "composer": {
diff --git a/locales/lv/common.json b/locales/lv/common.json
index be64fde0..b28caccc 100644
--- a/locales/lv/common.json
+++ b/locales/lv/common.json
@@ -1226,6 +1226,10 @@
         "off": "Izslēgts",
         "seconds": "{seconds} sekundes",
         "unsupported": "Pašreizējais konts neziņo par aizturētas sūtīšanas atbalstu. Iestatījums joprojām tiks saglabāts citiem kontiem."
+      },
+      "return_to_list_after_action": {
+        "label": "Return to list after delete or mark unread",
+        "description": "After deleting or marking the open message unread, go back to the message list instead of opening the next message."
       }
     },
     "composer": {
diff --git a/locales/nl/common.json b/locales/nl/common.json
index b05bba1d..4e486450 100644
--- a/locales/nl/common.json
+++ b/locales/nl/common.json
@@ -1226,6 +1226,10 @@
         "off": "Uit",
         "seconds": "{seconds} seconden",
         "unsupported": "Het huidige account meldt geen ondersteuning voor vertraagd verzenden. De instelling blijft opgeslagen voor andere accounts."
+      },
+      "return_to_list_after_action": {
+        "label": "Return to list after delete or mark unread",
+        "description": "After deleting or marking the open message unread, go back to the message list instead of opening the next message."
       }
     },
     "composer": {
diff --git a/locales/pl/common.json b/locales/pl/common.json
index 6c18886b..64107616 100644
--- a/locales/pl/common.json
+++ b/locales/pl/common.json
@@ -1226,6 +1226,10 @@
         "off": "Wyłączone",
         "seconds": "{seconds} sekund",
         "unsupported": "Bieżące konto nie zgłasza obsługi opóźnionej wysyłki. Ustawienie pozostanie zapisane dla innych kont."
+      },
+      "return_to_list_after_action": {
+        "label": "Return to list after delete or mark unread",
+        "description": "After deleting or marking the open message unread, go back to the message list instead of opening the next message."
       }
     },
     "composer": {
diff --git a/locales/pt/common.json b/locales/pt/common.json
index 1245e271..9a358039 100644
--- a/locales/pt/common.json
+++ b/locales/pt/common.json
@@ -1226,6 +1226,10 @@
         "off": "Desativado",
         "seconds": "{seconds} segundos",
         "unsupported": "A conta atual não anuncia suporte a envio atrasado. A configuração continuará salva para outras contas."
+      },
+      "return_to_list_after_action": {
+        "label": "Return to list after delete or mark unread",
+        "description": "After deleting or marking the open message unread, go back to the message list instead of opening the next message."
       }
     },
     "composer": {
diff --git a/locales/ro/common.json b/locales/ro/common.json
index aa3c0450..60c20915 100644
--- a/locales/ro/common.json
+++ b/locales/ro/common.json
@@ -1229,6 +1229,10 @@
         "off": "Oprit",
         "seconds": "{seconds} secunde",
         "unsupported": "Contul curent nu indică faptul că acceptă trimiterea amânată. Setarea este totuși salvată pentru alte conturi."
+      },
+      "return_to_list_after_action": {
+        "label": "Return to list after delete or mark unread",
+        "description": "After deleting or marking the open message unread, go back to the message list instead of opening the next message."
       }
     },
     "composer": {
diff --git a/locales/ru/common.json b/locales/ru/common.json
index 8adc1710..474cedc0 100644
--- a/locales/ru/common.json
+++ b/locales/ru/common.json
@@ -1226,6 +1226,10 @@
         "off": "Выкл.",
         "seconds": "{seconds} сек.",
         "unsupported": "Текущая учетная запись не заявляет поддержку отложенной отправки. Настройка сохранится для других учетных записей."
+      },
+      "return_to_list_after_action": {
+        "label": "Return to list after delete or mark unread",
+        "description": "After deleting or marking the open message unread, go back to the message list instead of opening the next message."
       }
     },
     "composer": {
diff --git a/locales/tr/common.json b/locales/tr/common.json
index 7b312ee0..71bac54c 100644
--- a/locales/tr/common.json
+++ b/locales/tr/common.json
@@ -1226,6 +1226,10 @@
         "off": "Kapalı",
         "seconds": "{seconds} saniye",
         "unsupported": "Geçerli hesap gecikmeli gönderim desteği bildirmiyor. Ayar diğer hesaplar için kaydedilmeye devam eder."
+      },
+      "return_to_list_after_action": {
+        "label": "Return to list after delete or mark unread",
+        "description": "After deleting or marking the open message unread, go back to the message list instead of opening the next message."
       }
     },
     "composer": {
diff --git a/locales/uk/common.json b/locales/uk/common.json
index ab746338..8cb6c033 100644
--- a/locales/uk/common.json
+++ b/locales/uk/common.json
@@ -1226,6 +1226,10 @@
         "off": "Вимкнено",
         "seconds": "{seconds} с",
         "unsupported": "Поточний обліковий запис не повідомляє про підтримку відкладеного надсилання. Налаштування залишиться збереженим для інших облікових записів."
+      },
+      "return_to_list_after_action": {
+        "label": "Return to list after delete or mark unread",
+        "description": "After deleting or marking the open message unread, go back to the message list instead of opening the next message."
       }
     },
     "composer": {
diff --git a/locales/zh/common.json b/locales/zh/common.json
index fc6228d7..a06642ec 100644
--- a/locales/zh/common.json
+++ b/locales/zh/common.json
@@ -1226,6 +1226,10 @@
         "off": "关闭",
         "seconds": "{seconds} 秒",
         "unsupported": "当前账户未声明支持延迟发送。该设置仍会为其他账户保存。"
+      },
+      "return_to_list_after_action": {
+        "label": "Return to list after delete or mark unread",
+        "description": "After deleting or marking the open message unread, go back to the message list instead of opening the next message."
       }
     },
     "composer": {
diff --git a/stores/settings-store.ts b/stores/settings-store.ts
index 38f44c63..7ec486d6 100644
--- a/stores/settings-store.ts
+++ b/stores/settings-store.ts
@@ -137,6 +137,7 @@ interface SettingsState {
   markAsReadDelay: number; // milliseconds (0 = instant, -1 = never)
   deleteAction: DeleteAction;
   permanentlyDeleteJunk: boolean; // Permanently delete emails from junk/spam instead of moving to trash
+  returnToListAfterAction: boolean; // After delete / mark-unread in an open message, return to the list instead of opening the next message
   showPreview: boolean;
   mailLayout: MailLayout;
   emailsPerPage: number;
@@ -330,6 +331,7 @@ const DEFAULT_SETTINGS = {
   markAsReadDelay: 0, // Instant
   deleteAction: 'trash' as DeleteAction,
   permanentlyDeleteJunk: false,
+  returnToListAfterAction: true,
   showPreview: true,
   mailLayout: 'split' as MailLayout,
   emailsPerPage: 50,
@@ -533,6 +535,7 @@ export const useSettingsStore = create<SettingsState>()(
           firstDayOfWeek: state.firstDayOfWeek,
           markAsReadDelay: state.markAsReadDelay,
           deleteAction: state.deleteAction,
+          returnToListAfterAction: state.returnToListAfterAction,
           showPreview: state.showPreview,
           mailLayout: state.mailLayout,
           emailsPerPage: state.emailsPerPage,