diff --git a/inc/Mailer.class.php b/inc/Mailer.class.php
index 141b69a1894a29af4ea35670780dfbdb8cca0129..d7dc70dede04709a8b1c3549f1726bceee823a81 100644
--- a/inc/Mailer.class.php
+++ b/inc/Mailer.class.php
@@ -171,8 +171,10 @@ class Mailer {
 
         // create HTML from text if not given
         if(is_null($html)){
-            $html = hsc($text);
-            $html = nl2br($text);
+            $html = $text;
+            $html = hsc($html);
+            $html = preg_replace('/^-----*$/m','<hr >',$html);
+            $html = nl2br($html);
         }
         if($wrap){
             $wrap = rawLocale('mailwrap','html');