Fix parsing email so tag is not included.