Enhance Message retrieval.