Matching From: addreses in email headers to certificates always gave me the layer violation heebie jeebies. I add my vote for removing mandated processing of email headers.