diff --git a/src/js/client.js b/src/js/client.js
index fb2b520a8..0d3574eed 100644
--- a/src/js/client.js
+++ b/src/js/client.js
@@ -425,8 +425,8 @@ angular.module('Application').service('Client', ['$http', '$interval', '$timeout
         // this._config.features.branding = true;
         // this._config.features.support = true;
         // this._config.features.directoryConfig = true;
-        this._config.features.mailboxMaxCount = 5;
-        this._config.features.emailPremium = false;
+        // this._config.features.mailboxMaxCount = 5;
+        // this._config.features.emailPremium = false;
 
         this._configListener.forEach(function (callback) {
             callback(that._config);
diff --git a/src/views/email.html b/src/views/email.html
index 48a618120..74ee05e36 100644
--- a/src/views/email.html
+++ b/src/views/email.html
@@ -1,3 +1,20 @@
+<!-- Modal subscription -->
+<div class="modal fade" id="subscriptionRequiredModal" tabindex="-1" role="dialog">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h4 class="modal-title">Subscription required</h4>
+      </div>
+      <div class="modal-body">
+        <p>To add more mailboxes, please setup a paid plain.</p>
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
+        <button type="button" class="btn btn-success" ng-click="openSubscriptionSetup()">Setup Subscription</button>
+      </div>
+    </div>
+  </div>
+</div>
 
 <!-- Modal enable email -->
 <div class="modal fade" id="enableEmailModal" tabindex="-1" role="dialog">
diff --git a/src/views/email.js b/src/views/email.js
index 791e55246..15e88e372 100644
--- a/src/views/email.js
+++ b/src/views/email.js
@@ -29,6 +29,7 @@ angular.module('Application').controller('EmailController', ['$scope', '$locatio
         dmarc: { },
         ptr: { }
     };
+
     $scope.expectedDnsRecordsTypes = [
         { name: 'MX', value: 'mx' },
         { name: 'DKIM', value: 'dkim' },
@@ -37,6 +38,10 @@ angular.module('Application').controller('EmailController', ['$scope', '$locatio
         { name: 'PTR', value: 'ptr' }
     ];
 
+    $scope.openSubscriptionSetup = function () {
+        Client.openSubscriptionSetup($scope.$parent.subscription);
+    };
+
     $scope.catchall = {
         mailboxes: [],
         busy: false,
@@ -319,6 +324,11 @@ angular.module('Application').controller('EmailController', ['$scope', '$locatio
             },
 
             show: function () {
+                if ($scope.config.features.mailboxMaxCount && $scope.config.features.mailboxMaxCount <= $scope.mailboxes.mailboxes.length) {
+                    $('#subscriptionRequiredModal').modal('show');
+                    return;
+                }
+
                 $scope.mailboxes.add.reset();
                 $('#mailboxAddModal').modal('show');
             },