Use Email flags now
Fixup make_message
Headers should be set with `create` not `get_or_create`