diff --git a/ChangeLog b/ChangeLog
index bad140fc0..1dde41b59 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
 $Id$ 
 $Source$
 
+2001-07-19  Loïc Chapeaux  <lolo@phpheaven.net>
+	* db_details.php3 & lib.inc.php3: patch from Laurent Haas <mci@free.fr>
+      that allows to remember and modify a sql query submitted.
+
 2001-07-19  Marc Delisle  <lem9@users.sourceforge.net>
 	* config.inc.php3, tbl_change.php3, db_details.php3, lib.inc.php3,
 	  tbl_properties.php3, tbl_properties_inc.php3, tbl_select.php3,
diff --git a/db_details.php3 b/db_details.php3
index 4346df50d..21d6feeb4 100755
--- a/db_details.php3
+++ b/db_details.php3
@@ -264,9 +264,12 @@ if ($num_tables > 0) {
  rows="<?php echo $cfgTextareaRows; ?>"
  cols="<?php echo $cfgTextareaCols; ?>"
 >
-<?php if (isset($show_query)) {
-         echo $show_query=="y" ? $sql_query : '';
-      }
+<?php
+if (isset($show_query)) {
+    echo $show_query=="y" ? $sql_query : '';
+} else {
+    echo stripslashes($sql_query);
+}
 ?>
 </textarea><br />
 <INPUT type=checkbox name='show_query' value="y" checked /><?php echo $strShowThisQuery; ?><br />
diff --git a/lib.inc.php3 b/lib.inc.php3
index a011f7f83..e86bdaf2f 100755
--- a/lib.inc.php3
+++ b/lib.inc.php3
@@ -108,7 +108,8 @@ function mysql_die($error = "") {
     echo "<b> $strError </b><p>";
     if(isset($sql_query) && !empty($sql_query))
     {
-        echo "$strSQLQuery: <pre>".htmlspecialchars($sql_query)."</pre><p>";
+        $edit_link=sprintf("<a href='db_details.php3?server=%s&lang=%s&db=%s&sql_query=%s'>%s</a>",$GLOBALS['server'],$GLOBALS['lang'],$GLOBALS['db'],urlencode($sql_query),$GLOBALS['strEdit']);
+        echo "$strSQLQuery: <pre>".$edit_link.htmlspecialchars($sql_query)."</pre><p>";
     }
     if(empty($error))
         echo "$strMySQLSaid ".mysql_error();
@@ -943,7 +944,8 @@ function show_message($message)
         $new_line   = '<br />' . "\n" . '            ';
         $query_base = htmlspecialchars($GLOBALS['sql_query']);
         $query_base = ereg_replace("(\015\012)|(\015)|(\012)", $new_line, $query_base);
-        echo '            ' . $query_base;
+        $edit_link=sprintf("<a href='db_details.php3?server=%s&lang=%s&db=%s&sql_query=%s'>%s</a>",$GLOBALS['server'],$GLOBALS['lang'],$GLOBALS['db'],urlencode($GLOBALS['sql_query']),$GLOBALS['strEdit']);
+        echo '            ' . $edit_link.'&nbsp;'.$query_base;
         if (isset($GLOBALS['sql_order'])) {
             echo ' ' . $GLOBALS['sql_order'];
         }