fixes identity calls in message
update conversation/message handling

add encrypted answer
Merged 'dev'.
Finish refactor-conversation