diff --git a/ChangeLog b/ChangeLog
index 4fdc7870b..742d71cc2 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -18,6 +18,8 @@ $Source$
 	* lib.inc.php3:
 	  - fixed again the socket patch, should work now.
 	  - modified the way defines.inc.php3 is loaded.
+	  - while browsing a table, ensure <cr> and <lf> in text/blob fields are
+	    displayed (remplaced by the <br /> tag).
 	* defines.lib.php3; db_details; tbl_properties.php3: ensures each constant
 	  isn't already defined before to define it and renamed PMA_INT_VERSION to
 	  PHP_INT_VERSION.
diff --git a/lib.inc.php3 b/lib.inc.php3
index 9b5dba867..f1fe592f6 100755
--- a/lib.inc.php3
+++ b/lib.inc.php3
@@ -93,8 +93,6 @@ if (!defined('__LIB_INC__')){
     if (!isset($cfgTextareaRows)) {
         $cfgTextareaRows = 7;
     }
- 
-    // defines wants to connect mysql, and at this place there are no connexion yet...
     include('./defines.inc.php3');
 
 
@@ -1180,10 +1178,16 @@ var errorMsg2 = '<?php echo(str_replace('\'', '\\\'', $GLOBALS['strNotValidNumbe
                         if (strlen($row[$i]) > $GLOBALS['cfgLimitChars']) {
                             $row[$i] = substr($row[$i], 0, $GLOBALS['cfgLimitChars']) . '...';
                         }
-                        echo '    <td>&nbsp;' . htmlspecialchars($row[$i]) . '&nbsp;</td>' . "\n";
+                        // loic1 : displays <cr>/<lf>
+                        //  echo '    <td>&nbsp;' . htmlspecialchars($row[$i]) . '&nbsp;</td>' . "\n";
+                        $row[$i]     = ereg_replace("((\015\012)|(\015)|(\012))+", '<br />', htmlspecialchars($row[$i]));
+                        echo '    <td>&nbsp;' . $row[$i] . '&nbsp;</td>' . "\n";
                     }
                 } else {
-                    echo '    <td>&nbsp;' . htmlspecialchars($row[$i]) . '&nbsp;</td>' . "\n";
+                    // loic1 : displays <cr>/<lf>
+                    // echo '    <td>&nbsp;' . htmlspecialchars($row[$i]) . '&nbsp;</td>' . "\n";
+                    $row[$i] = ereg_replace("((\015\012)|(\015)|(\012))+", '<br />', htmlspecialchars($row[$i]));
+                    echo '    <td>&nbsp;' . $row[$i] . '&nbsp;</td>' . "\n";
                 }
             } // end for
             // Possibility to have the modify/delete button on the left added