--- /usr/local/sbin/amavisd     Tue Nov  2 15:22:57 2004
+++ /usr/local/sbin/amavisd     Thu Dec 30 09:31:22 2004
@@ -258,6 +258,7 @@
 
       @keep_decoded_original_maps @map_full_type_to_short_type_maps
       @viruses_that_fake_sender_maps
+      $block_reason
     )],
     'unpack' => [qw(
       $file $arc $gzip $bzip2 $lzop $lha $unarj $uncompress $unfreeze
@@ -6407,8 +6408,7 @@
             $r->recip_blacklisted_sender ? 'sender blacklisted' : 'UBE';
           $r->recip_smtp_response(($final_destiny == D_DISCARD
                               ? "250 2.7.1 Ok, discarded, $reason"
-                              : "550 5.7.1 Message content rejected, $reason"
-                            ) . ", id=$am_id");
+                              : "550 5.7.1 $block_reason" ) );
           $r->recip_done(1);
         }
       }