[xwiki-users] attachments in notifications

Hi, I have upgraded our company wiki to XWiki Enterprise 2.0.24043. There was a problem with the watch list notifications that I now know how to fix from a previous post. However when I fix it the new messages that get sent have 16 attachments in each one. (BTW, I am using MS Outlook 2007 to view my email). Oddly when viewing the source in the email, down at the bottom it explains how there should be no attachments because of some clever trick that is supposed to fool the plugin. My users aren't going to be very happy with the 16 attachments for every update, especially when they aren't even used in the message display. Is there any easy way to stop adding the attachments to the messages? This is the bottom of the email source. The images listed are the ones being attached: <!-- We want to be able to use attached images in the HTML part of the email but we don't want them to be listed as attachments. We use a little trick here to make the mailsender plugin consider that we use all the attached images in this mail even if we don't (some images are used very rarely). src='cid:groups.png' src='cid:metadata.gif' src='cid:dblist.png' src='cid:attach.gif' src='cid:date.png' src='cid:boolean.png' src='cid:textarea.png' src='cid:string.png' src='cid:space.gif' src='cid:document.gif' src='cid:dbtreelist.png' src='cid:wiki.gif' src='cid:number.png' src='cid:class.gif' src='cid:users.png' src='cid:staticlist.png' src='cid:levels.png' src='cid:password.png' src='cid:object.gif' --> TIA for any help, Regan Gill