Fixed: PGP Crypted and Signed emails could be wrongly parsed (bug#9954).
Merge remote-tracking branch 'upstream/rel-3_2' into rel-3_2