diff --git a/Bugzilla/Util.pm b/Bugzilla/Util.pm
index f0dd772ed..c74bc3978 100644
--- a/Bugzilla/Util.pm
+++ b/Bugzilla/Util.pm
@@ -423,7 +423,7 @@ sub wrap_comment # makeParagraphs
         }
         $m[0] =~ s/^\s*\n//s;
         $m[0] =~ s/^([ \t]+)/$_ = $1; s!\t!    !g; $_/emog;
-        $m[0] =~ s/(<[^<>]*>)|( +)/$1 || ('&nbsp;' x length $2)/ge;
+        $m[0] =~ s/(<[^<>]*>)|(  +)/$1 || ' '.('&nbsp;' x (length($2)-1))/ge;
         if ($m[0] && !$p)
         {
             $text .= '<p>';