diff --git a/caddy/Caddyfile b/caddy/Caddyfile
index f0a296a..7306041 100644
--- a/caddy/Caddyfile
+++ b/caddy/Caddyfile
@@ -149,4 +149,55 @@ web.email-bayarea.com {
 }
 mail.email-srvr.com autodiscover.mail.email-srvr.com autoconfig.mail.email-srvr.com {
     reverse_proxy nginx-mailcow:8080
+}
+# Roundcube für docker-mailserver
+app.email-bayarea.com {
+    reverse_proxy roundcube-new:80
+    
+    log {
+        output stderr
+        format console
+    }
+    
+    encode gzip
+}
+
+# IMAP/SMTP Server für E-Mail-Clients
+email-srvr.com {
+    # Für E-Mail-Client-Konfiguration (Autodiscover)
+    handle /.well-known/autoconfig/mail/config-v1.1.xml {
+        header Content-Type "application/xml"
+        respond `<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig version="1.1">
+  <emailProvider id="email-srvr.com">
+    <domain>andreasknuth.de</domain>
+    <displayName>Andreas Knuth Mail</displayName>
+    <displayShortName>AK Mail</displayShortName>
+    <incomingServer type="imap">
+      <hostname>email-srvr.com</hostname>
+      <port>993</port>
+      <socketType>SSL</socketType>
+      <authentication>password-cleartext</authentication>
+      <username>%EMAILADDRESS%</username>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>email-srvr.com</hostname>
+      <port>587</port>
+      <socketType>STARTTLS</socketType>
+      <authentication>password-cleartext</authentication>
+      <username>%EMAILADDRESS%</username>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>`
+    }
+    
+    # Fallback für andere Anfragen
+    handle {
+        respond "Mail Server Configuration" 200
+    }
+    
+    log {
+        output stderr
+        format console
+    }
 }
\ No newline at end of file