diff --git a/src/mimeparser.rs b/src/mimeparser.rs
index 7130cb512..7ada49001 100644
--- a/src/mimeparser.rs
+++ b/src/mimeparser.rs
@@ -671,7 +671,7 @@ impl MimeMessage {
             && self
                 .parts
                 .get(1)
-                .map_or(false, |filepart| match filepart.typ {
+                .is_some_and(|filepart| match filepart.typ {
                     Viewtype::Image
                     | Viewtype::Gif
                     | Viewtype::Sticker
diff --git a/src/sql.rs b/src/sql.rs
index 3b6f2e4e9..47604778d 100644
--- a/src/sql.rs
+++ b/src/sql.rs
@@ -887,13 +887,11 @@ pub async fn remove_unused_files(context: &Context) -> Result<()> {
                         }
                         unreferenced_count += 1;
                         let recently_created =
-                            stats.created().map_or(false, |t| t > keep_files_newer_than);
-                        let recently_modified = stats
-                            .modified()
-                            .map_or(false, |t| t > keep_files_newer_than);
-                        let recently_accessed = stats
-                            .accessed()
-                            .map_or(false, |t| t > keep_files_newer_than);
+                            stats.created().is_ok_and(|t| t > keep_files_newer_than);
+                        let recently_modified =
+                            stats.modified().is_ok_and(|t| t > keep_files_newer_than);
+                        let recently_accessed =
+                            stats.accessed().is_ok_and(|t| t > keep_files_newer_than);
 
                         if p == blobdir
                             && (recently_created || recently_modified || recently_accessed)