diff --git a/src/views/email.html b/src/views/email.html
index e15eb5645..4a06c7ee6 100644
--- a/src/views/email.html
+++ b/src/views/email.html
@@ -151,7 +151,7 @@
   <div class="modal-dialog">
     <div class="modal-content">
       <div class="modal-header">
-        <h4 class="modal-title">Edit Mailing list {{ mailinglists.edit.list.name }}@{{selectedDomain.domain}}</h4>
+        <h4 class="modal-title">Edit Mailing list {{ mailinglists.edit.name }}@{{selectedDomain.domain}}</h4>
       </div>
       <div class="modal-body">
         <form name="mailinglistedit_form" role="form" ng-submit="mailinglists.edit.submit()" autocomplete="off">
@@ -161,7 +161,7 @@
             <div class="control-label" ng-show="mailinglists.edit.error">
               <small>{{ mailinglists.edit.error.message }}</small>
             </div>
-            <multiselect ng-model="mailinglists.edit.list.members" options="mailbox.name for mailbox in mailboxes.mailboxes" data-compare-by="name" data-multiple="true" autofocus></multiselect>
+            <multiselect ng-model="mailinglists.edit.members" options="mailbox.name for mailbox in mailboxes.mailboxes" data-compare-by="name" data-multiple="true" autofocus></multiselect>
           </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 2d7edf980..67b701ecd 100644
--- a/src/views/email.js
+++ b/src/views/email.js
@@ -105,10 +105,12 @@ angular.module('Application').controller('EmailController', ['$scope', '$locatio
         edit: {
             busy: false,
             error: null,
-            list: null,
+            name: '',
+            members: [],
 
             show: function (list) {
-                $scope.mailinglists.edit.list = 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; })});
 
                 $('#mailinglistEditModal').modal('show');
             },
@@ -116,7 +118,9 @@ angular.module('Application').controller('EmailController', ['$scope', '$locatio
             submit: function () {
                 $scope.mailinglists.edit.busy = true;
 
-                Client.updateMailingList($scope.selectedDomain.domain, $scope.mailinglists.edit.list.name, $scope.mailinglists.edit.list.members, function (error) {
+                var members = $scope.mailinglists.edit.members.map(function (m) { return m.name; });
+
+                Client.updateMailingList($scope.selectedDomain.domain, $scope.mailinglists.edit.name, members, function (error) {
                     $scope.mailinglists.edit.busy = false;
 
                     if (error) return console.error(error);