diff --git a/src/js/client.js b/src/js/client.js
index 21d7acc6e..9f0943020 100644
--- a/src/js/client.js
+++ b/src/js/client.js
@@ -2743,12 +2743,12 @@ angular.module('Application').service('Client', ['$http', '$interval', '$timeout
         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);
+            callback(null, data.queue);
         });
     };
 
     Client.prototype.delMailQueueItem = function (file, callback) {
-        del('/api/v1/mailserver/tempfail_queue/' + file, {}, config, function (error, data, status) {
+        del('/api/v1/mailserver/tempfail_queue/' + file, null, function (error, data, status) {
             if (error) return callback(error);
             if (status !== 200) return callback(new ClientError(status, data));
             callback(null, data.usage);
@@ -2756,7 +2756,7 @@ angular.module('Application').service('Client', ['$http', '$interval', '$timeout
     };
 
     Client.prototype.resendMailQueueItem = function (file, callback) {
-        post('/api/v1/mailserver/tempfail_queue/' + file + '/resend', {}, config, function (error, data, status) {
+        post('/api/v1/mailserver/tempfail_queue/' + file + '/resend', {}, null, function (error, data, status) {
             if (error) return callback(error);
             if (status !== 201) return callback(new ClientError(status, data));
             callback(null, data.usage);
diff --git a/src/translation/en.json b/src/translation/en.json
index 3d3c02c0b..0dd2513ac 100644
--- a/src/translation/en.json
+++ b/src/translation/en.json
@@ -748,7 +748,12 @@
             "enableAction": "Enable"
         },
         "queue": {
-            "title": "Email Queue"
+            "title": "Email Queue",
+            "time": "Time",
+            "mailFrom": "From",
+            "rcptTo": "To",
+            "details": "Details",
+            "empty": "Mail queue is empty"
         },
         "action": {
             "queue": "Queue"
diff --git a/src/translation/nl.json b/src/translation/nl.json
index 73c46b710..c2de93644 100644
--- a/src/translation/nl.json
+++ b/src/translation/nl.json
@@ -1744,7 +1744,8 @@
         "vi": "Vietnamees",
         "pl": "Pools",
         "es": "Spaans",
-        "ru": "Russisch"
+        "ru": "Russisch",
+        "pt": "Portugees"
     },
     "passwordResetEmail": {
         "subject": "[<%= cloudron %>] Wachtwoord herstellen",
diff --git a/src/translation/ru.json b/src/translation/ru.json
index 0c6a0af71..ccbe957b9 100644
--- a/src/translation/ru.json
+++ b/src/translation/ru.json
@@ -1745,7 +1745,8 @@
         "vi": "Вьетнамский",
         "zh_Hans": "Китайский (Упрощенный)",
         "es": "Испанский",
-        "ru": "Русский"
+        "ru": "Русский",
+        "pt": "Португальский"
     },
     "setupAccount": {
         "username": "Имя пользователя",
diff --git a/src/views/emails-queue.html b/src/views/emails-queue.html
index b5156906f..5c3d2fec6 100644
--- a/src/views/emails-queue.html
+++ b/src/views/emails-queue.html
@@ -34,11 +34,11 @@
         <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>
+              <th style="width: 15%">{{ 'emails.queue.time' | tr }}</th>
+              <th style="width: 25%">{{ 'emails.queue.mailFrom' | tr }}</th>
+              <th style="width: 25%">{{ 'emails.queue.rcptTo' | tr }}</th>
+              <th style="width: 30%">{{ 'emails.queue.details' | tr }}</th>
+              <th class="text-right" style="width: 30%">{{ 'main.actions' | tr }}</th>
             </tr>
           </thead>
           <tbody ng-hide="queue.items.length">
@@ -46,43 +46,21 @@
               <td colspan="4" class="text-center">
                 <br>
                 <br>
-                {{ 'emails.eventlog.empty' | tr }}
+                {{ 'emails.queue.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>
+          <tbody ng-show="queue.items.length" ng-repeat="item in queue.items">
+            <tr ng-click="queue.showItemDetails(item)" class="hand">
+              <td class="no-wrap"><span uib-tooltip="{{ item.ts | prettyLongDate }}" class="arrow">{{ item.ts | prettyDate }}</span></td>
+              <td class="elide-table-cell">{{ (item.mailFrom | prettyEmailAddresses) || '-' }}</td>
+              <td class="elide-table-cell">{{ (item.rcptTo | prettyEmailAddresses) || '-' }}</td>
+              <td class="elide-table-cell">{{ item.messageId }}</td>
+              <td class="text-right no-wrap">
+                <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-click="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 d3520f330..b707bef36 100644
--- a/src/views/emails-queue.js
+++ b/src/views/emails-queue.js
@@ -37,6 +37,20 @@ angular.module('Application').controller('EmailsQueueController', ['$scope', '$l
             });
         },
 
+        resend: function (item) {
+            Client.resendMailQueueItem(item.file, function (error) {
+                if (error) return console.error('Failed to retry item.', error);
+                $scope.queue.refresh();
+            });
+        },
+
+        discard: function (item) {
+            Client.delMailQueueItem(item.file, function (error) {
+                if (error) return console.error('Failed to discard item.', error);
+                $scope.queue.refresh();
+            });
+        },
+
         showNextPage: function () {
             $scope.queue.currentPage++;
             $scope.queue.refresh();