diff --git a/webadmin/src/views/apps.html b/webadmin/src/views/apps.html
index 853e30c8f..ac668b2cf 100644
--- a/webadmin/src/views/apps.html
+++ b/webadmin/src/views/apps.html
@@ -110,8 +110,8 @@
                             <br/>
                         </div>
 
-                        <p ng-show="!mailConfig.enabled && appConfigure.app.manifest.addons.email" class="text-danger">
-                            This app requires <a href="#/settings">Cloudron Email</a> to be enabled.
+                        <p ng-show="appConfigure.app.manifest.addons.email" class="text-danger">
+                            This app requires <a href="#/email">Cloudron Email</a> to be enabled on this domain.
                         </p>
 
                         <a href="" ng-click="appConfigure.advancedVisible = true" ng-hide="appConfigure.advancedVisible">Advanced settings...</a>
diff --git a/webadmin/src/views/apps.js b/webadmin/src/views/apps.js
index 0f73d3f9b..ef8c424b7 100644
--- a/webadmin/src/views/apps.js
+++ b/webadmin/src/views/apps.js
@@ -10,7 +10,6 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
     $scope.domains = [];
     $scope.groups = [];
     $scope.users = [];
-    $scope.mailConfig = {};
     $scope.backupConfig = {};
 
     $scope.appConfigure = {
@@ -497,14 +496,6 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
         });
     }
 
-    function getMailConfig() {
-        Client.getMailConfig(function (error, mailConfig) {
-            if (error) return console.error(error);
-
-            $scope.mailConfig = mailConfig;
-        });
-    }
-
     function getBackupConfig() {
         Client.getBackupConfig(function (error, backupConfig) {
             if (error) return console.error(error);
@@ -521,7 +512,6 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
                 fetchUsers();
                 fetchGroups();
                 getDomains();
-                getMailConfig();
                 getBackupConfig();
             }
 
diff --git a/webadmin/src/views/appstore.html b/webadmin/src/views/appstore.html
index 6c1d9a690..84063a378 100644
--- a/webadmin/src/views/appstore.html
+++ b/webadmin/src/views/appstore.html
@@ -102,8 +102,8 @@
                             <br/>
                         </div>
 
-                        <p ng-show="!mailConfig.enabled && appInstall.app.manifest.addons.email" class="text-danger">
-                            This app requires <a href="#/settings">Cloudron Email</a> to be enabled.
+                        <p ng-show="appInstall.app.manifest.addons.email" class="text-danger">
+                            This app requires <a href="#/email">Cloudron Email</a> to be enabled on this domain.
                         </p>
 
                         <div class="hide">
diff --git a/webadmin/src/views/appstore.js b/webadmin/src/views/appstore.js
index a1648a582..38e9b411c 100644
--- a/webadmin/src/views/appstore.js
+++ b/webadmin/src/views/appstore.js
@@ -18,7 +18,6 @@ angular.module('Application').controller('AppStoreController', ['$scope', '$loca
     $scope.searchString = '';
     $scope.validAppstoreAccount = false;
     $scope.appstoreConfig = null;
-    $scope.mailConfig = {};
 
     $scope.showView = function (view) {
         // wait for dialog to be fully closed to avoid modal behavior breakage when moving to a different view already
@@ -527,14 +526,6 @@ angular.module('Application').controller('AppStoreController', ['$scope', '$loca
         });
     }
 
-    function getMailConfig() {
-        Client.getMailConfig(function (error, mailConfig) {
-            if (error) return console.error(error);
-
-            $scope.mailConfig = mailConfig;
-        });
-    }
-
     function init() {
         $scope.ready = false;
 
@@ -548,7 +539,6 @@ angular.module('Application').controller('AppStoreController', ['$scope', '$loca
 
             fetchUsers();
             fetchGroups();
-            getMailConfig();
 
             // domains is required since we populate the dropdown with domains[0]
             Client.getDomains(function (error, result) {