fixes for send message