=== modified file 'Bugzilla/Template.pm'

--- Bugzilla/Template.pm	2011-02-14 21:56:52 +0000

+++ Bugzilla/Template.pm	2011-07-06 14:44:21 +0000

@@ -549,6 +549,9 @@

             # as prefix. In addition it replaces a ' ' by a '_'.

             css_class_quote => \&Bugzilla::Util::css_class_quote ,

+            # Removes control characters and trims extra whitespace.

+            clean_text => \&Bugzilla::Util::clean_text ,

+

             quoteUrls => [ sub {

                                my ($context, $bug) = @_;

                                return sub {

=== modified file 'template/en/default/request/email.txt.tmpl'

--- template/en/default/request/email.txt.tmpl	2009-09-03 19:05:33 +0000

+++ template/en/default/request/email.txt.tmpl	2011-07-06 14:43:11 +0000

@@ -50,7 +50,7 @@

 To: [% to %]

 Subject: [% flag.type.name %] [%+ subject_status %]: [[% terms.Bug %] [%+ bug.bug_id %]] [% bug.short_desc %]

 [%- IF attachment %] :

-  [Attachment [% attachment.id %]] [% attachment.description %][% END %]

+  [Attachment [% attachment.id %]] [% attachment.description FILTER clean_text %][% END %]

 X-Bugzilla-Type: request

 [%+ threadingmarker %]