- Fix forwarded attachments, broken in r5204

alecpl

2011-09-20 eeae0db10cbd645a6f4abe6a16b2876cd1f0afe5

- Fix forwarded attachments, broken in r5204

 program/include/rcube_imap.php

@@ -2390,18 +2390,18 @@
            return true;
        }

        // convert charset (if text or message part)
        if ($body && preg_match('/^(text|message)$/', $o_part->ctype_primary)) {
        // Remove NULL characters (#1486189)
        $body = str_replace("\x00", '', $body);

        // convert charset (if text or message part)
        if ($body && !$skip_charset_conv &&
            preg_match('/^(text|message)$/', $o_part->ctype_primary)
        ) {
           if (!$skip_charset_conv) {
            if (!$o_part->charset || strtoupper($o_part->charset) == 'US-ASCII') {
                $o_part->charset = $this->default_charset;
            }
            $body = rcube_charset_convert($body, $o_part->charset);
        }
        }

        return $body;
    }