diff --git a/src/views/emails.html b/src/views/emails.html
index 603311e63..c67bc31bf 100644
--- a/src/views/emails.html
+++ b/src/views/emails.html
@@ -111,6 +111,13 @@
               </td>
             </tr>
           </tbody>
+          <tbody ng-hide="activity.eventLogs.length">
+            <tr>
+              <td colspan="5" class="text-center">
+                Event Log is empty.
+              </td>
+            </tr>
+          </tbody>
           <tbody ng-repeat="eventlog in activity.eventLogs" ng-hide="activity.busy">
             <tr ng-click="activity.showEventLogDetails(eventlog)" class="hand">
               <td class="no-wrap">
@@ -134,6 +141,9 @@
 
         <br/>
 
+        <button class="btn btn-default btn-outline" 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-default btn-outline" ng-click="activity.showNextPage()" ng-disabled="activity.busy || activity.perPage > activity.eventLogs.length">next <i class="fa fa-angle-double-right"></i></button>
+
         <a class="btn btn-primary pull-right" href="/logs.html?id=mail" target="_blank">Show Raw Logs</a>
       </div>
     </div>
diff --git a/src/views/emails.js b/src/views/emails.js
index dea00e66b..f0b41328f 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: 1000,
+        perPage: 100,
 
         fetchEventLogs: function () {
             $scope.activity.busy = true;