Add new setting to minimize to tray when closing on Windows (#1093)

Co-authored-by: Amine El Mouafik <amine@mouafik.fr>

47 files changed, 58 insertions, 1 deletions

diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js
index 476c4f045..cd772214f 100644
--- a/src/components/settings/settings/EditSettingsForm.js
+++ b/src/components/settings/settings/EditSettingsForm.js
@@ -305,6 +305,9 @@ export default @observer class EditSettingsForm extends Component {
                 {process.platform === 'win32' && (
                   <Toggle field={form.$('minimizeToSystemTray')} />
                 )}
+                {process.platform === 'win32' && (
+                  <Toggle field={form.$('closeToSystemTray')} />
+                )}
                 <Toggle field={form.$('privateNotifications')} />
                 {(process.platform === 'win32' || process.platform === 'darwin') && (
                   <Toggle field={form.$('notifyTaskBarOnMessage')} />)}
diff --git a/src/config.js b/src/config.js
index 32996a03c..eb6f08be9 100644
--- a/src/config.js
+++ b/src/config.js
@@ -93,6 +93,7 @@ export const DEFAULT_APP_SETTINGS = {
   enableSystemTray: true,
   startMinimized: false,
   minimizeToSystemTray: false,
+  closeToSystemTray: false,
   privateNotifications: false,
   notifyTaskBarOnMessage: false,
   showDisabledServices: true,
diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js
index d87b2512e..097f0ed8b 100644
--- a/src/containers/settings/EditSettingsScreen.js
+++ b/src/containers/settings/EditSettingsScreen.js
@@ -55,6 +55,10 @@ const messages = defineMessages({
     id: 'settings.app.form.minimizeToSystemTray',
     defaultMessage: '!!!Minimize Ferdi to system tray',
   },
+  closeToSystemTray: {
+    id: 'settings.app.form.closeToSystemTray',
+    defaultMessage: '!!!Close Ferdi to system tray',
+  },
   privateNotifications: {
     id: 'settings.app.form.privateNotifications',
     defaultMessage: '!!!Don\'t show message content in notifications',
@@ -233,6 +237,7 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
         reloadAfterResume: settingsData.reloadAfterResume,
         startMinimized: settingsData.startMinimized,
         minimizeToSystemTray: settingsData.minimizeToSystemTray,
+        closeToSystemTray: settingsData.closeToSystemTray,
         privateNotifications: settingsData.privateNotifications,
         notifyTaskBarOnMessage: settingsData.notifyTaskBarOnMessage,
         navigationBarBehaviour: settingsData.navigationBarBehaviour,
@@ -374,6 +379,11 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
           value: settings.all.app.minimizeToSystemTray,
           default: DEFAULT_APP_SETTINGS.minimizeToSystemTray,
         },
+        closeToSystemTray: {
+          label: intl.formatMessage(messages.closeToSystemTray),
+          value: settings.all.app.closeToSystemTray,
+          default: DEFAULT_APP_SETTINGS.closeToSystemTray,
+        },
         privateNotifications: {
           label: intl.formatMessage(messages.privateNotifications),
           value: settings.all.app.privateNotifications,
diff --git a/src/i18n/locales/af.json b/src/i18n/locales/af.json
index 0f8bdd914..3536c4f84 100644
--- a/src/i18n/locales/af.json
+++ b/src/i18n/locales/af.json
@@ -308,6 +308,7 @@
   "settings.app.form.language": "Language",
   "settings.app.form.lockPassword": "Password",
   "settings.app.form.minimizeToSystemTray": "Minimize Ferdi to system tray",
+  "settings.app.form.closeToSystemTray": "Close Ferdi to system tray",
   "settings.app.form.navigationBarBehaviour": "Navigation bar behaviour",
   "settings.app.form.predefinedTodoServer": "Todo Server",
   "settings.app.form.privateNotifications": "Don't show message content in notifications",
diff --git a/src/i18n/locales/ar.json b/src/i18n/locales/ar.json
index 9a2eab3b8..7b2331d43 100644
--- a/src/i18n/locales/ar.json
+++ b/src/i18n/locales/ar.json
@@ -308,6 +308,7 @@
   "settings.app.form.language": "اللغة",
   "settings.app.form.lockPassword": "كلمة المرور",
   "settings.app.form.minimizeToSystemTray": "تصغير النافذة إلى جانب شريط المهام",
+  "settings.app.form.closeToSystemTray": "Close Ferdi to system tray",
   "settings.app.form.navigationBarBehaviour": "سلوك شريط التنقل",
   "settings.app.form.predefinedTodoServer": "خادم Todo",
   "settings.app.form.privateNotifications": "عدم إظهار محتوى الرسالة في الإشعارات",
diff --git a/src/i18n/locales/be.json b/src/i18n/locales/be.json
index a08dd9bb0..9e1d8f86e 100644
--- a/src/i18n/locales/be.json
+++ b/src/i18n/locales/be.json
@@ -308,6 +308,7 @@
   "settings.app.form.language": "Language",
   "settings.app.form.lockPassword": "Password",
   "settings.app.form.minimizeToSystemTray": "Minimize Ferdi to system tray",
+  "settings.app.form.closeToSystemTray": "Close Ferdi to system tray",
   "settings.app.form.navigationBarBehaviour": "Navigation bar behaviour",
   "settings.app.form.predefinedTodoServer": "Todo Server",
   "settings.app.form.privateNotifications": "Don't show message content in notifications",
diff --git a/src/i18n/locales/bs.json b/src/i18n/locales/bs.json
index 0f8bdd914..3536c4f84 100644
--- a/src/i18n/locales/bs.json
+++ b/src/i18n/locales/bs.json
@@ -308,6 +308,7 @@
   "settings.app.form.language": "Language",
   "settings.app.form.lockPassword": "Password",
   "settings.app.form.minimizeToSystemTray": "Minimize Ferdi to system tray",
+  "settings.app.form.closeToSystemTray": "Close Ferdi to system tray",
   "settings.app.form.navigationBarBehaviour": "Navigation bar behaviour",
   "settings.app.form.predefinedTodoServer": "Todo Server",
   "settings.app.form.privateNotifications": "Don't show message content in notifications",
diff --git a/src/i18n/locales/ca.json b/src/i18n/locales/ca.json
index 53cfc5e7c..6dae6423d 100644
--- a/src/i18n/locales/ca.json
+++ b/src/i18n/locales/ca.json
@@ -308,6 +308,7 @@
   "settings.app.form.language": "Idioma",
   "settings.app.form.lockPassword": "Contrasenya",
   "settings.app.form.minimizeToSystemTray": "Minimitza Ferdi a la safata del sistema",
+  "settings.app.form.closeToSystemTray": "Close Ferdi to system tray",
   "settings.app.form.navigationBarBehaviour": "Navigation bar behaviour",
   "settings.app.form.predefinedTodoServer": "Todo Server",
   "settings.app.form.privateNotifications": "Don't show message content in notifications",
diff --git a/src/i18n/locales/cs.json b/src/i18n/locales/cs.json
index 4e4fb630b..85b527fd3 100644
--- a/src/i18n/locales/cs.json
+++ b/src/i18n/locales/cs.json
@@ -308,6 +308,7 @@
   "settings.app.form.language": "Jazyk",
   "settings.app.form.lockPassword": "Password",
   "settings.app.form.minimizeToSystemTray": "Minimalizovat Ferdi do systémové lišty",
+  "settings.app.form.closeToSystemTray": "Close Ferdi to system tray",
   "settings.app.form.navigationBarBehaviour": "Navigation bar behaviour",
   "settings.app.form.predefinedTodoServer": "Todo Server",
   "settings.app.form.privateNotifications": "Don't show message content in notifications",
diff --git a/src/i18n/locales/da.json b/src/i18n/locales/da.json
index 44e37ab87..8ac11fa88 100644
--- a/src/i18n/locales/da.json
+++ b/src/i18n/locales/da.json
@@ -308,6 +308,7 @@
   "settings.app.form.language": "Sprog",
   "settings.app.form.lockPassword": "Adgangskode",
   "settings.app.form.minimizeToSystemTray": "Minimer Ferdi til systembakken",
+  "settings.app.form.closeToSystemTray": "Close Ferdi to system tray",
   "settings.app.form.navigationBarBehaviour": "Adressefeltets opførsel",
   "settings.app.form.predefinedTodoServer": "Todo server",
   "settings.app.form.privateNotifications": "Vis ikke beskedindhold i notifikationer",
diff --git a/src/i18n/locales/de.json b/src/i18n/locales/de.json
index b1edcbaaf..867879614 100644
--- a/src/i18n/locales/de.json
+++ b/src/i18n/locales/de.json
@@ -308,6 +308,7 @@
   "settings.app.form.language": "Sprache",
   "settings.app.form.lockPassword": "Passwort",
   "settings.app.form.minimizeToSystemTray": "Ferdi in den Infobereich minimieren",
+  "settings.app.form.closeToSystemTray": "Close Ferdi to system tray",
   "settings.app.form.navigationBarBehaviour": "Verhalten der Navigationsleiste",
   "settings.app.form.predefinedTodoServer": "Todo-Server",
   "settings.app.form.privateNotifications": "Nachrichteninhalt nicht in Benachrichtigungen anzeigen",
diff --git a/src/i18n/locales/el.json b/src/i18n/locales/el.json
index 937223423..9dfe9b4d1 100644
--- a/src/i18n/locales/el.json
+++ b/src/i18n/locales/el.json
@@ -308,6 +308,7 @@
   "settings.app.form.language": "Γλώσσα",
   "settings.app.form.lockPassword": "Password",
   "settings.app.form.minimizeToSystemTray": "Ελαχιστοποίηση του Ferdi στη γραμμή ειδοποιήσεων",
+  "settings.app.form.closeToSystemTray": "Close Ferdi to system tray",
   "settings.app.form.navigationBarBehaviour": "Navigation bar behaviour",
   "settings.app.form.predefinedTodoServer": "Todo Server",
   "settings.app.form.privateNotifications": "Don't show message content in notifications",
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
index a08dd9bb0..9e1d8f86e 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -308,6 +308,7 @@
   "settings.app.form.language": "Language",
   "settings.app.form.lockPassword": "Password",
   "settings.app.form.minimizeToSystemTray": "Minimize Ferdi to system tray",
+  "settings.app.form.closeToSystemTray": "Close Ferdi to system tray",
   "settings.app.form.navigationBarBehaviour": "Navigation bar behaviour",
   "settings.app.form.predefinedTodoServer": "Todo Server",
   "settings.app.form.privateNotifications": "Don't show message content in notifications",
diff --git a/src/i18n/locales/es.json b/src/i18n/locales/es.json
index 8846e47ab..b681f2bd4 100644
--- a/src/i18n/locales/es.json
+++ b/src/i18n/locales/es.json
@@ -308,6 +308,7 @@
   "settings.app.form.language": "Idioma",
   "settings.app.form.lockPassword": "Contraseña",
   "settings.app.form.minimizeToSystemTray": "Minimizar Ferdi a la bandeja del sistema",
+  "settings.app.form.closeToSystemTray": "Close Ferdi to system tray",
   "settings.app.form.navigationBarBehaviour": "Comportamiento de la barra de navegación",
   "settings.app.form.predefinedTodoServer": "Servidor de tareas",
   "settings.app.form.privateNotifications": "No mostrar contenido de mensajes en notificaciones",
diff --git a/src/i18n/locales/fi.json b/src/i18n/locales/fi.json
index c6b5575c4..4e33ca094 100644
--- a/src/i18n/locales/fi.json
+++ b/src/i18n/locales/fi.json
@@ -308,6 +308,7 @@
   "settings.app.form.language": "Kieli",
   "settings.app.form.lockPassword": "Salasana",
   "settings.app.form.minimizeToSystemTray": "Pienennä Ferdi ilmoitusalueelle",
+  "settings.app.form.closeToSystemTray": "Close Ferdi to system tray",
   "settings.app.form.navigationBarBehaviour": "Navigointipalkin käyttäytyminen",
   "settings.app.form.predefinedTodoServer": "Todo Palvelin",
   "settings.app.form.privateNotifications": "Älä näytä viestin sisältöä ilmoituksissa",
diff --git a/src/i18n/locales/fr.json b/src/i18n/locales/fr.json
index efe2907e7..dadfc9582 100644
--- a/src/i18n/locales/fr.json
+++ b/src/i18n/locales/fr.json
@@ -308,6 +308,7 @@
   "settings.app.form.language": "Langue",
   "settings.app.form.lockPassword": "Mot de passe",
   "settings.app.form.minimizeToSystemTray": "Minimiser Ferdi dans la zone de notification",
+  "settings.app.form.closeToSystemTray": "Close Ferdi to system tray",
   "settings.app.form.navigationBarBehaviour": "Comportement de la barre de navigation",
   "settings.app.form.predefinedTodoServer": "Serveur Todo",
   "settings.app.form.privateNotifications": "Ne pas afficher le contenu des notifications",
diff --git a/src/i18n/locales/ga.json b/src/i18n/locales/ga.json
index 83545e788..693d585a0 100644
--- a/src/i18n/locales/ga.json
+++ b/src/i18n/locales/ga.json
@@ -308,6 +308,7 @@
   "settings.app.form.language": "Teanga",
   "settings.app.form.lockPassword": "Password",
   "settings.app.form.minimizeToSystemTray": "Íoslaghdaigh Ferdi chuig tráidire an chórais",
+  "settings.app.form.closeToSystemTray": "Close Ferdi to system tray",
   "settings.app.form.navigationBarBehaviour": "Navigation bar behaviour",
   "settings.app.form.predefinedTodoServer": "Todo Server",
   "settings.app.form.privateNotifications": "Don't show message content in notifications",
diff --git a/src/i18n/locales/he.json b/src/i18n/locales/he.json
index 5a2eae5f0..65bb34a1d 100644
--- a/src/i18n/locales/he.json
+++ b/src/i18n/locales/he.json
@@ -308,6 +308,7 @@
   "settings.app.form.language": "שפה",
   "settings.app.form.lockPassword": "סיסמא",
   "settings.app.form.minimizeToSystemTray": "מזער למגש המערכת",
+  "settings.app.form.closeToSystemTray": "Close Ferdi to system tray",
   "settings.app.form.navigationBarBehaviour": "אפשרויות סרגל ניווט",
   "settings.app.form.predefinedTodoServer": "Todo Server",
   "settings.app.form.privateNotifications": "אל תציג את תוכן ההודעות בהתראה",
diff --git a/src/i18n/locales/hr.json b/src/i18n/locales/hr.json
index 81ebd49a7..ef04d0f25 100644
--- a/src/i18n/locales/hr.json
+++ b/src/i18n/locales/hr.json
@@ -308,6 +308,7 @@
   "settings.app.form.language": "Jezik",
   "settings.app.form.lockPassword": "Password",
   "settings.app.form.minimizeToSystemTray": "Smanji Franca u sustavsku traku",
+  "settings.app.form.closeToSystemTray": "Close Ferdi to system tray",
   "settings.app.form.navigationBarBehaviour": "Navigation bar behaviour",
   "settings.app.form.predefinedTodoServer": "Todo Server",
   "settings.app.form.privateNotifications": "Don't show message content in notifications",
diff --git a/src/i18n/locales/hu.json b/src/i18n/locales/hu.json
index 3f6c98314..14f599e71 100644
--- a/src/i18n/locales/hu.json
+++ b/src/i18n/locales/hu.json
@@ -308,6 +308,7 @@
   "settings.app.form.language": "Nyelv",
   "settings.app.form.lockPassword": "Password",
   "settings.app.form.minimizeToSystemTray": "Ferdi kicsinyítése a tálcára",
+  "settings.app.form.closeToSystemTray": "Close Ferdi to system tray",
   "settings.app.form.navigationBarBehaviour": "Navigation bar behaviour",
   "settings.app.form.predefinedTodoServer": "Todo Server",
   "settings.app.form.privateNotifications": "Don't show message content in notifications",
diff --git a/src/i18n/locales/id.json b/src/i18n/locales/id.json
index 6ac6df1b0..70b99b09b 100644
--- a/src/i18n/locales/id.json
+++ b/src/i18n/locales/id.json
@@ -308,6 +308,7 @@
   "settings.app.form.language": "Bahasa",
   "settings.app.form.lockPassword": "Password",
   "settings.app.form.minimizeToSystemTray": "Perkecil Ferdi ke baki sistem",
+  "settings.app.form.closeToSystemTray": "Close Ferdi to system tray",
   "settings.app.form.navigationBarBehaviour": "Navigation bar behaviour",
   "settings.app.form.predefinedTodoServer": "Todo Server",
   "settings.app.form.privateNotifications": "Don't show message content in notifications",
diff --git a/src/i18n/locales/it.json b/src/i18n/locales/it.json
index fd6121a52..0a0a15308 100644
--- a/src/i18n/locales/it.json
+++ b/src/i18n/locales/it.json
@@ -308,6 +308,7 @@
   "settings.app.form.language": "Lingua",
   "settings.app.form.lockPassword": "Password",
   "settings.app.form.minimizeToSystemTray": "Minimizza Ferdi nell'area di notifica",
+  "settings.app.form.closeToSystemTray": "Close Ferdi to system tray",
   "settings.app.form.navigationBarBehaviour": "Comportamento della barra di navigazione",
   "settings.app.form.predefinedTodoServer": "Server Todo",
   "settings.app.form.privateNotifications": "Non mostrare il contenuto dei messaggi nelle notifiche",
diff --git a/src/i18n/locales/ja.json b/src/i18n/locales/ja.json
index 8c1acae12..f8f8c1d00 100644
--- a/src/i18n/locales/ja.json
+++ b/src/i18n/locales/ja.json
@@ -308,6 +308,7 @@
   "settings.app.form.language": "言語",
   "settings.app.form.lockPassword": "Password",
   "settings.app.form.minimizeToSystemTray": "Ferdiをシステムトレイに最小化する",
+  "settings.app.form.closeToSystemTray": "Close Ferdi to system tray",
   "settings.app.form.navigationBarBehaviour": "Navigation bar behaviour",
   "settings.app.form.predefinedTodoServer": "Todo Server",
   "settings.app.form.privateNotifications": "Don't show message content in notifications",
diff --git a/src/i18n/locales/ka.json b/src/i18n/locales/ka.json
index 601d07827..95ef16fa3 100644
--- a/src/i18n/locales/ka.json
+++ b/src/i18n/locales/ka.json
@@ -308,6 +308,7 @@
   "settings.app.form.language": "ენა",
   "settings.app.form.lockPassword": "Password",
   "settings.app.form.minimizeToSystemTray": "ჩაკეცეთ Ferdi სისტემის უჯრაში",
+  "settings.app.form.closeToSystemTray": "Close Ferdi to system tray",
   "settings.app.form.navigationBarBehaviour": "Navigation bar behaviour",
   "settings.app.form.predefinedTodoServer": "Todo Server",
   "settings.app.form.privateNotifications": "Don't show message content in notifications",
diff --git a/src/i18n/locales/ko.json b/src/i18n/locales/ko.json
index d48aae470..cfabe42a8 100644
--- a/src/i18n/locales/ko.json
+++ b/src/i18n/locales/ko.json
@@ -308,6 +308,7 @@
   "settings.app.form.language": "언어",
   "settings.app.form.lockPassword": "비밀번호",
   "settings.app.form.minimizeToSystemTray": "시스템 트레이에 Ferdi 최소화",
+  "settings.app.form.closeToSystemTray": "Close Ferdi to system tray",
   "settings.app.form.navigationBarBehaviour": "Navigation bar behaviour",
   "settings.app.form.predefinedTodoServer": "Todo Server",
   "settings.app.form.privateNotifications": "Don't show message content in notifications",
diff --git a/src/i18n/locales/nb.json b/src/i18n/locales/nb.json
index 97f340d59..dde8fcb83 100644
--- a/src/i18n/locales/nb.json
+++ b/src/i18n/locales/nb.json
@@ -129,6 +129,7 @@
   "settings.app.form.autoLaunchInBackground": "Åpne i bakgrunnen",
   "settings.app.form.enableSystemTray": "Vis Ferdi i systemfeltet",
   "settings.app.form.minimizeToSystemTray": "Minimer Ferdi til systemfeltet",
+  "settings.app.form.closeToSystemTray": "Close Ferdi to system tray",
   "settings.app.form.runInBackground": "Behold Ferdi i bakgrunnen når du lukker vinduet",
   "settings.app.form.language": "Språk",
   "settings.app.form.beta": "Inkluder beta versjoner",
diff --git a/src/i18n/locales/nl-BE.json b/src/i18n/locales/nl-BE.json
index b554a6a72..3f2147ddf 100644
--- a/src/i18n/locales/nl-BE.json
+++ b/src/i18n/locales/nl-BE.json
@@ -308,6 +308,7 @@
   "settings.app.form.language": "Taal",
   "settings.app.form.lockPassword": "Password",
   "settings.app.form.minimizeToSystemTray": "Minimaliseer Ferdi naar de systeembalk",
+  "settings.app.form.closeToSystemTray": "Close Ferdi to system tray",
   "settings.app.form.navigationBarBehaviour": "Navigation bar behaviour",
   "settings.app.form.predefinedTodoServer": "Todo Server",
   "settings.app.form.privateNotifications": "Don't show message content in notifications",
diff --git a/src/i18n/locales/nl.json b/src/i18n/locales/nl.json
index e5558c9cf..5d35122e2 100644
--- a/src/i18n/locales/nl.json
+++ b/src/i18n/locales/nl.json
@@ -308,6 +308,7 @@
   "settings.app.form.language": "Taal",
   "settings.app.form.lockPassword": "Wachtwoord",
   "settings.app.form.minimizeToSystemTray": "Minimaliseer Ferdi naar systeemvak",
+  "settings.app.form.closeToSystemTray": "Close Ferdi to system tray",
   "settings.app.form.navigationBarBehaviour": "Navigation bar behaviour",
   "settings.app.form.predefinedTodoServer": "Todo Server",
   "settings.app.form.privateNotifications": "Toon geen bericht-inhoud in meldingen",
diff --git a/src/i18n/locales/no.json b/src/i18n/locales/no.json
index 1733c6b5b..8859a432c 100644
--- a/src/i18n/locales/no.json
+++ b/src/i18n/locales/no.json
@@ -308,6 +308,7 @@
   "settings.app.form.language": "Språk",
   "settings.app.form.lockPassword": "Passord",
   "settings.app.form.minimizeToSystemTray": "Minimer Ferdi til systemstatusfeltet",
+  "settings.app.form.closeToSystemTray": "Close Ferdi to system tray",
   "settings.app.form.navigationBarBehaviour": "Navigasjonsbar oppførsel",
   "settings.app.form.predefinedTodoServer": "Gjøremål-tjener",
   "settings.app.form.privateNotifications": "Ikke vis meldingsinnholdet i varsler",
diff --git a/src/i18n/locales/pl.json b/src/i18n/locales/pl.json
index 2fee10f0a..8c9147bfd 100644
--- a/src/i18n/locales/pl.json
+++ b/src/i18n/locales/pl.json
@@ -308,6 +308,7 @@
   "settings.app.form.language": "Język",
   "settings.app.form.lockPassword": "Password",
   "settings.app.form.minimizeToSystemTray": "Zminimalizuj aplikację Ferdi",
+  "settings.app.form.closeToSystemTray": "Close Ferdi to system tray",
   "settings.app.form.navigationBarBehaviour": "Navigation bar behaviour",
   "settings.app.form.predefinedTodoServer": "Todo Server",
   "settings.app.form.privateNotifications": "Don't show message content in notifications",
diff --git a/src/i18n/locales/pt-BR.json b/src/i18n/locales/pt-BR.json
index 8ea28b58b..889429407 100644
--- a/src/i18n/locales/pt-BR.json
+++ b/src/i18n/locales/pt-BR.json
@@ -308,6 +308,7 @@
   "settings.app.form.language": "Idioma",
   "settings.app.form.lockPassword": "Senha",
   "settings.app.form.minimizeToSystemTray": "Minimizar o Ferdi para a barra do sistema",
+  "settings.app.form.closeToSystemTray": "Close Ferdi to system tray",
   "settings.app.form.navigationBarBehaviour": "Comportamento da barra de navegação",
   "settings.app.form.predefinedTodoServer": "Servidor Todo",
   "settings.app.form.privateNotifications": "Não mostrar o conteúdo das mensagens nas notificações",
diff --git a/src/i18n/locales/pt.json b/src/i18n/locales/pt.json
index 25115da6e..6181eec70 100644
--- a/src/i18n/locales/pt.json
+++ b/src/i18n/locales/pt.json
@@ -308,6 +308,7 @@
   "settings.app.form.language": "Idioma",
   "settings.app.form.lockPassword": "Palavra-passe",
   "settings.app.form.minimizeToSystemTray": "Minimizar Ferdi para a área de sistema",
+  "settings.app.form.closeToSystemTray": "Close Ferdi to system tray",
   "settings.app.form.navigationBarBehaviour": "Comportamento da barra de navegação",
   "settings.app.form.predefinedTodoServer": "Servidor das Tarefas",
   "settings.app.form.privateNotifications": "Não mostrar o conteúdo de mensagens nas notificações",
diff --git a/src/i18n/locales/ro.json b/src/i18n/locales/ro.json
index 1db6f1a71..8a4a03bda 100644
--- a/src/i18n/locales/ro.json
+++ b/src/i18n/locales/ro.json
@@ -308,6 +308,7 @@
   "settings.app.form.language": "Language",
   "settings.app.form.lockPassword": "Password",
   "settings.app.form.minimizeToSystemTray": "Minimize Ferdi to system tray",
+  "settings.app.form.closeToSystemTray": "Close Ferdi to system tray",
   "settings.app.form.navigationBarBehaviour": "Navigation bar behaviour",
   "settings.app.form.predefinedTodoServer": "Todo Server",
   "settings.app.form.privateNotifications": "Don't show message content in notifications",
diff --git a/src/i18n/locales/ru.json b/src/i18n/locales/ru.json
index 656d2bf3d..bd42cac86 100644
--- a/src/i18n/locales/ru.json
+++ b/src/i18n/locales/ru.json
@@ -308,6 +308,7 @@
   "settings.app.form.language": "Язык",
   "settings.app.form.lockPassword": "Пароль",
   "settings.app.form.minimizeToSystemTray": "Сворачивать Ferdi в системный трей",
+  "settings.app.form.closeToSystemTray": "Close Ferdi to system tray",
   "settings.app.form.navigationBarBehaviour": "Navigation bar behaviour",
   "settings.app.form.predefinedTodoServer": "Todo Server",
   "settings.app.form.privateNotifications": "Don't show message content in notifications",
diff --git a/src/i18n/locales/sk.json b/src/i18n/locales/sk.json
index 65bdcf5a4..917b799b1 100644
--- a/src/i18n/locales/sk.json
+++ b/src/i18n/locales/sk.json
@@ -308,6 +308,7 @@
   "settings.app.form.language": "Jazyk",
   "settings.app.form.lockPassword": "Heslo",
   "settings.app.form.minimizeToSystemTray": "Minimalizovať Ferdi do systémovej lišty",
+  "settings.app.form.closeToSystemTray": "Close Ferdi to system tray",
   "settings.app.form.navigationBarBehaviour": "Navigation bar behaviour",
   "settings.app.form.predefinedTodoServer": "Todo Server",
   "settings.app.form.privateNotifications": "Don't show message content in notifications",
diff --git a/src/i18n/locales/sl.json b/src/i18n/locales/sl.json
index 0f8bdd914..3536c4f84 100644
--- a/src/i18n/locales/sl.json
+++ b/src/i18n/locales/sl.json
@@ -308,6 +308,7 @@
   "settings.app.form.language": "Language",
   "settings.app.form.lockPassword": "Password",
   "settings.app.form.minimizeToSystemTray": "Minimize Ferdi to system tray",
+  "settings.app.form.closeToSystemTray": "Close Ferdi to system tray",
   "settings.app.form.navigationBarBehaviour": "Navigation bar behaviour",
   "settings.app.form.predefinedTodoServer": "Todo Server",
   "settings.app.form.privateNotifications": "Don't show message content in notifications",
diff --git a/src/i18n/locales/sr.json b/src/i18n/locales/sr.json
index 91105f68e..0725bd738 100644
--- a/src/i18n/locales/sr.json
+++ b/src/i18n/locales/sr.json
@@ -308,6 +308,7 @@
   "settings.app.form.language": "Jezik",
   "settings.app.form.lockPassword": "Password",
   "settings.app.form.minimizeToSystemTray": "Smanji Franca u sustavsku traku",
+  "settings.app.form.closeToSystemTray": "Close Ferdi to system tray",
   "settings.app.form.navigationBarBehaviour": "Navigation bar behaviour",
   "settings.app.form.predefinedTodoServer": "Todo Server",
   "settings.app.form.privateNotifications": "Don't show message content in notifications",
diff --git a/src/i18n/locales/sv.json b/src/i18n/locales/sv.json
index b2ca460eb..90c191941 100644
--- a/src/i18n/locales/sv.json
+++ b/src/i18n/locales/sv.json
@@ -308,6 +308,7 @@
   "settings.app.form.language": "Språk",
   "settings.app.form.lockPassword": "Lösenord",
   "settings.app.form.minimizeToSystemTray": "Minimera Ferdi till systemfältet",
+  "settings.app.form.closeToSystemTray": "Close Ferdi to system tray",
   "settings.app.form.navigationBarBehaviour": "Navigeringsfältets beteende",
   "settings.app.form.predefinedTodoServer": "Todo-server",
   "settings.app.form.privateNotifications": "Visa inte meddelandeinnehåll i aviseringar",
diff --git a/src/i18n/locales/tr.json b/src/i18n/locales/tr.json
index ab54dc7d8..eb3a95c21 100644
--- a/src/i18n/locales/tr.json
+++ b/src/i18n/locales/tr.json
@@ -308,6 +308,7 @@
   "settings.app.form.language": "Dil",
   "settings.app.form.lockPassword": "Şifre",
   "settings.app.form.minimizeToSystemTray": "Ferdi'ı sistem tepsisine küçült",
+  "settings.app.form.closeToSystemTray": "Close Ferdi to system tray",
   "settings.app.form.navigationBarBehaviour": "Navigation bar behaviour",
   "settings.app.form.predefinedTodoServer": "Todo Server",
   "settings.app.form.privateNotifications": "Don't show message content in notifications",
diff --git a/src/i18n/locales/uk.json b/src/i18n/locales/uk.json
index 289e77af1..389860feb 100644
--- a/src/i18n/locales/uk.json
+++ b/src/i18n/locales/uk.json
@@ -308,6 +308,7 @@
   "settings.app.form.language": "Мова",
   "settings.app.form.lockPassword": "Пароль",
   "settings.app.form.minimizeToSystemTray": "Мінімізувати Ferdi до системного лотка",
+  "settings.app.form.closeToSystemTray": "Close Ferdi to system tray",
   "settings.app.form.navigationBarBehaviour": "Navigation bar behaviour",
   "settings.app.form.predefinedTodoServer": "Todo Server",
   "settings.app.form.privateNotifications": "Don't show message content in notifications",
diff --git a/src/i18n/locales/vi.json b/src/i18n/locales/vi.json
index cb4a5b9e5..3a3619902 100644
--- a/src/i18n/locales/vi.json
+++ b/src/i18n/locales/vi.json
@@ -308,6 +308,7 @@
   "settings.app.form.language": "Language",
   "settings.app.form.lockPassword": "Password",
   "settings.app.form.minimizeToSystemTray": "Minimize Ferdi to system tray",
+  "settings.app.form.closeToSystemTray": "Close Ferdi to system tray",
   "settings.app.form.navigationBarBehaviour": "Navigation bar behaviour",
   "settings.app.form.predefinedTodoServer": "Todo Server",
   "settings.app.form.privateNotifications": "Don't show message content in notifications",
diff --git a/src/i18n/locales/zh-CN.json b/src/i18n/locales/zh-CN.json
index b617f7e0a..0c83bc021 100644
--- a/src/i18n/locales/zh-CN.json
+++ b/src/i18n/locales/zh-CN.json
@@ -284,6 +284,7 @@
   "settings.app.form.language": "Language",
   "settings.app.form.lockPassword": "Password",
   "settings.app.form.minimizeToSystemTray": "Minimize Ferdi to system tray",
+  "settings.app.form.closeToSystemTray": "Close Ferdi to system tray",
   "settings.app.form.noUpdates": "Disable updates",
   "settings.app.form.privateNotifications": "Don't show message content in notifications",
   "settings.app.form.runInBackground": "Keep Ferdi in background when closing the window",
diff --git a/src/i18n/locales/zh-HANT.json b/src/i18n/locales/zh-HANT.json
index 05830e0a5..219067f12 100644
--- a/src/i18n/locales/zh-HANT.json
+++ b/src/i18n/locales/zh-HANT.json
@@ -308,6 +308,7 @@
   "settings.app.form.language": "語言",
   "settings.app.form.lockPassword": "密碼",
   "settings.app.form.minimizeToSystemTray": "最小化至系統匣",
+  "settings.app.form.closeToSystemTray": "Close Ferdi to system tray",
   "settings.app.form.navigationBarBehaviour": "Navigation bar behaviour",
   "settings.app.form.predefinedTodoServer": "Todo Server",
   "settings.app.form.privateNotifications": "Don't show message content in notifications",
diff --git a/src/i18n/locales/zh-TW.json b/src/i18n/locales/zh-TW.json
index d04b1a326..f4bf16afb 100644
--- a/src/i18n/locales/zh-TW.json
+++ b/src/i18n/locales/zh-TW.json
@@ -211,6 +211,7 @@
   "settings.app.form.keepAllWorkspacesLoaded": "Keep all workspaces loaded",
   "settings.app.form.language": "語言",
   "settings.app.form.minimizeToSystemTray": "最小化 Ferdi 到系統列",
+  "settings.app.form.closeToSystemTray": "Close Ferdi to system tray",
   "settings.app.form.runInBackground": "當關閉視窗時，保持 Ferdi 在背景運作",
   "settings.app.form.showDisabledServices": "顯示停用的服務標籤",
   "settings.app.form.showMessagesBadgesWhenMuted": "當通知關閉時，標記未讀的訊息",
diff --git a/src/i18n/locales/zh.json b/src/i18n/locales/zh.json
index baf8b4c68..4e2050eb9 100644
--- a/src/i18n/locales/zh.json
+++ b/src/i18n/locales/zh.json
@@ -308,6 +308,7 @@
   "settings.app.form.language": "Language",
   "settings.app.form.lockPassword": "Password",
   "settings.app.form.minimizeToSystemTray": "Minimize Ferdi to system tray",
+  "settings.app.form.closeToSystemTray": "Close Ferdi to system tray",
   "settings.app.form.navigationBarBehaviour": "Navigation bar behaviour",
   "settings.app.form.predefinedTodoServer": "Todo Server",
   "settings.app.form.privateNotifications": "Don't show message content in notifications",
diff --git a/src/index.js b/src/index.js
index 928a9744e..cce8d8ea0 100644
--- a/src/index.js
+++ b/src/index.js
@@ -272,7 +272,7 @@ const createWindow = () => {
         debug('Window: minimize');
         mainWindow.minimize();
 
-        if (settings.get('minimizeToSystemTray')) {
+        if (settings.get('closeToSystemTray')) {
           debug('Skip taskbar: true');
           mainWindow.setSkipTaskbar(true);
         }
diff --git a/src/stores/SettingsStore.js b/src/stores/SettingsStore.js
index c50475819..83f6f9c89 100644
--- a/src/stores/SettingsStore.js
+++ b/src/stores/SettingsStore.js
@@ -173,6 +173,7 @@ export default class SettingsStore extends Store {
           runInBackground: legacySettings.runInBackground,
           enableSystemTray: legacySettings.enableSystemTray,
           minimizeToSystemTray: legacySettings.minimizeToSystemTray,
+          closeToSystemTray: legacySettings.closeToSystemTray,
           server: API,
           isAppMuted: legacySettings.isAppMuted,
           enableGPUAcceleration: legacySettings.enableGPUAcceleration,