Whoops. Forgot the other part of it.

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 */