Fixed bug #1484019 and #1484020

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

2 files changed, 4 insertions, 6 deletions

diff --git a/roundcubemail/program/lib/html2text.inc b/roundcubemail/program/lib/html2text.inc
index 82a254e56..36849a492 100644
--- a/roundcubemail/program/lib/html2text.inc
+++ b/roundcubemail/program/lib/html2text.inc
@@ -126,19 +126,18 @@ class html2text
         '/(<table[^>]*>|<\/table>)/i',           // <table> and </table>
         '/(<tr[^>]*>|<\/tr>)/i',                 // <tr> and </tr>
         '/<td[^>]*>(.+?)<\/td>/i',               // <td> and </td>
-        '/<th[^>]*>(.+?)<\/th>/i',               // <th> and </th>
+        '/<th[^>]*>(.+?)<\/th>/ie',              // <th> and </th>
         '/&nbsp;/i',
         '/&quot;/i',
         '/&gt;/i',
         '/&lt;/i',
-        '/&amp;/i',
+        '/&(amp|#38);/i',
         '/&copy;/i',
         '/&trade;/i',
         '/&#8220;/',
         '/&#8221;/',
         '/&#8211;/',
-        '/&#8217;/',
-        '/&#38;/',
+        '/&#(8217|39);/',
         '/&#169;/',
         '/&#8482;/',
         '/&#151;/',
@@ -188,7 +187,6 @@ class html2text
         '"',
         '-',
         "'",
-        '&',
         '(c)',
         '(tm)',
         '--',
diff --git a/roundcubemail/program/lib/imap.inc b/roundcubemail/program/lib/imap.inc
index b2e1d43c0..caa1d2721 100644
--- a/roundcubemail/program/lib/imap.inc
+++ b/roundcubemail/program/lib/imap.inc
@@ -1887,7 +1887,7 @@ function iil_C_HandlePartBody(&$conn, $mailbox, $id, $part, $mode){
                 $remaining = $bytes - $received;
                 $line = iil_ReadLine($fp, 1024);
                 $len = strlen($line);
-                if ($len > $remaining) substr($line, 0, $remaining);
+                if ($len > $remaining) $line = substr($line, 0, $remaining);
                 $received += strlen($line);
                 if ($mode==1) $result .= chop($line)."\n";
                 else if ($mode==2){ echo chop($line)."\n"; flush(); }