Followup fix for bug#10364 - Inline images displayed as attachment in SMIME and PGP signed messages.
Merge remote-tracking branch 'upstream/master'