Email Count fix