Fix error on new mail (message's headers object doesn't exist)
Fix so additional headers are added to all messages sent (#1489284)