email scrap bug fix