some email notification header fixes