@email tag added to template

This patch adds the @email tag to the template system.