Refactoring + Ajout nbMessages