more email case fixes refs #550