diff --git a/src/theme.scss b/src/theme.scss
index 6fd8a1072..27a8343b8 100644
--- a/src/theme.scss
+++ b/src/theme.scss
@@ -509,6 +509,19 @@ multiselect {
     padding: 0 !important;
 }
 
+.aliases .col-lg-11 {
+    padding-right: 5px;
+}
+
+.aliases .col-lg-1 {
+    padding-left: 0px;
+    padding-right: 0px;
+}
+
+.aliases .row {
+    margin-top: 5px;
+}
+
 // ----------------------------
 // App view
 // ----------------------------
diff --git a/src/views/app.html b/src/views/app.html
index 743486741..0424c2bc8 100644
--- a/src/views/app.html
+++ b/src/views/app.html
@@ -590,6 +590,7 @@
                     <a href="" ng-click="location.addAlternateDomain($event)">Add another domain</a>
                   </div>
                 </div>
+
               </fieldset>
             </form>
           </div>
diff --git a/src/views/email.html b/src/views/email.html
index bc6294ea3..32d39589a 100644
--- a/src/views/email.html
+++ b/src/views/email.html
@@ -112,16 +112,41 @@
             <label class="control-label">Mailbox Owner</label>
             <select class="form-control" ng-model="mailboxes.edit.owner" ng-options="u.display for u in users track by u.id" autofocus></select>
           </div>
-          <div class="form-group" ng-class="{ 'has-error': mailboxes.edit.error }">
+
+          <div class="form-group aliases">
             <label class="control-label">Aliases</label>
-            <div class="control-label" ng-show="mailboxes.edit.error">
-              <small>{{ mailboxes.edit.error.message }}</small>
+            <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="col col-lg-11">
+                <div class="input-group">
+                  <input type="text" class="form-control" ng-model="alias.name">
+
+                  <div class="input-group-btn">
+                    <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
+                      <span>{{ alias.domain }}</span>
+                      <span class="caret"></span>
+                    </button>
+                    <ul class="dropdown-menu dropdown-menu-right" role="menu">
+                      <li ng-repeat="domain in incomingDomains">
+                        <a href="" ng-click="alias.domain = domain.domain">{{ alias.domain }}</a>
+                      </li>
+                    </ul>
+                  </div>
+                </div>
+              </div>
+              <div class="col col-lg-1">
+                <button class="btn btn-danger btn-sm" ng-click="mailboxes.edit.delAlias($event, $index)"><i class="far fa-trash-alt"></i></button>
+              </div>
             </div>
-            <div class="input-group form-inline" style="margin-top: 10px;">
-              <tag-input class="form-group form-control" placeholder="Add alias" taglist="mailboxes.edit.aliases" name="aliases"></tag-input>
-              <div class="input-group-addon">@{{ domain.domain }}</div>
+            <div ng-show="mailboxes.edit.aliases.length === 0">
+                No aliases are configured. <a href="" ng-click="mailboxes.edit.addAlias($event)">Add an alias</a>
+            </div>
+            <div ng-show="mailboxes.edit.aliases.length > 0" style="margin-top: 5px;">
+              <a href="" ng-click="mailboxes.edit.addAlias($event)">Add another alias</a>
             </div>
           </div>
+
           <input class="hide" type="submit" ng-disabled="mailboxedit_form.$invalid || mailboxes.edit.busy || !mailboxes.edit.owner"/>
         </form>
       </div>
@@ -328,10 +353,9 @@
                       {{ mailbox.ownerDisplayName }}
                     </td>
                     <td class="hand" ng-click="mailboxes.edit.show(mailbox)">
-                      <!-- aliases is spaces separated, so it will wrap as needed -->
-                      {{ mailbox.aliases }}
+                      <span ng-repeat="alias in mailbox.aliases"> {{ alias.name + '@' + alias.domain }}</span>
                     </td>
-                    <td class="hand" ng-click="mailboxes.edit.show(mailbox)">
+                    <td class="hand no-wrap" ng-click="mailboxes.edit.show(mailbox)">
                       {{ mailbox.usage | prettyMailSize }}
                     </td>
                     <td class="text-right no-wrap">
diff --git a/src/views/email.js b/src/views/email.js
index c7737b8d2..cae90b107 100644
--- a/src/views/email.js
+++ b/src/views/email.js
@@ -2,6 +2,7 @@
 
 /* global angular:false */
 /* global $:false */
