mailaddr fixups, correct more common errors