diff --git a/mozilla/webtools/bugzilla/.bzrrev b/mozilla/webtools/bugzilla/.bzrrev
index 28e7b0dbcaa..32cdb4700b8 100644
--- a/mozilla/webtools/bugzilla/.bzrrev
+++ b/mozilla/webtools/bugzilla/.bzrrev
@@ -1 +1 @@
-8789
\ No newline at end of file
+8790
\ No newline at end of file
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
index e52f8406c90..02bd38e1337 100644
--- a/mozilla/webtools/bugzilla/template/en/default/email/header-common.txt.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/email/header-common.txt.tmpl
@@ -18,5 +18,7 @@ X-Bugzilla-Status: [% bug.bug_status %]
 X-Bugzilla-Resolution: [% bug.resolution %]
 X-Bugzilla-Priority: [% bug.priority %]
 X-Bugzilla-Assigned-To: [% bug.assigned_to.login %]
+[% IF Param('usetargetmilestone') %]
 X-Bugzilla-Target-Milestone: [% bug.target_milestone %]
+[% END %]
 X-Bugzilla-Flags:[% FOREACH flag = bug.flags %] [%+ flag.name %][% flag.status %][% END %]