Quick-fix various problems with emails.