modified a little the base Message class and the Message class
Code refactoring