Task #4746 - Fix problem when sending messages
Merge pull request #191 from esakol/task4746

Task #4746 - Fix problem when sending messages