diff --git a/src/views/emails.html b/src/views/emails.html
index 9ca3bbb2e..f5ab982fc 100644
--- a/src/views/emails.html
+++ b/src/views/emails.html
@@ -32,7 +32,7 @@
   </div>
 </div>
 
-<div class="content">
+<div class="content content-large">
   <div class="text-left">
     <h1>
       Mail Server
@@ -43,7 +43,7 @@
     <h3>Domains</h3>
   </div>
 
-  <div class="card" style="margin-bottom: 15px;">
+  <div class="card card-large" style="margin-bottom: 15px;">
     <div class="row ng-hide" ng-hide="ready">
       <div class="col-lg-12 text-center">
         <h2><i class="fa fa-circle-notch fa-spin"></i></h2>
@@ -88,13 +88,11 @@
       <button class="btn btn-sm btn-default btn-outline pull-right" ng-click="activity.showPrevPage()" ng-disabled="activity.busy || activity.currentPage <= 1"><i class="fa fa-angle-double-left"></i> prev</button>
       <button class="btn btn-sm btn-primary btn-outline pull-right" ng-click="activity.refresh()" ng-disabled="activity.busy"><i class="fa fa-sync"></i></button>
 
-      <!--
-      <input class="form-control pull-right" style="width: 200px;" placeholder="Search" type="text" ng-model="activity.search"/>
-      -->
+      <input class="form-control pull-right" style="width: 200px;" placeholder="Search" type="text" ng-model="activity.search" ng-model-options="{ debounce: 1000 }" ng-change="activity.updateFilter()" />
     </h3>
   </div>
 
-  <div class="card" style="margin-bottom: 15px;">
+  <div class="card card-large" style="margin-bottom: 15px;">
     <div class="row ng-hide" ng-hide="ready">
       <div class="col-lg-12 text-center">
         <h2><i class="fa fa-circle-notch fa-spin"></i></h2>
@@ -106,11 +104,12 @@
           <thead>
             <tr>
               <th style="width:  5%"><!-- Direction --></th>
-              <th style="width: 10%">Time</th>
-              <th style="width: 15%">Txn ID</th>
+              <th style="width: 10%">Txn ID</th>
+              <th style="width: 15%">Source</th>
               <th style="width: 25%">From</th>
               <th style="width: 25%">To</th>
-              <th style="width:  5%">Event</th>
+              <th style="width: 10%">Event</th>
+              <th style="width: 10%">Time</th>
             </tr>
           </thead>
           <tbody ng-show="activity.busy">
@@ -122,8 +121,12 @@
           </tbody>
           <tbody ng-hide="activity.eventLogs.length || activity.busy">
             <tr>
-              <td colspan="5" class="text-center">
+              <td colspan="6" class="text-center">
+                <br>
+                <br>
                 Event Log is empty.
+                <br>
+                <br>
               </td>
             </tr>
           </tbody>
@@ -133,12 +136,17 @@
                 <i class="fas fa-arrow-circle-left" ng-show="eventlog.direction === 'outbound'" uib-tooltip="Outgoing"></i>
                 <i class="fas fa-arrow-circle-right" ng-show="eventlog.direction === 'inbound'" uib-tooltip="Incoming"></i>
                 <i class="fas fa-ban" ng-show="eventlog.details.spamStatus.indexOf('Yes,') === 0" uib-tooltip="Spam"></i>
+                <i class="fas fa-minus-circle" ng-show="eventlog.type === 'denied'" uib-tooltip="Denied"></i>
               </td>
-              <td class="no-wrap"><span uib-tooltip="{{ eventlog.ts | prettyLongDate }}" class="arrow">{{ eventlog.ts | prettyDate }}</span></td>
               <td class="no-wrap"><span uib-tooltip="{{ eventlog.uuid }}">{{ eventlog.uuid.slice(0, 8) }}</span></td>
+              <td class="elide-table-cell">
+                <span ng-show="eventlog.authUser">{{ eventlog.authUser }}</span>
+                <span ng-show="!eventlog.authUser">{{ eventlog.remote ? eventlog.remote.ip : '-' }}</span>
+              </td>
               <td class="elide-table-cell">{{ eventlog.mailFrom | prettyEmailAddresses }}</td>
               <td class="elide-table-cell">{{ eventlog.rcptTo | prettyEmailAddresses }}</td>
               <td class="elide-table-cell" style="text-transform: capitalize">{{ eventlog.type }}</td>
+              <td class="no-wrap"><span uib-tooltip="{{ eventlog.ts | prettyLongDate }}" class="arrow">{{ eventlog.ts | prettyDate }}</span></td>
             </tr>
             <tr ng-show="activity.activeEventLog === eventlog">
               <td colspan="6">
diff --git a/src/views/emails.js b/src/views/emails.js
index 17e2aec66..b01f94819 100644
--- a/src/views/emails.js
+++ b/src/views/emails.js
@@ -45,6 +45,11 @@ angular.module('Application').controller('EmailsController', ['$scope', '$locati
         showEventLogDetails: function (eventLog) {
             if ($scope.activity.activeEventLog === eventLog) $scope.activity.activeEventLog = null;
             else $scope.activity.activeEventLog = eventLog;
+        },
+
+        updateFilter: function () {
+            $scope.activity.currentPage = 1;
+            $scope.activity.refresh();
         }
     };