Index: branches/5.0.x/core/kernel/utility/email_send.php =================================================================== diff -u -N -r12299 -r12706 --- branches/5.0.x/core/kernel/utility/email_send.php (.../email_send.php) (revision 12299) +++ branches/5.0.x/core/kernel/utility/email_send.php (.../email_send.php) (revision 12706) @@ -1,6 +1,6 @@ $address) { $value .= $this->QuotedPrintableEncode($name, $this->charset).' <'.$address.'>, '; } - $value = preg_replace('/(.*),$/', '\\1', $value); - $this->SetHeader($header, $value); + $this->SetHeader($header, substr($value, 0, -2)); } @@ -1903,10 +1902,9 @@ } $value = isset($this->headers[$header_name]) ? $this->headers[$header_name] : ''; - $value .= ', '.$this->QuotedPrintableEncode($name, $this->charset).' <'.$email.'>'; + $value .= ', ' . $this->QuotedPrintableEncode($name, $this->charset) . ' <' . $email . '>'; - $value = preg_replace('/^,(.*)/', '\\1', $value); // remove first comma - $this->SetHeader($header_name, $value); + $this->SetHeader($header_name, substr($value, 2)); } /**