diff --git a/webadmin/src/views/settings.html b/webadmin/src/views/settings.html
index 6211b3f64..8b215be9d 100644
--- a/webadmin/src/views/settings.html
+++ b/webadmin/src/views/settings.html
@@ -182,6 +182,29 @@
     </div>
 </div>
 
+<div class="section-header">
+    <div class="text-left">
+        <h3>Email</h3>
+    </div>
+</div>
+
+<div class="card" style="margin-bottom: 15px;">
+    <div class="row">
+        <div class="col-md-12">
+            <span>Cloudron has a built-in email server that allows you to send/receive email for your domain. When enabled, your DNS will be configured automatically.</span>
+        </div>
+    </div>
+    <div class="row">
+        <p class="col-md-12" ng-show="!config.isCustomDomain">
+            Email server can only be enabled for custom domains.
+        </p>
+
+        <div class="col-xs-6 text-right" ng-show="config.isCustomDomain">
+            <button class="btn btn-primary pull-right" ng-click="toggleEmail()" ng-enabled="mailConfig">{{ mailConfig.enabled ? "Disable Email" : "Enable Email" }}</button>
+        </div>
+    </div>
+</div>
+
 <div class="section-header">
     <div class="text-left">
         <h3>Backups</h3>
diff --git a/webadmin/src/views/settings.js b/webadmin/src/views/settings.js
index 217cca55f..052aa6ada 100644
--- a/webadmin/src/views/settings.js
+++ b/webadmin/src/views/settings.js
@@ -9,6 +9,8 @@ angular.module('Application').controller('SettingsController', ['$scope', '$loca
     $scope.dnsConfig = {};
     $scope.appstoreConfig = {};
 
+    $scope.mailConfig = null;
+
     $scope.lastBackup = null;
     $scope.backups = [];
 
@@ -119,6 +121,22 @@ angular.module('Application').controller('SettingsController', ['$scope', '$loca
         });
     }
 
+    function getMailConfig() {
+        Client.getMailConfig(function (error, mailConfig) {
+            if (error) return console.error(error);
+
+            $scope.mailConfig = mailConfig;
+        });
+    }
+
+    $scope.toggleEmail = function () {
+        Client.setMailConfig({ enabled: !$scope.mailConfig.enabled }, function (error) {
+            if (error) return console.error(error);
+
+            $scope.mailConfig.enabled = !$scope.mailConfig.enabled;
+        });
+    };
+
     function getPlans() {
         AppStore.getSizes(function (error, result) {
             if (error) return console.error(error);
@@ -359,6 +377,7 @@ angular.module('Application').controller('SettingsController', ['$scope', '$loca
 
     Client.onReady(function () {
         fetchBackups();
+        getMailConfig();
 
         if ($scope.config.provider === 'caas') {
             getPlans();