From: pdontthink <pdontthink@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Date: Wed, 22 Nov 2017 22:56:18 +0000 (+0000)
Subject: Make return-to-message work for forwards
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=aa1340ebb1e775a36b74dbfc22391ee095d45394;p=squirrelmail.git

Make return-to-message work for forwards

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@14745 7612ce4b-ef26-0410-bec9-ea0150e637f0
---

diff --git a/src/compose.php b/src/compose.php
index f25ae34c..a45512aa 100644
--- a/src/compose.php
+++ b/src/compose.php
@@ -574,7 +574,8 @@ if ($send) {
         } else {
             if ( !isset($pageheader_sent) || !$pageheader_sent ) {
                 global $return_to_message_after_reply;
-                if (($action === 'reply' || $action === 'reply_all') && $return_to_message_after_reply)
+                if (($action === 'reply' || $action === 'reply_all' || $action === 'forward' || $action === 'forward_as_attachment')
+                 && $return_to_message_after_reply && $passed_id)
                     header("Location: $location/read_body.php?passed_id=$passed_id&mailbox=$urlMailbox".
                             "&startMessage=$startMessage&mail_sent=$mail_sent");
                 else