Renamed feature file
Revised email and added mail feature