diff --git a/mozilla/webtools/bugzilla/.bzrrev b/mozilla/webtools/bugzilla/.bzrrev
index d8d6472c70b..2388f22e7d8 100644
--- a/mozilla/webtools/bugzilla/.bzrrev
+++ b/mozilla/webtools/bugzilla/.bzrrev
@@ -1 +1 @@
-8508
\ No newline at end of file
+8509
\ No newline at end of file
diff --git a/mozilla/webtools/bugzilla/template/en/default/email/bugmail-header.txt.tmpl b/mozilla/webtools/bugzilla/template/en/default/email/bugmail-header.txt.tmpl
index 1489f2400c8..f9cdbd814a0 100644
--- a/mozilla/webtools/bugzilla/template/en/default/email/bugmail-header.txt.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/email/bugmail-header.txt.tmpl
@@ -18,20 +18,6 @@ Date: [% date %]
 X-Bugzilla-Reason: [% reasonsheader %]
 X-Bugzilla-Type: [% isnew ? 'new' : 'changed' %]
 X-Bugzilla-Watch-Reason: [% reasonswatchheader %]
-[% IF Param('useclassification') %]
-X-Bugzilla-Classification: [% bug.classification %]
-[% END %]
-X-Bugzilla-Product: [% bug.product %]
-X-Bugzilla-Component: [% bug.component %]
-X-Bugzilla-Version: [% bug.version %]
-X-Bugzilla-Keywords: [% bug.keywords %]
-X-Bugzilla-Severity: [% bug.bug_severity %]
-X-Bugzilla-Who: [% changer.login %]
-X-Bugzilla-Status: [% bug.bug_status %]
-X-Bugzilla-Resolution: [% bug.resolution %]
-X-Bugzilla-Priority: [% bug.priority %]
-X-Bugzilla-Assigned-To: [% bug.assigned_to.login %]
-X-Bugzilla-Target-Milestone: [% bug.target_milestone %]
-X-Bugzilla-Flags:[% FOREACH flag = bug.flags %] [%+ flag.name %][% flag.status %][% END %]
+[%+ INCLUDE "email/header-common.txt.tmpl" %]
 X-Bugzilla-Changed-Fields: [% changedfields.join(" ") %]
 [%+ threadingmarker %]
diff --git a/mozilla/webtools/bugzilla/template/en/default/email/flagmail.txt.tmpl b/mozilla/webtools/bugzilla/template/en/default/email/flagmail.txt.tmpl
index 411c4e64127..26b60143d28 100644
--- a/mozilla/webtools/bugzilla/template/en/default/email/flagmail.txt.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/email/flagmail.txt.tmpl
@@ -37,6 +37,7 @@ Subject: [% flagtype_name %] [%+ subject_status %]: [[% terms.Bug %] [%+ bug.bug
   [Attachment [% attachment.id %]] [% attachment.description FILTER clean_text %][% END %]
 Date: [% date %]
 X-Bugzilla-Type: request
+[%+ INCLUDE "email/header-common.txt.tmpl" %]
 [%+ threadingmarker %]
 
 [%+ USE wrap -%]
diff --git a/mozilla/webtools/bugzilla/template/en/default/email/header-common.txt.tmpl b/mozilla/webtools/bugzilla/template/en/default/email/header-common.txt.tmpl
new file mode 100644
index 00000000000..e52f8406c90
--- /dev/null
+++ b/mozilla/webtools/bugzilla/template/en/default/email/header-common.txt.tmpl
@@ -0,0 +1,22 @@
+[%# This Source Code Form is subject to the terms of the Mozilla Public
+  # License, v. 2.0. If a copy of the MPL was not distributed with this
+  # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+  #
+  # This Source Code Form is "Incompatible With Secondary Licenses", as
+  # defined by the Mozilla Public License, v. 2.0.
+  #%]
+[% IF Param('useclassification') %]
+X-Bugzilla-Classification: [% bug.classification %]
+[% END %]
+X-Bugzilla-Product: [% bug.product %]
+X-Bugzilla-Component: [% bug.component %]
+X-Bugzilla-Version: [% bug.version %]
+X-Bugzilla-Keywords: [% bug.keywords %]
+X-Bugzilla-Severity: [% bug.bug_severity %]
+X-Bugzilla-Who: [% changer.login %]
+X-Bugzilla-Status: [% bug.bug_status %]
+X-Bugzilla-Resolution: [% bug.resolution %]
+X-Bugzilla-Priority: [% bug.priority %]
+X-Bugzilla-Assigned-To: [% bug.assigned_to.login %]
+X-Bugzilla-Target-Milestone: [% bug.target_milestone %]
+X-Bugzilla-Flags:[% FOREACH flag = bug.flags %] [%+ flag.name %][% flag.status %][% END %]