sync Bugzilla 4.4.4 changes on custom BugMail.pm

this file has been touched in the 4.4 upgrade
and also has custom changes, sync the live version
with repo

bug #64226

also see: I7b1d9e735

Change-Id: Id70e8dcc95fcaff000edb61ebdbb85c709ffe346