Fix mismerge of mail settings.