More changes for messaging