mail code edits