make an individual field for "subject", and another field for all header tokens combined.