Added e-mail base functionality