fixing email parsigin issues