Update messages method
Merge pull request #349 from owdqa/update_29909_29910

Update messages method