diff --git a/src/views/email.js b/src/views/email.js
index 67b701ecd..334e228e9 100644
--- a/src/views/email.js
+++ b/src/views/email.js
@@ -110,7 +110,10 @@ angular.module('Application').controller('EmailController', ['$scope', '$locatio
 
             show: function (list) {
                 $scope.mailinglists.edit.name = list.name;
-                $scope.mailinglists.edit.members = list.members.map(function (name) { return $scope.mailboxes.mailboxes.find(function (m) { return m.name === name; })});
+                var members = list.members.map(function (name) { return $scope.mailboxes.mailboxes.find(function (m) { return m.name === name; })});
+
+                // A mailinglist may contain mailbox names, which do not exist, so remove them here
+                $scope.mailinglists.edit.members = members.filter(function (m) { return !!m; });
 
                 $('#mailinglistEditModal').modal('show');
             },