diff --git a/src/infra_version.js b/src/infra_version.js
index c24507d11..ca06ccbd9 100644
--- a/src/infra_version.js
+++ b/src/infra_version.js
@@ -18,7 +18,7 @@ exports = module.exports = {
         'postgresql': { repo: 'cloudron/postgresql', tag: 'cloudron/postgresql:0.17.0' },
         'mongodb': { repo: 'cloudron/mongodb', tag: 'cloudron/mongodb:0.13.0' },
         'redis': { repo: 'cloudron/redis', tag: 'cloudron/redis:0.11.0' },
-        'mail': { repo: 'cloudron/mail', tag: 'cloudron/mail:0.34.0' },
+        'mail': { repo: 'cloudron/mail', tag: 'cloudron/mail:0.34.1' },
         'graphite': { repo: 'cloudron/graphite', tag: 'cloudron/graphite:0.11.0' }
     }
 };
diff --git a/src/platform.js b/src/platform.js
index 684499ae2..3082f08f5 100644
--- a/src/platform.js
+++ b/src/platform.js
@@ -40,7 +40,9 @@ function start(callback) {
 
     debug('initializing addon infrastructure');
 
+    // restart mail container if any of these keys change
     settings.events.on(settings.MAIL_CONFIG_KEY, function () { startMail(NOOP_CALLBACK); });
+    settings.events.on(settings.MAIL_RELAY_KEY, function () { startMail(NOOP_CALLBACK); });
 
     certificates.events.on(certificates.EVENT_CERT_CHANGED, function (domain) {
         if (domain === '*.' + config.fqdn() || domain === config.adminFqdn()) startMail(NOOP_CALLBACK);
diff --git a/src/settings.js b/src/settings.js
index faa06d717..df5c5a9ad 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -485,8 +485,6 @@ function setMailRelay(relay, callback) {
 
             exports.events.emit(exports.MAIL_RELAY_KEY, relay);
 
-            platform.createMailConfig(NOOP_CALLBACK);
-
             callback(null);
         });
     });
diff --git a/webadmin/src/views/email.html b/webadmin/src/views/email.html
index 4f91ef097..6f246ca32 100644
--- a/webadmin/src/views/email.html
+++ b/webadmin/src/views/email.html
@@ -67,7 +67,7 @@
 <div class="card" style="margin-bottom: 15px;" ng-show="isPaying">
     <div class="row">
         <div class="col-md-12">
-            Select the mail server through which outbound mails are sent:
+            Select the mail server through which Cloudron will send outbound mails:
         </div>
     </div>
     <br/>