Adjust to changes in emails