From 3ad3ab38c8e0ef05c2b754bd6d64bbd8885d6edd Mon Sep 17 00:00:00 2001
From: Andreas Knuth <andreas.knuth@gmail.com>
Date: Tue, 27 Jan 2026 16:14:53 -0600
Subject: [PATCH] <LoginName>{header.X-Anchormailbox}</LoginName>

---
 caddy/email_autodiscover | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/caddy/email_autodiscover b/caddy/email_autodiscover
index 83a7d28..4b3a530 100644
--- a/caddy/email_autodiscover
+++ b/caddy/email_autodiscover
@@ -1,7 +1,8 @@
 (email_settings) {
-    # 1. Autodiscover für Outlook (POST Request)
+    # 1. Autodiscover für Outlook
     route /autodiscover/autodiscover.xml {
         header Content-Type "application/xml"
+        # Wir nutzen {header.X-Anchormailbox} um die Email dynamisch einzufügen
         respond `<?xml version="1.0" encoding="utf-8"?>
 <Autodiscover xmlns="http://schemas.microsoft.com/exchange/autodiscover/responseschema/2006">
   <Response xmlns="http://schemas.microsoft.com/exchange/autodiscover/outlook/responseschema/2006a">
@@ -13,6 +14,7 @@
         <Server>mail.email-srvr.com</Server>
         <Port>993</Port>
         <DomainRequired>on</DomainRequired>
+        <LoginName>{header.X-Anchormailbox}</LoginName>
         <SPA>off</SPA>
         <SSL>on</SSL>
         <AuthRequired>on</AuthRequired>
@@ -22,6 +24,7 @@
         <Server>mail.email-srvr.com</Server>
         <Port>465</Port>
         <DomainRequired>on</DomainRequired>
+        <LoginName>{header.X-Anchormailbox}</LoginName>
         <SPA>off</SPA>
         <SSL>on</SSL>
         <AuthRequired>on</AuthRequired>
@@ -31,8 +34,16 @@
 </Autodiscover>` 200
     }
 
+    # 2. JSON Autodiscover (Modern Outlook) - bleibt gleich
+    route /autodiscover/autodiscover.json {
+        header Content-Type "application/json"
+        respond `{
+            "Protocol": "AutodiscoverV1",
+            "Url": "https://autodiscover.bayarea-cc.com/autodiscover/autodiscover.xml"
+        }` 200
+    }
 
-    # 3. Thunderbird Autoconfig (Bleibt wie es war)
+    # 3. Thunderbird Autoconfig - bleibt gleich (dort funktioniert %EMAILADDRESS% ja nativ)
     route /mail/config-v1.1.xml {
         header Content-Type "application/xml"
         respond `<?xml version="1.0"?>