diff --git a/DMS/docker-compose.yml b/DMS/docker-compose.yml
index 44fb353..79e6843 100644
--- a/DMS/docker-compose.yml
+++ b/DMS/docker-compose.yml
@@ -137,8 +137,8 @@ services:
       # Roundcube verbindet intern über den Docker-Alias
       - ROUNDCUBEMAIL_DEFAULT_HOST=ssl://node1.email-srvr.com
       - ROUNDCUBEMAIL_DEFAULT_PORT=993
-      - ROUNDCUBEMAIL_SMTP_SERVER=ssl://mailserver
-      - ROUNDCUBEMAIL_SMTP_PORT=465
+      - ROUNDCUBEMAIL_SMTP_SERVER=tls://mailserver     # intern, kein externer DNS-SNI-Chaos
+      - ROUNDCUBEMAIL_SMTP_PORT=587
       - ROUNDCUBEMAIL_PLUGINS=password,email_config
     ports:
       - "8888:80"
diff --git a/DMS/docker-data/roundcube/plugins/email_config/config/config.inc.php b/DMS/docker-data/roundcube/plugins/email_config/config/config.inc.php
index a06c3ef..d163ef0 100644
--- a/DMS/docker-data/roundcube/plugins/email_config/config/config.inc.php
+++ b/DMS/docker-data/roundcube/plugins/email_config/config/config.inc.php
@@ -2,6 +2,9 @@
 
 $config['language'] = 'en_US';
 
+$config['smtp_server'] = 'ssl://mailserver';
+$config['smtp_port']   = 465;
+
 $config['smtp_conn_options'] = array(
     'ssl' => array(
         'verify_peer'       => false,