rewamp error handling, also old mail is not deleted now when something fails