diff --git a/Cargo.toml b/Cargo.toml
index c6451ec..efe8a7e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -68,6 +68,7 @@ unicode-width = "0.1"
 
 [patch.crates-io]
 #ratatui = { path = "../ratatui", features = ["serde", "macros"] }
+eyeball-im = { git = "https://github.com/progval/eyeball.git", rev = "33bc7b532985a78cd8aa2e0865c9848211cfadec" }
 
 [dev-dependencies]
 pretty_assertions = "1.4.0"
diff --git a/src/buffers/mod.rs b/src/buffers/mod.rs
index af5d9e2..b84d3a0 100644
--- a/src/buffers/mod.rs
+++ b/src/buffers/mod.rs
@@ -54,12 +54,12 @@ impl Buffers {
 
   pub async fn poll_updates(&mut self) {
     self
-        .iter_mut()
-        .map(|buf| buf.poll_updates())
-        .collect::<FuturesUnordered<_>>()
-        .next()
-        .await
-        .expect("poll_updates reached the end of the never-ending stream");
+      .iter_mut()
+      .map(|buf| buf.poll_updates())
+      .collect::<FuturesUnordered<_>>()
+      .next()
+      .await
+      .expect("poll_updates reached the end of the never-ending stream");
   }
 
   pub fn iter(&self) -> impl Iterator<Item = &dyn Buffer> {
diff --git a/src/buffers/room.rs b/src/buffers/room.rs
index 0c3cdfd..d3be695 100644
--- a/src/buffers/room.rs
+++ b/src/buffers/room.rs
@@ -50,13 +50,11 @@ impl SingleClientRoomBuffer {
       // TODO: run this concurrently with stream.next() below
       self.spawn_back_pagination(back_pagination_request).await;
     }
-    self.items.extend(
-      self
-        .stream
-        .next()
-        .await
-        .map(|change| format!("New items: {:#?}", change)),
-    );
+    if let Some(changes) = self.stream.next().await {
+      for change in changes {
+        change.map(|timeline_item| format!("{:#?}", timeline_item)).apply(&mut self.items);
+      }
+    }
   }
 
   async fn spawn_back_pagination(&self, num: u16) {