fixing email issues