fix-email-bugs