diff --git a/src/views/emails.html b/src/views/emails.html
index ef724defa..bd9dc9c61 100644
--- a/src/views/emails.html
+++ b/src/views/emails.html
@@ -113,23 +113,22 @@
         <table class="table table-hover" style="margin: 0;">
           <thead>
             <tr>
-              <th style="width:  5%"><!-- Direction --></th>
-              <th style="width: 20%">Source</th>
-              <th style="width: 55%">Correspondents</th>
-              <th style="width: 10%">Event</th>
+              <th style="width:  5%"><!-- Icon --></th>
               <th style="width: 10%">Time</th>
+              <th style="width: 20%">Source</th>
+              <th style="width: 65%">Details</th>
             </tr>
           </thead>
           <tbody ng-show="activity.busy">
             <tr>
-              <td colspan="5" class="text-center">
+              <td colspan="4" class="text-center">
                 <i class="fa fa-circle-notch fa-spin"></i>
               </td>
             </tr>
           </tbody>
           <tbody ng-hide="activity.eventLogs.length || activity.busy">
             <tr>
-              <td colspan="5" class="text-center">
+              <td colspan="4" class="text-center">
                 <br>
                 <br>
                 Event Log is empty.
@@ -141,20 +140,29 @@
           <tbody ng-repeat="eventlog in activity.eventLogs" ng-hide="activity.busy">
             <tr ng-click="activity.showEventLogDetails(eventlog)" class="hand">
               <td class="no-wrap">
-                <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-arrow-circle-left" ng-show="eventlog.type === 'delivered'" uib-tooltip="Outgoing"></i>
+                <i class="fas fa-history" ng-show="eventlog.type === 'deferred'" uib-tooltip="Deferred"></i>
+                <i class="fas fa-arrow-circle-right" ng-show="eventlog.type === 'received'" uib-tooltip="Incoming"></i>
+                <i class="fas fa-align-justify" ng-show="eventlog.type === 'queued'" uib-tooltip="Queued"></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>
+                <i class="fas fa-hand-paper" ng-show="eventlog.type === 'bounce'" uib-tooltip="Bounce"></i>
+                <i class="fas fa-filter" ng-show="eventlog.type === 'spam-selectdb'" uib-tooltip="Spam database selected"></i>
+                <i class="fas fa-filter" ng-show="eventlog.type === 'spam-default-db'" uib-tooltip="Spam filter seeded"></i>
+                <i class="fas fa-filter" ng-show="eventlog.type === 'spam-learn'" uib-tooltip="Spam filter trained"></i>
               </td>
+              <td class="no-wrap"><span uib-tooltip="{{ eventlog.ts | prettyLongDate }}" class="arrow">{{ eventlog.ts | prettyDate }}</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">
-                <span ng-show="eventlog.type === 'delivered' || eventlog.type === 'queued' || eventlog.type === 'received' || eventlog.type === 'bounce'">{{ eventlog.mailFrom | prettyEmailAddresses }} <i class="fas fa-long-arrow-alt-right"></i> {{ eventlog.rcptTo | prettyEmailAddresses }}</span>
+                <span ng-show="eventlog.type === 'delivered' || eventlog.type === 'queued' || eventlog.type === 'received' || eventlog.type === 'bounce' || eventlog.type === 'deferred'">{{ eventlog.mailFrom | prettyEmailAddresses }} <i class="fas fa-long-arrow-alt-right"></i> {{ eventlog.rcptTo | prettyEmailAddresses }}</span>
+                <span ng-show="eventlog.type === 'denied'">Incoming connection denied</span>
+                <span ng-show="eventlog.type === 'spam-default-db'">Spam filter seeded</span>
+                <span ng-show="eventlog.type === 'spam-selectdb' && eventlog.users.length">Spam filter configured to use personal database for {{ eventlog.users.join(',') }}</span>
+                <span ng-show="eventlog.type === 'spam-learn'">Spam filter trained using mailbox content</span>
               </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 c0f6c740e..62325ec34 100644
--- a/src/views/emails.js
+++ b/src/views/emails.js
@@ -16,7 +16,7 @@ angular.module('Application').controller('EmailsController', ['$scope', '$locati
         eventLogs: [],
         activeEventLog: null,
         currentPage: 1,
-        perPage: 20,
+        perPage: 2000,
         search: '',
 
         refresh: function () {