Improve email by taking account the limit + correct some paths + minor improvement