Email parser updated