diff --git a/ChangeLog b/ChangeLog
index 833e30f9d..efb668b9f 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2005-05-22 Marc Delisle  <lem9@users.sourceforge.net>
+    * libraries/charset_conversion.lib.php: diacritics wrongly converted 
+      in Browse mode under MySQL 4.1.x if AllowAnywhereRecoding set to TRUE
+
 2005-05-19 Marc Delisle  <lem9@users.sourceforge.net>
     * tbl_select.php: bug #1204235, searching on a VARBINARY field
 
diff --git a/libraries/charset_conversion.lib.php b/libraries/charset_conversion.lib.php
index 93ee46fad..7a8fd43fb 100644
--- a/libraries/charset_conversion.lib.php
+++ b/libraries/charset_conversion.lib.php
@@ -139,7 +139,8 @@ function PMA_convert_display_charset($what) {
     global $cfg, $allow_recoding, $charset, $convcharset;
 
     if (!(isset($cfg['AllowAnywhereRecoding']) && $cfg['AllowAnywhereRecoding'] && $allow_recoding)
-        || $convcharset == $charset) { // rabus: if input and output charset are the same, we don't have to do anything...
+        || $convcharset == $charset // rabus: if input and output charset are the same, we don't have to do anything...
+        || PMA_MYSQL_INT_VERSION >= 40100 ) {  // lem9: even if AllowAnywhereRecoding is TRUE, do not recode for MySQL >= 4.1.x since MySQL does the job
         return $what;
     }
     else if (is_array($what)) {
@@ -158,6 +159,7 @@ function PMA_convert_display_charset($what) {
         return $result;
     }
     else if (is_string($what)) {
+
         switch ($GLOBALS['PMA_recoding_engine']) {
             case PMA_CHARSET_RECODE:
                 return recode_string($convcharset . '..'  . $charset, $what);