diff --git a/compose/mail/compose.yaml b/compose/mail/compose.yaml
index 4fd515f..2214376 100644
--- a/compose/mail/compose.yaml
+++ b/compose/mail/compose.yaml
@@ -27,45 +27,17 @@ services:
       - /srv/mail-fetch01/config/mailserver:/tmp/docker-mailserver
       - /srv/mail-fetch01/data/mailserver/state:/var/mail-state
       - /srv/mail-fetch01/data/mailserver/dkim:/etc/opendkim/keys
+      - /srv/mail-fetch01/data/mailserver/logs:/var/log/mail
       - /srv/mail-fetch01/data/mailserver/certs/fullchain.pem:/etc/letsencrypt/live/mailserver/fullchain.pem:ro
       - /srv/mail-fetch01/data/mailserver/certs/privkey.pem:/etc/letsencrypt/live/mailserver/privkey.pem:ro
-      - /srv/mail-fetch01/config/mailserver/fetchmailrc:/etc/fetchmailrc
     healthcheck:
       test: ["CMD-SHELL", "ss -ltn | grep -q ':25' || exit 1"]
       interval: 30s
       timeout: 10s
       retries: 5
       start_period: 20s
-
-  roundcube:
-    image: roundcube/roundcubemail:latest
-    container_name: roundcube
-    restart: unless-stopped
-    depends_on:
-      db-mail:
-        condition: service_healthy
-    environment:
-      TZ: Europe/Zurich
-      ROUNDCUBEMAIL_DB_TYPE: mysql
-      ROUNDCUBEMAIL_DB_HOST: db-mail
-      ROUNDCUBEMAIL_DB_NAME: roundcube
-      ROUNDCUBEMAIL_DB_USER: roundcube
-      ROUNDCUBEMAIL_DB_PASSWORD: "RCPASS_8xT2mQ7vL4pD1cK9"
-      ROUNDCUBEMAIL_SKIN: elastic
-      ROUNDCUBEMAIL_DEFAULT_HOST: "tls://mail.theboxhub.ch"
-      ROUNDCUBEMAIL_DEFAULT_PORT: 143
-      ROUNDCUBEMAIL_SMTP_SERVER: "tls://mail.theboxhub.ch"
-      ROUNDCUBEMAIL_SMTP_PORT: 587
-      ROUNDCUBEMAIL_IMAP_CONN_OPTIONS: '{"ssl":{"verify_peer":false,"verify_peer_name":false,"allow_self_signed":true}}'
-      ROUNDCUBEMAIL_SMTP_CONN_OPTIONS: '{"ssl":{"verify_peer":false,"verify_peer_name":false,"allow_self_signed":true}}'
-    ports:
-      - "8080:80"
-    healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost/"]
-      interval: 30s
-      timeout: 10s
-      retries: 5
-      start_period: 20s
+    networks:
+      - mail-nw
 
   db-mail:
     image: mariadb:10.11
@@ -84,4 +56,41 @@ services:
       interval: 10s
       timeout: 5s
       retries: 3
-      start_period: 10s
\ No newline at end of file
+      start_period: 10s
+    networks:
+      - mail-nw
+
+  roundcube:
+    image: roundcube/roundcubemail:latest
+    container_name: roundcube
+    restart: unless-stopped
+    depends_on:
+      db-mail:
+        condition: service_healthy
+    environment:
+      TZ: Europe/Zurich
+      ROUNDCUBEMAIL_DB_TYPE: mysql
+      ROUNDCUBEMAIL_DB_HOST: db-mail
+      ROUNDCUBEMAIL_DB_NAME: roundcube
+      ROUNDCUBEMAIL_DB_USER: roundcube
+      ROUNDCUBEMAIL_DB_PASSWORD: "RCPASS_8xT2mQ7vL4pD1cK9"
+      ROUNDCUBEMAIL_SKIN: elastic
+      # Nutze hier nun den echten Domainnamen aus dem SSL-Zertifikat:
+      ROUNDCUBEMAIL_DEFAULT_HOST: "tls://imap.theboxhub.ch"
+      ROUNDCUBEMAIL_DEFAULT_PORT: 143
+      ROUNDCUBEMAIL_SMTP_SERVER: "tls://imap.theboxhub.ch"
+      ROUNDCUBEMAIL_SMTP_PORT: 587
+    ports:
+      - "8080:80"
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost/"]
+      interval: 30s
+      timeout: 10s
+      retries: 5
+      start_period: 20s
+    networks:
+      - mail-nw
+
+networks:
+  mail-nw:
+    driver: bridge
\ No newline at end of file