Improved UnitTest. The html body in attachment file-2 should not be included, when Frontend::RichText is disabled, because of bug#9350.
Merge remote-tracking branch 'upstream/rel-3_2' into rel-3_2