BZ-9597:Migrate Notes to Messages