diff options
| author | alecpl <alec@alec.pl> | 2011-11-16 08:57:32 +0000 |
|---|---|---|
| committer | alecpl <alec@alec.pl> | 2011-11-16 08:57:32 +0000 |
| commit | 3fd5e2edfc72cea56ede0512f081a67d547ed61f (patch) | |
| tree | 1529d839ec83ff49fbe21c3aea307e248eb1f016 /program/steps | |
| parent | 3fec6952ddbff1b5b487ea2927928338f39e4fef (diff) | |
- Apply fixes from trunk up to r5433
Diffstat (limited to 'program/steps')
| -rw-r--r-- | program/steps/mail/compose.inc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc index c527ce15f..9df25f031 100644 --- a/program/steps/mail/compose.inc +++ b/program/steps/mail/compose.inc @@ -358,11 +358,13 @@ foreach ($parts as $header) { $mailfollowup = $MESSAGE->headers->others['mail-followup-to']; $mailreplyto = $MESSAGE->headers->others['mail-reply-to']; + // Reply to mailing list... if ($MESSAGE->reply_all == 'list' && $mailfollowup) $fvalue = $mailfollowup; else if ($MESSAGE->reply_all == 'list' && preg_match('/<mailto:([^>]+)>/i', $MESSAGE->headers->others['list-post'], $m)) $fvalue = $m[1]; + // Reply to... else if ($MESSAGE->reply_all && $mailfollowup) $fvalue = $mailfollowup; else if ($mailreplyto) @@ -371,6 +373,11 @@ foreach ($parts as $header) { $fvalue = $MESSAGE->headers->replyto; else if (!empty($MESSAGE->headers->from)) $fvalue = $MESSAGE->headers->from; + + // Reply to message sent by yourself (#1487074) + if (!empty($ident) && $fvalue == $ident['ident']) { + $fvalue = $MESSAGE->headers->to; + } } // add recipient of original message if reply to all else if ($header == 'cc' && !empty($MESSAGE->reply_all) && $MESSAGE->reply_all != 'list') { |