Merge native DKIM support (from DEVEL_PDKIM)