Fixes to email headers