Don't query for all the messages

Good job, David.