diff --git a/ChangeLog b/ChangeLog
index 0e541335b..492b9e945 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@ phpMyAdmin - Changelog
 $Id$ 
 $Source$
 
+2001-05-15  Armel Fauveau  <armel.fauveau@globalis-ms.com>
+    * Added "Bookmarked SQL-query" combo box when you click on a table (Feature #423065)
+
 2001-05-11  Loïc Chapeaux  <lolo@phpheaven.net>
 	* lib.inc.php3, lines 76, 81 and 612: fixed a bug if a field contains html
 	  tags (suggested by Olivier Bussier at the phpMyAdmin official forum:
diff --git a/tbl_properties.php3 b/tbl_properties.php3
index 77ec57c67..6296eb00c 100755
--- a/tbl_properties.php3
+++ b/tbl_properties.php3
@@ -200,6 +200,29 @@ if(mysql_num_rows($result)>0)
 <?php echo $strRunSQLQuery.$db." ".show_docu("manual_Reference.html#SELECT");?>:<br>
 <textarea name="sql_query" cols="40" rows="3" wrap="VIRTUAL" style="width: <?php
 echo $cfgMaxInputsize;?>">select * from <?php echo $table?> where 1</textarea>
+<br>
+<?php
+// Bookmark Support
+
+if($cfgBookmark['db'] && $cfgBookmark['table'])
+{
+    if(($bookmark_list=list_bookmarks($db, $cfgBookmark)) && count($bookmark_list)>0)
+    {
+        echo "<i>$strOr</i> $strBookmarkQuery:<br>\n";
+        echo "<select name=\"id_bookmark\">\n";
+        echo "<option value=\"\"></option>\n";
+        while(list($key,$value)=each($bookmark_list)) {
+            echo "<option value=\"".htmlentities($value)."\">".htmlentities($key)."</option>\n";
+        }
+        echo "</select>\n";
+        echo "<input type=\"radio\" name=\"action_bookmark\" value=\"0\" checked>".$strSubmit;
+        echo "<input type=\"radio\" name=\"action_bookmark\" value=\"1\">".$strBookmarkView;
+        echo "<input type=\"radio\" name=\"action_bookmark\" value=\"2\">".$strDelete;
+        echo "<br>\n";
+    }
+}
+?>
+
 <input type="submit" name="SQL" value="<?php echo $strGo; ?>">
 </form>
 <li><a href="sql.php3?sql_query=<?php echo urlencode("SELECT * FROM $table");?>&pos=0&<?php echo $query;?>"><?php echo $strBrowse; ?></a></li>