diff --git a/src/js/client.js b/src/js/client.js
index 4fe0f0687..b5b226f8a 100644
--- a/src/js/client.js
+++ b/src/js/client.js
@@ -2215,6 +2215,15 @@ angular.module('Application').service('Client', ['$http', '$interval', '$timeout
         });
     };
 
+    Client.prototype.setMailBanner = function (domain, data, callback) {
+        post('/api/v1/mail/' + domain + '/banner', data, null, function (error, data, status) {
+            if (error) return callback(error);
+            if (status !== 202) return callback(new ClientError(status, data));
+
+            callback(null);
+        });
+    };
+
     Client.prototype.setCatchallAddresses = function (domain, addresses, callback) {
         post('/api/v1/mail/' + domain + '/catch_all', { addresses: addresses }, null, function (error, data, status) {
             if (error) return callback(error);
diff --git a/src/views/email.html b/src/views/email.html
index 15e383656..93a9a0f6e 100644
--- a/src/views/email.html
+++ b/src/views/email.html
@@ -608,6 +608,44 @@
                 </div>
               </div>
           </div>
+
+          <div class="card card-large">
+            <h4>Signature</h4>
+            <p>The text here will be attached to all emails going out from this domain.</p>
+
+            <div class="row" ng-hide="config.features.emailPremium">
+              <div class="col-md-12">
+                This feature is only available in the paid plans. <a href="" class="pull-right" ng-click="openSubscriptionSetup()">Setup Subscription Now</a>
+              </div>
+            </div>
+
+            <div class="row" ng-show="config.features.emailPremium">
+              <div class="col-md-12">
+                <form role="form" name="bannerForm" ng-submit="banner.submit()" autocomplete="off">
+                  <fieldset>
+                    <div class="form-group">
+                      <label class="control-label" style="width: 100%">Text format</label>
+                      <textarea ng-model="banner.text" class="form-control" rows="4"></textarea>
+                    </div>
+
+                    <div class="form-group">
+                      <label class="control-label" style="width: 100%">HTML format (Optional)</label>
+                      <textarea ng-model="banner.html" class="form-control" rows="4"></textarea>
+                    </div>
+
+                    <input class="ng-hide" type="submit" ng-disabled="banner.$invalid || banner.busy"/>
+                  </fieldset>
+                </form>
+              </div>
+            </div>
+            <div class="row">
+              <div class="col-md-12 text-right">
+                <button class="btn btn-outline btn-primary pull-right" ng-click="banner.submit()" ng-disabled="banner.$invalid || banner.busy">
+                  <i class="fa fa-circle-notch fa-spin" ng-show="banner.busy"></i> Save
+                </button>
+              </div>
+            </div>
+          </div>
       </uib-tab>
 
       <uib-tab index="3" heading="Status">
diff --git a/src/views/email.js b/src/views/email.js
index 3a24601d7..c32e3fff8 100644
--- a/src/views/email.js
+++ b/src/views/email.js
@@ -238,6 +238,29 @@ angular.module('Application').controller('EmailController', ['$scope', '$locatio
         }
     };
 
+    $scope.banner = {
+        busy: false,
+        text: '',
+        html: '',
+
+        submit: function () {
+            $scope.banner.busy = true;
+
+            Client.setMailBanner($scope.domain.domain, { text: $scope.banner.text, html: $scope.banner.html }, function (error) {
+                if (error) {
+                    $scope.banner.busy = false;
+                    return console.error(error);
+                }
+
+                // give sometime for the mail container to restart
+                $timeout(function () {
+                    $scope.banner.busy = false;
+                    $scope.refreshDomain();
+                }, 5000);
+            });
+        }
+    };
+
     $scope.incomingEmail = {
         busy: false,
         setupDns: true,
@@ -525,6 +548,17 @@ angular.module('Application').controller('EmailController', ['$scope', '$locatio
         busy: false,
         preset: $scope.mailRelayPresets[0],
 
+        // form data to be set on load
+        relay: {
+            provider: 'cloudron-smtp',
+            host: '',
+            port: 25,
+            username: '',
+            password: '',
+            serverApiToken: '',
+            acceptSelfSignedCerts: false
+        },
+
         presetChanged: function () {
             $scope.mailRelay.error = null;
 
@@ -537,17 +571,6 @@ angular.module('Application').controller('EmailController', ['$scope', '$locatio
             $scope.mailRelay.relay.acceptSelfSignedCerts = false;
         },
 
-        // form data to be set on load
-        relay: {
-            provider: 'cloudron-smtp',
-            host: '',
-            port: 25,
-            username: '',
-            password: '',
-            serverApiToken: '',
-            acceptSelfSignedCerts: false
-        },
-
         submit: function () {
             $scope.mailRelay.error = null;
             $scope.mailRelay.busy = true;
@@ -685,6 +708,9 @@ angular.module('Application').controller('EmailController', ['$scope', '$locatio
                 }
             }
 
+            $scope.banner.text = mailConfig.banner.text || '';
+            $scope.banner.html = mailConfig.banner.html || '';
+
             // amend to selected domain to be available for the UI
             $scope.domain.mailConfig = mailConfig;
             $scope.domain.mailStatus = {};