diff --git a/src/js/client.js b/src/js/client.js
index 34e6790f9..cbb1a37b6 100644
--- a/src/js/client.js
+++ b/src/js/client.js
@@ -1508,9 +1508,6 @@ angular.module('Application').service('Client', ['$http', '$interval', 'md5', 'N
         get('/api/v1/mail/' + domain + '/mailboxes').success(function(data, status) {
             if (status !== 200) return callback(new ClientError(status, data));
 
-            // filter out app mailboxes
-            data.mailboxes = data.mailboxes.filter(function (m) { return m.ownerType !== 'app'; });
-
             callback(null, data.mailboxes);
         }).error(defaultErrorHandler(callback));
     };
diff --git a/src/views/email.html b/src/views/email.html
index 3ab920abd..ab7807c72 100644
--- a/src/views/email.html
+++ b/src/views/email.html
@@ -325,7 +325,7 @@
                       {{ mailbox.name }}
                     </td>
                     <td class="hand" ng-click="mailboxes.edit.show(mailbox)">
-                      {{ mailbox.owner.display }}
+                      {{ mailbox.ownerDisplayName }}
                     </td>
                     <td class="hand" ng-click="mailboxes.edit.show(mailbox)">
                       {{ mailbox.aliases }}
diff --git a/src/views/email.js b/src/views/email.js
index eae490c5a..120d2f7d5 100644
--- a/src/views/email.js
+++ b/src/views/email.js
@@ -8,6 +8,7 @@ angular.module('Application').controller('EmailController', ['$scope', '$locatio
     $scope.client = Client;
     $scope.user = Client.getUserInfo();
     $scope.config = Client.getConfig();
+    $scope.apps = Client.getInstalledApps();
     $scope.domains = [];
     $scope.users = [];
     $scope.selectedDomain = null;
@@ -364,6 +365,8 @@ angular.module('Application').controller('EmailController', ['$scope', '$locatio
                     $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.owner = $scope.users.find(function (u) { return u.id === m.ownerId; });
+                        m.ownerDisplayName = m.owner.display; // this meta property is set when we get the user list
+
                         return m;
                     });
 
@@ -630,6 +633,8 @@ angular.module('Application').controller('EmailController', ['$scope', '$locatio
                 return u;
             });
 
+            $scope.users = users;
+
             Client.getDomains(function (error, domains) {
                 if (error) return console.error('Unable to get domain listing.', error);