Merge pull request #1145 from atm-maxime/develop

Fix : email message combined with html signature made troubles with line breaks

htdocs/core/class/html.formmail.class.php

@@ -575,9 +575,10 @@ class FormMail
         			}
         		}
 
+				$defaultmessage=str_replace('\n',"\n",$defaultmessage);
+				if($conf->global->FCKEDITOR_ENABLE_MAIL) $defaultmessage=nl2br($defaultmessage);
         		$defaultmessage=make_substitutions($defaultmessage,$this->substit);
         		if (isset($_POST["message"])) $defaultmessage=$_POST["message"];
-        		$defaultmessage=str_replace('\n',"\n",$defaultmessage);
 
         		$out.= '<tr>';
         		$out.= '<td width="180" valign="top">'.$langs->trans("MailText").'</td>';