Added basic e-mail functionality