hacky double-check, for different types of cleartext mails
Merge remote-tracking branch 'origin/master'
always decode internally, but possibly re-encode for output