X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fdelete_message.php;h=7cc08b1cf2924f7b340844f918c238d95f7493c8;hb=a61878d029c321a773834b25a146fe7a38f9b294;hp=18629228eab559a096b56fa4b444b1447a9885a2;hpb=65c3ec94c897fb098598f3843e371020deb2226b;p=squirrelmail.git

diff --git a/src/delete_message.php b/src/delete_message.php
index 18629228..7cc08b1c 100644
--- a/src/delete_message.php
+++ b/src/delete_message.php
@@ -23,15 +23,29 @@ sqimap_messages_delete($imapConnection, $message, $message, $mailbox);
 if ($auto_expunge) {
     sqimap_mailbox_expunge($imapConnection, $mailbox, true);
 }
+if (!isset($saved_draft)) {
+    $saved_draft = '';
+}
+
+if (!isset($mail_sent)) {
+    $mail_sent = '';
+}
 
 $location = get_location();
+
 if (isset($where) && isset($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));
+    if (!empty($saved_draft) || !empty($mail_sent)) {
+          header("Location: $location/compose.php?mail_sent=$mail_sent&saved_draft=$saved_draft");
+    }
+    else {
+        header("Location: $location/right_main.php?sort=$sort&startMessage=$startMessage&mailbox=" .
+               urlencode($mailbox));
+    }
 }
 
 sqimap_logout($imapConnection);
+
 ?>