added some sorting but temp removed the scope of messages from the current_user