Adding full functionality for messages on client