Fixed double escape for email