Added code to load previous messages in the client, just missing the rendering
Fixed merge conflict with Mari's code
Fixed conflict with Arissa's code, refactored it a bit