fixed client message retrieval