diff --git a/ChangeLog b/ChangeLog
index 6881ec3f3..2c7f34db5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,6 +15,8 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
 - bug #2355753 [core] do not bail out creating session on any PHP warning
 - bug #2355925 [display] properly update tooltips in navigation frame
 - bug #2355923 [core] do not use ctype if it is not available
+- bug #2356433 [display] HeaderFlipType "fake" problems,
+  thanks to Michal Biniek
 
 3.1.0.0 (2008-11-28)
 + [auth] Support for Swekey hardware authentication,
diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index e12e572ad..eae98043b 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -1795,19 +1795,19 @@ function PMA_flipstring($string, $Separator = "<br />\n")
         if ($char == '&') {
             $format_string .= $charbuff;
             $charbuff = $char;
-            $append = true;
-        } elseif (!empty($charbuff)) {
-            $charbuff .= $char;
         } elseif ($char == ';' && !empty($charbuff)) {
-            $format_string .= $charbuff;
+            $format_string .= $charbuff . $char;
             $charbuff = false;
             $append = true;
+        } elseif (! empty($charbuff)) {
+            $charbuff .= $char;
         } else {
             $format_string .= $char;
             $append = true;
         }
 
-        if ($append && ($i != strlen($string))) {
+        // do not add separator after the last character
+        if ($append && ($i != strlen($string)-1)) {
             $format_string .= $Separator;
         }
     }
@@ -1815,7 +1815,6 @@ function PMA_flipstring($string, $Separator = "<br />\n")
     return $format_string;
 }
 
-
 /**
  * Function added to avoid path disclosures.
  * Called by each script that needs parameters, it displays