Catalog Mail and Payment file updates

Catalog Mail and Payment file updates