- Use default_charset for bodies of messages without charset definition (#1486187)

release-0.6
alecpl 15 years ago
parent fefed62caa
commit 2c7296a82d

@ -1,6 +1,7 @@
CHANGELOG RoundCube Webmail
===========================
- Use default_charset for bodies of messages without charset definition (#1486187)
- Password: added cPanel driver
- Fix return to first page from e-mail screen (#1486105)
- Fix handling HTML comments in HTML messages (#1486189)

@ -1554,7 +1554,7 @@ class rcube_imap
// convert charset (if text or message part)
if ($o_part->ctype_primary=='text' || $o_part->ctype_primary=='message') {
// assume default if no charset specified
if (empty($o_part->charset))
if (empty($o_part->charset) || strtolower($o_part->charset) == 'us-ascii')
$o_part->charset = $this->default_charset;
$body = rcube_charset_convert($body, $o_part->charset);

Loading…
Cancel
Save