Add support for `messages` in manifest (bug 866864)