diff --git a/src/views/email.html b/src/views/email.html
index 3d01f5d3a..12b65b4e6 100644
--- a/src/views/email.html
+++ b/src/views/email.html
@@ -155,11 +155,9 @@
       <div class="modal-body">
         <form name="mailinglistadd_form" role="form" ng-submit="mailinglists.add.submit()" autocomplete="off">
           <input type="password" style="display: none;">
-          <div class="form-group" ng-class="{ 'has-error': mailinglists.add.error.statusCode === 409 }">
+          <div class="form-group" ng-class="{ 'has-error': mailinglists.add.error.name }">
             <label class="control-label">Name</label>
-            <div class="control-label" ng-show="mailinglists.add.error.statusCode === 409">
-                <small>A mailbox of list with this name already exists</small>
-              </div>
+            <div class="control-label" ng-show="mailinglists.add.error.name"><small>{{ mailinglists.add.error.name }}</small></div>
             <div class="input-group form-inline" style="margin-top: 10px;">
               <input type="text" class="form-control" ng-model="mailinglists.add.name" placeholder="Name" required autofocus autocomplete="off"/>
               <div class="input-group-addon">@{{ selectedDomain.domain }}</div>
@@ -167,14 +165,15 @@
           </div>
           <div class="form-group">
             <label class="control-label">List Members</label><br/>
-            <multiselect ng-model="mailinglists.add.members" options="mailbox.name for mailbox in mailboxes.mailboxes" data-compare-by="name" data-multiple="true"></multiselect>
+            <div class="has-error control-label" ng-show="mailinglists.add.error.members"><small>{{ mailinglists.add.error.members }}</small></div>
+            <textarea ng-model="mailinglists.add.membersTxt" placeholder="Separate email addresses with a newline" class="form-control" rows="10"></textarea>
           </div>
-          <input class="hide" type="submit" ng-disabled="mailinglistadd_form.$invalid || mailinglists.add.members.length === 0 || mailinglists.add.busy"/>
+          <input class="hide" type="submit" ng-disabled="mailinglistadd_form.$invalid || mailinglists.add.membersTxt.length === 0 || mailinglists.add.busy"/>
         </form>
       </div>
       <div class="modal-footer">
         <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-        <button type="button" class="btn btn-success" ng-click="mailinglists.add.submit()" ng-disabled="mailinglistadd_form.$invalid || mailinglists.add.members.length === 0 || mailinglists.add.busy"><i class="fa fa-circle-notch fa-spin" ng-show="mailinglists.add.busy"></i> Save</button>
+        <button type="button" class="btn btn-success" ng-click="mailinglists.add.submit()" ng-disabled="mailinglistadd_form.$invalid || mailinglists.add.membersTxt.length === 0 || mailinglists.add.busy"><i class="fa fa-circle-notch fa-spin" ng-show="mailinglists.add.busy"></i> Save</button>
       </div>
     </div>
   </div>
@@ -190,12 +189,10 @@
       <div class="modal-body">
         <form name="mailinglistedit_form" role="form" ng-submit="mailinglists.edit.submit()" autocomplete="off">
           <input type="password" style="display: none;">
-          <div class="form-group" ng-class="{ 'has-error': mailinglists.edit.error }">
+          <div class="form-group" ng-class="{ 'has-error': mailinglists.edit.error.members }">
             <label class="control-label">List Members</label><br/>
-            <div class="control-label" ng-show="mailinglists.edit.error">
-              <small>{{ mailinglists.edit.error.message }}</small>
-            </div>
-            <multiselect ng-model="mailinglists.edit.members" options="mailbox.name for mailbox in mailboxes.mailboxes" data-compare-by="name" data-multiple="true" autofocus></multiselect>
+            <div class="has-error control-label" ng-show="mailinglists.edit.error.members"><small>{{ mailinglists.edit.error.members }}</small></div>
+            <textarea ng-model="mailinglists.edit.membersTxt" placeholder="Separate email addresses with a newline" class="form-control" rows="10"></textarea>
           </div>
           <input class="hide" type="submit" ng-disabled="mailinglistedit_form.$invalid || mailinglists.edit.busy"/>
         </form>
