diff --git a/ChangeLog b/ChangeLog
index fb3e2af2b..289971602 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -28,6 +28,7 @@ $Source$
       error.php if this fails too
        - moved loading of extension out of libraries/dbi/* into
          libraries/database_interface.lib.php
+    * libraries/sanitizing.lib.php: dont use deprecated tags
 
 2005-11-16 Marc Delisle  <lem9@users.sourceforge.net>
     * tbl_properties_links.php: missing menu tabs
diff --git a/libraries/sanitizing.lib.php b/libraries/sanitizing.lib.php
index c001a85f0..b36af285a 100644
--- a/libraries/sanitizing.lib.php
+++ b/libraries/sanitizing.lib.php
@@ -15,16 +15,24 @@
 function PMA_sanitize($message)
 {
     $replace_pairs = array(
-        '<'     => '&lt;',
-        '>'     => '&gt;',
-        '[i]'   => '<i>',
-        '[/i]'  => '</i>',
-        '[b]'   => '<b>',
-        '[/b]'  => '</b>',
-        '[tt]'   => '<tt>',
-        '[/tt]'  => '</tt>',
-        '[br]'  => '<br />',
-        '[/a]'  => '</a>',
+        '<'         => '&lt;',
+        '>'         => '&gt;',
+        '[i]'       => '<em>',      // deprecated by em
+        '[/i]'      => '</em>',     // deprecated by em
+        '[em]'      => '<em>',
+        '[/em]'     => '</em>',
+        '[b]'       => '<strong>',  // deprecated by strong
+        '[/b]'      => '</strong>', // deprecated by strong
+        '[strong]'  => '<strong>',
+        '[/strong]' => '</strong>',
+        '[tt]'      => '<code>',    // deprecated by CODE or KBD
+        '[/tt]'     => '</code>',   // deprecated by CODE or KBD
+        '[code]'    => '<code>',
+        '[/code]'   => '</code>',
+        '[kbd]'     => '<kbd>',
+        '[/kbd]'    => '</kbd>',
+        '[br]'      => '<br />',
+        '[/a]'      => '</a>',
     );
     return preg_replace('/\[a@([^"@]*)@([^]"]*)\]/', '<a href="\1" target="\2">', strtr($message, $replace_pairs));
 }