clean up mail troubles after refactor