resize cleanup and Email class change