Correctly filter emails with single part html emails
Merge remote-tracking branch 'upstream/master'