diff -urN smeserver-qmHandle-1.4_old/root/usr/share/smanager/lib/SrvMngr/Controller/Qmh.pm smeserver-qmHandle-1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Qmh.pm
--- smeserver-qmHandle-1.4_old/root/usr/share/smanager/lib/SrvMngr/Controller/Qmh.pm	2022-09-20 17:54:54.270430467 +1000
+++ smeserver-qmHandle-1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Qmh.pm	2022-09-21 08:13:00.000000000 +1000
@@ -95,18 +95,16 @@
 
     if ($trt eq 'MSG') {
 	my $msgid = $c->param('msgid');
-	$result = $c->render_to_string(inline => showDeleteMessageNumber($c, $msgid)) if $msgid;
+	$result = $c->render_to_string(inline => showDeleteMessageNumber($c, $msgid, $altq, $report_type)) if $msgid;
 	$qmh_datas{'msgid'} = $msgid;
     }
 
 
     if ($trt eq 'DEL') {
 	my $msgid = $c->param('msgid');
-	$result = $c->render_to_string(inline => deleteMessageNumber($c, $msgid)) if $msgid;
+	$result = $c->render_to_string(inline => deleteMessageNumber($c, $msgid, $altq, $report_type)) if $msgid;
 	my $message = $c->l('qmh_DELETE') . ' <br> ' . $msgid;
 	#$c->app->log->info($message.' '.$result); 
-	$c->flash( success => $message );
-	$c->redirect_to('/qmh');
     }
 
 
@@ -149,6 +149,7 @@
     my ($c, $altq) = @_;
 
     my $out = '';
+    my $reporttype = 'list-queues';
 
     my $opt = ($altq ? 'altqmail: ' : '');
     $out .= sprintf("<h2>%s</h2><br>", $opt . $c->l('qmh_SHOWLISTQUEUES'));
@@ -159,11 +160,12 @@
     $MailQueues =~ s/</'/g;
     $MailQueues =~ s/>/'/g;
 
-    $MailQueues = AddLinks($MailQueues, $c, $altq);
+    $MailQueues = AddLinks($MailQueues, $altq, $reporttype);
 
     $out .= sprintf "<pre>";
     $out .= "$MailQueues";
     $out .= sprintf "</pre>";
+    $out .= sprintf "<input type=hidden name=\"Report_type\" value=\"$reporttype\">";
     return $out;
 }
 
@@ -176,6 +178,7 @@
     my ($c, $altq) = @_;
 
     my $out = '';
+    my $reporttype = 'list-local-queue';
 
     my $opt = ($altq ? 'altqmail: ' : '');
     $out .= sprintf("<h2>%s</h2><br>", $opt . $c->l('qmh_LIST_LOCAL_QUEUE'));
@@ -186,11 +189,12 @@
     $LocalQueue =~ s/</'/g;
     $LocalQueue =~ s/>/'/g;
 
-    $LocalQueue = AddLinks($LocalQueue, $c, $altq);
+    $LocalQueue = AddLinks($LocalQueue, $altq, $reporttype);
 
     $out .= sprintf "<pre>";
     $out .= "$LocalQueue";
     $out .= sprintf "</pre>";
+    $out .= sprintf "<input type=hidden name=\"Report_type\" value=\"$reporttype\">";
     return $out;
 }
 
@@ -203,6 +207,7 @@
     my ($c, $altq) = @_;
 
     my $out = '';
+    my $reporttype = 'list-remote-queue';
 
     my $opt = ($altq ? 'altqmail: ' : '');
     $out .= sprintf("<h2>%s</h2><br>", $opt . $c->l('qmh_LIST_REMOTE_QUEUE'));
@@ -213,11 +218,12 @@
     $RemoteQueue =~ s/</'/g;
     $RemoteQueue =~ s/>/'/g;
 
-    $RemoteQueue = AddLinks($RemoteQueue, $c, $altq);
+    $RemoteQueue = AddLinks($RemoteQueue, $altq, $reporttype);
 
     $out .= sprintf "<pre>";
     $out .= "$RemoteQueue";
     $out .= sprintf "</pre>";
+    $out .= sprintf "<input type=hidden name=\"Report_type\" value=\"$reporttype\">";
     return $out;
 }
 
@@ -230,6 +236,7 @@
     my ($c, $altq) = @_;
 
     my $out = '';
+    my $reporttype = 'resend';
 
     my $opt = ($altq ? 'altqmail: ' : '');
     $out .= sprintf("<h2>%s</h2><br>", $opt . $c->l('qmh_TRY_SEND_QUEUE'));
@@ -240,11 +247,12 @@
     $Res =~ s/</'/g;
     $Res =~ s/>/'/g;
 
