Task #4746 - Fix problem when sending messages