Added the mail feature