4 files changed, 8 insertions, 4 deletions
diff --git a/template/en/default/email/newchangedmail.txt.tmpl b/template/en/default/email/newchangedmail.txt.tmpl
index d0bc8b124..ad7d564b4 100644
--- a/template/en/default/email/newchangedmail.txt.tmpl
+++ b/template/en/default/email/newchangedmail.txt.tmpl
@@ -20,10 +20,11 @@
   #%]
 
 [% PROCESS "global/field-descs.none.tmpl" %]
-From: bugzilla-daemon
+From: [% Param('mailfrom') %]
 To: [% to %]
 Subject: [[% terms.Bug %] [%+ bugid %]] [% neworchanged %][%+ summary %]
 X-Bugzilla-Reason: [% reasonsheader %]
+X-Bugzilla-Type: newchanged
 X-Bugzilla-Watch-Reason: [% reasonswatchheader %]
 X-Bugzilla-Product: [% product %]
 X-Bugzilla-Component: [% comp %]
diff --git a/template/en/default/email/sudo.txt.tmpl b/template/en/default/email/sudo.txt.tmpl
index 06026cf39..758c67b02 100644
--- a/template/en/default/email/sudo.txt.tmpl
+++ b/template/en/default/email/sudo.txt.tmpl
@@ -22,10 +22,11 @@
 [% PROCESS global/variables.none.tmpl %]
 
 Content-Type: text/plain
-From: [% Param("maintainer") %]
+From: [% Param('mailfrom') %]
 To: [% user.email %]
 Subject: [[% terms.Bugzilla %]] Your account [% user.login -%]
  is being impersonated
+X-Bugzilla-Type: admin
 
     [%+ sudoer.identity %] has used the 'sudo' feature to access 
 [%+ terms.Bugzilla %] using your account.
diff --git a/template/en/default/email/votes-removed.txt.tmpl b/template/en/default/email/votes-removed.txt.tmpl
index e9f1db34c..6bf2afd8c 100644
--- a/template/en/default/email/votes-removed.txt.tmpl
+++ b/template/en/default/email/votes-removed.txt.tmpl
@@ -21,9 +21,10 @@
 
 [% PROCESS global/variables.none.tmpl %]
 
-From: bugzilla-daemon
+From: [% Param('mailfrom') %]
 To: [% to %]
 Subject: [% terms.Bug %] [%+ bugid %] Some or all of your votes have been removed.
+X-Bugzilla-Type: voteremoved
 
 Some or all of your votes have been removed from [% terms.bug %] [%+ bugid %].
 
diff --git a/template/en/default/email/whine.txt.tmpl b/template/en/default/email/whine.txt.tmpl
index 214231394..e50964e8a 100644
--- a/template/en/default/email/whine.txt.tmpl
+++ b/template/en/default/email/whine.txt.tmpl
@@ -20,9 +20,10 @@
   #%]
 
 [% PROCESS "global/field-descs.none.tmpl" %]
-From: [% Param("maintainer") %]
+From: [% Param("mailfrom") %]
 To: [% email %][% Param("emailsuffix") %]
 Subject: Your [% terms.Bugzilla %] buglist needs attention.
+X-Bugzilla-Type: whine
 
 [This e-mail has been automatically generated.]