Fixed email escaping