diff --git a/src/js/client.js b/src/js/client.js
index 8fb9cb667..d63ef52d8 100644
--- a/src/js/client.js
+++ b/src/js/client.js
@@ -2717,6 +2717,38 @@ angular.module('Application').service('Client', ['$http', '$interval', '$timeout
         });
     };
 
+    Client.prototype.listMailQueue = function (search, page, perPage, callback) {
+        var config = {
+            params: {
+                search: search,
+                page: page,
+                per_page: perPage
+            }
+        };
+
+        get('/api/v1/mailserver/tempfail_queue', config, function (error, data, status) {
+            if (error) return callback(error);
+            if (status !== 200) return callback(new ClientError(status, data));
+            callback(null, data.usage);
+        });
+    };
+
+    Client.prototype.delMailQueueItem = function (file, callback) {
+        del('/api/v1/mailserver/tempfail_queue/' + file, {}, config, function (error, data, status) {
+            if (error) return callback(error);
+            if (status !== 200) return callback(new ClientError(status, data));
+            callback(null, data.usage);
+        });
+    };
+
+    Client.prototype.resendMailQueueItem = function (file, callback) {
+        post('/api/v1/mailserver/tempfail_queue/' + file + '/resend', {}, config, function (error, data, status) {
+            if (error) return callback(error);
+            if (status !== 201) return callback(new ClientError(status, data));
+            callback(null, data.usage);
+        });
+    };
+
     Client.prototype.getMailConfigForDomain = function (domain, callback) {
         get('/api/v1/mail/' + domain, null, function (error, data, status) {
             if (error) return callback(error);
diff --git a/src/js/index.js b/src/js/index.js
index 6825f7fd7..c9c45276b 100644
--- a/src/js/index.js
+++ b/src/js/index.js
@@ -83,6 +83,9 @@ app.config(['$routeProvider', function ($routeProvider) {
     }).when('/emails-eventlog', {
         controller: 'EmailsEventlogController',
         templateUrl: 'views/emails-eventlog.html?<%= revision %>'
+    }).when('/emails-queue', {
+        controller: 'EmailsQueueController',
+        templateUrl: 'views/emails-queue.html?<%= revision %>'
     }).when('/email/:domain/:view?', {
         controller: 'EmailController',
         templateUrl: 'views/email.html?<%= revision %>'
diff --git a/src/views/emails-eventlog.html b/src/views/emails-eventlog.html
index 752848d63..af3f777d8 100644
--- a/src/views/emails-eventlog.html
+++ b/src/views/emails-eventlog.html
@@ -8,6 +8,7 @@
       {{ 'emails.eventlog.title' | tr }}
 
       <a class="btn btn-default btn-outline pull-right" href="/logs.html?id=mail" target="_blank">{{ 'main.action.logs' | tr }}</a>
+      <a class="btn btn-default btn-outline pull-right" href="#/emails-queue.html">{{ 'emails.action.queue' | tr }}</a>
     </h1>
   </div>
 </div>
diff --git a/src/views/emails-queue.html b/src/views/emails-queue.html
new file mode 100644
index 000000000..b5156906f
--- /dev/null
+++ b/src/views/emails-queue.html
@@ -0,0 +1,98 @@
+<div>
+  <a href="/#/email" class="back-to-view-link"><i class="fas fa-arrow-left"></i> {{ 'email.backAction' | tr }}</a>
+
+  <br/>
+
+  <div class="col-md-10 col-md-offset-1">
+    <h1>
+      {{ 'emails.queue.title' | tr }}
+
+      <a class="btn btn-default btn-outline pull-right" href="/logs.html?id=mail" target="_blank">{{ 'main.action.logs' | tr }}</a>
+    </h1>
+  </div>
+</div>
+
+<div>
+  <div class="col-md-10 col-md-offset-1">
+    <div class="maillog-filter">
+      <input class="form-control" style="width: 200px;" placeholder="{{ 'main.searchPlaceholder' | tr }}" type="text" ng-model="queue.search" ng-model-options="{ debounce: 1000 }" ng-change="queue.updateFilter(true)" />
+      <select class="form-control" ng-model="queue.pageItems" ng-options="a.name for a in pageItemCount" ng-change="queue.updateFilter(true)"></select>
+    </div>
+    <div class="pagination pull-right">
+      <button class="btn btn-default btn-outline" ng-click="queue.refresh()"><i class="fas fa-sync-alt" ng-class="{ 'fa-spin': busyRefresh }"></i></button>
+      <button class="btn btn-default btn-outline" ng-click="queue.showPrevPage()" ng-disabled="queue.busy || queue.currentPage <= 1"><i class="fa fa-angle-double-left"></i> {{ 'main.pagination.prev' | tr }}</button>
+      <button class="btn btn-default btn-outline" ng-click="queue.showNextPage()" ng-disabled="queue.busy || queue.perPage > queue.items.length">{{ 'main.pagination.next' | tr }} <i class="fa fa-angle-double-right"></i></button>
+    </div>
+  </div>
+</div>
+
+<div>
+  <div class="col-md-10 col-md-offset-1">
+    <div class="card card-block" style="max-width: 100%">
+      <div>
+        <center ng-show="queue.busy"><h2><i class="fa fa-circle-notch fa-spin"></i></h2></center>
+        <table ng-hide="queue.busy" class="table table-hover" style="margin: 0; table-layout:fixed">
+          <thead>
+            <tr>
+              <th style="width:  5%"><!-- Icon --></th>
+              <th style="width: 15%">{{ 'emails.eventlog.time' | tr }}</th>
+              <th style="width: 25%">{{ 'emails.eventlog.mailFrom' | tr }}</th>
+              <th style="width: 25%">{{ 'emails.eventlog.rcptTo' | tr }}</th>
+              <th style="width: 30%">{{ 'emails.eventlog.details' | tr }}</th>
+            </tr>
+          </thead>
+          <tbody ng-hide="queue.items.length">
+            <tr>
+              <td colspan="4" class="text-center">
+                <br>
+                <br>
+                {{ 'emails.eventlog.empty' | tr }}
+                <br>
+                <br>
+              </td>
+            </tr>
+          </tbody>
+          <tbody ng-show="queue.items.length" ng-repeat="eventlog in queue.items">
+            <tr ng-click="queue.showItemDetails(eventlog)" class="hand">
+              <td class="no-wrap">
+                <i class="fas fa-arrow-circle-left" ng-show="eventlog.type === 'delivered'" uib-tooltip="{{ 'emails.eventlog.type.outgoing' | tr }}"></i>
+                <i class="fas fa-history" ng-show="eventlog.type === 'deferred'" uib-tooltip="{{ 'emails.eventlog.type.deferred' | tr }}"></i>
+                <i class="fas fa-arrow-circle-right" ng-show="eventlog.type === 'received'" uib-tooltip="{{ 'emails.eventlog.type.incoming' | tr }}"></i>
+                <i class="fas fa-align-justify" ng-show="eventlog.type === 'queued' && eventlog.spamStatus.indexOf('Yes,') !== 0" uib-tooltip="{{ 'emails.eventlog.type.queued' | tr }}"></i>
+                <i class="fas fa-trash" ng-show="eventlog.type === 'queued' && eventlog.spamStatus.indexOf('Yes,') === 0" uib-tooltip="{{ 'emails.eventlog.type.queued' | tr }}"></i>
+                <i class="fas fa-minus-circle" ng-show="eventlog.type === 'denied'" uib-tooltip="{{ 'emails.eventlog.type.denied' | tr }}"></i>
+                <i class="fas fa-hand-paper" ng-show="eventlog.type === 'bounce'" uib-tooltip="{{ 'emails.eventlog.type.bounce' | tr }}"></i>
+                <i class="fas fa-filter" ng-show="eventlog.type === 'spam-learn'" uib-tooltip="{{ 'emails.eventlog.type.spamFilterTrained' | tr }}"></i>
+                <i class="fas fa-fill-drip" ng-show="eventlog.type === 'quota'" uib-tooltip="{{ 'emails.eventlog.type.quota' | tr }}"></i>
+              </td>
+              <td class="no-wrap"><span uib-tooltip="{{ eventlog.ts | prettyLongDate }}" class="arrow">{{ eventlog.ts | prettyDate }}</span></td>
+              <td class="elide-table-cell">{{ (eventlog.mailFrom | prettyEmailAddresses) || '-' }}</td>
+              <td class="elide-table-cell">{{ (eventlog.rcptTo | prettyEmailAddresses) || eventlog.mailbox || '-' }}</td>
+              <td>
+                <span ng-show="eventlog.type === 'bounce'">{{ 'emails.eventlog.type.bounceInfo' | tr }}. {{ eventlog.message || eventlog.reason }}</span>
+                <span ng-show="eventlog.type === 'deferred'">{{ 'emails.eventlog.type.deferredInfo' | tr: { delay:eventlog.delay } }}. {{ eventlog.message || eventlog.reason }} </span>
+                <span ng-show="eventlog.type === 'queued'">
+                  <span ng-show="eventlog.direction === 'inbound'">{{ 'emails.eventlog.type.inboundInfo' | tr }}</span>
+                  <span ng-show="eventlog.direction === 'outbound'">{{ 'emails.eventlog.type.outboundInfo' | tr }}</span>
+                </span>
+                <span ng-show="eventlog.type === 'received'">{{ 'emails.eventlog.type.receivedInfo' | tr }}</span>
+                <span ng-show="eventlog.type === 'delivered'">{{ 'emails.eventlog.type.deliveredInfo' | tr }}</span>
+                <span ng-show="eventlog.type === 'denied'">{{ 'emails.eventlog.type.deniedInfo' | tr }}. {{ eventlog.message || eventlog.reason }} </span>
+                <span ng-show="eventlog.type === 'spam-learn'">{{ 'emails.eventlog.type.spamFilterTrainedInfo' | tr }}</span>
+                <span ng-show="eventlog.type === 'quota'">
+                  <span ng-show="eventlog.quotaPercent > 0">{{ 'emails.eventlog.type.overQuotaInfo' | tr: { mailbox: eventlog.mailbox, quotaPercent: eventlog.quotaPercent } }}</span>
+                  <span ng-show="eventlog.quotaPercent < 0">{{ 'emails.eventlog.type.underQuotaInfo' | tr: { mailbox: eventlog.mailbox, quotaPercent: -eventlog.quotaPercent } }}</span>
+                </span>
+              </td>
+            </tr>
+            <tr ng-show="queue.activeItem === item">
+              <td colspan="6">
+                <pre class="item-details">{{ item | json }}</pre>
+              </td>
+            </tr>
+          </tbody>
+        </table>
+      </div>
+    </div>
+  </div>
+</div>
diff --git a/src/views/emails-queue.js b/src/views/emails-queue.js
new file mode 100644
index 000000000..d3520f330
--- /dev/null
+++ b/src/views/emails-queue.js
@@ -0,0 +1,69 @@
+'use strict';
+
+/* global $ */
+/* global angular */
+
+angular.module('Application').controller('EmailsQueueController', ['$scope', '$location', '$translate', '$timeout', 'Client', function ($scope, $location, $translate, $timeout, Client) {
+    Client.onReady(function () { if (!Client.getUserInfo().isAtLeastOwner) $location.path('/'); });
+
+    $scope.ready = false;
+    $scope.config = Client.getConfig();
+    $scope.user = Client.getUserInfo();
+
+    $scope.pageItemCount = [
+        { name: $translate.instant('main.pagination.perPageSelector', { n: 20 }), value: 20 },
+        { name: $translate.instant('main.pagination.perPageSelector', { n: 50 }), value: 50 },
+        { name: $translate.instant('main.pagination.perPageSelector', { n: 100 }), value: 100 }
+    ];
+
+    $scope.queue = {
+        busy: true,
+        items: [],
+        activeItem: null,
+        currentPage: 1,
+        perPage: 20,
+        pageItems: $scope.pageItemCount[0],
+        search: '',
+
+        refresh: function () {
+            $scope.queue.busy = true;
+
+            Client.listMailQueue($scope.queue.search, $scope.queue.currentPage, $scope.queue.pageItems.value, function (error, result) {
+                if (error) return console.error('Failed to fetch mail eventlogs.', error);
+
+                $scope.queue.busy = false;
+
+                $scope.queue.items = result;
+            });
+        },
+
+        showNextPage: function () {
+            $scope.queue.currentPage++;
+            $scope.queue.refresh();
+        },
+
+        showPrevPage: function () {
+            if ($scope.queue.currentPage > 1) $scope.queue.currentPage--;
+            else $scope.queue.currentPage = 1;
+            $scope.queue.refresh();
+        },
+
+        showItemDetails: function (item) {
+            if ($scope.queue.activeItem === item) $scope.queue.activeItem = null;
+            else $scope.queue.activeItem = item;
+        },
+
+        updateFilter: function (fresh) {
+            if (fresh) $scope.queue.currentPage = 1;
+            $scope.queue.refresh();
+        }
+    };
+
+    Client.onReady(function () {
+        $scope.ready = true;
+
+        $scope.queue.refresh();
+    });
+
+    $('.modal-backdrop').remove();
+}]);
diff --git a/src/views/emails.html b/src/views/emails.html
index 3cb860a37..2cccde43a 100644
--- a/src/views/emails.html
+++ b/src/views/emails.html
@@ -213,8 +213,9 @@
     <h1>
       {{ 'emails.title' | tr }}
 
-      <div class="btn-group pull-right" role="group">
-        <a class="btn btn-default" ng-show="user.isAtLeastOwner" href="#/emails-eventlog">{{ 'main.action.logs' | tr }}</a>
+      <div class="pull-right">
+        <a class="btn btn-default" ng-show="user.isAtLeastOwner" href="#/emails-queue">{{ 'emails.action.queue' | tr }}</a>
+        <a class="btn btn-default" ng-show="user.isAtLeastOwner" href="#/emails-eventlog">{{ 'eventlog.title' | tr }}</a>
         <!-- hidden for now, until we see a purpose -->
         <!-- <a class="btn btn-sm btn-default" ng-disabled="user.isAtLeastOwner" href="/filemanager.html?id=mail&type=mail" target="_blank" uib-tooltip="{{ 'app.filemanagerActionTooltip' | tr }}" tooltip-append-to-body="true" tooltip-placement="bottom"><i class="fas fa-folder"></i></a> -->
       </div>