diff --git a/src/infra_version.js b/src/infra_version.js
index 0a94fce21..e50e21f8e 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.1.1@sha256:86e4e2f4fd43809efca7c9cb1def4d7608cf36cb9ea27052f9b64da4481db43a' },
         'mongodb': { repo: 'cloudron/mongodb', tag: 'cloudron/mongodb:4.0.2@sha256:9df297ccc3370f38c54f8d614e214e082b363777cd1c6c9522e29663cc8f5362' },
         'redis': { repo: 'cloudron/redis', tag: 'cloudron/redis:3.0.4@sha256:5c60de75d078ae609da5565f32dcd91030f45907e945756cc976ff207b8c6199' },
-        'mail': { repo: 'cloudron/mail', tag: 'cloudron/mail:3.5.0@sha256:e05d328ea1afa94e31e2eae9b035ff2edde8b90cae902ca49e06053b5bdb5fde' },
+        'mail': { repo: 'cloudron/mail', tag: 'cloudron/mail:3.5.1@sha256:5fd56a8ec1b655c4c2b5fc9fc9d6f89b22a6e0cd0f1d119b19ba535d0df233e8' },
         'graphite': { repo: 'cloudron/graphite', tag: 'cloudron/graphite:3.0.1@sha256:bed9f6b5d06fe2c5289e895e806cfa5b74ad62993d705be55d4554a67d128029' },
         'sftp': { repo: 'cloudron/sftp', tag: 'cloudron/sftp:3.4.2@sha256:810306478c3dac7caa7497e5f6381cc7ce2f68aafda849a4945d39a67cc04bc1' }
     }
diff --git a/src/mail.js b/src/mail.js
index c626aecc5..f3d90560b 100644
--- a/src/mail.js
+++ b/src/mail.js
@@ -610,11 +610,10 @@ async function checkConfiguration() {
     return markdownMessage; // empty message means all status checks succeeded
 }
 
-async function createMailConfig(mailFqdn, mailDomain) {
+async function createMailConfig(mailFqdn) {
     assert.strictEqual(typeof mailFqdn, 'string');
-    assert.strictEqual(typeof mailDomain, 'string');
 
-    debug('createMailConfig: generating mail config');
+    debug(`createMailConfig: generating mail config with ${mailFqdn}`);
 
     const mailDomains = await listDomains();
 
@@ -623,7 +622,7 @@ async function createMailConfig(mailFqdn, mailDomain) {
 
     // mail_domain is used for SRS
     if (!safe.fs.writeFileSync(`${paths.MAIL_CONFIG_DIR}/mail.ini`,
-        `mail_in_domains=${mailInDomains}\nmail_out_domains=${mailOutDomains}\nmail_server_name=${mailFqdn}\nmail_domain=${mailDomain}\n\n`, 'utf8')) {
+        `mail_in_domains=${mailInDomains}\nmail_out_domains=${mailOutDomains}\nmail_server_name=${mailFqdn}\n\n`, 'utf8')) {
         throw new BoxError(BoxError.FS_ERROR, `Could not create mail var file: ${safe.error.message}`);
     }
 
@@ -706,7 +705,7 @@ async function configureMail(mailFqdn, mailDomain, serviceConfig) {
     await shell.promises.exec('stopMail', 'docker stop mail || true');
     await shell.promises.exec('removeMail', 'docker rm -f mail || true');
 
-    const allowInbound = await createMailConfig(mailFqdn, mailDomain);
+    const allowInbound = await createMailConfig(mailFqdn);
 
     const ports = allowInbound ? '-p 587:2587 -p 993:9993 -p 4190:4190 -p 25:2587 -p 465:2465 -p 995:9995' : '';
     const readOnly = !serviceConfig.recoveryMode ? '--read-only' : '';
@@ -762,8 +761,8 @@ async function restartMail() {
     const servicesConfig = await settings.getServicesConfig();
     const mailConfig = servicesConfig['mail'] || {};
 
-    debug(`restartMail: restarting mail container with mailFqdn:${settings.mailFqdn()} dashboardDomain:${settings.dashboardDomain()}`);
-    await configureMail(settings.mailFqdn(), settings.dashboardDomain(), mailConfig);
+    debug(`restartMail: restarting mail container with mailFqdn:${settings.mailFqdn()} mailDomain:${settings.mailDomain()}`);
+    await configureMail(settings.mailFqdn(), settings.mailDomain(), mailConfig);
 }
 
 async function startMail(existingInfra) {