From d3105370870a8c51aaeb6a18f561311202da3356 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Mon, 11 Apr 2011 08:24:00 -0400
Subject: [PATCH] - Apply fixes from trunk

---
 program/include/rcube_message.php |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/program/include/rcube_message.php b/program/include/rcube_message.php
index 5c07738..6ffe919 100644
--- a/program/include/rcube_message.php
+++ b/program/include/rcube_message.php
@@ -725,7 +725,9 @@
                     $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;

--
Gitblit v1.9.1