e-mail auto-expand

E-Mails now auto-expand to include custom variables.