Clean up email handling in ContactUs.