Store "clientId" for messages
Merge pull request #290 from njam/message-clientId

Store "clientId" for messages