Bug 893188 - Update system message manager