bug-fixes in messaging