email receivers logic change