fixed email parsing