Remove some uses of user.message_set