Fix for forward messages from a search

[squirrelmail.git] / src / move_messages.php

diff --git a/src/move_messages.php b/src/move_messages.php
index 21c87a76726eb38781baf250fc1df21e46b14def..802ddba8cf80572f7b36ddd3987fe37fb8c1c68c 100644 (file)
--- a/src/move_messages.php
+++ b/src/move_messages.php
@@ -200,7 +200,16 @@ if(isset($expungeButton)) {
         }
         $location = get_location();
         if (isset($where) && isset($what)) {
-            header ("Location: $location/search.php?mailbox=".urlencode($mailbox)."&what=".urlencode($what)."&where=".urlencode($where));
+           if (isset($attache)) {
+               $composesession = attachSelectedMessages($msg, $imapConnection);
+               if ($compose_new_win == '1') {
+                   header ("Location: $location/search.php?mailbox=".urlencode($mailbox)."&what=".urlencode($what)."&where=".urlencode($where)."&composenew=1&session=$composesession&attachedmessages=true");
+               } else {
+                   header ("Location: $location/compose.php?startMessage=$startMessage&mailbox=". urlencode($mailbox)."&session=$composesession&attachedmessages=true".$wherewhat);
+               }
+           } else {            
+               header ("Location: $location/search.php?mailbox=".urlencode($mailbox)."&what=".urlencode($what)."&where=".urlencode($where));
+           }
        } elseif(isset($attache)) {
            $composesession = attachSelectedMessages($msg, $imapConnection);
            if ($compose_new_win == '1') {