Don't clear References and in-Reply-To when a message is "edited as new" (#...

Aleksander Machniak

2013-07-02 c78a652746fde91ec6c713cdbaf368437d63e2e3

Don't clear References and in-Reply-To when a message is "edited as new" (#1489216)

Conflicts:

	CHANGELOG

 CHANGELOG

@@ -1,6 +1,7 @@
CHANGELOG Roundcube Webmail
===========================

- Don't clear References and in-Reply-To when a message is "edited as new" (#1489216)
- Fix messages list sorting with THREAD=REFS
- Remove deprecated (in PHP 5.5) PREG /e modifier usage (#1489174)
- Fix empty messages list when register_globals is enabled (#1489157)

 program/steps/mail/compose.inc

@@ -210,8 +210,8 @@
      $COMPOSE['param']['sent_mbox'] = $sent_folder;
    }
  }
  else if ($compose_mode == RCUBE_COMPOSE_DRAFT) {
    if ($draft_info = $MESSAGE->headers->get('x-draft-info')) {
  else if ($compose_mode == RCUBE_COMPOSE_DRAFT || $compose_mode == RCUBE_COMPOSE_EDIT) {
    if ($compose_mode == RCUBE_COMPOSE_DRAFT && ($draft_info = $MESSAGE->headers->get('x-draft-info'))) {
      // get reply_uid/forward_uid to flag the original message when sending
      $info = rcmail_draftinfo_decode($draft_info);