diff --git a/src/views/email.js b/src/views/email.js
index ffac54d09..966b9fa3d 100644
--- a/src/views/email.js
+++ b/src/views/email.js
@@ -70,15 +70,15 @@ angular.module('Application').controller('EmailController', ['$scope', '$locatio
 
         add: {
             busy: false,
-            error: null,
+            error: {},
             name: '',
-            members: [],
+            membersTxt: '',
 
             reset: function () {
                 $scope.mailinglists.add.busy = false;
-                $scope.mailinglists.add.error = null;
+                $scope.mailinglists.add.error = {};
                 $scope.mailinglists.add.name = '';
-                $scope.mailinglists.add.members = [];
+                $scope.mailinglists.add.membersTxt = '';
             },
 
             show: function () {
@@ -89,12 +89,21 @@ angular.module('Application').controller('EmailController', ['$scope', '$locatio
             submit: function () {
                 $scope.mailinglists.add.busy = true;
 
-                var members = $scope.mailinglists.add.members.map(function (m) { return m.name; });
+                var members = $scope.mailinglists.add.membersTxt
+                    .split(/[\n,]/)
+                    .map(function (m) { return m.trim(); })
+                    .filter(function (m) { return m.length !== 0; });
 
                 Client.addMailingList($scope.selectedDomain.domain, $scope.mailinglists.add.name, members, function (error) {
+                    $scope.mailinglists.add.busy = false;
+                    $scope.mailinglists.add.error = {};
+
                     if (error) {
-                        $scope.mailinglists.add.busy = false;
-                        $scope.mailinglists.add.error = error;
+                        if (error.statusCode === 400 && error.message.indexOf('member') !== -1) {
+                            $scope.mailinglists.add.error.members = error.message;
+                        } else {
+                            $scope.mailinglists.add.error.name = error.message;
+                        }
                         return;
                     }
 
@@ -108,18 +117,13 @@ angular.module('Application').controller('EmailController', ['$scope', '$locatio
 
         edit: {
             busy: false,
-            error: null,
+            error: {},
             name: '',
-            members: [],
+            membersTxt: '',
 
             show: function (list) {
                 $scope.mailinglists.edit.name = list.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; });
+                $scope.mailinglists.edit.membersTxt = list.members.sort().join('\n');
 
                 $('#mailinglistEditModal').modal('show');
             },
@@ -127,12 +131,18 @@ angular.module('Application').controller('EmailController', ['$scope', '$locatio
             submit: function () {
                 $scope.mailinglists.edit.busy = true;
 
-                var members = $scope.mailinglists.edit.members.map(function (m) { return m.name; });
+                var members = $scope.mailinglists.edit.membersTxt.split(/[\n,]/)
+                    .map(function (m) { return m.trim(); })
+                    .filter(function (m) { return m.length !== 0; });
 
                 Client.updateMailingList($scope.selectedDomain.domain, $scope.mailinglists.edit.name, members, function (error) {
                     $scope.mailinglists.edit.busy = false;
+                    $scope.mailinglists.edit.error = {};
 
-                    if (error) return console.error(error);
+                    if (error) {
+                        $scope.mailinglists.edit.error.members = error.message;
+                        return;
+                    }
 
                     $scope.mailinglists.refresh();
 
@@ -722,7 +732,7 @@ angular.module('Application').controller('EmailController', ['$scope', '$locatio
     // setup all the dialog focus handling
     ['testEmailModal', 'mailboxAddModal', 'mailboxEditModal', 'mailinglistEditModal', 'mailinglistAddModal'].forEach(function (id) {
         $('#' + id).on('shown.bs.modal', function () {
-            $(this).find("[autofocus]:first").focus();
+            $(this).find('[autofocus]:first').focus();
         });
     });