fixes for email