Fix email parsing