From eafd5b1aa4e67c4de18fc09493540b55dc647220 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Thu, 3 Oct 2013 17:36:31 +0200
Subject: Improved mailto: link arguments handling (#1489363)

---
 program/steps/mail/sendmail.inc | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'program/steps/mail/sendmail.inc')

diff --git a/program/steps/mail/sendmail.inc b/program/steps/mail/sendmail.inc
index dee8d2136..ccb8978be 100644
--- a/program/steps/mail/sendmail.inc
+++ b/program/steps/mail/sendmail.inc
@@ -414,9 +414,6 @@ if (!empty($headers['Reply-To'])) {
 if (!empty($_POST['_followupto'])) {
   $headers['Mail-Followup-To'] = rcmail_email_input_format(get_input_value('_followupto', RCUBE_INPUT_POST, TRUE, $message_charset));
 }
-if (!empty($COMPOSE['reply_msgid'])) {
-  $headers['In-Reply-To'] = $COMPOSE['reply_msgid'];
-}
 
 // remember reply/forward UIDs in special headers
 if (!empty($COMPOSE['reply_uid']) && $savedraft) {
@@ -426,6 +423,9 @@ else if (!empty($COMPOSE['forward_uid']) && $savedraft) {
   $headers['X-Draft-Info'] = array('type' => 'forward', 'uid' => $COMPOSE['forward_uid']);
 }
 
+if (!empty($COMPOSE['reply_msgid'])) {
+  $headers['In-Reply-To'] = $COMPOSE['reply_msgid'];
+}
 if (!empty($COMPOSE['references'])) {
   $headers['References'] = $COMPOSE['references'];
 }
@@ -759,7 +759,7 @@ if ($store_target) {
 
     if (PEAR::isError($msg))
       raise_error(array('code' => 650, 'type' => 'php',
-	    'file' => __FILE__, 'line' => __LINE__,
+        'file' => __FILE__, 'line' => __LINE__,
             'message' => "Could not create message: ".$msg->getMessage()),
             TRUE, FALSE);
     else {
-- 
cgit v1.2.3