Mail improvements and grammatics