Updates to email message parsing