- Improve space-stuffing handling in format=flowed messages (#1487861)

1 files changed, 3 insertions, 1 deletions

diff --git a/program/include/rcube_message.php b/program/include/rcube_message.php
index a8c51cc4e..4f9a2f230 100644
--- a/program/include/rcube_message.php
+++ b/program/include/rcube_message.php
@@ -726,7 +726,9 @@ class rcube_message
                     $line  = $prefix . rc_wordwrap($line, $length - $level - 2, " \r\n$prefix ");
                 }
                 else if ($line) {
-                    $line = ' ' . rc_wordwrap(rtrim($line), $length - 2, " \r\n ");
+                    $line = rc_wordwrap(rtrim($line), $length - 2, " \r\n");
+                    // space-stuffing
+                    $line = preg_replace('/(^|\r\n)(From| |>)/', '\\1 \\2', $line);
                 }
 
                 $text[$idx] = $line;