diff --git a/ChangeLog b/ChangeLog
index dc3282cc8..6603e8537 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,9 @@ $Source$
 2003-07-07 Garvin Hicking <me@supergarv.de>
     * tbl_change.php3: Fix undefined index for disp_query 
       (when inserting a new row with a file uploaded to a column)
+    * libraries/transformations/image_jpeg__inline.inc.php3,
+      libraries/transformations/image_png__inline.inc.php3: Proper escaping
+      of &amp;
     
 2003-07-07 Marc Delisle  <lem9@users.sourceforge.net>
     * libraries/auth/cookie.auth.lib.php3, config.inc.php3, user_password.php3,
diff --git a/libraries/transformations/image_jpeg__inline.inc.php3 b/libraries/transformations/image_jpeg__inline.inc.php3
index 938fdafdd..421bd0cb6 100644
--- a/libraries/transformations/image_jpeg__inline.inc.php3
+++ b/libraries/transformations/image_jpeg__inline.inc.php3
@@ -9,7 +9,7 @@ if (!defined('PMA_TRANSFORMATION_IMAGE_JPEG__INLINE')){
         include('./libraries/transformations/global.inc.php3');
         
         if (PMA_IS_GD2) {
-            $transform_options = array ('string' => '<a href="transformation_wrapper.php3' . $options['wrapper_link'] . '" target="_blank"><img src="transformation_wrapper.php3' . $options['wrapper_link'] . '&resize=jpeg&newWidth=' . (isset($options[0]) ? $options[0] : '100') . '&newHeight=' . (isset($options[1]) ? $options[1] : 100) . '" alt="[__BUFFER__]" border="0"></a>');
+            $transform_options = array ('string' => '<a href="transformation_wrapper.php3' . $options['wrapper_link'] . '" target="_blank"><img src="transformation_wrapper.php3' . $options['wrapper_link'] . '&amp;resize=jpeg&amp;newWidth=' . (isset($options[0]) ? $options[0] : '100') . '&amp;newHeight=' . (isset($options[1]) ? $options[1] : 100) . '" alt="[__BUFFER__]" border="0"></a>');
         } else {
             $transform_options = array ('string' => '<img src="transformation_wrapper.php3' . $options['wrapper_link'] . '" alt="[__BUFFER__]" width="320" height="240">');
         }
diff --git a/libraries/transformations/image_png__inline.inc.php3 b/libraries/transformations/image_png__inline.inc.php3
index d283f173e..fcf8985c2 100644
--- a/libraries/transformations/image_png__inline.inc.php3
+++ b/libraries/transformations/image_png__inline.inc.php3
@@ -9,7 +9,7 @@ if (!defined('PMA_TRANSFORMATION_IMAGE_PNG__INLINE')){
         include('./libraries/transformations/global.inc.php3');
         
         if (PMA_IS_GD2) {
-            $transform_options = array ('string' => '<a href="transformation_wrapper.php3' . $options['wrapper_link'] . '" target="_blank"><img src="transformation_wrapper.php3' . $options['wrapper_link'] . '&resize=png&newWidth=' . (isset($options[0]) ? $options[0] : '100') . '&newHeight=' . (isset($options[1]) ? $options[1] : 100) . '" alt="[__BUFFER__]" border="0"></a>');
+            $transform_options = array ('string' => '<a href="transformation_wrapper.php3' . $options['wrapper_link'] . '" target="_blank"><img src="transformation_wrapper.php3' . $options['wrapper_link'] . '&amp;resize=png&amp;newWidth=' . (isset($options[0]) ? $options[0] : '100') . '&amp;newHeight=' . (isset($options[1]) ? $options[1] : 100) . '" alt="[__BUFFER__]" border="0"></a>');
         } else {
             $transform_options = array ('string' => '<img src="transformation_wrapper.php3' . $options['wrapper_link'] . '" alt="[__BUFFER__]" width="320" height="240">');
         }