Refactored User Messaging System