fixing mail fetching?