diff --git a/src/js/client.js b/src/js/client.js
index 5d2bdf812..0323bbfc2 100644
--- a/src/js/client.js
+++ b/src/js/client.js
@@ -2212,8 +2212,17 @@ angular.module('Application').service('Client', ['$http', '$interval', '$timeout
         });
     };
 
-    Client.prototype.removeMailbox = function (domain, name, callback) {
-        del('/api/v1/mail/' + domain + '/mailboxes/' + name, null, function (error, data, status) {
+    Client.prototype.removeMailbox = function (domain, name, deleteMails, callback) {
+        var config = {
+            data: {
+                deleteMails: deleteMails
+            },
+            headers: {
+                'Content-Type': 'application/json'
+            }
+        };
+
+        del('/api/v1/mail/' + domain + '/mailboxes/' + name, config, function (error, data, status) {
             if (error) return callback(error);
             if (status !== 201) return callback(new ClientError(status, data));
 
diff --git a/src/views/email.html b/src/views/email.html
index f372e789e..4f3ef919a 100644
--- a/src/views/email.html
+++ b/src/views/email.html
@@ -183,7 +183,14 @@
         <h4 class="modal-title">Delete mailbox {{ mailboxes.remove.mailbox.name }}@{{domain.domain}}</h4>
       </div>
       <div class="modal-body">
-        <p>After deletion, emails to this mailbox will bounce. Note that the mailbox data is not removed.</p>
+        <p>After deletion, emails to this mailbox will bounce. You can choose to keep emails on the server for archival purposes.
+          <sup><a ng-href="{{ config.webServerOrigin }}/documentation/email/#archived-mails" class="help" target="_blank"><i class="fa fa-question-circle"></i></a></sup>
+        </p>
+        <p class="checkbox">
+          <label>
+            <input type="checkbox" ng-model="mailboxes.remove.deleteMails">Delete all mails inside this mailbox</input>
+          </label>
+        </p>
       </div>
       <div class="modal-footer">
         <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
diff --git a/src/views/email.js b/src/views/email.js
index 15e88e372..3a24601d7 100644
--- a/src/views/email.js
+++ b/src/views/email.js
@@ -415,6 +415,7 @@ angular.module('Application').controller('EmailController', ['$scope', '$locatio
         remove: {
             busy: false,
             mailbox: null,
+            deleteMails: true,
 
             show: function (mailbox) {
                 $scope.mailboxes.remove.mailbox = mailbox;
@@ -425,7 +426,7 @@ angular.module('Application').controller('EmailController', ['$scope', '$locatio
             submit: function () {
                 $scope.mailboxes.remove.busy = true;
 
-                Client.removeMailbox($scope.domain.domain, $scope.mailboxes.remove.mailbox.name, function (error) {
+                Client.removeMailbox($scope.domain.domain, $scope.mailboxes.remove.mailbox.name, $scope.mailboxes.remove.deleteMails, function (error) {
                     $scope.mailboxes.remove.busy = false;
                     if (error) return console.error(error);