--- Postfix.pm.old	2004-03-20 10:14:23.000000000 +0000
+++ Postfix.pm	2004-03-22 12:04:13.000000000 +0000
@@ -326,7 +326,8 @@
         $recdata =~ s/\<$//;
         $message->{from} = lc($recdata);
         $FROMFound = 1;
-      } elsif ($rectype eq 'R') {
+      #JKF 20040322 } elsif ($rectype eq 'R') {
+      } elsif ($rectype eq 'O') {
         # Recipient address
         $recdata =~ s/^\<//;
         $recdata =~ s/\<$//;
@@ -334,7 +335,8 @@
         push @{$message->{metadata}}, "$rectype$recdata";
         $TOFound = 1;
         #print STDERR "Pre R Recip $recdata\n";
-      } elsif ($rectype eq 'O') {
+      #JKF 20040322 } elsif ($rectype eq 'O') {
+      } elsif ($rectype eq 'R') {
         # Original recipients are handled by MS as normal recipients,
         # but are put back into the 'O' originalrcpts list in the
         # replacement message.
@@ -344,7 +346,8 @@
         $recdata = lc($recdata);
         push @{$message->{to}}, $recdata;
         push @{$message->{metadata}}, "$rectype$recdata";
-        $message->{originalrecips}{"$recdata"} = 1;
+        #JKF 20040322 $message->{originalrecips}{"$recdata"} = 1;
+        $message->{postfixrecips}{"$recdata"} = 1;
         $TOFound = 1;
         #print STDERR "Pre O Recip $recdata\n";
       } else {
@@ -395,7 +398,8 @@
         push @{$message->{metadata}}, "$rectype$recdata";
         last;
       }
-      if ($rectype eq 'R') {
+      #JKF 20040322 if ($rectype eq 'R') {
+      if ($rectype eq 'O') {
         # Recipient address
         $recdata =~ s/^\<//;
         $recdata =~ s/\<$//;
@@ -403,7 +407,8 @@
         push @{$message->{metadata}}, "$rectype$recdata";
         $TOFound = 1;
         #print STDERR "Post R Recip $recdata\n";
-      } elsif ($rectype eq 'O') {
+      #JKF 20040322 } elsif ($rectype eq 'O') {
+      } elsif ($rectype eq 'R') {
         # These recipients are used in the message handling in MS,
         # but must be put back in the 'O' list in the new message.
         # Original recipient address
@@ -412,7 +417,8 @@
         $recdata = lc($recdata);
         push @{$message->{to}}, $recdata;
         push @{$message->{metadata}}, "$rectype$recdata";
-        $message->{originalrecips}{"$recdata"} = 1;
+        #JKF 20040322 $message->{originalrecips}{"$recdata"} = 1;
+        $message->{postfixrecips}{"$recdata"} = 1;
         $TOFound = 1;
         #print STDERR "Post O Recip $recdata\n";
       } else {