Fixed message sending issue