diff -r -U10 libdomainkeys-0.68/domainkeys.c libdomainkeys-0.68+byte/domainkeys.c --- libdomainkeys-0.68/domainkeys.c 2005-08-30 21:31:39.000000000 +0100 +++ libdomainkeys-0.68+byte/domainkeys.c 2006-12-16 11:14:19.000000000 +0000 @@ -1617,20 +1617,24 @@ char *dk_address(DK *dk) { if ((!dk)||(dk->dkmarker != DKMARK)) { return "N"; } if (dk->sender) { return dk->sender; /* TC14-3 */ } + if (dk->sender_beforesign && (dk->signing == DK_SIGNING_NOVERIFY)) + { + return dk->sender_beforesign; + } if (dk->from) { return dk->from; /* TC14-4 */ } return "N"; /* TC14-5 */ } /* HEADER */ /* * Called at end-of-message (before response to DATA-dot, if synchronous with SMTP session).