Fix the ordering of lunch/drink messages