*8094* Emails cleanup