diff options
| -rw-r--r-- | program/lib/Roundcube/rcube_message.php | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/program/lib/Roundcube/rcube_message.php b/program/lib/Roundcube/rcube_message.php index 0d33ba411..d089713e5 100644 --- a/program/lib/Roundcube/rcube_message.php +++ b/program/lib/Roundcube/rcube_message.php @@ -263,17 +263,18 @@ class rcube_message $this->storage->set_folder($this->folder); $body = $this->storage->get_message_part($this->uid, $mime_id, $part, - $mode === -1, is_resource($mode) ? $mode : null, !$formatted, $max_bytes, $formatted); - - if (!$mode && $body && $formatted) { - $body = self::format_part_body($body, $part, $this->headers->charset); - } + $mode === -1, is_resource($mode) ? $mode : null, + !($mode && $formatted), $max_bytes, $mode && $formatted); if (is_resource($mode)) { rewind($mode); return $body !== false; } + if (!$mode && $body && $formatted) { + $body = self::format_part_body($body, $part, $this->headers->charset); + } + return $body; } |