Make HTML email filter-friendly

In Jira, the HTML emails are much nicer to read than the plain text emails. However the HTML email template has been constructed so that it's very hard to filter the notifications based on their content. For example, I'm filtering email that assigns issues to me differently from email that I just get due to being a team member in a project. I'd love to receive the HTML email from Jira but can't since that'd break all the filters.

Can you please improve the HTML email template to include a "keywords" section that'd at least include the "Assignee:" and "Reporter:" fields in a "plain text friendly" manner. Or maybe you could include the whole plain text email version in a hidden HTML portion at the end of the email? That'd enable the filtering and the nice layouts..