changed message retrieval stratedgy - removed previous implementation