diff --git a/src/views/email.html b/src/views/email.html
index a20da3561..d06b8b705 100644
--- a/src/views/email.html
+++ b/src/views/email.html
@@ -307,18 +307,20 @@
           <br/>
         </div>
 
+        <br/>
+
         <div class="text-left">
           <h3 style="margin-bottom: 15px;">Mailboxes
-            <button class="btn btn-primary btn-outline pull-right" ng-click="mailboxes.add.show()"  ng-disabled="!selectedDomain.mailConfig.enabled"
-                    tooltip-enable="!selectedDomain.mailConfig.enabled" uib-tooltip="Email is disabled for this domain">
-              <i class="fa fa-inbox"></i> New Mailbox
-            </button>
+
+            <button class="btn btn-primary btn-outline pull-right" ng-click="mailboxes.add.show()"  ng-disabled="!selectedDomain.mailConfig.enabled" tooltip-enable="!selectedDomain.mailConfig.enabled" uib-tooltip="Email is disabled for this domain"><i class="fa fa-inbox"></i> New Mailbox</button>
+            <input class="form-control pull-right" style="width: 200px;" placeholder="Search" type="text" ng-model="mailboxes.search"/>
           </h3>
         </div>
 
         <div class="card card-large" style="margin-bottom: 15px;">
           <div class="row">
             <div class="col-md-12">
+
               <table class="table table-hover">
                 <thead>
                   <tr>
@@ -329,7 +331,7 @@
                   </tr>
                 </thead>
                 <tbody>
-                  <tr ng-repeat="mailbox in mailboxes.mailboxes">
+                  <tr ng-repeat="mailbox in mailboxes.mailboxes | filter:mailboxes.search">
                     <td class="hand" ng-click="mailboxes.edit.show(mailbox)">
                       {{ mailbox.name }}
                     </td>
@@ -350,12 +352,12 @@
           </div>
         </div>
 
+        <br/>
+
         <div class="text-left">
           <h3 style="margin-bottom: 15px;">Mailing Lists
-            <button class="btn btn-primary btn-outline pull-right" ng-click="mailinglists.add.show()" ng-disabled="!selectedDomain.mailConfig.enabled"
-                    tooltip-enable="!selectedDomain.mailConfig.enabled" uib-tooltip="Email is disabled for this domain">
-              <i class="fa fa-list"></i> New Mailing list
-            </button>
+            <button class="btn btn-primary btn-outline pull-right" ng-click="mailinglists.add.show()" ng-disabled="!selectedDomain.mailConfig.enabled" tooltip-enable="!selectedDomain.mailConfig.enabled" uib-tooltip="Email is disabled for this domain"><i class="fa fa-list"></i> New Mailing list</button>
+            <input class="form-control pull-right" style="width: 200px;" placeholder="Search" type="text" ng-model="mailinglists.search"/>
           </h3>
         </div>
 
@@ -376,7 +378,7 @@
                   </tr>
                 </thead>
                 <tbody>
-                  <tr ng-repeat="list in mailinglists.mailinglists">
+                  <tr ng-repeat="list in mailinglists.mailinglists | filter:mailinglists.search">
                     <td class="hand" ng-click="mailinglists.edit.show(list)">
                       {{ list.name }}
                     </td>
@@ -394,6 +396,8 @@
           </div>
         </div>
 
+        <br/>
+
         <div class="text-left">
           <h3>Catch-all</h3>
         </div>
diff --git a/src/views/email.js b/src/views/email.js
index 6ac52ae28..b3ce520af 100644
--- a/src/views/email.js
+++ b/src/views/email.js
@@ -67,6 +67,7 @@ angular.module('Application').controller('EmailController', ['$scope', '$locatio
     $scope.mailinglists = {
         busy: false,
         mailinglists: [],
+        search: '',
 
         add: {
             busy: false,
@@ -261,6 +262,7 @@ angular.module('Application').controller('EmailController', ['$scope', '$locatio
 
     $scope.mailboxes = {
         mailboxes: [],
+        search: '',
 
         add: {
             error: null,