From the start, you could disable categorization by tapping the three-dot icon in the upper right corner ... lets you disable or enable Apple’s other Mail changes. It’s a small tweak, but ...