diff options
| author | Aleksander Machniak <alec@alec.pl> | 2013-07-02 15:50:19 +0200 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2013-07-02 15:50:19 +0200 |
| commit | bd73a86dadb2fccf24e0bef89e01e18bd91c5853 (patch) | |
| tree | f44cbbe4330c7499790d0076aaad3883c1f0ea18 | |
| parent | ed3e51f1b41d818ae757220fd41cdf0b093b20f6 (diff) | |
Don't clear References and in-Reply-To when a message is "edited as new" (#1489216)
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | program/steps/mail/compose.inc | 6 |
2 files changed, 4 insertions, 3 deletions
@@ -1,6 +1,7 @@ CHANGELOG Roundcube Webmail =========================== +- Don't clear References and in-Reply-To when a message is "edited as new" (#1489216) - Make possible to disable some (broken) IMAP extensions with imap_disable_caps option (#1489184) - Contacts drag-n-drop default action is to move contacts (#1488751) - Added possibility to choose to move or copy contacts from drag-n-drop menu (#1488751) diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc index d3bc7fe72..351ac7217 100644 --- a/program/steps/mail/compose.inc +++ b/program/steps/mail/compose.inc @@ -219,8 +219,8 @@ if (!empty($msg_uid) && empty($COMPOSE['as_attachment'])) $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); @@ -242,7 +242,7 @@ if (!empty($msg_uid) && empty($COMPOSE['as_attachment'])) if ($in_reply_to = $MESSAGE->headers->get('in-reply-to')) $COMPOSE['reply_msgid'] = '<' . $in_reply_to . '>'; - $COMPOSE['references'] = $MESSAGE->headers->references; + $COMPOSE['references'] = $MESSAGE->headers->references; } } else { |