diff --git a/CHANGELOG.md b/CHANGELOG.md
index cdc91ce6..37eede76 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,10 @@
 
 - Basque language
 
+### Changed
+
+- Bump Rust to nightly 2022-01-26
+
 ### Fixed
 
 - Add explanation of sign-up step at sign-up page when email sign-up mode
diff --git a/plume-models/src/comments.rs b/plume-models/src/comments.rs
index 0809aab5..09f26a35 100644
--- a/plume-models/src/comments.rs
+++ b/plume-models/src/comments.rs
@@ -304,14 +304,13 @@ impl FromId<DbConn> for Comment {
                 .chain(bcc)
                 .collect::<HashSet<_>>() // remove duplicates (don't do a query more than once)
                 .into_iter()
-                .map(|v| {
+                .flat_map(|v| {
                     if let Ok(user) = User::from_id(conn, &v, None, CONFIG.proxy()) {
                         vec![user]
                     } else {
                         vec![] // TODO try to fetch collection
                     }
                 })
-                .flatten()
                 .filter(|u| u.get_instance(conn).map(|i| i.local).unwrap_or(false))
                 .collect::<HashSet<User>>(); //remove duplicates (prevent db error)
 
diff --git a/plume-models/src/search/tokenizer.rs b/plume-models/src/search/tokenizer.rs
index 52cd62b2..83228e67 100644
--- a/plume-models/src/search/tokenizer.rs
+++ b/plume-models/src/search/tokenizer.rs
@@ -57,7 +57,7 @@ impl<'a> WhitespaceTokenStream<'a> {
             .filter(|&(_, ref c)| c.is_whitespace())
             .map(|(offset, _)| offset)
             .next()
-            .unwrap_or_else(|| self.text.len())
+            .unwrap_or(self.text.len())
     }
 }
 
diff --git a/rust-toolchain b/rust-toolchain
index a1da0415..63af764b 100644
--- a/rust-toolchain
+++ b/rust-toolchain
@@ -1 +1 @@
-nightly-2021-11-27
+nightly-2022-01-27
diff --git a/templates/partials/image_select.rs.html b/templates/partials/image_select.rs.html
index 8a200bbd..53e7eee0 100644
--- a/templates/partials/image_select.rs.html
+++ b/templates/partials/image_select.rs.html
@@ -17,7 +17,7 @@
                 @if !media.alt_text.is_empty() {
                     @media.alt_text
                 } else {
-                    @media.content_warning.unwrap_or(i18n!(ctx.1, "No description"))
+                    @media.content_warning.unwrap_or_else(|| i18n!(ctx.1, "No description")))
                 }
             </option>
         }