Email template fixes - remove extra newlines
Update to version v566