Remove 'multipart/encrypted' header after decrypting incoming mail. Clos...

...es #4454.