diff --git a/ChangeLog b/ChangeLog
index eba0818c4..6764faea7 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,12 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2003-12-05 Garvin Hicking <weihnachtsgarv@supergarv.de>
+    * libraries/transformations/text_plain__dateformat.inc.php:
+      Use <dfn>-Tag to display original data to not waste display
+      clarity by using hyperlinks. Original implementation also
+      failed when using customized options.
+
 2003-12-04 Marc Delisle  <lem9@users.sourceforge.net>
     * lang/estonian: Updated, thanks to Alvar Soome (finsoft).
     * libraries/transformations/text_plain__dateformat.inc.php:
diff --git a/libraries/transformations/text_plain__dateformat.inc.php b/libraries/transformations/text_plain__dateformat.inc.php
index 732926912..023b81364 100644
--- a/libraries/transformations/text_plain__dateformat.inc.php
+++ b/libraries/transformations/text_plain__dateformat.inc.php
@@ -12,9 +12,8 @@ function PMA_transformation_text_plain__dateformat($buffer, $options = array(),
     }
 
     if (!isset($options[1]) || $options[1] == '') {
-        //$options[1] = $GLOBALS['datefmt'];
-        $buffer_message = "'" . $buffer . "'";
-        $options[1] = '<a href="javascript:alert(' . $buffer_message . ')" title=' . $buffer_message . '>' . $GLOBALS['datefmt'] .  '</a>';
+        $options[1] = $GLOBALS['datefmt'];
+
     }
 
     $timestamp = -1;
@@ -52,7 +51,8 @@ function PMA_transformation_text_plain__dateformat($buffer, $options = array(),
     // Reformat a valid timestamp
     if ($timestamp >= 0) {
         $timestamp -= $options[0] * 60 * 60;
-        $buffer = PMA_localisedDate($timestamp, $options[1]);
+        $source = $buffer;
+        $buffer = '<dfn onclick="alert(\'' . $source . '\');" title="' . $source . '">' . PMA_localisedDate($timestamp, $options[1]) . '</dfn>';
     }
 
     return $buffer;