Fixes for send message

issues for previous revert