Email Templates Plugin - fixes #2