diff --git a/src/dc_imap.rs b/src/dc_imap.rs
index 6d0618e61..640bf8182 100644
--- a/src/dc_imap.rs
+++ b/src/dc_imap.rs
@@ -1500,18 +1500,22 @@ impl Imap {
             info!(
                 context,
                 0,
-                "Marking message \"%s\", %s/%i for deletion...",
-                &message_id,
-                CString::new(folder.as_ref().to_owned()).unwrap().as_ptr(),
-                *server_uid as libc::c_int
+                format!(
+                    "Marking message \"{}\", {}/{} for deletion...",
+                    message_id.as_ref(),
+                    folder.as_ref(),
+                    server_uid,
+                )
             );
 
             if self.select_folder(context, Some(&folder)) == 0 {
                 warn!(
                     context,
                     0,
-                    "Cannot select folder %s for deleting message.",
-                    CString::new(folder.as_ref().to_owned()).unwrap().as_ptr(),
+                    format!(
+                        "Cannot select folder {} for deleting message.",
+                        folder.as_ref()
+                    )
                 );
             } else {
                 let set = format!("{}", server_uid);
@@ -1531,10 +1535,12 @@ impl Imap {
                                 warn!(
                                     context,
                                     0,
-                                    "Cannot delete on IMAP, %s/%i does not match %s.",
-                                    CString::new(folder.as_ref().to_owned()).unwrap().as_ptr(),
-                                    *server_uid as libc::c_int,
-                                    message_id,
+                                    format!(
+                                        "Cannot delete on IMAP, {}/{} does not match {}.",
+                                        folder.as_ref(),
+                                        server_uid,
+                                        message_id.as_ref(),
+                                    )
                                 );
                                 *server_uid = 0;
                             }
@@ -1545,9 +1551,11 @@ impl Imap {
                             warn!(
                                 context,
                                 0,
-                                "Cannot delete on IMAP, %s/%i not found.",
-                                CString::new(folder.as_ref().to_owned()).unwrap().as_ptr(),
-                                *server_uid as libc::c_int,
+                                format!(
+                                    "Cannot delete on IMAP, {}/{} not found.",
+                                    folder.as_ref(),
+                                    server_uid,
+                                )
                             );
                             *server_uid = 0;
                         }
diff --git a/src/dc_sqlite3.rs b/src/dc_sqlite3.rs
index 6463a09f5..c3d7bd153 100644
--- a/src/dc_sqlite3.rs
+++ b/src/dc_sqlite3.rs
@@ -1523,10 +1523,14 @@ pub unsafe fn dc_housekeeping(context: &dc_context_t) {
 
             match std::fs::metadata(std::ffi::CStr::from_ptr(path).to_str().unwrap()) {
                 Ok(stats) => {
-                    if stats.created().unwrap() > keep_files_newer_than
-                        || stats.modified().unwrap() > keep_files_newer_than
-                        || stats.accessed().unwrap() > keep_files_newer_than
-                    {
+                    let created =
+                        stats.created().is_ok() && stats.created().unwrap() > keep_files_newer_than;
+                    let modified = stats.modified().is_ok()
+                        && stats.modified().unwrap() > keep_files_newer_than;
+                    let accessed = stats.accessed().is_ok()
+                        && stats.accessed().unwrap() > keep_files_newer_than;
+
+                    if created || modified || accessed {
                         dc_log_info(
                             context,
                             0,