Email sent to mail archive from Outlook with attachments doesn't display attachments

This one needs some more research, but we're seeing that mail sent to the email archive from Outlook is messing up the DOM for velocity somehow and causing attachments sent to the message (after the body) to not display. I haven't completely reproduced this in test as getting mail into the archive from Outlook in a test environment isn't the easiest. For whatever reason (if you look at the screenshot) in the <td> for the body, the "buffered body tool content" stops and the footer of the page is dumped into the <td>. The code in chef_mailbody-view.vm". I don't see any relevant errors in the logs.

		<tr>
			<th>$tlang.getString("gen.bod2")</th>
			<td>$validator.escapeHtmlFormattedText($email.FormattedBody)</td>
		</tr>

It never actually gets to the </td> and to the attachments section.

This might not even be really related to email archive but just a problem with portal or somewhere else?

Some suggestions
1) add jsoup cleanup HTML method to kernel (nice long-term benefits) and try to clean this up
2) iframe html for this body content
3) popup for html and plain text content