Fix the email sending issues.