Fix wrapping of quoted text with format=flowed (#1488177)

Conflicts:

	CHANGELOG
	program/include/rcube_mime.php

2 files changed, 6 insertions, 5 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 64db1eb3e..61b088d0c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,6 +3,7 @@ CHANGELOG Roundcube Webmail
 
 - Fix cache (in)validation after setting \Deleted flag
 - Fix keybord events on messages list in opera browser (#1488823)
+- Fix wrapping of quoted text with format=flowed (#1488177)
 
 RELEASE 0.8.4
 -------------
diff --git a/program/include/rcube_mime.php b/program/include/rcube_mime.php
index 287bde851..d33c4eba6 100644
--- a/program/include/rcube_mime.php
+++ b/program/include/rcube_mime.php
@@ -540,11 +540,11 @@ class rcube_mime
 
         foreach ($text as $idx => $line) {
             if ($line != '-- ') {
-                if ($line[0] == '>' && preg_match('/^(>+)/', $line, $regs)) {
-                    $prefix = $regs[0];
-                    $level = strlen($prefix);
-                    $line  = rtrim(substr($line, $level));
-                    $line  = $prefix . rc_wordwrap($line, $length - $level - 2, " \r\n$prefix ");
+                if ($line[0] == '>' && preg_match('/^(>+ {0,1})+/', $line, $regs)) {
+                    $level  = substr_count($regs[0], '>');
+                    $prefix = str_repeat('>', $level) . ' ';
+                    $line   = rtrim(substr($line, strlen($regs[0])));
+                    $line   = $prefix . rc_wordwrap($line, $length - $level - 2, " \r\n$prefix", false, $charset);
                 }
                 else if ($line) {
                     $line = rc_wordwrap(rtrim($line), $length - 2, " \r\n");