Changes to messaging system.