diff --git a/src/infra_version.js b/src/infra_version.js
index 86bc667b7..6e19dc513 100644
--- a/src/infra_version.js
+++ b/src/infra_version.js
@@ -20,7 +20,7 @@ exports = module.exports = {
         'postgresql': { repo: 'cloudron/postgresql', tag: 'cloudron/postgresql:4.0.3@sha256:712e6b03e0edd9a5ca725f29b8150388ecf7667b57d46d772da6d0fc45f3f480' },
         'mongodb': { repo: 'cloudron/mongodb', tag: 'cloudron/mongodb:4.0.2@sha256:9df297ccc3370f38c54f8d614e214e082b363777cd1c6c9522e29663cc8f5362' },
         'redis': { repo: 'cloudron/redis', tag: 'cloudron/redis:3.0.3@sha256:37e5222e01ae89bc5a742ce12030631de25a127b5deec8a0e992c68df0fdec10' },
-        'mail': { repo: 'cloudron/mail', tag: 'cloudron/mail:3.3.0@sha256:d0b9724e9fb4cb1da52e032481d39de96d3d1f9cc99b2296500276dda703f20d' },
+        'mail': { repo: 'cloudron/mail', tag: 'cloudron/mail:3.3.0@sha256:c2366d009c649946f8d7d6346a0bcbbce49d8e4d7b9360a8004a5ca64707ee74' },
         'graphite': { repo: 'cloudron/graphite', tag: 'cloudron/graphite:2.4.1@sha256:b00b64b8df4032985d7a1ddd548a2713b6d7d88a54ebe9b7d324cece2bd6829e' },
         'sftp': { repo: 'cloudron/sftp', tag: 'cloudron/sftp:3.2.0@sha256:61e8247ded1e07cf882ca478dab180960357c614472e80b938f1f690a46788c2' }
     }
diff --git a/src/mail.js b/src/mail.js
index e79fea46e..a86dfe5f0 100644
--- a/src/mail.js
+++ b/src/mail.js
@@ -633,7 +633,7 @@ function configureMail(mailFqdn, mailDomain, serviceConfig, callback) {
     assert.strictEqual(typeof serviceConfig, 'object');
     assert.strictEqual(typeof callback, 'function');
 
-    // mail (note: 2525 is hardcoded in mail container and app use this port)
+    // mail (note: 2587 is hardcoded in mail container and app use this port)
     // MAIL_SERVER_NAME is the hostname of the mailserver i.e server uses these certs
     // MAIL_DOMAIN is the domain for which this server is relaying mails
     // mail container uses /app/data for backed up data and /run for restart-able data
@@ -662,7 +662,7 @@ function configureMail(mailFqdn, mailDomain, serviceConfig, callback) {
             createMailConfig(mailFqdn, mailDomain, function (error, allowInbound) {
                 if (error) return callback(error);
 
-                var ports = allowInbound ? '-p 587:2525 -p 993:9993 -p 4190:4190 -p 25:2525' : '';
+                var ports = allowInbound ? '-p 587:2587 -p 993:9993 -p 4190:4190 -p 25:2587' : '';
 
                 const cmd = `docker run --restart=always -d --name="mail" \
                             --net cloudron \
diff --git a/src/services.js b/src/services.js
index f57d25968..d5c74abde 100644
--- a/src/services.js
+++ b/src/services.js
@@ -1081,14 +1081,15 @@ function setupSendMail(app, options, callback) {
         const envPrefix = app.manifest.manifestVersion <= 1 ? '' : 'CLOUDRON_';
 
         var env = [
+            { name: `${envPrefix}MAIL_SERVER_HOST`, value: settings.mailFqdn() },
             { name: `${envPrefix}MAIL_SMTP_SERVER`, value: 'mail' },
             { name: `${envPrefix}MAIL_SMTP_PORT`, value: '2525' },
             { name: `${envPrefix}MAIL_SMTPS_PORT`, value: '2465' },
+            { name: `${envPrefix}MAIL_STARTTLS_PORT`, value: '2587' },
             { name: `${envPrefix}MAIL_SMTP_USERNAME`, value: app.mailboxName + '@' + app.mailboxDomain },
             { name: `${envPrefix}MAIL_SMTP_PASSWORD`, value: password },
             { name: `${envPrefix}MAIL_FROM`, value: app.mailboxName + '@' + app.mailboxDomain },
-            { name: `${envPrefix}MAIL_DOMAIN`, value: app.mailboxDomain },
-            { name: `${envPrefix}MAIL_SMTP_STARTTLS`, value: '1' },
+            { name: `${envPrefix}MAIL_DOMAIN`, value: app.mailboxDomain }
         ];
         debugApp(app, 'Setting sendmail addon config to %j', env);
         appdb.setAddonConfig(app.id, 'sendmail', env, callback);