Fix Email Header and add Block ID to logging