diff -urN cf.orig/m4/proto.m4 cf/m4/proto.m4
--- cf.orig/m4/proto.m4	2003-08-01 19:02:36.000000000 +0300
+++ cf/m4/proto.m4	2004-11-08 18:21:51.000000000 +0200
@@ -1105,7 +1105,14 @@
 # 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$*				$: <?> $1
+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',