fix for mail fetch