Fix up emailParser refactor