Save draft information in one header; finally fixes #1486203

thomascube

2010-03-11 bc404ffd41c3411510a022ae5b0c9f2bfe8f5db1

 program/steps/mail/sendmail.inc

@@ -313,12 +313,12 @@

if (!empty($_SESSION['compose']['reply_msgid']))
  $headers['In-Reply-To'] = $_SESSION['compose']['reply_msgid'];

  
// remember reply/forward UIDs in special headers
if (!empty($_SESSION['compose']['reply_uid']) && $savedraft)
  $headers['X-Reply-UID'] = $_SESSION['compose']['reply_uid'];
  $headers['X-Draft-Info'] = array('type' => 'reply', 'uid' => $_SESSION['compose']['reply_uid']);
else if (!empty($_SESSION['compose']['forward_uid']) && $savedraft)
  $headers['X-Forward-UID'] = $_SESSION['compose']['forward_uid'];
  $headers['X-Draft-Info'] = array('type' => 'forward', 'uid' => $_SESSION['compose']['forward_uid']);

if (!empty($_SESSION['compose']['references']))
  $headers['References'] = $_SESSION['compose']['references'];
@@ -341,6 +341,9 @@
$headers['Message-ID'] = $message_id;
$headers['X-Sender'] = $from;

if (is_array($headers['X-Draft-Info']))
  $headers['X-Draft-Info'] = rcmail_draftinfo_encode($headers['X-Draft-Info'] + array('folder' => $_SESSION['compose']['mailbox']));

if (!empty($CONFIG['useragent']))
  $headers['User-Agent'] = $CONFIG['useragent'];