diff --git a/src/dc_job.rs b/src/dc_job.rs index 065fde15d..f69c3ca87 100644 --- a/src/dc_job.rs +++ b/src/dc_job.rs @@ -1180,9 +1180,16 @@ pub unsafe fn dc_job_send_msg(context: &Context, msg_id: uint32_t) -> libc::c_in /* create message */ if 0 == dc_mimefactory_render(&mut mimefactory) { dc_set_msg_failed(context, msg_id, mimefactory.error); - } else if 0 != dc_param_get_int((*mimefactory.msg).param, 'c' as i32, 0i32) + } else if 0 != dc_param_get_int((*mimefactory.msg).param, 'c' as i32, 0) && 0 == mimefactory.out_encrypted { + warn!( + context, + 0, + "e2e encryption unavailable {} - {}", + msg_id, + dc_param_get_int((*mimefactory.msg).param, 'c' as i32, 0), + ); dc_set_msg_failed( context, msg_id, diff --git a/src/dc_receive_imf.rs b/src/dc_receive_imf.rs index 08181d78c..0da0d3429 100644 --- a/src/dc_receive_imf.rs +++ b/src/dc_receive_imf.rs @@ -541,12 +541,12 @@ pub unsafe fn dc_receive_imf( (*part).bytes, hidden, if 0 != save_mime_headers { - Some(as_str(imf_raw_not_terminated)) + Some(to_string(imf_raw_not_terminated)) } else { None }, - as_str(mime_in_reply_to), - as_str(mime_references), + to_string(mime_in_reply_to), + to_string(mime_references), ]); if res.is_err() {