diff --git a/mozilla/webtools/bugzilla/globals.pl b/mozilla/webtools/bugzilla/globals.pl
index 94e16734d0c..d8d1bc14298 100644
--- a/mozilla/webtools/bugzilla/globals.pl
+++ b/mozilla/webtools/bugzilla/globals.pl
@@ -731,7 +731,7 @@ sub GetLongDescriptionAsText {
     while (MoreSQLData()) {
         my ($who, $when, $text) = (FetchSQLData());
         if ($count) {
-            $result .= "\n\n------- Additional Comments From $who  " .
+            $result .= "\n\n------- Additional Comments From $who".Param('emailsuffix')."  ".
                 time2str("%Y-%m-%d %H:%M", str2time($when)) . " -------\n";
         }
         $result .= $text;
@@ -772,6 +772,7 @@ sub GetLongDescriptionAsHTML {
     SendSQL($query);
     while (MoreSQLData()) {
         my ($who, $email, $when, $text) = (FetchSQLData());
+        $email .= Param('emailsuffix');
         if ($count) {
             $result .= "<BR><BR><I>------- Additional Comments From ";
               if ($who) {
diff --git a/mozilla/webtools/bugzilla/processmail b/mozilla/webtools/bugzilla/processmail
index d96a6f96ef1..c919b7acccb 100755
--- a/mozilla/webtools/bugzilla/processmail
+++ b/mozilla/webtools/bugzilla/processmail
@@ -402,7 +402,7 @@ sub NewProcessOneBug {
         my ($who, $what, $when, $old, $new) = (@$ref);
         if ($who ne $lastwho) {
             $lastwho = $who;
-            $difftext .= "\n$who changed:\n\n";
+            $difftext .= "\n$who" . Param('emailsuffix') . " changed:\n\n";
             $difftext .= FormatTriple("What    ", "Old Value", "New Value");
             $difftext .= ('-' x 76) . "\n";
         }
@@ -570,6 +570,8 @@ sub NewProcessOnePerson ($$\@\%\%\%$$$$) {
     my $isnew = ($start !~ m/[1-9]/);
     
     my %substs;
+
+    $person .= Param('emailsuffix');
     $substs{"neworchanged"} = $isnew ? "New" : "Changed";
     $substs{"to"} = $person;
     $substs{"cc"} = '';