From d04a6978e9c5df0af5c570df8f35a1a690a0ae9c Mon Sep 17 00:00:00 2001
From: Luca <102960244+Luca-Timo@users.noreply.github.com>
Date: Fri, 12 Jun 2026 14:41:49 +0200
Subject: [PATCH] =?UTF-8?q?fix(email):=20IMAP=20Security=20dropdown=20matc?=
 =?UTF-8?q?hes=20outgoing=20=E2=80=94=20no=20port=20in=20label,=20manual?=
 =?UTF-8?q?=20port?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Reverts the auto-fill; drops the (993)/(143) from the Security option labels so
incoming behaves exactly like the outgoing SMTP card (plain SSL/TLS vs
STARTTLS, port set manually).
---
 .../admin/IncomingMailConfigCard.tsx          | 20 +++----------------
 frontend/src/i18n/locales/de.json             |  4 ++--
 frontend/src/i18n/locales/en.json             |  4 ++--
 3 files changed, 7 insertions(+), 21 deletions(-)

diff --git a/frontend/src/components/admin/IncomingMailConfigCard.tsx b/frontend/src/components/admin/IncomingMailConfigCard.tsx
index 1eb64883..472b0fdd 100644
--- a/frontend/src/components/admin/IncomingMailConfigCard.tsx
+++ b/frontend/src/components/admin/IncomingMailConfigCard.tsx
@@ -30,20 +30,6 @@ export const IncomingMailConfigCard: React.FC = () => {
 
   const set = (k: keyof IncomingMailConfig, v: any) => setCfg((c) => ({ ...c, [k]: v }));
 
-  // Changing Security auto-fills the conventional IMAP port (SSL/TLS → 993,
-  // STARTTLS/none → 143) so the port in the dropdown label isn't just
-  // decoration. A non-standard custom port is left untouched.
-  const onSecurityChange = (val: string) => {
-    const secure = val === 'ssl';
-    setCfg((c) => {
-      const next = { ...c, imap_secure: secure };
-      if (!c.imap_port || c.imap_port === 993 || c.imap_port === 143) {
-        next.imap_port = secure ? 993 : 143;
-      }
-      return next;
-    });
-  };
-
   const save = useMutation({
     mutationFn: () => {
       // Mirror the SMTP card's client-side required guard. Host + port +
@@ -105,9 +91,9 @@ export const IncomingMailConfigCard: React.FC = () => {
           </div>
           <div>
             <label className={labelCls}>{t('email.incoming.security', 'Security')}</label>
-            <select className={selectCls} value={cfg.imap_secure ? 'ssl' : 'plain'} onChange={(e) => onSecurityChange(e.target.value)}>
-              <option value="ssl">{t('email.incoming.ssl', 'SSL/TLS (993)')}</option>
-              <option value="plain">{t('email.incoming.plain', 'None / STARTTLS (143)')}</option>
+            <select className={selectCls} value={cfg.imap_secure ? 'ssl' : 'plain'} onChange={(e) => set('imap_secure', e.target.value === 'ssl')}>
+              <option value="ssl">{t('email.incoming.ssl', 'SSL/TLS')}</option>
+              <option value="plain">{t('email.incoming.plain', 'None / STARTTLS')}</option>
             </select>
           </div>
         </div>
diff --git a/frontend/src/i18n/locales/de.json b/frontend/src/i18n/locales/de.json
index 98111071..9fc69175 100644
--- a/frontend/src/i18n/locales/de.json
+++ b/frontend/src/i18n/locales/de.json
@@ -2481,8 +2481,8 @@
       "host": "IMAP-Host",
       "port": "Port",
       "security": "Sicherheit",
-      "ssl": "SSL/TLS (993)",
-      "plain": "Keine / STARTTLS (143)",
+      "ssl": "SSL/TLS",
+      "plain": "Keine / STARTTLS",
       "user": "Benutzername",
       "pass": "Passwort",
       "folder": "Ordner",
diff --git a/frontend/src/i18n/locales/en.json b/frontend/src/i18n/locales/en.json
index e6974d7c..bf3057b8 100644
--- a/frontend/src/i18n/locales/en.json
+++ b/frontend/src/i18n/locales/en.json
@@ -2054,8 +2054,8 @@
       "host": "IMAP host",
       "port": "Port",
       "security": "Security",
-      "ssl": "SSL/TLS (993)",
-      "plain": "None / STARTTLS (143)",
+      "ssl": "SSL/TLS",
+      "plain": "None / STARTTLS",
       "user": "Username",
       "pass": "Password",
       "folder": "Folder",