Improve decrypt failure handling

On failure to decrypt, list the encrypted part as an attachment