Tested and fixed recent message sending code changes