another change related to Date/Message-Id order, just took me a while to realize...