diff --git a/ChangeLog b/ChangeLog
index f50e63f18..c93c5f88f 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,8 @@ $Source$
 2006-01-07 Marc Delisle  <lem9@users.sourceforge.net>
     * sql.php: bug #1395590 Safari Bookmark query fieldset float problem,
       thanks to Ryan Schmidt
+    * libraries/common.lib.php: bug #1397749, Safari: space before
+      PMA_linkOrButton link is part of the link, thanks to Ryan Schmidt
 
 2006-01-06 Marc Delisle  <lem9@users.sourceforge.net>
     * db_datadict.php, pdf_schema.php: bug #1389165, data dict shows all 
diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index 089ca49fb..7ba1eb80e 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -1922,9 +1922,10 @@ window.parent.updateTableTitle('<?php echo $uni_tbl; ?>', '<?php echo PMA_jsForm
 
         // previously the limit was set to 2047, it seems 1000 is better
         if (strlen($url) <= 1000) {
-            $ret = '<a href="' . $url . '" '
-                . implode(' ', $tag_params_strings) . '>' . "\n"
-                . '    ' . $message . '</a>' . "\n";
+            // no whitespace within an <a> else Safari will make it part of the link
+            $ret = "\n" . '<a href="' . $url . '" '
+                . implode(' ', $tag_params_strings) . '>'
+                . $message . '</a>' . "\n";
         }
         else {
             // no spaces (linebreaks) at all