Improvements to email sent under simple settings