diff --git a/src/views/email.html b/src/views/email.html
index 9e0f3f5df..0a401d1bb 100644
--- a/src/views/email.html
+++ b/src/views/email.html
@@ -122,7 +122,7 @@
             <label class="control-label">{{ 'email.editMailboxDialog.aliases' | tr }}</label>
             <div class="has-error" ng-show="mailboxes.edit.error">{{ mailboxes.edit.error.message }}</div>
 
-            <div class="row" ng-repeat="alias in mailboxes.edit.aliases">
+            <div class="row" ng-repeat="alias in mailboxes.edit.aliases | orderBy:'reversedSortingNotation'">
               <div class="col col-lg-11">
                 <div class="input-group">
                   <input type="text" class="form-control input-sm" ng-model="alias.name">
diff --git a/src/views/email.js b/src/views/email.js
index 4c21836c2..099e0fac0 100644
--- a/src/views/email.js
+++ b/src/views/email.js
@@ -415,7 +415,8 @@ angular.module('Application').controller('EmailController', ['$scope', '$locatio
 
                 $scope.mailboxes.edit.aliases.push({
                     name: '',
-                    domain: domainName
+                    domain: domainName,
+                    reversedSortingNotation: 'z'.repeat(100) // quick and dirty to ensure newly added are on bottom
                 });
             },
 
@@ -427,7 +428,7 @@ angular.module('Application').controller('EmailController', ['$scope', '$locatio
             show: function (mailbox) {
                 $scope.mailboxes.edit.name = mailbox.name;
                 $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.aliases = angular.copy(mailbox.aliases, []).map(function (a) { a.reversedSortingNotation = a.domain + '@' + a.name; return a; });
                 $scope.mailboxes.edit.active = mailbox.active;
                 $scope.mailboxes.edit.enablePop3 = mailbox.enablePop3;