put unchecked messages back onto the set
bring back partition locking