Expire calculation in the wrong spot, should wait until all messages are there