Fix issue with reordering conversations