Improve email parsing