Addressed feedback/fixed email clearing