|
|
|
@ -352,8 +352,12 @@ foreach ($parts as $header) {
|
|
|
|
|
if ($v = $MESSAGE->headers->cc)
|
|
|
|
|
$fvalue .= (!empty($fvalue) ? $separator : '') . $v;
|
|
|
|
|
// Use Sender header (#1489011)
|
|
|
|
|
if (($v = $MESSAGE->headers->get('Sender', false)) && strpos($v, '-bounces@') === false)
|
|
|
|
|
$fvalue .= (!empty($fvalue) ? $separator : '') . $v;
|
|
|
|
|
if ($v = $MESSAGE->headers->get('Sender', false)) {
|
|
|
|
|
// Skip common mailing lists addresses: *-bounces@ and *-request@ (#1490452)
|
|
|
|
|
if (empty($MESSAGE->headers->others['list-post']) || !preg_match('/-(bounces|request)@/', $v)) {
|
|
|
|
|
$fvalue .= (!empty($fvalue) ? $separator : '') . $v;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// When To: and Reply-To: are the same we add From: address to the list (#1489037)
|
|
|
|
|
if ($v = $MESSAGE->headers->from) {
|
|
|
|
@ -678,7 +682,6 @@ function rcmail_compose_header_from($attrib)
|
|
|
|
|
return $out;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
function rcmail_compose_editor_mode()
|
|
|
|
|
{
|
|
|
|
|
global $RCMAIL, $compose_mode;
|
|
|
|
|