diff --git a/htdocs/core/tpl/freeproductline_view.tpl.php b/htdocs/core/tpl/freeproductline_view.tpl.php
index 15defba59d8..7beb197f139 100644
--- a/htdocs/core/tpl/freeproductline_view.tpl.php
+++ b/htdocs/core/tpl/freeproductline_view.tpl.php
@@ -37,14 +37,14 @@
 					$discount->fetch($line->fk_remise_except);
 					echo ' - '.$langs->transnoentities("DiscountFromDeposit",$discount->getNomUrl(0));
 				} else {
-					echo ' - '.nl2br($line->description);
+					echo ' - '.dol_nl2br($line->description,1,true);
 				}
 			}
 		} else {
 			if (! empty($line->fk_parent_line)) echo img_picto('', 'rightarrow');
 			if ($type==1) $text = img_object($langs->trans('Service'),'service');
 			else $text = img_object($langs->trans('Product'),'product');
-			echo $text.' '.nl2br($line->description);
+			echo $text.' '.dol_nl2br($line->description,1,true);
 			// Show range
 			print_date_range($line->date_start,$line->date_end);
 		} ?>
diff --git a/htdocs/lib/functions.lib.php b/htdocs/lib/functions.lib.php
index 456dd8c54de..e6eda3ef5fa 100644
--- a/htdocs/lib/functions.lib.php
+++ b/htdocs/lib/functions.lib.php
@@ -3064,8 +3064,8 @@ function dol_nl2br($stringtoencode,$nl2brmode=0,$forxml=false)
     }
 	else
 	{
-		$ret=str_replace("\r","",$stringtoencode);
-		$ret=str_replace("\n",($forxml?'<br />':'<br>'),$ret);
+		$ret=preg_replace('/(<br>|<br\s*\/>|<br\/>)\s*(\r\n|\r|\n)+/i',($forxml?'<br />':'<br>'),$stringtoencode);
+		$ret=preg_replace('/([^<li\s*>])+(\r\n|\r|\n)+/i',($forxml?'<br />':'<br>'),$ret);
 		return $ret;
 	}
 }
@@ -3087,7 +3087,8 @@ function dol_htmlentitiesbr($stringtoencode,$nl2brmode=0,$pagecodefrom='UTF-8')
 {
 	if (dol_textishtml($stringtoencode))
 	{
-	    $newstring=preg_replace('/<br(\s[\sa-zA-Z_="]*)?\/?>/i','<br>',$stringtoencode);	// Replace "<br type="_moz" />" by "<br>". It's same and avoid pb with FPDF.
+	    $newstring=preg_replace('/([^<li\s*>])+(\r\n|\r|\n)+/i',($forxml?'<br />':'<br>'),$stringtoencode); // Don't replace if in list
+		$newstring=preg_replace('/<br(\s[\sa-zA-Z_="]*)?\/?>/i','<br>',$newstring);	// Replace "<br type="_moz" />" by "<br>". It's same and avoid pb with FPDF.
 		$newstring=preg_replace('/<br>$/i','',$newstring);	// Replace "<br type="_moz" />" by "<br>". It's same and avoid pb with FPDF.
 		$newstring=strtr($newstring,array('&'=>'__and__','<'=>'__lt__','>'=>'__gt__','"'=>'__dquot__'));
 		$newstring=dol_htmlentities($newstring,ENT_COMPAT,$pagecodefrom);	// Make entity encoding
@@ -3270,6 +3271,7 @@ function dol_textishtml($msg,$option=0)
 		elseif (preg_match('/<br/i',$msg))				return true;
 		elseif (preg_match('/<span/i',$msg))			return true;
 		elseif (preg_match('/<div/i',$msg))				return true;
+		elseif (preg_match('/<li/i',$msg))				return true;
 		elseif (preg_match('/<table/i',$msg))			return true;
 		elseif (preg_match('/<font/i',$msg))			return true;
 		elseif (preg_match('/<strong/i',$msg))			return true;
@@ -3807,4 +3809,36 @@ function complete_head_from_modules($conf,$langs,$object,&$head,&$h,$type,$mode=
     }
 }
 
+/**
+ * Converts newlines and break tags to an
+ * arbitrary string selected by the user,
+ * defaults to PHP_EOL.
+ *
+ * In the case where a break tag is followed by
+ * any amount of whitespace, including \r and \n,
+ * the tag and the whitespace will be converted
+ * to a single instance of the line break argument.
+ *
+ * @author Matthew Kastor
+ * @param string $string
+ *   string in which newlines and break tags will be replaced
+ * @param string $line_break
+ *   replacement string for newlines and break tags
+ * @return string
+ *   Returns the original string with newlines and break tags
+ *   converted
+ */
+function convert_line_breaks($string, $line_break=PHP_EOL) {
+    $patterns = array(   
+                        "/(<br>|<br \/>|<br\/>)\s*/i",
+                        "/(\r\n|\r|\n)/"
+    );
+    $replacements = array(   
+                            PHP_EOL,
+                            $line_break
+    );
+    $string = preg_replace($patterns, $replacements, $string);
+    return $string;
+}
+
 ?>
\ No newline at end of file
diff --git a/htdocs/product/fiche.php b/htdocs/product/fiche.php
index a1d862f818f..5a6628f55f8 100644
--- a/htdocs/product/fiche.php
+++ b/htdocs/product/fiche.php
@@ -1099,7 +1099,7 @@ if ($id || $ref)
 			print '</td></tr>';
 
 			// Description
-			print '<tr><td valign="top">'.$langs->trans("Description").'</td><td colspan="2">'.nl2br($product->description).'</td></tr>';
+			print '<tr><td valign="top">'.$langs->trans("Description").'</td><td colspan="2">'.dol_nl2br($product->description,1,true).'</td></tr>';
 
 			// Nature
 			if($product->type!=1)