Fixed S/MIME sign+encrypt logic to match what other clients do