[Server] Added 'id' in response for mentioning users
[Client] Code refactoring