diff --git a/src/js/client.js b/src/js/client.js
index cb89a4593..df30afa2a 100644
--- a/src/js/client.js
+++ b/src/js/client.js
@@ -2002,10 +2002,11 @@ angular.module('Application').service('Client', ['$http', '$interval', '$timeout
     };
 
     // Email
-    Client.prototype.getMailEventLogs = function (search, page, perPage, callback) {
+    Client.prototype.getMailEventLogs = function (search, types, page, perPage, callback) {
         var config = {
             params: {
                 page: page,
+                types: types,
                 per_page: perPage,
                 search: search
             }
diff --git a/src/theme.scss b/src/theme.scss
index 472ee55ec..5a3546311 100644
--- a/src/theme.scss
+++ b/src/theme.scss
@@ -484,6 +484,15 @@ multiselect {
 // Mail view
 // ----------------------------
 
+.maillog-filter {
+    display: inline-block;
+
+    .form-control {
+        display: inline-block;
+        width: 200px;
+    }
+}
+
 .email-domain-list-item {
     display: block;
     text-decoration: none;
@@ -1331,7 +1340,7 @@ footer {
 // Eventlog/Activity
 // ----------------------------
 
-.filter {
+.eventlog-filter {
     display: inline-block;
     padding-left: 0;
     margin: 20px 0;
diff --git a/src/views/activity.html b/src/views/activity.html
index f4160ace2..23685bdbb 100644
--- a/src/views/activity.html
+++ b/src/views/activity.html
@@ -7,7 +7,7 @@
 
 <div>
   <div class="col-md-10 col-md-offset-1">
-    <div class="filter">
+    <div class="eventlog-filter">
       <input type="text" class="form-control" style="min-width: 350px;" ng-model="search" ng-model-options="{ debounce: 1000 }" ng-change="updateFilter()" placeholder="Search"/>
       <multiselect ng-model="selectedActions" ms-header="All Events" options="a.name for a in actions" data-multiple="true"  ng-change="updateFilter(true)" filter-after-rows="5" scroll-after-rows="10"></multiselect>
       <select class="form-control" ng-model="pageItems" ng-options="a.name for a in pageItemCount" ng-change="updateFilter(true)"></select>
diff --git a/src/views/emails.html b/src/views/emails.html
index 05f11bd33..34d15ebcc 100644
--- a/src/views/emails.html
+++ b/src/views/emails.html
@@ -92,17 +92,24 @@
   <br/>
 
   <div class="text-left">
-    <h3>Event Log
-
-      <button class="btn btn-sm btn-default btn-outline pull-right" ng-click="activity.showNextPage()" ng-disabled="activity.busy || activity.perPage > activity.eventLogs.length">next <i class="fa fa-angle-double-right"></i></button>
-      <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" ng-model-options="{ debounce: 1000 }" ng-change="activity.updateFilter()" />
-    </h3>
+    <h3>Event Log</h3>
   </div>
 
-  <div class="card card-large" style="margin-bottom: 15px;">
+  <div class="row">
+    <div class="col-md-12">
+      <div class="maillog-filter">
+        <input class="form-control" style="width: 200px;" placeholder="Search" type="text" ng-model="activity.search" ng-model-options="{ debounce: 1000 }" ng-change="activity.updateFilter()" />
+        <multiselect ng-model="activity.selectedTypes" ms-header="All Events" options="a.name for a in activityTypes" data-multiple="true"  ng-change="activity.updateFilter(true)" filter-after-rows="5" scroll-after-rows="10"></multiselect>
+        <select class="form-control" ng-model="activity.pageItems" ng-options="a.name for a in pageItemCount" ng-change="activity.updateFilter(true)"></select>
+      </div>
+      <div class="pull-right">
+        <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>
+      </div>
+    </div>
+  </div>
+
+  <div class="card card-large" style="margin-top: 10px; 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>
diff --git a/src/views/emails.js b/src/views/emails.js
index c0f6c740e..bef5a4781 100644
--- a/src/views/emails.js
+++ b/src/views/emails.js
@@ -11,18 +11,37 @@ angular.module('Application').controller('EmailsController', ['$scope', '$locati
     $scope.user = Client.getUserInfo();
     $scope.domains = [];
 
+    $scope.pageItemCount = [
+        { name: 'Show 20 per page', value: 20 },
+        { name: 'Show 50 per page', value: 50 },
+        { name: 'Show 100 per page', value: 100 }
+    ];
+
+    $scope.activityTypes = [
+        { name: 'Bounce', value: 'bounce' },
+        { name: 'Deferred', value: 'deferred' },
+        { name: 'Delivered', value: 'delivered' },
+        { name: 'Denied', value: 'denied' },
+        { name: 'Queued', value: 'queued' },
+        { name: 'Received', value: 'received' },
+    ];
+
     $scope.activity = {
         busy: true,
         eventLogs: [],
         activeEventLog: null,
         currentPage: 1,
         perPage: 20,
+        pageItems: $scope.pageItemCount[0],
+        selectedTypes: [],
         search: '',
 
         refresh: function () {
             $scope.activity.busy = true;
 
-            Client.getMailEventLogs($scope.activity.search, $scope.activity.currentPage, $scope.activity.perPage, function (error, result) {
+            var types = $scope.activity.selectedTypes.map(function (a) { return a.value; }).join(',');
+
+            Client.getMailEventLogs($scope.activity.search, types, $scope.activity.currentPage, $scope.activity.pageItems.value, function (error, result) {
                 if (error) return console.error('Failed to fetch mail eventlogs.', error);
 
                 $scope.activity.busy = false;
@@ -47,8 +66,8 @@ angular.module('Application').controller('EmailsController', ['$scope', '$locati
             else $scope.activity.activeEventLog = eventLog;
         },
 
-        updateFilter: function () {
-            $scope.activity.currentPage = 1;
+        updateFilter: function (fresh) {
+            if (fresh) $scope.activity.currentPage = 1;
             $scope.activity.refresh();
         }
     };