Minor changes to make Mail Catcher work, both when 1080 receiving emails or not