+/* global asyncForEach */
 
 angular.module('Application').controller('EmailController', ['$scope', '$location', '$timeout', '$routeParams', 'Client', function ($scope, $location, $timeout, $routeParams, Client) {
     Client.onReady(function () { if (!Client.getUserInfo().isAtLeastAdmin) $location.path('/'); });
@@ -16,6 +17,7 @@ angular.module('Application').controller('EmailController', ['$scope', '$locatio
     $scope.config = Client.getConfig();
     $scope.apps = Client.getInstalledApps();
     $scope.users = [];
+    $scope.incomingDomains = [];
     $scope.domain = null;
     $scope.adminDomain = null;
 
@@ -315,7 +317,22 @@ angular.module('Application').controller('EmailController', ['$scope', '$locatio
             error: null,
             name: '',
             owner: null,
-            aliases: '',
+            incomingDomains: [],
+            aliases: [],
+
+            addAlias: function (event) {
+                event.preventDefault();
+
+                $scope.mailboxes.edit.aliases.push({
+                    name: '',
+                    domain: domainName
+                });
+            },
+
+            delAlias: function (event, index) {
+                event.preventDefault();
+                $scope.mailboxes.edit.aliases.splice(index, 1);
+            },
 
             show: function (mailbox) {
                 $scope.mailboxes.edit.name = mailbox.name;
@@ -336,9 +353,7 @@ angular.module('Application').controller('EmailController', ['$scope', '$locatio
                         return;
                     }
 
-                    var aliases = $scope.mailboxes.edit.aliases.split(' ').map(function (a) { return a.trim(); }).filter(function (a) { return !!a; });
-
-                    Client.setAliases($scope.domain.domain, $scope.mailboxes.edit.name, aliases, function (error) {
+                    Client.setAliases($scope.domain.domain, $scope.mailboxes.edit.name, $scope.mailboxes.edit.aliases, function (error) {
                         if (error) {
                             $scope.mailboxes.edit.error = error;
                             $scope.mailboxes.edit.busy = false;
@@ -349,7 +364,7 @@ angular.module('Application').controller('EmailController', ['$scope', '$locatio
                         $scope.mailboxes.edit.error = null;
                         $scope.mailboxes.edit.name = '';
                         $scope.mailboxes.edit.owner = null;
-                        $scope.mailboxes.edit.aliases = '';
+                        $scope.mailboxes.edit.aliases = [];
                         $scope.mailboxes.refresh();
 
                         $('#mailboxEditModal').modal('hide');
@@ -397,7 +412,7 @@ angular.module('Application').controller('EmailController', ['$scope', '$locatio
                     if (error) return callback(error);
 
                     $scope.mailboxes.mailboxes = mailboxes.map(function (m) {
-                        m.aliases = aliases.filter(function (a) { return a.aliasTarget === m.name; }).map(function (a) { return a.name; }).join(' ');
+                        m.aliases = aliases.filter(function (a) { return a.aliasName === m.name && a.aliasDomain === m.domain; }).map(function (a) { return { name: a.name, domain: a.domain }; });
                         m.owner = $scope.users.find(function (u) { return u.id === m.ownerId; }); // owner may not exist
                         m.ownerDisplayName = m.owner ? m.owner.display : ''; // this meta property is set when we get the user list
 
@@ -671,17 +686,22 @@ angular.module('Application').controller('EmailController', ['$scope', '$locatio
 
             $scope.users = users;
 
-            Client.getDomain(domainName, function (error, result) {
+            Client.getDomains(function (error, result) {
                 if (error) return console.error('Unable to get view domain.', error);
 
-                $scope.domain = result;
+                $scope.domain = result.filter(function (d) { return d.domain === domainName; })[0];
+                $scope.adminDomain = result.filter(function (d) { return d.domain === $scope.config.adminDomain; })[0];
+                $scope.refreshDomain();
 
-                Client.getDomain($scope.config.adminDomain, function (error, result) {
-                    if (error) return console.error('Unable to get admin domain.', error);
+                asyncForEach(result, function (domain, iteratorDone) {
+                    Client.getMailConfigForDomain(domain.domain, function (error, mailConfig) {
+                        if (error) return console.error('Failed to fetch mail config for domain', domain.domain, error);
 
-                    $scope.adminDomain = result;
-
-                    $scope.refreshDomain();
+                        if (mailConfig.enabled) $scope.incomingDomains.push(domain);
+                        iteratorDone();
+                    });
+                }, function iteratorDone(error) {
+                    if (error) return console.error(error);
 
                     $scope.ready = true;
                 });