X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fdelete_message.php;h=086750e6b424052159a2460c43a45a05bd913c28;hb=1d7e3ec9120416c8759521324c1c6315ad47bcda;hp=fd274d3e3e9e5490c06ac8d10358237d81b80a7d;hpb=1195c34026fc65eb8e0ca7a337fe4b406764dee8;p=squirrelmail.git

diff --git a/src/delete_message.php b/src/delete_message.php
index fd274d3e..086750e6 100644
--- a/src/delete_message.php
+++ b/src/delete_message.php
@@ -29,8 +29,14 @@
 
    sqimap_messages_delete($imapConnection, $message, $message, $mailbox);
    if ($auto_expunge)
-      sqimap_mailbox_expunge($imapConnection, $mailbox);
+      sqimap_mailbox_expunge($imapConnection, $mailbox, true);
 
    $location = get_location();
-   header ("Location: $location/right_main.php?sort=$sort&startMessage=$startMessage&mailbox=".urlencode($mailbox));
+   if ($where && $what)
+      header ("Location: $location/search.php?where=".urlencode($where)."&what=".urlencode($what)."&mailbox=".urlencode($mailbox));
+   else   
+      header ("Location: $location/right_main.php?sort=$sort&startMessage=$startMessage&mailbox=".urlencode($mailbox));
+
+   sqimap_mailbox_close($imapConnection);
+   sqimap_logout($imapConnection);
 ?>