Don't use queue to send
Tweak the email layout
Update the email views