Feature emailenhancements

This branch now contains on the email enhancements, all other changes were removed