Improve email detection.