Added some more code to Email category.