This closes bug #453335

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@1522 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/src/compose.php b/src/compose.php
index 8a348b70359ca40cf0594171c30b42b00db9dd31..9ebb5ded071d4f4541fa343de5756e8121aefbe3 100644 (file)
--- a/src/compose.php
+++ b/src/compose.php
@@ -444,7 +444,8 @@
         $body = explode("\n", $body);
         $newBody = '';
         foreach ($body as $line) {
-           $line = rtrim($line);
+           if( $line <> '-- ' )
+              $line = rtrim($line);
            if (strlen($line) <= $editor_size + 1)
               $newBody .= $line . "\n";
            else {

diff --git a/src/options_personal.php b/src/options_personal.php
index e5bab6796f3624a283b3422a209be4e2aae276f1..3a40f28365d55872830f79ecd9de1078f6e755af 100644 (file)
--- a/src/options_personal.php
+++ b/src/options_personal.php
@@ -103,7 +103,7 @@
    if ( $prefix_sig )
      echo ' checked';
    echo '>  ' .
-        _( "Prefix signature with '--' ?" ) . '<BR>';
+        _( "Prefix signature with '-- ' ?" ) . '<BR>';
    echo "\n<textarea name=\"signature_edit\" rows=\"5\" cols=\"50\">$signature_abs</textarea><br>";
 ?>
             </td>