Use email_templates dir when emailing
Avoid single quotes which stuff highlighting
Update to version v565