Fix next message display after removing a message (#1489800)