Bug fixes in email