Added mail feature