diff --git a/mozilla/webtools/bugzilla/Bugzilla/BugMail.pm b/mozilla/webtools/bugzilla/Bugzilla/BugMail.pm
index f1a47a3a332..6c2f8591c2a 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/BugMail.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/BugMail.pm
@@ -584,6 +584,8 @@ sub sendMail {
     }
     $substs{"product"} = $values{'product'};
     $substs{"component"} = $values{'component'};
+    $substs{"keywords"} = $values{'keywords'};
+    $substs{"severity"} = $values{'bug_severity'};
     $substs{"summary"} = $values{'short_desc'};
     $substs{"reasonsheader"} = join(" ", map { $rel_names{$_} } @$relRef);
     $substs{"reasonsbody"} = $reasonsbody;
diff --git a/mozilla/webtools/bugzilla/Bugzilla/Config/MTA.pm b/mozilla/webtools/bugzilla/Bugzilla/Config/MTA.pm
index 25f70761bae..61569e2d3e4 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/Config/MTA.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/Config/MTA.pm
@@ -89,6 +89,8 @@ Subject: [Bug %bugid%] %neworchanged%%summary%
 X-Bugzilla-Reason: %reasonsheader%
 X-Bugzilla-Product: %product%
 X-Bugzilla-Component: %component%
+X-Bugzilla-Keywords: %keywords%
+X-Bugzilla-Severity: %severity%
 
 %urlbase%show_bug.cgi?id=%bugid%