Adding Support for automatic e-mailing