Whoops. Forgot the other part of it.

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@6309 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/functions/mime.php b/functions/mime.php
index a65e5619b0b42ba1baed4ee70c7114ed8398dfa8..f7c3379d67b4c881a1f321161a5014887be6ab04 100644 (file)
--- a/functions/mime.php
+++ b/functions/mime.php
@@ -660,13 +660,6 @@ function decodeHeader ($string, $utfencode=true,$htmlsave=true) {
             $chunk = $res[5];
             $encoded = true;
         }
-
-        if (!$encoded && $htmlsave) {
-            $ret .= htmlspecialchars($chunk);
-        } else {
-            $ret .= $chunk;
-        }
-
         if (!$encoded) {
             if ($htmlsave) {
                 $ret .= ' ';
@@ -674,6 +667,12 @@ function decodeHeader ($string, $utfencode=true,$htmlsave=true) {
                 $ret .= ' ';
             }
         }
+
+        if (!$encoded && $htmlsave) {
+            $ret .= htmlspecialchars($chunk);
+        } else {
+            $ret .= $chunk;
+        }
         ++$i;
     }
     /* remove the first added space */