Emails now ordered the right way