diff -urN cg.orig/m4/proto.m4 cf/m4/proto.m4
--- cg.orig/m4/proto.m4	2004-03-12 11:48:08.000000000 +0200
+++ cf/m4/proto.m4	2004-11-08 18:37:10.000000000 +0200
@@ -1105,7 +1105,17 @@
 # not local -- try mailer table lookup
 R$* <@ $+ > $*		$: < $2 > $1 < @ $2 > $3	extract host name
 R< $+ . > $*		$: < $1 > $2			strip trailing dot
-R< $+ > $*		$: < $(mailertable $1 $) > $2	lookup
+##### patch to mailertable per address
+# R< $+ > $*		$: < $(mailertable $1 $) > $2	lookup
+R $*				$: $&f $| <?> $1
+R $+@$+ $| <?> $*		$: $1@$2 $| < $(mailertable From:$1@$2 $: ? $) > $3	lookup
+R $+ $| <?> $*			$: $1 $| < $(mailertable From:$1 $: ? $) > $2	lookup
+R $* $| $*			$: $2
+R <?> < $+ > $+ < @ $+ > $*	$: < $(mailertable $2@$1 $: ? $) > < $1 > $2 < @ $3 > $4	lookup
+R <?> < $+ > $*			$: < $(mailertable $1 $: ? $) > < $1 > $2	lookup
+R <?> $*			$: $1
+R <$*> < $+ > $*		$: <$1> $3
+##### patch to mailertable per address
 dnl it is $~[ instead of $- to avoid matches on IPv6 addresses
 R< $~[ : $* > $* 	$>MailerToTriple < $1 : $2 > $3		check -- resolved?
 R< $+ > $*		$: $>Mailertable <$1> $2		try domain',