mail stripper fixes