1 files changed, 4 insertions, 0 deletions

diff --git a/Bugzilla/Template.pm b/Bugzilla/Template.pm
index 3141c8a4c..e5fecbe0d 100644
--- a/Bugzilla/Template.pm
+++ b/Bugzilla/Template.pm
@@ -698,6 +698,10 @@ sub create {
                 $var =~ s/\>/>/g;
                 $var =~ s/\"/\"/g;
                 $var =~ s/\&/\&/g;
+                # Now remove extra whitespace, and wrap it to 72 characters.
+                my $collapse_filter = $Template::Filters::FILTERS->{collapse};
+                $var = $collapse_filter->($var);
+                $var = wrap_comment($var, 72);
                 return $var;
             },