improve email issue