refactor message creation (conversations)
Merge pull request #4556 from Raven24/conversations

refactor conversation message creation