Fixes #4 - support {{@Id}} in email template substitutions