Fix bug where hook didn't trigger handler because of missing headers.
Add support for email.