Fixed PGP/MIME decoding bug
Fix bugs introduced by CLI composition work