Rearranged Queue Manager + Ukraine Flag fix

data/web/js/site/admin.js

@@ -466,86 +466,6 @@ jQuery(function($){
       ]
     });
   }
-  function draw_queue() {
-    // just recalc width if instance already exists
-    if ($.fn.DataTable.isDataTable('#queuetable') ) {
-      $('#queuetable').DataTable().columns.adjust().responsive.recalc();
-      return;
-    }
-
-    $('#queuetable').DataTable({
-      processing: true,
-      serverSide: false,
-      language: lang_datatables,
-      ajax: {
-        type: "GET",
-        url: "/api/v1/get/mailq/all",
-        dataSrc: function(data){
-          return process_table_data(data, 'queuetable');
-        }
-      },
-      columns: [
-          {
-            // placeholder, so checkbox will not block child row toggle
-            title: '',
-            data: null,
-            searchable: false,
-            orderable: false,
-            defaultContent: ''
-          },
-          {
-            title: '',
-            data: 'chkbox',
-            searchable: false,
-            orderable: false,
-            defaultContent: ''
-          },
-          {
-            title: 'QID',
-            data: 'queue_id',
-            defaultContent: ''
-          },
-          {
-            title: 'Queue',
-            data: 'queue_name',
-            defaultContent: ''
-          },
-          {
-            title: lang.arrival_time,
-            data: 'arrival_time',
-            defaultContent: '',
-            render: function (data, type){
-              var date = new Date(data ? data * 1000 : 0); 
-              return date.toLocaleDateString(undefined, {year: "numeric", month: "2-digit", day: "2-digit", hour: "2-digit", minute: "2-digit", second: "2-digit"});
-            }
-          },
-          {
-            title: lang.message_size,
-            data: 'message_size',
-            defaultContent: '',
-            render: function (data, type){
-              return humanFileSize(data);
-            }
-          },
-          {
-            title: lang.sender,
-            data: 'sender',
-            defaultContent: ''
-          },
-          {
-            title: lang.recipients,
-            data: 'recipients',
-            defaultContent: ''
-          },
-          {
-            title: lang.action,
-            data: 'action',
-            className: 'text-md-end dt-sm-head-hidden dt-body-right',
-            defaultContent: ''
-          },
-      ]
-    });
-  }
 
   function process_table_data(data, table) {
     if (table == 'relayhoststable') {
@@ -653,7 +573,6 @@ jQuery(function($){
   onVisible("[id^=forwardinghoststable]", () => draw_fwd_hosts());
   onVisible("[id^=relayhoststable]", () => draw_relayhosts());
   onVisible("[id^=transportstable]", () => draw_transport_maps());
-  onVisible("[id^=queuetable]", () => draw_queue());
 
 
   $('body').on('click', 'span.footable-toggle', function () {
@@ -713,22 +632,6 @@ jQuery(function($){
       $('#transport_type').val(button.data('transport-type'));
     }
   })
-  // Queue item
-  $('#showQueuedMsg').on('show.bs.modal', function (e) {
-    $('#queue_msg_content').text(lang.loading);
-    button = $(e.relatedTarget)
-    if (button != null) {
-      $('#queue_id').text(button.data('queue-id'));
-    }
-    $.ajax({
-        type: 'GET',
-        url: '/api/v1/get/postcat/' + button.data('queue-id'),
-        dataType: 'text',
-        complete: function (data) {
-          $('#queue_msg_content').text(data.responseText);
-        }
-    });
-  })
   $('#test_transport').on('click', function (e) {
     e.preventDefault();
     prev = $('#test_transport').text();

data/web/js/site/queue.js

@@ -0,0 +1,119 @@
+jQuery(function($){
+
+    $(".refresh_table").on('click', function(e) {
+      e.preventDefault();
+      var table_name = $(this).data('table');
+      $('#' + table_name).DataTable().ajax.reload();
+    });
+
+    // Queue item
+    $('#showQueuedMsg').on('show.bs.modal', function (e) {
+      $('#queue_msg_content').text(lang.loading);
+      button = $(e.relatedTarget)
+      if (button != null) {
+        $('#queue_id').text(button.data('queue-id'));
+      }
+      $.ajax({
+          type: 'GET',
+          url: '/api/v1/get/postcat/' + button.data('queue-id'),
+          dataType: 'text',
+          complete: function (data) {
+            $('#queue_msg_content').text(data.responseText);
+          }
+      });
+    })
+
+    function draw_queue() {
+    // just recalc width if instance already exists
+    if ($.fn.DataTable.isDataTable('#queuetable') ) {
+      $('#queuetable').DataTable().columns.adjust().responsive.recalc();
+      return;
+    }
+
+    $('#queuetable').DataTable({
+      processing: true,
+      serverSide: false,
+      language: lang_datatables,
+      ajax: {
+        type: "GET",
+        url: "/api/v1/get/mailq/all",
+        dataSrc: function(data){
+          $.each(data, function (i, item) {
+            item.chkbox = '<input type="checkbox" data-id="mailqitems" name="multi_select" value="' + item.queue_id + '" />';
+            rcpts = $.map(item.recipients, function(i) {
+              return escapeHtml(i);
+            });
+            item.recipients = rcpts.join('<hr style="margin:1px!important">');
+            item.action = '<div class="btn-group">' +
+              '<a href="#" data-bs-toggle="modal" data-bs-target="#showQueuedMsg" data-queue-id="' + encodeURI(item.queue_id) + '" class="btn btn-xs btn-secondary">' + lang.queue_show_message + '</a>' +
+            '</div>';
+          });
+          return data;
+        }
+      },
+      columns: [
+          {
+            // placeholder, so checkbox will not block child row toggle
+            title: '',
+            data: null,
+            searchable: false,
+            orderable: false,
+            defaultContent: ''
+          },
+          {
+            title: '',
+            data: 'chkbox',
+            searchable: false,
+            orderable: false,
+            defaultContent: ''
+          },
+          {
+            title: 'QID',
+            data: 'queue_id',
+            defaultContent: ''
+          },
+          {
+            title: 'Queue',
+            data: 'queue_name',
+            defaultContent: ''
+          },
+          {
+            title: lang.arrival_time,
+            data: 'arrival_time',
+            defaultContent: '',
+            render: function (data, type){
+              var date = new Date(data ? data * 1000 : 0); 
+              return date.toLocaleDateString(undefined, {year: "numeric", month: "2-digit", day: "2-digit", hour: "2-digit", minute: "2-digit", second: "2-digit"});
+            }
+          },
+          {
+            title: lang.message_size,
+            data: 'message_size',
+            defaultContent: '',
+            render: function (data, type){
+              return humanFileSize(data);
+            }
+          },
+          {
+            title: lang.sender,
+            data: 'sender',
+            defaultContent: ''
+          },
+          {
+            title: lang.recipients,
+            data: 'recipients',
+            defaultContent: ''
+          },
+          {
+            title: lang.action,
+            data: 'action',
+            className: 'text-md-end dt-sm-head-hidden dt-body-right',
+            defaultContent: ''
+          },
+      ]
+    });
+  }
+
+  draw_queue();
+
+})

data/web/lang/lang.ca.json

@@ -269,7 +269,7 @@
     "header": {
         "administration": "Administració",
         "debug": "Debug",
-        "mailboxes": "Bústies",
+        "email": "E-Mail",
         "mailcow_config": "Configuració",
         "quarantine": "Quarantena",
         "restart_sogo": "Reiniciar SOGo",
@@ -386,6 +386,18 @@
         "text_plain_content": "Contingut (text/plain)",
         "toggle_all": "Marcar tots"
     },
+    "queue": {
+        "delete_queue": "Delete all",
+        "flush_queue": "Flush queue",
+        "queue_ays": "Please confirm you want to delete all items from the current queue.",
+        "queue_command_success": "Queue command completed successfully",
+        "queue_deliver_mail": "Deliver",
+        "queue_hold_mail": "Hold",
+        "queue_manager": "Queue Manager",
+        "queue_show_message": "Show message",
+        "queue_unban": "queue unban",
+        "queue_unhold_mail": "Unhold"
+    },
     "start": {
         "help": "Mostrar/Ocultar panell d'ajuda",
         "mailcow_apps_detail": "Tria una aplicació (de moment només SOGo) per a accedir als teus correus, calendari, contactes i més.",

data/web/lang/lang.cs.json

@@ -150,7 +150,6 @@
         "credentials_transport_warning": "<b>Upozornění</b>: Přidání položky do transportní mapy aktualizuje také přihlašovací údaje všech záznamů s odpovídajícím skokem.",
         "customer_id": "ID zákazníka",
         "customize": "Přizpůsobení",
-        "delete_queue": "Smazat vše",
         "destination": "Cíl",
         "dkim_add_key": "Přidat ARC/DKIM klíč",
         "dkim_domains_selector": "Selektor",
@@ -187,7 +186,6 @@
         "f2b_retry_window": "Časový horizont pro maximum pokusů (s)",
         "f2b_whitelist": "Sítě/hostitelé na whitelistu",
         "filter_table": "Tabulka filtrů",
-        "flush_queue": "Vyprázdnit frontu (opětovně doručit)",
         "forwarding_hosts": "Předávající servery",
         "forwarding_hosts_add_hint": "Lze zadat IPv4/IPv6 adresy, sítě ve formátu CIDR, názvy serverů (budou převedeny na IP adresy) nebo názvy domén (budou převedeny na IP pomocí SPF záznamů, příp. MX záznamů).",
         "forwarding_hosts_hint": "Příchozí zprávy od zde uvedených serverů jsou bezpodmínečně přijaty. U těchto serverů se nekontroluje DNSBL a nepoužije greylisting. Spam od těchto serverů se nikdy neodmítá, ale občas může skončit ve složce se spamem. Nejčastěji se zde uvádějí mailové servery, jež předávají příchozí e-maily na tento mailový server.",
@@ -257,13 +255,6 @@
         "quarantine_release_format_att": "Jako příloha",
         "quarantine_release_format_raw": "Nezměněný originál",
         "quarantine_retention_size": "Počet zadržených zpráv na mailovou schránku<br />0 znamená <b>neaktivní</b>.",
-        "queue_ays": "Potvrďte prosím, že chcete odstranit všechny položky z aktuální fronty.",
-        "queue_deliver_mail": "Doručit",
-        "queue_hold_mail": "Zadržet",
-        "queue_manager": "Správce fronty",
-        "queue_show_message": "Zobrazit zprávu",
-        "queue_unban": "odblokovat",
-        "queue_unhold_mail": "Propustit",
         "quota_notification_html": "Šablona upozornění:<br><small>Ponechte prázdné, aby se obnovila výchozí šablona.</small>",
         "quota_notification_sender": "Odesílatel upozornění",
         "quota_notification_subject": "Předmět upozornění",
@@ -643,7 +634,7 @@
         "administration": "Hlavní nastavení",
         "apps": "Aplikace",
         "debug": "Systémové informace",
-        "mailboxes": "Nastavení mailů",
+        "email": "E-Mail",
         "mailcow_config": "Nastavení",
         "quarantine": "Karanténa",
         "restart_netfilter": "Restartovat netfilter",
@@ -884,6 +875,17 @@
         "toggle_all": "Označit vše",
         "type": "Typ"
     },
+    "queue": {
+        "delete_queue": "Smazat vše",
+        "flush_queue": "Vyprázdnit frontu (opětovně doručit)",
+        "queue_ays": "Potvrďte prosím, že chcete odstranit všechny položky z aktuální fronty.",
+        "queue_deliver_mail": "Doručit",
+        "queue_hold_mail": "Zadržet",
+        "queue_manager": "Správce fronty",
+        "queue_show_message": "Zobrazit zprávu",
+        "queue_unban": "odblokovat",
+        "queue_unhold_mail": "Propustit"
+    },
     "ratelimit": {
         "disabled": "Vypnuto",
         "second": "zpráv za sekundu",

data/web/lang/lang.da.json

@@ -141,7 +141,6 @@
         "credentials_transport_warning": "<b>Advarsel</b>: Tilføjelse af en ny transportkortpost opdaterer legitimationsoplysningerne for alle poster med en matchende nexthop-kolonne.",
         "customer_id": "Kunde ID",
         "customize": "Tilpas",
-        "delete_queue": "Slet alt",
         "destination": "Bestemmelsessted",
         "dkim_add_key": "Tilføj ARC/DKIM nøgle",
         "dkim_domains_selector": "Vælger",
@@ -178,7 +177,6 @@
         "f2b_retry_window": "Genindlæs vindue om (s) for max. forsøg",
         "f2b_whitelist": "Hvidlisted netværk/vært",
         "filter_table": "Filtertabel",
-        "flush_queue": "Tøm kø",
         "forwarding_hosts": "Videresendelse af værter",
         "forwarding_hosts_add_hint": "Du kan enten angive IPv4 / IPv6-adresser, netværk i CIDR-notation, værtsnavne (som løses til IP-adresser) eller domænenavne (som løses til IP-adresser ved at spørge SPF-poster eller i mangel af MX-poster).",
         "forwarding_hosts_hint": "Indgående beskeder accepteres ubetinget fra værter, der er anført her. Disse værter kontrolleres derefter ikke mod DNSBL'er eller udsættes for gråt notering. Spam modtaget fra dem afvises aldrig, men det kan eventuelt arkiveres i Junk-mappen. Den mest almindelige anvendelse til dette er at specificere mailservere, hvor du har oprettet en regel, der videresender indgående e-mails til din mailcow-server. ",
@@ -237,13 +235,6 @@
         "quarantine_release_format_att": "Som vedhæftet fil",
         "quarantine_release_format_raw": "Umodificeret original",
         "quarantine_retention_size": "Tilbageholdelse pr. Postkasse:<br><small>0 angiver <b>inaktiv</b>.</small>",
-        "queue_ays": "Bekræft venligst, at du vil slette alle emner fra den aktuelle kø.",
-        "queue_deliver_mail": "Aflevere",
-        "queue_hold_mail": "Hold",
-        "queue_manager": "Køadministrator",
-        "queue_unban": "kø ikke udeluk",
-        "queue_unhold_mail": "Unhold",
-        "queue_show_message": "Vis besked",
         "quota_notification_html": "Notifikations-e-mail-skabelon:<br><small>Lad det være tomt for at gendanne standardskabelonen.</small>",
         "quota_notification_sender": "Afsender af underretnings-e-mail",
         "quota_notification_subject": "Underretningens e-mail-emne",
@@ -581,7 +572,7 @@
         "administration": "Konfiguration og detailer",
         "apps": "Apps",
         "debug": "Systemoplysninger",
-        "mailboxes": "Mailopsætning",
+        "email": "E-Mail",
         "mailcow_config": "Konfiguration",
         "quarantine": "Karantæne",
         "restart_netfilter": "Genstart netfilter",
@@ -803,6 +794,17 @@
         "text_plain_content": "Indhold (text/plain)",
         "toggle_all": "Skift alt"
     },
+    "queue": {
+        "delete_queue": "Slet alt",
+        "flush_queue": "Tøm kø",
+        "queue_ays": "Bekræft venligst, at du vil slette alle emner fra den aktuelle kø.",
+        "queue_deliver_mail": "Aflevere",
+        "queue_hold_mail": "Hold",
+        "queue_manager": "Køadministrator",
+        "queue_unban": "kø ikke udeluk",
+        "queue_unhold_mail": "Unhold",
+        "queue_show_message": "Vis besked"
+    },
     "start": {
         "help": "Vis / skjul hjælpepanel",
         "imap_smtp_server_auth_info": "Brug din fulde e-mail-adresse og PLAIN-godkendelsesmekanismen.<br>\r\nDine login-data bliver krypteret af den obligatoriske kryptering på serversiden.",

data/web/lang/lang.de.json

@@ -150,7 +150,6 @@
         "credentials_transport_warning": "<b>Warnung</b>: Das Hinzufügen einer neuen Regel bewirkt die Aktualisierung der Authentifizierungsdaten aller vorhandenen Einträge mit identischem Next Hop.",
         "customer_id": "Kunde",
         "customize": "UI-Anpassung",
-        "delete_queue": "Alle löschen",
         "destination": "Ziel",
         "dkim_add_key": "ARC/DKIM-Key hinzufügen",
         "dkim_domains_selector": "Selector",
@@ -187,7 +186,6 @@
         "f2b_retry_window": "Wiederholungen im Zeitraum von (s)",
         "f2b_whitelist": "Whitelist für Netzwerke und Hosts",
         "filter_table": "Tabelle filtern",
-        "flush_queue": "Flush Queue",
         "forwarding_hosts": "Weiterleitungs-Hosts",
         "forwarding_hosts_add_hint": "Sie können entweder IPv4-/IPv6-Adressen, Netzwerke in CIDR-Notation, Hostnamen (die zu IP-Adressen aufgelöst werden), oder Domainnamen (die zu IP-Adressen aufgelöst werden, indem ihr SPF-Record abgefragt wird oder, in dessen Abwesenheit, ihre MX-Records) angeben.",
         "forwarding_hosts_hint": "Eingehende Nachrichten werden von den hier gelisteten Hosts bedingungslos akzeptiert. Diese Hosts werden dann nicht mit DNSBLs abgeglichen oder Greylisting unterworfen. Von ihnen empfangener Spam wird nie abgelehnt, optional kann er aber in den Spam-Ordner einsortiert werden. Die übliche Verwendung für diese Funktion ist, um Mailserver anzugeben, auf denen eine Weiterleitung zu Ihrem mailcow-Server eingerichtet wurde.",
@@ -255,13 +253,6 @@
         "quarantine_release_format_att": "Als Anhang",
         "quarantine_release_format_raw": "Unverändertes Original",
         "quarantine_retention_size": "Rückhaltungen pro Mailbox:<br><small>0 bedeutet <b>inaktiv</b>.</small>",
-        "queue_ays": "Soll die derzeitige Queue wirklich komplett bereinigt werden?",
-        "queue_deliver_mail": "Ausliefern",
-        "queue_hold_mail": "Zurückhalten",
-        "queue_manager": "Queue Manager",
-        "queue_show_message": "Nachricht anzeigen",
-        "queue_unban": "Entsperren einreihen",
-        "queue_unhold_mail": "Freigeben",
         "quota_notification_html": "Benachrichtigungs-E-Mail Inhalt:<br><small>Leer lassen, um Standard-Template wiederherzustellen.</small>",
         "quota_notification_sender": "Benachrichtigungs-E-Mail Absender",
         "quota_notification_subject": "Benachrichtigungs-E-Mail Betreff",
@@ -684,7 +675,7 @@
         "administration": "Server-Konfiguration",
         "apps": "Apps",
         "debug": "Information",
-        "mailboxes": "E-Mail-Setup",
+        "email": "E-Mail",
         "mailcow_config": "Konfiguration",
         "quarantine": "Quarantäne",
         "restart_netfilter": "Netfilter neustarten",
@@ -925,6 +916,18 @@
         "toggle_all": "Alle auswählen",
         "type": "Typ"
     },
+    "queue": {
+        "delete_queue": "Queue löschen",
+        "flush_queue": "Queue flushen",
+        "queue_ays": "Soll die derzeitige Queue wirklich komplett bereinigt werden?",
+        "queue_command_success": "Queue-Aufgabe erfolgreich ausgeführt",
+        "queue_deliver_mail": "Ausliefern",
+        "queue_hold_mail": "Zurückhalten",
+        "queue_manager": "Queue Manager",
+        "queue_show_message": "Nachricht anzeigen",
+        "queue_unban": "queue unban",
+        "queue_unhold_mail": "Freigeben"
+    },
     "start": {
         "help": "Hilfe ein-/ausblenden",
         "imap_smtp_server_auth_info": "Bitte verwenden Sie Ihre vollständige E-Mail-Adresse sowie das PLAIN-Authentifizierungsverfahren.<br>\r\nIhre Anmeldedaten werden durch die obligatorische Verschlüsselung entgegen des Begriffes \"PLAIN\" nicht unverschlüsselt übertragen.",

data/web/lang/lang.en.json

@@ -152,7 +152,6 @@
         "credentials_transport_warning": "<b>Warning</b>: Adding a new transport map entry will update the credentials for all entries with a matching next hop column.",
         "customer_id": "Customer ID",
         "customize": "Customize",
-        "delete_queue": "Delete all",
         "destination": "Destination",
         "dkim_add_key": "Add ARC/DKIM key",
         "dkim_domains_selector": "Selector",
@@ -189,7 +188,6 @@
         "f2b_retry_window": "Retry window (s) for max. attempts",
         "f2b_whitelist": "Whitelisted networks/hosts",
         "filter_table": "Filter table",
-        "flush_queue": "Flush queue",
         "forwarding_hosts": "Forwarding Hosts",
         "forwarding_hosts_add_hint": "You can either specify IPv4/IPv6 addresses, networks in CIDR notation, host names (which will be resolved to IP addresses), or domain names (which will be resolved to IP addresses by querying SPF records or, in their absence, MX records).",
         "forwarding_hosts_hint": "Incoming messages are unconditionally accepted from any hosts listed here. These hosts are then not checked against DNSBLs or subjected to greylisting. Spam received from them is never rejected, but optionally it can be filed into the Junk folder. The most common use for this is to specify mail servers on which you have set up a rule that forwards incoming emails to your mailcow server.",
@@ -259,13 +257,6 @@
         "quarantine_release_format_att": "As attachment",
         "quarantine_release_format_raw": "Unmodified original",
         "quarantine_retention_size": "Retentions per mailbox:<br><small>0 indicates <b>inactive</b>.</small>",
-        "queue_ays": "Please confirm you want to delete all items from the current queue.",
-        "queue_deliver_mail": "Deliver",
-        "queue_hold_mail": "Hold",
-        "queue_manager": "Queue manager",
-        "queue_show_message": "Show message",
-        "queue_unban": "queue unban",
-        "queue_unhold_mail": "Unhold",
         "quota_notification_html": "Notification email template:<br><small>Leave empty to restore default template.</small>",
         "quota_notification_sender": "Notification email sender",
         "quota_notification_subject": "Notification email subject",
@@ -477,7 +468,7 @@
       "thousands": ",",
       "lengthMenu": "Show _MENU_ entries",
       "loadingRecords": "Loading...",
-      "processing": "",
+      "processing": "Please wait...",
       "search": "Search:",
       "zeroRecords": "No matching records found",
       "paginate": {
@@ -684,7 +675,7 @@
         "administration": "Configuration & Details",
         "apps": "Apps",
         "debug": "Information",
-        "mailboxes": "Mail Setup",
+        "email": "E-Mail",
         "mailcow_system": "System",
         "mailcow_config": "Configuration",
         "quarantine": "Quarantine",
@@ -926,6 +917,18 @@
         "toggle_all": "Toggle all",
         "type": "Type"
     },
+    "queue": {
+        "delete_queue": "Delete all",
+        "flush_queue": "Flush queue",
+        "queue_ays": "Please confirm you want to delete all items from the current queue.",
+        "queue_command_success": "Queue command completed successfully",
+        "queue_deliver_mail": "Deliver",
+        "queue_hold_mail": "Hold",
+        "queue_manager": "Queue Manager",
+        "queue_show_message": "Show message",
+        "queue_unban": "queue unban",
+        "queue_unhold_mail": "Unhold"
+    },
     "ratelimit": {
       "disabled": "Disabled",
       "second": "msgs / second",
@@ -994,7 +997,6 @@
         "password_policy_saved": "Password policy was saved successfully",
         "pushover_settings_edited": "Pushover settings successfully set, please verify credentials.",
         "qlearn_spam": "Message ID %s was learned as spam and deleted",
-        "queue_command_success": "Queue command completed successfully",
         "recipient_map_entry_deleted": "Recipient map ID %s has been deleted",
         "recipient_map_entry_saved": "Recipient map entry \"%s\" has been saved",
         "relayhost_added": "Map entry %s has been added",

data/web/lang/lang.es.json

@@ -119,7 +119,6 @@
         "configuration": "Configuración",
         "credentials_transport_warning": "<b>Advertencia</b>: al agregar una nueva entrada de ruta de transporte se actualizarán las credenciales para todas las entradas con una columna de \"siguiente destino\" coincidente.",
         "customize": "Personalizar",
-        "delete_queue": "Eliminar todos",
         "destination": "Destino",
         "dkim_add_key": "Agregar registro ARC/DKIM",
         "dkim_domains_selector": "Selector",
@@ -151,7 +150,6 @@
         "f2b_retry_window": "Ventana de tiempo entre reintentos",
         "f2b_whitelist": "Redes y hosts en lista blanca",
         "filter_table": "Filtrar tabla",
-        "flush_queue": "Vaciar la cola",
         "forwarding_hosts": "Hosts de reenvío",
         "forwarding_hosts_add_hint": "Se puede especificar direcciones IPv4 / IPv6, redes en notación CIDR, nombres de host (que se resolverán en direcciones IP) o dominios (que se resolverán en direcciones IP consultando registros SPF o, en su defecto, registros MX)",
         "forwarding_hosts_hint": "Los mensajes entrantes son aceptados incondicionalmente de cualquiera de los hosts enumerados aquí. Estos hosts no se comprueban con listas DNSBL o se someten a greylisting. El spam recibido de ellos nunca se rechaza, pero opcionalmente se puede archivar en la carpeta de correo no deseado. El uso más común para esto es especificar los servidores de correo en los que ha configurado una regla que reenvía los correos electrónicos entrantes al servidor mailcow.",
@@ -192,12 +190,6 @@
         "quarantine_release_format_att": "Como adjunto",
         "quarantine_release_format_raw": "Original sin modificar",
         "quarantine_retention_size": "Retenciones por buzón:<br><small>0 indica <b>inactivo</b>.</small>",
-        "queue_ays": "Confirme que desea eliminar todos los elementos de la cola actual.",
-        "queue_deliver_mail": "Entregar",
-        "queue_hold_mail": "Retener",
-        "queue_manager": "Administrador de cola",
-        "queue_unban": "Encolar desbloqueo",
-        "queue_unhold_mail": "Liberar retención",
         "quota_notification_html": "Plantilla del email de notificación:<br><small>Dejar en blanco para usar la planilla predeterminada.</small>",
         "quota_notification_sender": "Remitente del email de notificación",
         "quota_notification_subject": "Asunto del email de notificación",
@@ -438,7 +430,7 @@
     "header": {
         "administration": "Administración",
         "debug": "Información del sistema",
-        "mailboxes": "Buzones",
+        "email": "E-Mail",
         "mailcow_config": "Configuración",
         "quarantine": "Cuarentena",
         "restart_sogo": "Reiniciar SOGo",
@@ -598,6 +590,16 @@
         "text_plain_content": "Contenido (text/plain)",
         "toggle_all": "Seleccionar todos"
     },
+    "queue": {
+        "delete_queue": "Eliminar todos",
+        "flush_queue": "Vaciar la cola",
+        "queue_ays": "Confirme que desea eliminar todos los elementos de la cola actual.",
+        "queue_deliver_mail": "Entregar",
+        "queue_hold_mail": "Retener",
+        "queue_manager": "Administrador de cola",
+        "queue_unban": "Encolar desbloqueo",
+        "queue_unhold_mail": "Liberar retención"
+    },
     "start": {
         "help": "Mostrar/Ocultar panel de ayuda",
         "imap_smtp_server_auth_info": "Por favor utiliza tu dirección de correo completa y el mecanismo de autenticación PLAIN.<br>\r\nTus datos para iniciar sesión serán cifrados por el cifrado obligatorio del servidor",

data/web/lang/lang.fi.json

@@ -127,7 +127,6 @@
         "credentials_transport_warning": "<b>Varoitus</b>: Uuden kuljetuskarttatietueen lisääminen päivittää kaikkien merkintöjen käyttöoikeustiedot vastaavalla nexthop-sarakkeella.",
         "customer_id": "Asiakkaan tunnus ID",
         "customize": "Muokkaa",
-        "delete_queue": "Poista kaikki",
         "destination": "Määränpää",
         "dkim_add_key": "Lisää ARC/DKIM-avain",
         "dkim_domains_selector": "Valitsin",
@@ -160,7 +159,6 @@
         "f2b_retry_window": "Yritä uudelleen-ikkuna (s) Max. Yrittää",
         "f2b_whitelist": "Sallitut verkot/isännät",
         "filter_table": "Suodata taulukko",
-        "flush_queue": "Tyhjennä jono",
         "forwarding_hosts": "Palveluntarjoajien välittäminen",
         "forwarding_hosts_add_hint": "Voit joko määrittää IPv4 / IPv6-osoitteet, verkot CIDR-merkinnässä, isäntänimet (jotka määritetään IP-osoitteiksi) tai verkkotunnusten nimet (jotka määritetään IP-osoitteiksi kyselyllä SPF-tietueista tai niiden puuttuessa MX-tietueista). .",
         "forwarding_hosts_hint": "Saapuvat viestit hyväksytään ehdoitta kaikilta täällä luetelluilta isännöimiltä. Näitä isäntiä ei sitten tarkisteta DNSBL: ien suhteen, eikä heille suoriteta tyyliluettelointia. Heiltä vastaanotettua roskapostia ei koskaan hylätä, mutta valinnaisesti se voidaan tallentaa Roskakori-kansioon. Yleisin käyttö tähän tarkoitukseen on määrittää postipalvelimet, joille olet asettanut säännön, joka välittää tulevat sähköpostit mailcow-palvelimellesi.",
@@ -214,12 +212,6 @@
         "quarantine_release_format_att": "Liitteenä",
         "quarantine_release_format_raw": "Muuttamaton alkuperäinen",
         "quarantine_retention_size": " Pidätykset per postilaatikko:<br><small>0 ilmaisee <b>inactive</b>.</small>",
-        "queue_ays": "Vahvista, että haluat poistaa kaikki nykyisen jonon kohteet.",
-        "queue_deliver_mail": "Toimittaa",
-        "queue_hold_mail": "Pidossa",
-        "queue_manager": "Jonon hallinta",
-        "queue_unban": "jono unban",
-        "queue_unhold_mail": "Poista pidosta",
         "quota_notification_html": "Ilmoitusviestin malli:<br><small>Jätä tyhjä palauttaaksesi oletusmallin.</small>",
         "quota_notification_sender": "Ilmoitusviestin lähettäjä",
         "quota_notification_subject": "Ilmoitusviestin aihe",
@@ -506,7 +498,7 @@
         "administration": "Kokoonpanon & tiedot",
         "apps": "Sovellukset",
         "debug": "Järjestelmä tiedot",
-        "mailboxes": "Verkkotunnuksien asetukset",
+        "email": "E-Mail",
         "mailcow_config": "Kokoonpano",
         "quarantine": "Karanteeni",
         "restart_netfilter": "Uudelleen käynnistä netfilter",
@@ -682,6 +674,16 @@
         "text_plain_content": "Sisältö (teksti / tavallinen)",
         "toggle_all": "Valitse kaikki"
     },
+    "queue": {
+        "delete_queue": "Poista kaikki",
+        "flush_queue": "Tyhjennä jono",
+        "queue_ays": "Vahvista, että haluat poistaa kaikki nykyisen jonon kohteet.",
+        "queue_deliver_mail": "Toimittaa",
+        "queue_hold_mail": "Pidossa",
+        "queue_manager": "Jonon hallinta",
+        "queue_unban": "jono unban",
+        "queue_unhold_mail": "Poista pidosta"
+    },
     "start": {
         "help": "Näytä/Piilota help paneeli",
         "imap_smtp_server_auth_info": "Käytä täydellistä sähkö posti osoitetta ja tavallista todennus mekanismia.<br>\r\nPalvelin puolen pakollinen salaus salaa kirjautumistietosi.",

data/web/lang/lang.fr.json

@@ -143,7 +143,6 @@
         "credentials_transport_warning": "<b>Attention</b> : L’ajout d’une nouvelle entrée de carte de transport mettra à jour les informations d’identification pour toutes les entrées avec une colonne nexthop.",
         "customer_id": "ID client",
         "customize": "Personnaliser",
-        "delete_queue": "Tout supprimer",
         "destination": "Destination",
         "dkim_add_key": "Ajouter clé ARC/DKIM",
         "dkim_domains_selector": "Sélecteur",
@@ -180,7 +179,6 @@
         "f2b_retry_window": "Fenêtre de nouvel essai pour le nb max. de tentatives",
         "f2b_whitelist": "Réseaux/hôtes en liste blanche",
         "filter_table": "Table de filtrage",
-        "flush_queue": "Vider la file d'attente",
         "forwarding_hosts": "Hôtes de réexpédition",
         "forwarding_hosts_add_hint": "Vous pouvez aussi bien indiquer des adresses IPv4/IPv6, des réseaux en notation CIDR, des noms d'hôtes (qui seront convertis en adresses IP), ou des noms de domaine (qui seront convertis en adresses IP par une requête SPF ou, en son absence, l'enregistrement MX).",
         "forwarding_hosts_hint": "Tous les messages entrants sont acceptés sans condition depuis les hôtes listés ici. Ces hôtes ne sont pas validés par DNSBLs ou sujets à un greylisting. Les pourriels reçus de ces hôtes ne sont jamais rejetés, mais occasionnellement, ils peuvent se retrouver dans le dossier Pourriel. L'usage le plus courant est pour les serveurs de courriels qui ont été configurés pour réexpédier leurs courriels entrants vers votre serveur Mailcow.",
@@ -239,13 +237,6 @@
         "quarantine_release_format_att": "En pièce jointe",
         "quarantine_release_format_raw": "Original non modifié",
         "quarantine_retention_size": "Rétentions par boîte:<br><small>0 indique <b>inactive</b>.</small>",
-        "queue_ays": "Veuillez confirmer que vous voulez supprimer tous les éléments de la file d’attente actuelle.",
-        "queue_deliver_mail": "Délivrer",
-        "queue_hold_mail": "Garder",
-        "queue_manager": "Gestion de la file d'attente",
-        "queue_unban": "file d’attente unban",
-        "queue_unhold_mail": "Ne pas garder",
-        "queue_show_message": "Montrer message",
         "quota_notification_html": "Modèle de courriel de notification:<br><small>Laisser vide pour restaurer le modèle par défaut.</small>",
         "quota_notification_sender": "Notification par e-mail de l’expéditeur",
         "quota_notification_subject": "Objet du courriel de notification",
@@ -598,7 +589,7 @@
         "administration": "Configuration & détails",
         "apps": "Applications",
         "debug": "Information Système",
-        "mailboxes": "Configuration du courrier",
+        "email": "E-Mail",
         "mailcow_config": "Configuration",
         "quarantine": "Quarantaine",
         "restart_netfilter": "Redémarrer Netfilter",
@@ -821,6 +812,17 @@
         "text_plain_content": "Contenu (text/plain)",
         "toggle_all": "Tout basculer"
     },
+    "queue": {
+        "delete_queue": "Tout supprimer",
+        "flush_queue": "Vider la file d'attente",
+        "queue_ays": "Veuillez confirmer que vous voulez supprimer tous les éléments de la file d’attente actuelle.",
+        "queue_deliver_mail": "Délivrer",
+        "queue_hold_mail": "Garder",
+        "queue_manager": "Gestion de la file d'attente",
+        "queue_unban": "file d’attente unban",
+        "queue_unhold_mail": "Ne pas garder",
+        "queue_show_message": "Montrer message"
+    },
     "start": {
         "help": "Afficher/masquer le panneau d’aide",
         "imap_smtp_server_auth_info": "Veuillez utiliser votre adresse e-mail complète et le mécanisme d’authentification PLAIN.<br>\r\nVos données de connexion seront cryptées par le cryptage obligatoire côté serveur.",

data/web/lang/lang.hu.json

@@ -54,7 +54,7 @@
         "administration": "Beállítások és részletek",
         "apps": "Appok",
         "debug": "Rendszer információ",
-        "mailboxes": "Email beállítások",
+        "email": "E-Mail",
         "mailcow_config": "Beállítások",
         "quarantine": "Karantén",
         "restart_netfilter": "Netfilter újraindítása",
@@ -214,6 +214,18 @@
         "text_plain_content": "Tartalom (sima szöveg)",
         "toggle_all": "Összes átkapcsolása"
     },
+    "queue": {
+        "delete_queue": "Delete all",
+        "flush_queue": "Flush queue",
+        "queue_ays": "Please confirm you want to delete all items from the current queue.",
+        "queue_command_success": "Queue command completed successfully",
+        "queue_deliver_mail": "Deliver",
+        "queue_hold_mail": "Hold",
+        "queue_manager": "Queue Manager",
+        "queue_show_message": "Show message",
+        "queue_unban": "queue unban",
+        "queue_unhold_mail": "Unhold"
+    },
     "start": {
         "help": "Súgó panel megjelenítése/elrejtése",
         "imap_smtp_server_auth_info": "Kérjük használja a teljes email címét és a PLAIN hitelesítési mechanizmust.<br>\r\nAdatai el lesznek kódolva szerver-oldali kötelező titkosítással.",

data/web/lang/lang.it.json

@@ -150,7 +150,6 @@
         "credentials_transport_warning": "<b>Warning</b>: Adding a new transport map entry will update the credentials for all entries with a matching next hop column.",
         "customer_id": "ID cliente",
         "customize": "Personalizzare",
-        "delete_queue": "Elimina tutto",
         "destination": "Destinazione",
         "dkim_add_key": "Aggiungi chiave ARC/DKIM",
         "dkim_domains_selector": "Selettore",
@@ -187,7 +186,6 @@
         "f2b_retry_window": "Retry window (s) for max. attempts",
         "f2b_whitelist": "Host/reti in whitelist",
         "filter_table": "Tabella filtro",
-        "flush_queue": "Svuota la coda",
         "forwarding_hosts": "Inoltro degli host",
         "forwarding_hosts_add_hint": "È possibile specificare indirizzi IPv4 / IPv6, reti nella notazione CIDR, nomi host (che verranno risolti in indirizzi IP) o nomi di dominio (che verranno risolti agli indirizzi IP richiamando i record SPF o, in assenza, i record MX) .",
         "forwarding_hosts_hint": "I messaggi in entrata sono accettati in maniera incondizionata da tutti gli host qui elencati. Questi host sono quindi non controllati tramite DNSBL o sottoposti a greylisting. Lo spam ricevuto da questi host non viene mai rifiutato, ma potrebbe essere archiviato nella cartella Posta indesiderata. L'utilizzo più comune è quello di specificare i server di posta elettronica su cui è stata impostata una regola che inoltra le email in arrivo al server mailcow.",
@@ -255,13 +253,6 @@
         "quarantine_release_format_att": "Come allegato",
         "quarantine_release_format_raw": "Originale non modificato",
         "quarantine_retention_size": "Retention per casella di posta:<br><small>0 indica <b>inattivo</b>.</small>",
-        "queue_ays": "Conferma di voler eliminare tutti gli elementi dalla coda corrente.",
-        "queue_deliver_mail": "Consegna",
-        "queue_hold_mail": "Trattieni",
-        "queue_manager": "Gestore code",
-        "queue_show_message": "Visualizza messaggio",
-        "queue_unban": "queue unban",
-        "queue_unhold_mail": "Rilascia",
         "quota_notification_html": "Modello e-mail di notifica:<br><small>Lascia vuoto per utilizzare il modello predefinito.</small>",
         "quota_notification_sender": "Mittente e-mail di notifica",
         "quota_notification_subject": "Oggetto e-mail di notifica",
@@ -650,7 +641,7 @@
         "administration": "Amministrazione",
         "apps": "App",
         "debug": "Informazioni di sistema",
-        "mailboxes": "Caselle",
+        "email": "E-Mail",
         "mailcow_config": "Configurazione",
         "quarantine": "Quarantena",
         "restart_netfilter": "Riavvia netfilter",
@@ -891,6 +882,17 @@
         "toggle_all": "Inverti tutti",
         "type": "Tipologia"
     },
+    "queue": {
+        "delete_queue": "Elimina tutto",
+        "flush_queue": "Svuota la coda",
+        "queue_ays": "Conferma di voler eliminare tutti gli elementi dalla coda corrente.",
+        "queue_deliver_mail": "Consegna",
+        "queue_hold_mail": "Trattieni",
+        "queue_manager": "Gestore code",
+        "queue_show_message": "Visualizza messaggio",
+        "queue_unban": "queue unban",
+        "queue_unhold_mail": "Rilascia"
+    },
     "start": {
         "help": "Mostra/Nascondi pannello di aiuto",
         "imap_smtp_server_auth_info": "Please use your full email address and the PLAIN authentication mechanism.<br />\r\nYour login data will be encrypted by the server-side mandatory encryption.",

data/web/lang/lang.ko.json

@@ -141,7 +141,6 @@
         "credentials_transport_warning": "<b>Warning</b>: Adding a new transport map entry will update the credentials for all entries with a matching nexthop column.",
         "customer_id": "고객 ID",
         "customize": "사용자 정의",
-        "delete_queue": "전부 삭제",
         "destination": "목적지",
         "dkim_add_key": "ARC/DKIM key 추가",
         "dkim_domains_selector": "선택기",
@@ -174,7 +173,6 @@
         "f2b_retry_window": "최대 시도 횟수",
         "f2b_whitelist": "화이트리스트에 저장된 네트워크/호스트",
         "filter_table": "필터 테이블",
-        "flush_queue": "큐 비우기",
         "forwarding_hosts": "포워딩 호스트",
         "forwarding_hosts_add_hint": "IPv4/IPv6 주소, CIDR 방식의 네트워크, 호스트 이름 (IP 주소로 확인된 호스트 이름), 또는 도메인 이름 (SPF 레코드를 쿼리하거나 MX레코드가 없는 경우 IP 주소로 확인된 도메인 이름)을 지정할 수 있습니다.",
         "forwarding_hosts_hint": "수신된 메시지는 여기에 나열된 모든 호스트에 무조건 허용됩니다. 받은 다음에 이 호스트들은 DNSML에 대해 검사되지 않거나 그레이리스트에 포함되지 않습니다. 이들에게서 받은 스팸은 절대 거부되지 않지만, 선택적으로 정크 폴더에 저장될 수 있습니다. 일반적으로 수신받은 메일을 mailcow 서버로 전달하는 메일 서버를 지정하는 용도로 사용됩니다.",
@@ -230,13 +228,6 @@
         "quarantine_release_format_att": "첨부 파일",
         "quarantine_release_format_raw": "수정되지 않은 원본",
         "quarantine_retention_size": "메일함당 보관:<br><small>0은 <b>비활성</b>을 나타냅니다.</small>",
-        "queue_ays": "현재 대기열에서 모든 항목을 삭제할지 확인하십시오.",
-        "queue_deliver_mail": "Deliver",
-        "queue_hold_mail": "Hold",
-        "queue_manager": "대기열 관리자",
-        "queue_unban": "대기열 밴 해제",
-        "queue_unhold_mail": "Unhold",
-        "queue_show_message": "메시지 표시",
         "quota_notification_html": "알림 이메일 탬플릿:<br><small>없으면 기본 템플릿이 복구됩니다.</small>",
         "quota_notification_sender": "이메일 발신자 알림",
         "quota_notification_subject": "이메일 주제 알림",
@@ -572,7 +563,7 @@
         "administration": "Configuration & Details",
         "apps": "Apps",
         "debug": "System Information",
-        "mailboxes": "Mail Setup",
+        "email": "E-Mail",
         "mailcow_config": "Configuration",
         "quarantine": "Quarantine",
         "restart_netfilter": "Restart netfilter",
@@ -774,6 +765,17 @@
         "text_plain_content": "내용 (text/plain)",
         "toggle_all": "선택 반전"
     },
+    "queue": {
+        "delete_queue": "전부 삭제",
+        "flush_queue": "큐 비우기",
+        "queue_ays": "현재 대기열에서 모든 항목을 삭제할지 확인하십시오.",
+        "queue_deliver_mail": "Deliver",
+        "queue_hold_mail": "Hold",
+        "queue_manager": "대기열 관리자",
+        "queue_unban": "대기열 밴 해제",
+        "queue_unhold_mail": "Unhold",
+        "queue_show_message": "메시지 표시"
+    },
     "start": {
         "help": "Show/Hide help panel",
         "imap_smtp_server_auth_info": "Please use your full email address and the PLAIN authentication mechanism.<br>\r\nYour login data will be encrypted by the server-side mandatory encryption.",

data/web/lang/lang.lv.json

@@ -277,7 +277,7 @@
     "header": {
         "administration": "Administrēšana",
         "debug": "Atkļūdošana",
-        "mailboxes": "Pastkastes",
+        "email": "E-Mail",
         "mailcow_config": "Configurācija",
         "quarantine": "Karantīna",
         "restart_sogo": "Restartēt SOGo",
@@ -392,6 +392,18 @@
         "text_plain_content": "Saturs (teksts/vienkāršs)",
         "toggle_all": "Pārslēgt visu"
     },
+    "queue": {
+        "delete_queue": "Delete all",
+        "flush_queue": "Flush queue",
+        "queue_ays": "Please confirm you want to delete all items from the current queue.",
+        "queue_command_success": "Queue command completed successfully",
+        "queue_deliver_mail": "Deliver",
+        "queue_hold_mail": "Hold",
+        "queue_manager": "Queue Manager",
+        "queue_show_message": "Show message",
+        "queue_unban": "queue unban",
+        "queue_unhold_mail": "Unhold"
+    },
     "start": {
         "help": "Rādīt/Paslēp palīdzības paneli",
         "imap_smtp_server_auth_info": "Lūdzu, izmantojiet pilnu e-pasta adresi un PLAIN autentifikācijas mehānismu.<br>\r\nJūsu pieteikšanās dati tiks šifrēti, izmantojot servera puses obligātu šifrēšanu",

data/web/lang/lang.nl.json

@@ -143,7 +143,6 @@
         "credentials_transport_warning": "<b>Waarschuwing</b>: Bij het toevoegen van een nieuwe transport-map zullen de aanmeldingsgegevens voor alle items met een overeenkomende nexthop-kolom worden overgeschreven.",
         "customer_id": "Klantnummer",
         "customize": "Personalisatie",
-        "delete_queue": "Verwijder alles",
         "destination": "Bestemming",
         "dkim_add_key": "Voeg key toe",
         "dkim_domains_selector": "Selector",
@@ -180,7 +179,6 @@
         "f2b_retry_window": "Tijdsbestek voor maximale pogingen (s)",
         "f2b_whitelist": "Netwerken/hosts op de whitelist",
         "filter_table": "Filtertabel",
-        "flush_queue": "Leeg queue",
         "forwarding_hosts": "Forwarding hosts",
         "forwarding_hosts_add_hint": "Het is mogelijk om IPv4- of IPv6-adressen, netwerken in CIDR-notatie, hostnames (worden omgezet naar IP-adressen) of domeinnamen (worden tevens omgezet naar IP-adressen of, bij gebrek daaraan, MX-records) op te geven.",
         "forwarding_hosts_hint": "Inkomende berichten worden onvoorwaardelijk geaccepteerd vanaf iedere host hieronder vermeld. Deze hosts worden hierdoor niet gecontroleerd op DNSBLs, en zullen de greylisting omzeilen. Spam wordt daarentegen zoals gebruikelijk in de spamfolder geplaatst. Dit wordt vaak gebruikt om mailservers te specificeren die forwarden naar deze Mailcow-server.",
@@ -238,13 +236,6 @@
         "quarantine_release_format_att": "Bijlage",
         "quarantine_release_format_raw": "Origineel",
         "quarantine_retention_size": "Maximale retenties per mailbox:<br><small>Gebruik 0 om deze functionaliteit <b>uit te schakelen</b>.</small>",
-        "queue_ays": "Bevestig het verwijderen van alle items uit de queue.",
-        "queue_deliver_mail": "Lever af",
-        "queue_hold_mail": "Houd vast",
-        "queue_manager": "Queue manager",
-        "queue_unban": "hef verbanning op",
-        "queue_unhold_mail": "Geef vrij",
-        "queue_show_message": "Toon item",
         "quota_notification_html": "Meldingssjabloon:<br><small>Laat leeg om de standaardsjabloon te herstellen.</small>",
         "quota_notification_sender": "Afzender van meldingen",
         "quota_notification_subject": "Onderwerp van meldingen",
@@ -591,7 +582,7 @@
         "administration": "Configuratie & details",
         "apps": "Apps",
         "debug": "Systeeminformatie",
-        "mailboxes": "Mailconfiguratie",
+        "email": "E-Mail",
         "mailcow_config": "Beheer",
         "quarantine": "Quarantaine",
         "restart_netfilter": "Herstart netfilter",
@@ -812,6 +803,17 @@
         "text_plain_content": "Inhoud (tekst)",
         "toggle_all": "Selecteer alles"
     },
+    "queue": {
+        "delete_queue": "Verwijder alles",
+        "flush_queue": "Leeg queue",
+        "queue_ays": "Bevestig het verwijderen van alle items uit de queue.",
+        "queue_deliver_mail": "Lever af",
+        "queue_hold_mail": "Houd vast",
+        "queue_manager": "Queue manager",
+        "queue_unban": "hef verbanning op",
+        "queue_unhold_mail": "Geef vrij",
+        "queue_show_message": "Toon item"
+    },
     "start": {
         "help": "Toon/verberg hulppaneel",
         "imap_smtp_server_auth_info": "Gebruik je volledige mailadres en het bijbehorende (onversleutelde) verificatiemechanisme.<br>De aanmeldgegevens worden versleuteld verzonden.",

data/web/lang/lang.pl.json

@@ -201,7 +201,7 @@
     },
     "header": {
         "administration": "Administrowanie",
-        "mailboxes": "Skrzynki",
+        "email": "E-Mail",
         "mailcow_config": "Konfiguracja",
         "quarantine": "Kwarantanna",
         "restart_sogo": "Uruchom ponownie SOGo",
@@ -278,6 +278,18 @@
         "remove": "Usuń",
         "toggle_all": "Zaznacz wszystkie"
     },
+    "queue": {
+        "delete_queue": "Delete all",
+        "flush_queue": "Flush queue",
+        "queue_ays": "Please confirm you want to delete all items from the current queue.",
+        "queue_command_success": "Queue command completed successfully",
+        "queue_deliver_mail": "Deliver",
+        "queue_hold_mail": "Hold",
+        "queue_manager": "Queue Manager",
+        "queue_show_message": "Show message",
+        "queue_unban": "queue unban",
+        "queue_unhold_mail": "Unhold"
+    },
     "start": {
         "help": "Pokaż/Ukryj panel pomocy",
         "imap_smtp_server_auth_info": "Proszę korzystać z pełnego adresu email i mechanizmu uwierzytelniania PLAIN.<br>\r\nTwoje dane logowania zostaną zaszyfrowane przez obowiązkowe szyfrowanie po stronie serwera.",

data/web/lang/lang.pt.json

@@ -136,7 +136,7 @@
     },
     "header": {
         "administration": "Administração",
-        "mailboxes": "Contas",
+        "email": "E-Mail",
         "mailcow_config": "Configuração",
         "user_settings": "Configurações do usuário"
     },
@@ -186,6 +186,18 @@
         "action": "Ação",
         "remove": "Remover"
     },
+    "queue": {
+        "delete_queue": "Delete all",
+        "flush_queue": "Flush queue",
+        "queue_ays": "Please confirm you want to delete all items from the current queue.",
+        "queue_command_success": "Queue command completed successfully",
+        "queue_deliver_mail": "Deliver",
+        "queue_hold_mail": "Hold",
+        "queue_manager": "Queue Manager",
+        "queue_show_message": "Show message",
+        "queue_unban": "queue unban",
+        "queue_unhold_mail": "Unhold"
+    },
     "start": {
         "help": "Mostrar/Ocultar painel de ajuda",
         "imap_smtp_server_auth_info": "Utilize o endereço de email completo com o método de autentucação PLAIN.<br>\r\nOs dados de login serão encryptados pelo servidor.",

data/web/lang/lang.ro.json

@@ -151,7 +151,6 @@
         "credentials_transport_warning": "<b>Avertisment</b>: Adăugarea unei noi intrări hartă de transport va actualiza datele de acreditare pentru toate intrările cu o coloană nexthop corespunzătoare.",
         "customer_id": "ID client",
         "customize": "Personalizează",
-        "delete_queue": "Șterge tot",
         "destination": "Destinaţie",
         "dkim_add_key": "Adaugă cheia ARC/DKIM",
         "dkim_domains_selector": "Selector",
@@ -188,7 +187,6 @@
         "f2b_retry_window": "Reîncercați fereastra (ele) pentru max. încercări",
         "f2b_whitelist": "Rețele/gazde pe lista albă",
         "filter_table": "Tabel filtre",
-        "flush_queue": "Elimină coadă",
         "forwarding_hosts": "Gazde de redirecționare",
         "forwarding_hosts_add_hint": "Poți specifica fie adrese IPv4 / IPv6, rețele în notație CIDR, nume gazdă (care vor fi rezolvate la adrese IP), fie nume de domenii (care vor fi rezolvate la adrese IP prin interogarea înregistrărilor SPF sau, în absența acestora, a înregistrărilor MX).",
         "forwarding_hosts_hint": "Mesajele primite sunt acceptate necondiționat de la orice gazde listate aici. Aceste gazde nu sunt verificate împotriva DNSBL sau supuse la greylisting. Spamul primit de la ele nu este niciodată respins, dar opțional poate fi depus în folderul Junk. Cea mai obișnuită utilizare pentru acest lucru este de a specifica serverele de email pe care ai configurat o regulă care transmite mesajele primite către serverul mailcow.",
@@ -258,13 +256,6 @@
         "quarantine_release_format_att": "Ca atașament",
         "quarantine_release_format_raw": "Original nemodificat",
         "quarantine_retention_size": "Retențiile per căsuță poștală:<br><small>0 indică <b>inactiv</b>.</small>",
-        "queue_ays": "Te rog confirmă că dorești să ștergi toate articolele din coada curentă.",
-        "queue_deliver_mail": "Livrează",
-        "queue_hold_mail": "Blochează",
-        "queue_manager": "Manager de coadă",
-        "queue_unban": "coadă pentru dezactivare interdicție",
-        "queue_unhold_mail": "Deblochează",
-        "queue_show_message": "Arată mesajul",
         "quota_notification_html": "Șablon email de notificare:<br><small>Se lasă gol pentru a restabili șablonul implicit.</small>",
         "quota_notification_sender": "Expeditor email de notificare",
         "quota_notification_subject": "Subiect email de notificare",
@@ -649,7 +640,7 @@
         "administration": "Configurație și detalii",
         "apps": "Aplicații",
         "debug": "Informații Sistem",
-        "mailboxes": "Configurare Mail",
+        "email": "E-Mail",
         "mailcow_config": "Configurație",
         "quarantine": "Carantină",
         "restart_netfilter": "Repornire netfilter",
@@ -890,6 +881,17 @@
         "text_plain_content": "Conținut (text/simplu)",
         "toggle_all": "Comută toate"
     },
+    "queue": {
+        "delete_queue": "Șterge tot",
+        "flush_queue": "Elimină coadă",
+        "queue_ays": "Te rog confirmă că dorești să ștergi toate articolele din coada curentă.",
+        "queue_deliver_mail": "Livrează",
+        "queue_hold_mail": "Blochează",
+        "queue_manager": "Manager de coadă",
+        "queue_unban": "coadă pentru dezactivare interdicție",
+        "queue_unhold_mail": "Deblochează",
+        "queue_show_message": "Arată mesajul"
+    },
     "ratelimit": {
         "disabled": "Dezactivat",
         "second": "mesaje / sec",

data/web/lang/lang.ru.json

@@ -152,7 +152,6 @@
         "credentials_transport_warning": "<b>Предупреждение</b>: добавление новой записи перезапишет учетные данные для всех записей с таким же <i>следующим хостом</i>.",
         "customer_id": "ID клиента",
         "customize": "Персонализация",
-        "delete_queue": "Удалить все сообщения",
         "destination": "Назначение",
         "dkim_add_key": "Добавить ARC/DKIM ключ",
         "dkim_domains_selector": "Selector",
@@ -189,7 +188,6 @@
         "f2b_retry_window": "Промежуток времени для следующего бана (в секундах)",
         "f2b_whitelist": "Белый список подсетей/хостов",
         "filter_table": "Поиск",
-        "flush_queue": "Отправить все сообщения",
         "forwarding_hosts": "Переадресация хостов",
         "forwarding_hosts_add_hint": "Можно указывать: IPv4/IPv6 подсети в нотации CIDR, имена хостов (которые будут разрешаться в IP-адреса) или доменные имена (которые будут решаться с IP-адресами путем запроса SPF записей или, в случае их отсутствия - запросом MX записей).",
         "forwarding_hosts_hint": "Входящие сообщения безоговорочно принимаются от любых хостов, перечисленных здесь. Эти хосты не проходят проверку DNSBL и graylisting. Спам, полученный от них, никогда не отклоняется, но при желании можно включить спам фильтр и письма с плохим рейтингом будут попадать в Junk. Наиболее распространенное использование - указать почтовые серверы, на которых вы установили правило, которое перенаправляет входящие электронные письма на ваш почтовый сервер mailcow.",
@@ -259,13 +257,6 @@
         "quarantine_release_format_att": "Как вложение",
         "quarantine_release_format_raw": "Оригинальное письмо",
         "quarantine_retention_size": "Количество писем, сохраняемых в карантине на аккаунт:<br><small>0 означает, что карантин <b>отключён</b>.</small>",
-        "queue_ays": "Пожалуйста, подтвердите, что вы хотите удалить все элементы из очереди.",
-        "queue_deliver_mail": "Доставить",
-        "queue_hold_mail": "Поставить на удержание",
-        "queue_manager": "Очередь на отправку",
-        "queue_show_message": "Показать сообщение",
-        "queue_unban": "разблокировать очередь",
-        "queue_unhold_mail": "Снять с удержания",
         "quota_notification_html": "Шаблон уведомления:<br><small>Оставьте пустым, чтобы восстановить шаблон по умолчанию.</small>",
         "quota_notification_sender": "Email-адрес для отправки уведомления",
         "quota_notification_subject": "Тема письма",
@@ -647,7 +638,7 @@
         "administration": "Настройка сервера",
         "apps": "Приложения",
         "debug": "Состояние сервера",
-        "mailboxes": "Настройка почты",
+        "email": "E-Mail",
         "mailcow_config": "Конфигурация",
         "quarantine": "Карантин",
         "restart_netfilter": "Перезапустить netfilter",
@@ -888,6 +879,17 @@
         "toggle_all": "Выбрать все",
         "type": "Тип"
     },
+    "queue": {
+        "delete_queue": "Удалить все сообщения",
+        "flush_queue": "Отправить все сообщения",
+        "queue_ays": "Пожалуйста, подтвердите, что вы хотите удалить все элементы из очереди.",
+        "queue_deliver_mail": "Доставить",
+        "queue_hold_mail": "Поставить на удержание",
+        "queue_manager": "Очередь на отправку",
+        "queue_show_message": "Показать сообщение",
+        "queue_unban": "разблокировать очередь",
+        "queue_unhold_mail": "Снять с удержания"
+    },
     "ratelimit": {
         "disabled": "Отключен",
         "second": "сообщений / секунду",

data/web/lang/lang.sk.json

@@ -151,7 +151,6 @@
         "credentials_transport_warning": "<b>Upozornenie</b>: Pridaním ďalšieho záznamu do transportnej mapy bude mať za následok aktualizovanie údajov pre všetky záznamy so zhodným ďalším skokom.",
         "customer_id": "ID zákazníka",
         "customize": "Prispôsobiť",
-        "delete_queue": "Vymazať všetko",
         "destination": "Cieľ",
         "dkim_add_key": "Pridať ARC/DKIM kľúč",
         "dkim_domains_selector": "Selektor",
@@ -188,7 +187,6 @@
         "f2b_retry_window": "Čas v ktorom je treba uplatniť max. počet pokusov (s)",
         "f2b_whitelist": "Whitelist sietí/hostiteľov",
         "filter_table": "Tabuľka filtrov",
-        "flush_queue": "Vyprázdniť frontu",
         "forwarding_hosts": "Preposielacie servery",
         "forwarding_hosts_add_hint": "Môžete buď špecifikovať IPv4/IPv6 adresy, siete v CIDR notácii, názvy serverov (ktoré budú preložené na IP adresy), alebo doménové mená (ktoré budú ako IP získané z SPF záznamov, alebo v prípade ich neprítomnosti, pomocou MX záznamov).",
         "forwarding_hosts_hint": "Prichádzajúce správy sú bezpodmienečne prijaté z uvedených serverov. Nekontroluje sa ich prítomnosť v DNSBL a neaplikuje sa u nich greylisting. Spam z uvedených serverov sa neodmieta, ale občas môže skončiť nevyžiadanej pošte. Najčastejšie sa tu definujú servery ktoré doručujú alebo majú presmerovanú poštu na tento server.",
@@ -258,13 +256,6 @@
         "quarantine_release_format_att": "Prílohu",
         "quarantine_release_format_raw": "Nemodifikovaný originál",
         "quarantine_retention_size": "Počet zadržaných správ pre jednotlivé mailové schránky<br><small>0 znamená <b>neaktívne</b>.</small>",
-        "queue_ays": "Prosím potvrďte vymazanie všetkých položiek z aktuálnej fronty.",
-        "queue_deliver_mail": "Doručiť",
-        "queue_hold_mail": "Pozdržať",
-        "queue_manager": "Správca fronty",
-        "queue_show_message": "Zobraziť správu",
-        "queue_unban": "Odblokovať",
-        "queue_unhold_mail": "Uvoľniť",
         "quota_notification_html": "Notifikácia email predloha:<br><small>Nechať prázdne pre obnovenie originálnej predlohy.</small>",
         "quota_notification_sender": "Odosielateľ notifikácií",
         "quota_notification_subject": "Predmet notifikácií",
@@ -649,7 +640,7 @@
         "administration": "Konfigurácia & Detaily",
         "apps": "Aplikácie",
         "debug": "Systémové informácie",
-        "mailboxes": "Nastavenie mailov",
+        "email": "E-Mail",
         "mailcow_config": "Konfigurácia",
         "quarantine": "Karanténa",
         "restart_netfilter": "Reštartovať netfilter",
@@ -890,6 +881,17 @@
         "toggle_all": "Označiť všetky",
         "type": "Typ"
     },
+    "queue": {
+        "delete_queue": "Vymazať všetko",
+        "flush_queue": "Vyprázdniť frontu",
+        "queue_ays": "Prosím potvrďte vymazanie všetkých položiek z aktuálnej fronty.",
+        "queue_deliver_mail": "Doručiť",
+        "queue_hold_mail": "Pozdržať",
+        "queue_manager": "Správca fronty",
+        "queue_show_message": "Zobraziť správu",
+        "queue_unban": "Odblokovať",
+        "queue_unhold_mail": "Uvoľniť"
+    },
     "ratelimit": {
         "disabled": "Vypnuté",
         "second": "správ za sekundu",

data/web/lang/lang.sv.json

@@ -145,7 +145,6 @@
         "credentials_transport_warning": "<b>Varning</b>: När en ny reläserver läggs till uppdateras uppgifterna för alla reläservrar som hör till samma värd.",
         "customer_id": "Kundnummer",
         "customize": "Anpassa gränssnittet",
-        "delete_queue": "Ta bort allt",
         "destination": "Destination",
         "dkim_add_key": "Lägg till ARC/DKIM-nyckel",
         "dkim_domains_selector": "Välj",
@@ -182,7 +181,6 @@
         "f2b_retry_window": "Tidsfönster för antal försök",
         "f2b_whitelist": "Vitlistade nätverk/värdar",
         "filter_table": "Filtrera tebellen",
-        "flush_queue": "Kasta kön",
         "forwarding_hosts": "Värdar för inkommande e-post servrar",
         "forwarding_hosts_add_hint": "Du kan antingen specifiera IPv4-/IPv6-adresser, nätverk med CIDR betäckning, värdnamn (hämtar IP-adressen), eller domännamn (hämtar IP-adressen från SPF-uppslaget, eller från MX-uppslag).",
         "forwarding_hosts_hint": "Denna inställning används för att ange e-postservrar som används för att förmedla inkommande e-postmeddelanden till denna Mailcow-server. Inkommande e-postmeddelanden från dessa värdar accepteras oavsätt. Dessa värdar testas därav inte mot DNSBLs eller påverkas av grålistning. Spam som mottas från dessa värdar kastas aldrig, men kan ev filtreras till skräppostsmappen.",
@@ -248,13 +246,6 @@
         "quarantine_release_format_att": "Som bilaga",
         "quarantine_release_format_raw": "Oförändrat originalmeddelande",
         "quarantine_retention_size": "Antal meddelanden att förvara i karantän per postlåda:<br><small>0 indikerar <b>inaktivt</b>.</small>",
-        "queue_ays": "Bekräfta att du verkligen vill ta bort dessa objekt från den aktuella kön.",
-        "queue_deliver_mail": "Leverera",
-        "queue_hold_mail": "Håll kvar",
-        "queue_manager": "Kö-hanteraring",
-        "queue_unban": "schemalägg en borttagning från banlysning",
-        "queue_unhold_mail": "Släpp på",
-        "queue_show_message": "Visa meddelandet",
         "quota_notification_html": "E-postmall för notifieringar:<br><small>Lämna tomt för att återställa standardmallen.</small>",
         "quota_notification_sender": "Avsändaradress för notifieringsmeddelande",
         "quota_notification_subject": "Ämnesrad för notifieringsmeddelande",
@@ -607,7 +598,7 @@
         "administration": "Konfiguration & detaljer",
         "apps": "Applikationer",
         "debug": "Systeminformation",
-        "mailboxes": "Ställ in mejl",
+        "email": "E-Mail",
         "mailcow_config": "Konfiguration",
         "quarantine": "Karantän",
         "restart_netfilter": "Starta om netfilter",
@@ -831,6 +822,17 @@
         "text_plain_content": "Innehåll (text/plain)",
         "toggle_all": "Markera alla"
     },
+    "queue": {
+        "delete_queue": "Ta bort allt",
+        "flush_queue": "Kasta kön",
+        "queue_ays": "Bekräfta att du verkligen vill ta bort dessa objekt från den aktuella kön.",
+        "queue_deliver_mail": "Leverera",
+        "queue_hold_mail": "Håll kvar",
+        "queue_manager": "Kö-hanteraring",
+        "queue_unban": "schemalägg en borttagning från banlysning",
+        "queue_unhold_mail": "Släpp på",
+        "queue_show_message": "Visa meddelandet"
+    },
     "start": {
         "help": "Visa/dölj hjälppanel",
         "imap_smtp_server_auth_info": "Använd din fullständiga e-postadress och PLAIN-autentiseringsmekanism.<br>\r\nInloggningsuppgifterna överförs krypterat eftersom obligatorisk kryptering sker till servern.",

data/web/lang/lang.uk.json

@@ -141,7 +141,6 @@
         "convert_html_to_text": "Перетворити HTML на звичайний текст",
         "customer_id": "ID клієнта",
         "customize": "Персоналізація",
-        "delete_queue": "Видалити всі повідомлення",
         "destination": "Призначення",
         "dkim_add_key": "Додати ARC/DKIM ключ",
         "dkim_domains_selector": "Селектор",
@@ -228,12 +227,6 @@
         "quarantine_release_format_att": "Як додаток",
         "quarantine_release_format_raw": "Оригінальний лист",
         "quarantine_retention_size": "Кількість листів, які зберігаються в карантині на обліковий запис:<br><small>0 означає, що карантин <b>відключено</b>.</small>",
-        "queue_deliver_mail": "Доставити",
-        "queue_hold_mail": "Поставити на утримання",
-        "queue_manager": "Черга на відправлення",
-        "queue_show_message": "Показати повідомлення",
-        "queue_unban": "розблокувати чергу",
-        "queue_unhold_mail": "Зняти з утримання",
         "quota_notification_sender": "Email-адреса для надсилання повідомлення",
         "quota_notification_subject": "Тема листа",
         "quota_notifications": "Квота",
@@ -650,7 +643,7 @@
         "administration": "Налаштування сервера",
         "apps": "Додатки",
         "debug": "Стан сервера",
-        "mailboxes": "Налаштування пошти",
+        "email": "E-Mail",
         "quarantine": "Карантин",
         "restart_netfilter": "Перезапустити netfilter",
         "restart_sogo": "Перезапустити SOGo",
@@ -891,6 +884,16 @@
         "qinfo": "Система карантину зберігатиме відхилені листи в базі даних (у відправника <em>не</em> буде створене враження, що лист доставлений), а також пошту, яка буде доставлена як копія в папку «Спам» поштової скриньки.\n  <br>\"Вивчити як спам і видалити\" вивче повідомлення як спам за теоремою Байєса і також обчислювати нечіткі хеші до денних подібних повідомлень у майбутньому.\n  <br>Зверніть увагу, що вивчення кількох повідомлень – залежно від вашої системи – може зайняти багато часу.<br>Елементи чорного списку виключаються з карантину.",
         "table_size_show_n": "Відображати %s полів"
     },
+    "queue": {
+        "delete_queue": "Видалити всі повідомлення",
+        "flush_queue": "Flush queue",
+        "queue_deliver_mail": "Доставити",
+        "queue_hold_mail": "Поставити на утримання",
+        "queue_manager": "Черга на відправлення",
+        "queue_show_message": "Показати повідомлення",
+        "queue_unban": "розблокувати чергу",
+        "queue_unhold_mail": "Зняти з утримання"
+    },
     "ratelimit": {
         "disabled": "Вимкнено",
         "minute": "повідомлень / хвилину",

data/web/lang/lang.zh.json

@@ -141,7 +141,6 @@
         "credentials_transport_warning": "<b>警告</b>: 添加新的传输规则会为所有\"下一跳\"列匹配的规则更新认证凭证。",
         "customer_id": "客户ID",
         "customize": "自定义",
-        "delete_queue": "删除所有",
         "destination": "目标地址",
         "dkim_add_key": "添加ARC/DKIM密钥",
         "dkim_domains_selector": "选择器",
@@ -178,7 +177,6 @@
         "f2b_retry_window": "最多尝试次数重试窗口 (秒)",
         "f2b_whitelist": "网络/主机白名单",
         "filter_table": "筛选表格",
-        "flush_queue": "清空队列",
         "forwarding_hosts": "转发主机",
         "forwarding_hosts_add_hint": "你可以指定 IPv4/IPv6 地址、CIDR 表示的网络、主机名 (解析为IP地址)，或者邮箱域名 (查询SPF记录或MX记录并解析为IP地址)。",
         "forwarding_hosts_hint": "来自此处所列的主机的入站信息会被无条件接收。并且这些主机不会经过DNSBL检查或者被加入灰名单。 来自它们的垃圾邮件不会被拒绝，但可选的可以被移入垃圾文件夹。当你设置了转发规则将邮件转发到此mailcow服务器，通常你可以将来源主机加入此列表。",
@@ -235,13 +233,6 @@
         "quarantine_release_format_att": "附件",
         "quarantine_release_format_raw": "未修改原件",
         "quarantine_retention_size": "每个邮箱保留隔离项目数:<br><small>0 表示 <b>禁用</b>。</small>",
-        "queue_ays": "请确认你真的想要删除当前队列中的所有项目。",
-        "queue_deliver_mail": "递送",
-        "queue_hold_mail": "暂停",
-        "queue_manager": "队列管理器",
-        "queue_unban": "队列取消封禁",
-        "queue_unhold_mail": "继续",
-        "queue_show_message": "显示消息",
         "quota_notification_html": "通知邮件模板:<br><small>留空以恢复默认模板。</small>",
         "quota_notification_sender": "通知邮件发件人",
         "quota_notification_subject": "通知邮件主题",
@@ -582,7 +573,7 @@
         "administration": "配置和管理",
         "apps": "应用",
         "debug": "系统信息",
-        "mailboxes": "邮箱设置",
+        "email": "E-Mail",
         "mailcow_config": "配置",
         "quarantine": "隔离",
         "restart_netfilter": "重启netfilter",
@@ -797,6 +788,17 @@
         "text_plain_content": "内容 (text/plain)",
         "toggle_all": "选择/取消所有"
     },
+    "queue": {
+        "delete_queue": "删除所有",
+        "flush_queue": "清空队列",
+        "queue_ays": "请确认你真的想要删除当前队列中的所有项目。",
+        "queue_deliver_mail": "递送",
+        "queue_hold_mail": "暂停",
+        "queue_manager": "队列管理器",
+        "queue_unban": "队列取消封禁",
+        "queue_unhold_mail": "继续",
+        "queue_show_message": "显示消息"
+    },
     "start": {
         "help": "显示/隐藏 帮助面板",
         "imap_smtp_server_auth_info": "请使用你的完整邮箱地址并使用PLAIN(明文)认证方法。<br>\r\n你的登录数据会被服务端强制加密。",

data/web/queue.php

@@ -0,0 +1,25 @@
+<?php
+require_once $_SERVER['DOCUMENT_ROOT'] . '/inc/prerequisites.inc.php';
+
+if (!isset($_SESSION['mailcow_cc_role']) || $_SESSION['mailcow_cc_role'] != "admin") {
+  header('Location: /');
+  exit();
+}
+
+
+require_once $_SERVER['DOCUMENT_ROOT'] . '/inc/header.inc.php';
+$js_minifier->add('/web/js/site/queue.js');
+$_SESSION['return_to'] = $_SERVER['REQUEST_URI'];
+
+$role = ($_SESSION['mailcow_cc_role'] == "admin") ? 'admin' : 'domainadmin';
+
+$template = 'queue.twig';
+$template_data = [
+  'acl' => $_SESSION['acl'],
+  'acl_json' => json_encode($_SESSION['acl']),
+  'role' => $role,
+  'lang_admin' => json_encode($lang['admin']),
+  'lang_datatables' => json_encode($lang['datatables'])
+];
+
+require_once $_SERVER['DOCUMENT_ROOT'] . '/inc/footer.inc.php';

data/web/templates/admin.twig

@@ -28,7 +28,6 @@
     </li>
     <li role="presentation" class="nav-item"><button class="nav-link" data-bs-target="#tab-routing" aria-selected="false" aria-controls="tab-routing" role="tab" data-bs-toggle="tab">{{ lang.admin.routing }}</button></li>
     <li role="presentation" class="nav-item"><button class="nav-link" data-bs-target="#tab-sys-mails" aria-selected="false" aria-controls="tab-sys-mails" role="tab" data-bs-toggle="tab">{{ lang.admin.sys_mails }}</button></li>
-    <li role="presentation" class="nav-item"><button class="nav-link" data-bs-target="#tab-mailq" aria-selected="false" aria-controls="tab-mailq" role="tab" data-bs-toggle="tab">{{ lang.admin.queue_manager }}</button></li>
     <li class="nav-item dropdown">
       <a class="nav-link dropdown-toggle" data-bs-toggle="dropdown" href="#" role="button" aria-expanded="false">{{ lang.admin.rspamd_global_filters }}</a>
       <ul class="dropdown-menu">
@@ -54,7 +53,6 @@
         {% include 'admin/tab-config-customize.twig' %}
         {% include 'admin/tab-config-password-policy.twig' %}
         {% include 'admin/tab-sys-mails.twig' %}
-        {% include 'admin/tab-mailq.twig' %}
         {% include 'admin/tab-globalfilter-regex.twig' %}
       </div>
     </div> <!-- /col-md-12 -->

data/web/templates/base.twig

@@ -71,12 +71,15 @@
           </ul>
         </li>
         <li class="nav-item dropdown">
-          <a href="#" class="nav-link dropdown-toggle" data-bs-toggle="dropdown" role="button" aria-expanded="false">{{ lang.header.mailboxes }}</a>
+          <a href="#" class="nav-link dropdown-toggle" data-bs-toggle="dropdown" role="button" aria-expanded="false">{{ lang.header.email }}</a>
           <ul class="dropdown-menu">
             {% if mailcow_cc_role == 'admin' or mailcow_cc_role == 'domainadmin' %}
-            <li><a href="/mailbox" class="dropdown-item {% if is_uri('mailbox') %}active{% endif %}">{{ lang.header.mailboxes }}</a></li>
+            <li><a href="/mailbox" class="dropdown-item {% if is_uri('mailbox') %}active{% endif %}">{{ lang.header.mailcow_config }}</a></li>
             {% endif %}
             <li><a href="/quarantine" class="dropdown-item {% if is_uri('quarantine') %}active{% endif %}">{{ lang.header.quarantine }}</a></li>
+            {% if mailcow_cc_role == 'admin' %}
+            <li><a href="/queue" class="dropdown-item {% if is_uri('queue') %}active{% endif %}">{{ lang.queue.queue_manager }}</a></li>
+            {% endif %}
             <li><a href="#" class="dropdown-item" data-bs-toggle="modal" data-container="sogo-mailcow" data-bs-target="#RestartContainer">{{ lang.header.restart_sogo }}</a></li>
           </ul>
         </li>

data/web/templates/admin/tab-mailq.twig → data/web/templates/queue.twig

@@ -1,24 +1,23 @@
-<div role="tabpanel" class="tab-pane fade" id="tab-mailq" role="tabpanel" aria-labelledby="tab-mailq">
+{% extends 'base.twig' %}
+
+{% block content %}
   <div class="card mb-4">
     <div class="card-header d-flex fs-5">
-      <button class="btn d-md-none flex-grow-1 text-start me-2" data-bs-target="#collapse-tab-mailq" data-bs-toggle="collapse" aria-controls="ollapse-tab-mailq">
-        {{ lang.admin.queue_manager }} <span class="badge bg-info table-lines"></span>
-      </button>
-      <span class="d-none d-md-block">{{ lang.admin.queue_manager }} <span class="badge bg-info table-lines"></span></span>
+      <span>{{ lang.queue.queue_manager }} <span class="badge bg-info table-lines"></span></span>
       <div class="btn-group ms-auto">
         <button class="btn btn-xs btn-secondary refresh_table" data-draw="draw_queue" data-table="queuetable">{{ lang.admin.refresh }}</button>
       </div>
     </div>
-    <div id="collapse-tab-mailq" class="card-body collapse" data-bs-parent="#admin-content">
+    <div class="card-body">
       <table id="queuetable" class="table table-striped dt-responsive w-100"></table>
       <div class="mass-actions-admin">
         <div class="btn-group">
           <a class="btn btn-sm btn-xs-half d-block d-sm-inline btn-secondary" id="toggle_multi_select_all" data-id="mailqitems" href="#"><i class="bi bi-check-all"></i> {{ lang.mailbox.toggle_all }}</a>
           <a class="btn btn-sm btn-xs-half d-block d-sm-inline btn-secondary dropdown-toggle" data-bs-toggle="dropdown" href="#">{{ lang.mailbox.quick_actions }}</a>
           <ul class="dropdown-menu top33">
-            <li><a class="dropdown-item" data-bs-toggle="tooltip" title="postqueue -i" data-action="edit_selected" data-id="mailqitems" data-api-url='edit/mailq' data-api-attr='{"action":"deliver"}' href="#">{{ lang.admin.queue_deliver_mail }}</a></li>
-            <li><a class="dropdown-item" data-bs-toggle="tooltip" title="postsuper -H" data-action="edit_selected" data-id="mailqitems" data-api-url='edit/mailq' data-api-attr='{"action":"unhold"}' href="#">{{ lang.admin.queue_unhold_mail }}</a></li>
-            <li><a class="dropdown-item" data-bs-toggle="tooltip" title="postsuper -h" data-action="edit_selected" data-id="mailqitems" data-api-url='edit/mailq' data-api-attr='{"action":"hold"}' href="#">{{ lang.admin.queue_hold_mail }}</a></li>
+            <li><a class="dropdown-item" data-bs-toggle="tooltip" title="postqueue -i" data-action="edit_selected" data-id="mailqitems" data-api-url='edit/mailq' data-api-attr='{"action":"deliver"}' href="#">{{ lang.queue.queue_deliver_mail }}</a></li>
+            <li><a class="dropdown-item" data-bs-toggle="tooltip" title="postsuper -H" data-action="edit_selected" data-id="mailqitems" data-api-url='edit/mailq' data-api-attr='{"action":"unhold"}' href="#">{{ lang.queue.queue_unhold_mail }}</a></li>
+            <li><a class="dropdown-item" data-bs-toggle="tooltip" title="postsuper -h" data-action="edit_selected" data-id="mailqitems" data-api-url='edit/mailq' data-api-attr='{"action":"hold"}' href="#">{{ lang.queue.queue_hold_mail }}</a></li>
             <li><hr class="dropdown-divider"></li>
             <li><a class="dropdown-item" data-bs-toggle="tooltip" title="postsuper -d" data-action="delete_selected" data-id="mailqitems" data-api-url='delete/mailq' href="#">{{ lang.mailbox.remove }}</a></li>
           </ul>
@@ -28,7 +27,7 @@
              data-api-url='edit/mailq'
              data-api-attr='{"action":"flush"}'
              data-bs-toggle="tooltip" title="postqueue -f"
-             href="#"><i class="bi bi-check-all"></i> {{ lang.admin.flush_queue }}</a>
+             href="#"><i class="bi bi-check-all"></i> {{ lang.queue.flush_queue }}</a>
           <a class="btn btn-sm d-block d-sm-inline btn-danger"
              id="super_delete"
              data-action="edit_selected"
@@ -36,9 +35,17 @@
              data-api-url='edit/mailq'
              data-api-attr='{"action":"super_delete"}'
              data-bs-toggle="tooltip" title="postsuper -d ALL"
-             href="#"><i class="bi bi-trash"></i> {{ lang.admin.delete_queue }}</a>
+             href="#"><i class="bi bi-trash"></i> {{ lang.queue.delete_queue }}</a>
         </div>
       </div>
     </div>
   </div>
-</div>
+
+<script type='text/javascript'>
+  var lang = {{ lang_admin|raw }};
+  var lang_datatables = {{ lang_datatables|raw }};
+  var csrf_token = '{{ csrf_token }}';
+  var pagination_size = '{{ pagination_size }}';
+  var table_for_domain = '{{ domain }}';
+</script>
+{% endblock %}