Add additional space before plaintext signature

horde · Mar 31, 2014 · 8227ae4 · 8227ae4
1 parent 899dda0
commit 8227ae4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/imp/lib/Compose.php b/imp/lib/Compose.php
@@ -1475,9 +1475,9 @@ protected function _createMimeMessage(
         if (!empty($options['signature'])) {
             if (is_string($options['signature'])) {
                 if (empty($options['html'])) {
-                    $body .= "\n" . $options['signature'];
+                    $body .= "\n\n" . trim($options['signature']);
                 } else {
-                    $html_sig = $options['signature'];
+                    $html_sig = trim($options['signature']);
                     $body .= "\n" . $tfilter->filter($html_sig, 'Html2text');
                 }
             } else {

diff --git a/imp/lib/Prefs/Identity.php b/imp/lib/Prefs/Identity.php
@@ -421,7 +421,7 @@ public function getSignature($type = 'text', $ident = null)
                 $val = str_replace("\r\n", "\n", $val);
                 $val = ($this->getValue('sig_dashes', $ident))
                     ? "\n-- \n" . $val
-                    : "\n" . $val;
+                    : "\n\n" . $val;
             }
         }