-    $Res = AddLinks($Res, $c, $altq);
+    $Res = AddLinks($Res, $altq, $reporttype);
 
     $out .= sprintf "<pre>";
     $out .= "$Res";
     $out .= sprintf "</pre>";
+    $out .= sprintf "<input type=hidden name=\"Report_type\" value=\"$reporttype\">";
     $out .= sprintf "<h3>Done</h3>";
     return $out;
 }
@@ -252,13 +260,13 @@
 
 sub AddLinks {
 
-        my ($queues, $altq) = @_;
+        my ($queues, $altq, $reporttype) = @_;
 
         my @splitq = split(/\n/, $queues);
 
         for (my $i = 0; $i < $#splitq; $i++) {
 	       if ($splitq[$i] =~ /^(\d+)\s+(\(\d+\,\s+\d+\/+\d+\)\s*)$/ ) {
-                        $splitq[$i] = "<a href=\"qmh2?trt=MSG&msgid=$1\">$1</a> $2";
+                        $splitq[$i] = "<a href=\"qmh2?trt=MSG&msgid=$1&Report_type=$reporttype\">$1</a> $2";
                 }
         }
         $queues = join("\n", @splitq);
@@ -272,7 +280,7 @@
 #------------------------------------------------------------
 sub showDeleteMessageNumber {
 
-    my ($c, $msgid, $altq) = @_;
+    my ($c, $msgid, $altq, $reporttype) = @_;
 
     if ($msgid =~ /^(\d+)$/) {
        $msgid = $1;
@@ -290,15 +298,16 @@
     my $Message = `/usr/bin/qmHandle $opt`;
 
     $out .= sprintf "<pre>";
-    $out .= "$Message";
+    $out .= "<textarea name=\"message\" rows=30 cols=80>$Message</textarea>";
     $out .= sprintf "</pre>";
+    $out .= sprintf "<input type=hidden name=\"Report_type\" value=\"$reporttype\">";
     return $out;
 }
 
 
 sub deleteMessageNumber {
 
-    my ($c, $msgid, $altq) = @_;
+    my ($c, $msgid, $altq, $reporttype) = @_;
 
     if ($msgid =~ /^(\d+)$/) {
        $msgid = $1;
@@ -313,6 +322,7 @@
     $out .= sprintf "<pre>";
     $out .= "$Output";
     $out .= sprintf "</pre>";
+    $out .= sprintf "<input type=hidden name=\"Report_type\" value=\"$reporttype\">";
     return $out;
 
 }
diff -urN smeserver-qmHandle-1.4_old/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Qmh/en.pm smeserver-qmHandle-1.4/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Qmh/en.pm
--- smeserver-qmHandle-1.4_old/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Qmh/en.pm	1970-01-01 10:00:00.000000000 +1000
+++ smeserver-qmHandle-1.4/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Qmh/en.pm	2022-09-18 15:00:00.000000000 +1000
@@ -0,0 +1,39 @@
+package SrvMngr::I18N::Modules::Qmh::en;
+use strict;
+use warnings;
+use utf8;
+use Mojo::Base 'SrvMngr::I18N';
+
+use SrvMngr::I18N::Modules::General::en;
+
+my %lexicon = (
+'qmh_QMH_TITLE' => 'Qmail queue management',
+'qmh_OPERATION_STATUS_REPORT' => 'Operation status report',
+'qmh_QMH_DESC' => 'This panel uses <b>qmHandle</b> to manage the qmail message queues. Key features are the ability to view and delete messages in the queues.',
+'qmh_TRY_SEND_QUEUE' => 'Force resending of the Qmail queue',
+'qmh_SEND_QUEUE_AT' => 'Resend Qmail queue at: ',
+'qmh_LIST_QUEUE' => 'List message queues',
+'qmh_LIST_LOCAL_QUEUE' => 'List local message queue',
+'qmh_SHOWLISTQUEUES' => 'List Qmail local and remote queues',
+'qmh_LIST_REMOTE_QUEUE' => 'List remote message queue',
+'qmh_VIEW_TIME' => 'Qmail message queue, viewed at: ',
+'qmh_LIST_LOCAL_QUEUE' => 'List Qmail local queue',
+'qmh_LIST_REMOTE_QUEUE' => 'List Qmail remote queue',
+'qmh_RESEND_QUEUE' => 'Try to send queued messages now (qmail must be running)',
+'qmh_DELETE_MSG_TITLEB' => 'Queue management: delete Message',
+'qmh_DELETE_MESSAGE' => 'Delete this message from the queue ? (Only the first 100 lines are listed)', 
+'qmh_DELETE' => 'Delete',
+'qmh_SELECT_AN_ACTION' => 'Select an action',
+'qmh_FROM_QUEUE' => 'from message queue',
+'qmh_Administration' => 'Administration',
+'qmh_RETURN_TO_QUEUE' => 'Return to Queue',
+'E-mail Warteschlange' => 'E-Mail queue management',
+);
+
+our %Lexicon = (
+	%{ SrvMngr::I18N::Modules::General::en::Lexicon },
+	%lexicon
+);
+
+
+1;
diff -urN smeserver-qmHandle-1.4_old/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Qmh/fr.pm smeserver-qmHandle-1.4/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Qmh/fr.pm
--- smeserver-qmHandle-1.4_old/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Qmh/fr.pm	1970-01-01 10:00:00.000000000 +1000
+++ smeserver-qmHandle-1.4/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Qmh/fr.pm	2022-09-18 15:00:00.000000000 +1000
@@ -0,0 +1,39 @@
+package SrvMngr::I18N::Modules::Qmh::fr;
+use strict;
+use warnings;
+use utf8;
+use Mojo::Base 'SrvMngr::I18N';
+
+use SrvMngr::I18N::Modules::General::fr;
+
+my %lexicon = (
+'qmh_QMH_TITLE' => 'Administration de file d\'attente',
+'qmh_OPERATION_STATUS_REPORT' => 'Rapport d\'état de l\'opération',
+'qmh_QMH_DESC' => 'Ce panel utilise <b>qmHandle</b> pour administrer la file d\'attente de Qmail. Les fonctionnalités principales sont de voir et d\'effacer des messages dans la file d\'attente. ',
+'qmh_TRY_SEND_QUEUE' => 'Forcer le renvoi de la file d\'attente de qmail',
+'qmh_SEND_QUEUE_AT' => 'Renvoi la file d\'attente Qmail le : ',
+'qmh_LIST_QUEUE' => 'Message de la file d\'attente',
+'qmh_LIST_LOCAL_QUEUE' => 'File d\'attente locale',
+'qmh_SHOWLISTQUEUES' => 'Files d\'attente locale et distante',
+'qmh_LIST_REMOTE_QUEUE' => 'File d\'attente distante de QMAIL',
+'qmh_VIEW_TIME' => 'La file d\'attente des messages de Qmail le : ',
+'qmh_LIST_LOCAL_QUEUE' => 'File d\'attente locale de QMAIL',
+'qmh_LIST_REMOTE_QUEUE' => 'File d\'attente distante de QMAIL',
+'qmh_RESEND_QUEUE' => 'Renvoyer les messages de la file d\'attente maintenant (Qmail doit être en fonction)',
+'qmh_DELETE_MSG_TITLEB' => 'Administration de file d\'attente : effacer le Message',
+'qmh_DELETE_MESSAGE' => 'Effacez ce message de la file d\'attente? (Seulement les 100 premières lignes sont affichées)', 
+'qmh_DELETE' => 'Supprimer',
+'qmh_SELECT_AN_ACTION' => 'Sélectionnez une action :',
+'qmh_iFROM_QUEUE' => 'de la file d\'attente des messages',
+'qmh_Administration' => 'Administration',
+'qmh_RETURN_TO_QUEUE' => 'Retour à la file d\'attente',
+'E-mail Warteschlange' => 'Administration de file d\'attente des courriels',
+);
+
+our %Lexicon = (
+	%{ SrvMngr::I18N::Modules::General::fr::Lexicon },
+	%lexicon
+);
+
+
+1;
diff -urN smeserver-qmHandle-1.4_old/root/usr/share/smanager/themes/default/templates/qmh.html.ep smeserver-qmHandle-1.4/root/usr/share/smanager/themes/default/templates/qmh.html.ep
--- smeserver-qmHandle-1.4_old/root/usr/share/smanager/themes/default/templates/qmh.html.ep	2022-09-20 17:54:54.270430467 +1000
+++ smeserver-qmHandle-1.4/root/usr/share/smanager/themes/default/templates/qmh.html.ep	2022-09-20 21:06:00.000000000 +1000
@@ -34,6 +34,12 @@
         % $btn = l('NEXT');
 	%= $c->render_to_string( inline => stash 'modul' )
     %}
+    % if ($qmh_datas->{trt} eq 'DEL') {
+        % $btn = l('qmh_RETURN_TO_QUEUE');
+	%= $c->render_to_string( inline => stash 'modul' )
+        %= hidden_field 'msgid' => $qmh_datas->{msgid}
+	%  $qmh_datas->{trt} = 'LST';
+    %}
     % if ($qmh_datas->{trt} eq 'MSG') {
         % $btn = l('Delete');
 	%= $c->render_to_string( inline => stash 'modul' )