Added per-mail shortcodes (name, email etc)