diff --git a/src/views/emails-queue.html b/src/views/emails-queue.html
index d3739eac2..5fcefdf47 100644
--- a/src/views/emails-queue.html
+++ b/src/views/emails-queue.html
@@ -19,7 +19,7 @@
       <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.reload()"><i class="fas fa-sync-alt" ng-class="{ 'fa-spin': queue.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>
@@ -43,7 +43,7 @@
           </thead>
           <tbody ng-hide="queue.items.length">
             <tr>
-              <td colspan="4" class="text-center">
+              <td colspan="5" class="text-center">
                 <br>
                 <br>
                 {{ 'emails.queue.empty' | tr }}
@@ -65,7 +65,7 @@
               <td class="text-right no-wrap">
                 <!-- resend is broken in haraka -->
                 <!-- <button class="btn btn-xs btn-default" ng-click="queue.resend(item)" uib-tooltip="{{ 'emails.queue.resendTooltip' | tr }}"><i class="fa fa-retweet"></i></button> -->
-                <button class="btn btn-xs btn-default" ng-show="item.queueType === 'tempfail'" ng-click="queue.discard(item)" uib-tooltip="{{ 'emails.queue.discardTooltip' | tr }}"><i class="fa fa-trash-alt"></i></button>
+                <button class="btn btn-xs btn-default" ng-show="item.queueType === 'tempfail'" ng-click="$event.stopPropagation(); queue.discard(item)" uib-tooltip="{{ 'emails.queue.discardTooltip' | tr }}"><i class="fa fa-trash-alt"></i></button>
               </td>
             </tr>
             <tr ng-show="queue.activeItem === item">
diff --git a/src/views/emails-queue.js b/src/views/emails-queue.js
index b707bef36..6c5624e7b 100644
--- a/src/views/emails-queue.js
+++ b/src/views/emails-queue.js
@@ -18,6 +18,7 @@ angular.module('Application').controller('EmailsQueueController', ['$scope', '$l
 
     $scope.queue = {
         busy: true,
+        busyRefresh: false,
         items: [],
         activeItem: null,
         currentPage: 1,
@@ -25,41 +26,52 @@ angular.module('Application').controller('EmailsQueueController', ['$scope', '$l
         pageItems: $scope.pageItemCount[0],
         search: '',
 
-        refresh: function () {
-            $scope.queue.busy = true;
+        refresh: function (showBusy, callback) {
+            if (showBusy) $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);
+                if (showBusy) $scope.queue.busy = false;
 
-                $scope.queue.busy = false;
+                if (error) {
+                    console.error('Failed to fetch mail eventlogs.', error);
+                } else {
+                    $scope.queue.items = result;
+                }
 
-                $scope.queue.items = result;
+                if (callback) callback();
+            });
+        },
+
+        reload: function () {
+            $scope.queue.busyRefresh = true;
+            $scope.queue.refresh(true, function () {
+                $scope.queue.busyRefresh = false;
             });
         },
 
         resend: function (item) {
             Client.resendMailQueueItem(item.file, function (error) {
                 if (error) return console.error('Failed to retry item.', error);
-                $scope.queue.refresh();
+                $scope.queue.refresh(false);
             });
         },
 
         discard: function (item) {
             Client.delMailQueueItem(item.file, function (error) {
                 if (error) return console.error('Failed to discard item.', error);
-                $scope.queue.refresh();
+                $scope.queue.refresh(false);
             });
         },
 
         showNextPage: function () {
             $scope.queue.currentPage++;
-            $scope.queue.refresh();
+            $scope.queue.refresh(true);
         },
 
         showPrevPage: function () {
             if ($scope.queue.currentPage > 1) $scope.queue.currentPage--;
             else $scope.queue.currentPage = 1;
-            $scope.queue.refresh();
+            $scope.queue.refresh(true);
         },
 
         showItemDetails: function (item) {
@@ -69,14 +81,14 @@ angular.module('Application').controller('EmailsQueueController', ['$scope', '$l
 
         updateFilter: function (fresh) {
             if (fresh) $scope.queue.currentPage = 1;
-            $scope.queue.refresh();
+            $scope.queue.refresh(false);
         }
     };
 
     Client.onReady(function () {
         $scope.ready = true;
 
-        $scope.queue.refresh();
+        $scope.queue.refresh(true);
     });
 
     $('.modal-backdrop').remove();