minor query fix
Deal with line endings
rebuilt email-templates