building out mail headers a bit more