fix email issues