diff --git a/src/views/email.js b/src/views/email.js
index c32e3fff8..64f875fcd 100644
--- a/src/views/email.js
+++ b/src/views/email.js
@@ -658,7 +658,7 @@ angular.module('Application').controller('EmailController', ['$scope', '$locatio
         $location.path('/email/' + $scope.domain.domain, false);
     };
 
-    // this is required because we need to rewrite the MAIL_DOMAINS env var
+    // this is required because we need to rewrite the CLOUDRON_MAIL_SERVER_HOST env var
     $scope.reconfigureEmailApps = function () {
         var installedApps = Client.getInstalledApps();
         for (var i = 0; i < installedApps.length; i++) {
diff --git a/src/views/emails.js b/src/views/emails.js
index 0aec00272..0f7529469 100644
--- a/src/views/emails.js
+++ b/src/views/emails.js
@@ -71,6 +71,18 @@ angular.module('Application').controller('EmailsController', ['$scope', '$locati
         }
     };
 
+    // this is required because we need to rewrite the MAIL_SERVER_NAME env var
+    $scope.reconfigureEmailApps = function () {
+        var installedApps = Client.getInstalledApps();
+        for (var i = 0; i < installedApps.length; i++) {
+            if (!installedApps[i].manifest.addons.email) continue;
+
+            Client.repairApp(installedApps[i].id, { }, function (error) {
+                if (error) console.error(error);
+            });
+        }
+    };
+
     $scope.mailLocation = {
         busy: false,
         error: null,
@@ -91,6 +103,8 @@ angular.module('Application').controller('EmailsController', ['$scope', '$locati
                     if (error) return console.error(error);
                     if (!task) return;
 
+                    $scope.reconfigureEmailApps();
+
                     $scope.mailLocation.taskId = task.id;
                     $scope.mailLocation.updateStatus();
                 });