add pubKey
Merged 'dev'.
Finish refactor-conversation