This patch drops the content after the last boundary in a multi-part message
which prevents it from being considered in some case where the available
content sections are not favorable.

Backport me to v1.9