diff --git a/src/dc_imex.rs b/src/dc_imex.rs
index af3ed4bfe..b7850d2c3 100644
--- a/src/dc_imex.rs
+++ b/src/dc_imex.rs
@@ -909,7 +909,7 @@ unsafe fn import_self_keys(context: &Context, dir_name: *const libc::c_char) ->
                     }
                 }
                 set_default = 1;
-                if name_f.find("legacy").is_some() {
+                if name_f.contains("legacy") {
                     info!(
                         context,
                         "Treating \"{}\" as a legacy private key.",
diff --git a/src/dc_mimefactory.rs b/src/dc_mimefactory.rs
index aadf639a3..ba06f22c7 100644
--- a/src/dc_mimefactory.rs
+++ b/src/dc_mimefactory.rs
@@ -788,8 +788,10 @@ fn build_body_text(text: &str) -> *mut mailmime {
 }
 
 fn set_body_text(part: *mut mailmime, text: &str) {
+    use libc::strlen;
     unsafe {
-        mailmime_set_body_text(part, text.strdup(), text.len());
+        let text_c = text.strdup();
+        mailmime_set_body_text(part, text_c, strlen(text_c));
     }
 }
 
@@ -909,7 +911,7 @@ fn build_body_file(context: &Context, msg: &Message, base_name: &str) -> (*mut m
 pub(crate) fn vec_contains_lowercase(vec: &Vec<String>, part: &str) -> bool {
     let partlc = part.to_lowercase();
     for cur in vec.iter() {
-        if (*cur).to_lowercase() == partlc {
+        if cur.to_lowercase() == partlc {
             return true;
         }
     }