fixing up more mail errors