From 87a96809c7a067f8cc140884558898fd92c87032 Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Mon, 21 Jan 2013 12:00:24 +0100 Subject: Rtrim() quoted lines on conversion to flowed format (according to RFC2646) --- program/lib/Roundcube/rcube_mime.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/program/lib/Roundcube/rcube_mime.php b/program/lib/Roundcube/rcube_mime.php index e9d5cf148..2f24a1bb3 100644 --- a/program/lib/Roundcube/rcube_mime.php +++ b/program/lib/Roundcube/rcube_mime.php @@ -544,8 +544,8 @@ class rcube_mime if ($line[0] == '>') { // remove quote chars, store level in $level $line = preg_replace('/^>+/', '', $line, -1, $level); - // remove (optional) space-staffing - $line = preg_replace('/^ /', '', $line); + // remove (optional) space-staffing and spaces before the line end + $line = preg_replace('/(^ | +$)/', '', $line); $prefix = str_repeat('>', $level) . ' '; $line = $prefix . self::wordwrap($line, $length - $level - 2, " \r\n$prefix", false, $charset); } -- cgit v1.2.3