Fix wrong message fetch count in intial fetch and remove unnecesary check.