Added e-mail functionlity