update recipient handling in conversations
Merged 'dev'.
Finish refactor-conversation