More improvements to messaging.