prefetch queue messages properly (ZEN-11028)

forward port of ZEN-11051 changes.