diff --git a/caddy/Caddyfile b/caddy/Caddyfile
index 9b8f06c..2432d8d 100644
--- a/caddy/Caddyfile
+++ b/caddy/Caddyfile
@@ -4,6 +4,19 @@
     acme_ca https://acme-v02.api.letsencrypt.org/directory
 }
 import email_autodiscover
+# ---------------------------------------------------------
+# Block A: Die dedizierten Autodiscover Domains
+# ---------------------------------------------------------
+autodiscover.bayarea-cc.com, autodiscover.bizmatch.net,
+autoconfig.bayarea-cc.com, autoconfig.bizmatch.net {
+    
+    # Hier rufen wir das Snippet auf
+    import email_settings
+    
+    # Fallback für Aufrufe auf Root dieser Subdomains
+    respond "Autodiscover Service Online" 200
+}
+
 # Prod: Neue Domains
 www.bizmatch.net {
   handle /pictures/* {
@@ -55,6 +68,7 @@ bayarea-cc.com {
         format console
     }
     encode gzip
+    import email_settings
 }
 www.bayarea-cc.com {
     redir https://bayarea-cc.com{uri} permanent
diff --git a/caddy/email_autodiscover b/caddy/email_autodiscover
index aaabea0..e9d9b3a 100644
--- a/caddy/email_autodiscover
+++ b/caddy/email_autodiscover
@@ -1,22 +1,7 @@
-# ------------------------------------------------------------------
-# E-Mail Autodiscover Configuration
-# Covers: Outlook (XML & JSON), Thunderbird (Mozilla XML), and generic clients
-# ------------------------------------------------------------------
+# (email_settings) ist der Name unseres Snippets
+(email_settings) {
 
-# 1. Autodiscover für Outlook & Mobile Clients (Microsoft Standard)
-# ------------------------------------------------------------------
-autodiscover.bayarea-cc.com, autodiscover.bizmatch.net {
-    
-    # JSON Route (für moderne Outlook Clients / Mobile)
-    route /autodiscover/autodiscover.json {
-        header Content-Type "application/json"
-        respond `{
-            "Protocol": "AutodiscoverV1",
-            "Url": "https://{host}/autodiscover/autodiscover.xml"
-        }` 200
-    }
-
-    # XML Route (Klassisch Outlook)
+    # 1. Autodiscover für Outlook (POST Request)
     route /autodiscover/autodiscover.xml {
         header Content-Type "application/xml"
         respond `<?xml version="1.0" encoding="utf-8"?>
@@ -46,15 +31,17 @@ autodiscover.bayarea-cc.com, autodiscover.bizmatch.net {
 </Autodiscover>` 200
     }
 
-    # Fallback für Browser-Tests
-    route / {
-        respond "Autodiscover Service for Outlook is running." 200
+    # 2. JSON Autodiscover (Modern Outlook)
+    route /autodiscover/autodiscover.json {
+        header Content-Type "application/json"
+        # Achtung: Hier hardcoden wir jetzt die Subdomain für den Redirect, das ist sicherer
+        respond `{
+            "Protocol": "AutodiscoverV1",
+            "Url": "https://autodiscover.bayarea-cc.com/autodiscover/autodiscover.xml"
+        }` 200
     }
-}
 
-# 2. Autoconfig für Thunderbird (Mozilla Standard)
-# ------------------------------------------------------------------
-autoconfig.bayarea-cc.com, autoconfig.bizmatch.net {
+    # 3. Thunderbird Autoconfig
     route /mail/config-v1.1.xml {
         header Content-Type "application/xml"
         respond `<?xml version="1.0"?>
@@ -70,17 +57,12 @@ autoconfig.bayarea-cc.com, autoconfig.bizmatch.net {
     </incomingServer>
     <outgoingServer type="smtp">
       <hostname>mail.email-srvr.com</hostname>
-      <port>587</port>
-      <socketType>STARTTLS</socketType>
+      <port>465</port>
+      <socketType>SSL</socketType>
       <authentication>password-cleartext</authentication>
       <username>%EMAILADDRESS%</username>
     </outgoingServer>
   </emailProvider>
 </clientConfig>` 200
     }
-
-    # Fallback
-    route / {
-        respond "Autoconfig Service for Thunderbird is running." 200
-    }
 }
\ No newline at end of file