[MERGE] Merged small fix of email_template. It fixes a crash when using 'send by...