messaging bug fix