Fix for email issues
updates