Refactoring of the Message History implementation
Solving conflicts