improve e-mail notify