Matching quarantine ID with quarantine filename

[Alex]

Hi,
I've set up a fedora15 box with postfix and amavisd-2.6.6 with
spamassassin-v3.3.2. I've configured the quarantine method filenames
to be as follows:

$virus_quarantine_method            = 'local:virus-%b-%i-%n.gz';
$spam_quarantine_method             = 'local:spam-%b-%i-%n.gz';
$banned_files_quarantine_method     = 'local:banned-%b-%i-%n.gz';
$bad_header_quarantine_method       = 'local:badh-%b-%i-%n.gz';

This successfully stores the files in /var/spool/amavisd/quarantine/
as expected. However, the quarantine ID in the file does not match the
filename. Assuming the filename is
spam-58d3e2f687ac89fd6d137312e8b528bf-20111221T105112-06719-11-2.gz,
it does not match the quarantine ID in the file:

X-Quarantine-ID: <RmDFUlpnSSb8>

How do I configure the X-header to represent the proper filename so I
may use amavisd-release effectively?

In the meantime, is there another way to effectively resubmit this
quarantined file back into the mail stream so it isn't flagged again?

If I whitelist the sender, how can I pass it to sendmail to resend it?

Thanks,
Alex