This should definitely fix the email issue.