Header and HeaderField classes for CircularMail

Plus some misc. adjustments