diff --git a/src/js/client.js b/src/js/client.js
index b00f5aa2a..08990f31d 100644
--- a/src/js/client.js
+++ b/src/js/client.js
@@ -2570,13 +2570,7 @@ angular.module('Application').service('Client', ['$http', '$interval', '$timeout
         });
     };
 
-    Client.prototype.updateMailbox = function (domain, name, ownerId, ownerType, active, callback) {
-        var data = {
-            ownerId: ownerId,
-            ownerType: ownerType,
-            active: active
-        };
-
+    Client.prototype.updateMailbox = function (domain, name, data, callback) {
         post('/api/v1/mail/' + domain + '/mailboxes/' + name, data, null, function (error, data, status) {
             if (error) return callback(error);
             if (status !== 204) return callback(new ClientError(status, data));
diff --git a/src/translation/en.json b/src/translation/en.json
index ea4a5b838..68a3b161e 100644
--- a/src/translation/en.json
+++ b/src/translation/en.json
@@ -1180,7 +1180,8 @@
             "activeCheckbox": "Mailing list is active"
         },
         "updateMailboxDialog": {
-            "activeCheckbox": "Mailbox is active"
+            "activeCheckbox": "Mailbox is active",
+            "enablePop3": "Enable POP3 access"
         }
     },
     "app": {
diff --git a/src/views/email.html b/src/views/email.html
index bf3ab5a75..6beed05e7 100644
--- a/src/views/email.html
+++ b/src/views/email.html
@@ -152,6 +152,12 @@
             </div>
           </div>
 
+          <div class="checkbox">
+            <label>
+              <input type="checkbox" ng-model="mailboxes.edit.enablePop3"> {{ 'email.updateMailboxDialog.enablePop3' | tr }}</input>
+            </label>
+          </div>
+
           <div class="checkbox">
             <label>
               <input type="checkbox" ng-model="mailboxes.edit.active"> {{ 'email.updateMailboxDialog.activeCheckbox' | tr }}</input>
diff --git a/src/views/email.js b/src/views/email.js
index c6a9e7145..8b7a66753 100644
--- a/src/views/email.js
+++ b/src/views/email.js
@@ -387,6 +387,7 @@ angular.module('Application').controller('EmailController', ['$scope', '$locatio
             incomingDomains: [],
             aliases: [],
             active: true,
+            enablePop3: false,
 
             addAlias: function (event) {
                 event.preventDefault();
@@ -407,6 +408,7 @@ angular.module('Application').controller('EmailController', ['$scope', '$locatio
                 $scope.mailboxes.edit.owner = mailbox.owner; // this can be null if mailbox had no owner
                 $scope.mailboxes.edit.aliases = angular.copy(mailbox.aliases, []);
                 $scope.mailboxes.edit.active = mailbox.active;
+                $scope.mailboxes.edit.enablePop3 = mailbox.enablePop3;
 
                 $('#mailboxEditModal').modal('show');
             },
@@ -414,8 +416,15 @@ angular.module('Application').controller('EmailController', ['$scope', '$locatio
             submit: function () {
                 $scope.mailboxes.edit.busy = true;
 
+                var data = {
+                    ownerId: $scope.mailboxes.edit.owner.id,
+                    ownerType: $scope.mailboxes.edit.owner.type,
+                    active: $scope.mailboxes.edit.active,
+                    enablePop3: $scope.mailboxes.edit.enablePop3
+                };
+
                 // $scope.mailboxes.edit.owner is expected to be validated by the UI
-                Client.updateMailbox($scope.domain.domain, $scope.mailboxes.edit.name, $scope.mailboxes.edit.owner.id, $scope.mailboxes.edit.owner.type, $scope.mailboxes.edit.active, function (error) {
+                Client.updateMailbox($scope.domain.domain, $scope.mailboxes.edit.name, data, function (error) {
                     if (error) {
                         $scope.mailboxes.edit.error = error;
                         $scope.mailboxes.edit.busy = false;