diff --git a/src/views/email.html b/src/views/email.html
index 064043d3d..68211c610 100644
--- a/src/views/email.html
+++ b/src/views/email.html
@@ -86,7 +86,9 @@
             </div>
           <div class="form-group">
             <label class="control-label">{{ 'email.addMailboxDialog.owner' | tr }}</label>
-            <select class="form-control" ng-model="mailboxes.add.owner" ng-options="o.display for o in owners track by o.id" required></select>
+            <div class="control-label">
+              <multiselect ng-model="mailboxes.add.owner" options="o.display for o in owners" data-compare-by="name" data-multiple="false" filter-after-rows="5" scroll-after-rows="10"></multiselect>
+            </div>
           </div>
           <input class="hide" type="submit" ng-disabled="mailboxadd_form.$invalid || mailboxes.add.busy"/>
         </form>
@@ -111,7 +113,9 @@
           <input type="password" style="display: none;">
           <div class="form-group">
             <label class="control-label">{{ 'email.editMailboxDialog.owner' | tr }}</label>
-            <select class="form-control" ng-model="mailboxes.edit.owner" ng-options="o.display for o in owners track by o.id" autofocus></select>
+            <div class="control-label">
+              <multiselect ng-model="mailboxes.edit.owner" options="o.display for o in owners" data-compare-by="name" data-multiple="false" filter-after-rows="5" scroll-after-rows="10"></multiselect>
+            </div>
           </div>
 
           <div class="form-group aliases">