summaryrefslogtreecommitdiff
path: root/program
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2009-10-02 18:57:45 +0000
committeralecpl <alec@alec.pl>2009-10-02 18:57:45 +0000
commit2c7296a82df28cbd1d44949d948bdea35f4cb836 (patch)
tree0e72ae0615305467e876f7658cbffc4b724c77d1 /program
parentfefed62caa38a83b10f20db07467f13dcc330c70 (diff)
- Use default_charset for bodies of messages without charset definition (#1486187)
Diffstat (limited to 'program')
-rw-r--r--program/include/rcube_imap.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/program/include/rcube_imap.php b/program/include/rcube_imap.php
index 6e98b208a..d1021fd98 100644
--- a/program/include/rcube_imap.php
+++ b/program/include/rcube_imap.php
@@ -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);