Fixes somes issues for send message functionality, fixes #7