Fixed domain and from email issues