adding support for email tag