X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fcompose.php;h=27a8ccf091690247eda290d1f3292b09e1320f6a;hb=6c766fd5dccb5a7f87a97b7a0c2e0f5598ee1c8d;hp=c05cbc52f175408bd1d9c0c1bddd80c5c03ae4c4;hpb=d7c82551df7a28530139681c44a283836be6b6fc;p=squirrelmail.git

diff --git a/src/compose.php b/src/compose.php
index c05cbc52..27a8ccf0 100644
--- a/src/compose.php
+++ b/src/compose.php
@@ -666,19 +666,18 @@ function newMail ($mailbox='', $passed_id='', $passed_ent_id='', $action='', $se
             }
             /* this corrects some wrapping/quoting problems on replies */
             $rewrap_body = explode("\n", $body);
-
-	    $from =  (is_array($orig_header->from)) ? 
-	              $orig_header->from[0] : $orig_header->from;
+	        $from =  (is_array($orig_header->from)) ? 
+	                $orig_header->from[0] : $orig_header->from;
             $body = getReplyCitation($from->getAddress(false));
-
+            sqUnWordWrap($body);
             $cnt = count($rewrap_body);
             for ($i=0;$i<$cnt;$i++) {
-//              sqWordWrap($rewrap_body[$i], ($editor_size - 2));
+              sqWordWrap($rewrap_body[$i], ($editor_size));
                 if (preg_match("/^(>+)/", $rewrap_body[$i], $matches)) {
                     $gt = $matches[1];
-                    $body .= '>' . str_replace("\n", "\n$gt ", $rewrap_body[$i]) ."\n";
+                    $body .= '>' . str_replace("\n", "\n>$gt ", rtrim($rewrap_body[$i])) ."\n";
                 } else {
-                    $body .= '> ' . $rewrap_body[$i] . "\n";
+                    $body .= '> ' . str_replace("\n", "\n> ", rtrim($rewrap_body[$i])) . "\n";
                 }
                 unset($rewrap_body[$i]);
             }