Update to parse emails
Upstream merge