diff --git a/src/views/emails.html b/src/views/emails.html
index a981978d9..ef724defa 100644
--- a/src/views/emails.html
+++ b/src/views/emails.html
@@ -114,10 +114,8 @@
           <thead>
             <tr>
               <th style="width:  5%"><!-- Direction --></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: 20%">Source</th>
+              <th style="width: 55%">Correspondents</th>
               <th style="width: 10%">Event</th>
               <th style="width: 10%">Time</th>
             </tr>
@@ -131,7 +129,7 @@
           </tbody>
           <tbody ng-hide="activity.eventLogs.length || activity.busy">
             <tr>
-              <td colspan="6" class="text-center">
+              <td colspan="5" class="text-center">
                 <br>
                 <br>
                 Event Log is empty.
@@ -148,19 +146,19 @@
                 <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.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">
+                <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>
+              </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">
-                <pre class="eventlog-details">{{ eventlog.details | json }}</pre>
+                <pre class="eventlog-details">{{ eventlog | json }}</pre>
               </td>
             </tr>
           </tbody>