Messaging, and user favorites fix