improve messages fetching