Added e-mail feature