Improved error logging on email failure
Allow simple tokens in sender name
Fixed HTML email content