Fix of bug with email name and start of template