Added support for e-mail action