$filename in reports picking up wrong filename

[Gareth]

Someone sent us a .ocx file which our system blocked. The inline warning
was :-

Warning: This message has had one or more attachments removed
(Sources2929.zip, loadingprogramProj1.ocx). Please read the
"lgdeltd-Attachment-Warning.txt" attachment(s) for more information.


However the attachment warning contains :-

This is a message from the MailScanner E-Mail Virus Protection Service
----------------------------------------------------------------------
The original e-mail attachment "Sources2929.zip"
is on the list of unacceptable attachments for this site and has been
replaced by this warning message.

If you wish to receive a copy of the original attachment, please
e-mail helpdesk and include the whole of this message
in your request. Alternatively, you can call them, with
the contents of this message to hand when you call.

At Mon Jun  4 06:22:24 2007 the virus scanner said:
   MailScanner: No programs allowed (loadingprogramProj1.ocx)

Note to Help Desk: Look on the lgdeltd (mailscanner) MailScanner in
/var/spool/MailScanner/quarantine/20070604 (message 4CE42AA011D.B874C).

You can see from the mailscanner report that the ocx file was the
problem but the wrong filename is shown earlier.
Can this be fixed?
It would be ok if $filename showed both files as it does with the inline
warning as that way I can at least reword the warning message.
I am running mailscanner 4.57.6-1

Thanks
Gareth