#1333167

#1484916


git-svn-id: https://svn.roundcube.net/trunk@1306 208e9e7b-5314-0410-a742-e7e81cd9613c

1 files changed, 3 insertions, 3 deletions

diff --git a/roundcubemail/program/lib/imap.inc b/roundcubemail/program/lib/imap.inc
index 96353dd2f..5c15353f5 100644
--- a/roundcubemail/program/lib/imap.inc
+++ b/roundcubemail/program/lib/imap.inc
@@ -2360,9 +2360,9 @@ function iil_C_HandlePartBody(&$conn, $mailbox, $id, $part, $mode) {
                 }
                 $received += strlen($line);
                 if ($mode == 1) {
-                    $result .= chop($line) . "\n";
+                    $result .= rtrim($line, "\t\r\n\0\x0B") . "\n";
                 } else if ($mode == 2) {
-                    echo chop($line) . "\n"; flush();
+                    echo rtrim($line, "\t\r\n\0\x0B") . "\n"; flush();
                 } else if ($mode == 3) {
                     echo base64_decode($line); flush();
                 }
@@ -2374,7 +2374,7 @@ function iil_C_HandlePartBody(&$conn, $mailbox, $id, $part, $mode) {
 		} while (!iil_StartsWith($line, $key));
         
         if ($result) {
-			$result = chop($result);
+	    $result = rtrim($result, "\t\r\n\0\x0B");
             return $result; // substr($result, 0, strlen($result)-1);
         }
         return false;