Bugfix message sending