Fix a old fix that was breaking the search when coming back from move_messages