Improve handling of user to user messages.