diff --git a/crates/coop/src/views/chat/mod.rs b/crates/coop/src/views/chat/mod.rs
index cb38916..4f6f39c 100644
--- a/crates/coop/src/views/chat/mod.rs
+++ b/crates/coop/src/views/chat/mod.rs
@@ -176,12 +176,8 @@ impl Chat {
         cx.spawn_in(window, async move |this, cx| {
             match load_messages.await {
                 Ok(events) => {
-                    cx.update(|window, cx| {
-                        window.push_notification(t!("chat.reload_tooltip"), cx);
-                        this.update(cx, |this, cx| {
-                            this.insert_messages(events, cx);
-                        })
-                        .ok();
+                    this.update(cx, |this, cx| {
+                        this.insert_messages(events, cx);
                     })
                     .ok();
                 }
@@ -1077,7 +1073,8 @@ impl Chat {
         Button::new("reload")
             .icon(IconName::Refresh)
             .tooltip(t!("chat.reload_tooltip"))
-            .on_click(move |_, _window, cx| {
+            .on_click(move |_, window, cx| {
+                window.push_notification(t!("common.refreshed"), cx);
                 room.update(cx, |this, cx| {
                     this.emit_refresh(cx);
                 })
diff --git a/crates/registry/src/room.rs b/crates/registry/src/room.rs
index 36b3825..713a405 100644
--- a/crates/registry/src/room.rs
+++ b/crates/registry/src/room.rs
@@ -388,31 +388,22 @@ impl Room {
     /// A Task that resolves to Result<Vec<Event>, Error> containing all messages for this room
     pub fn load_messages(&self, cx: &App) -> Task<Result<Vec<Event>, Error>> {
         let members = self.members.clone();
-        let members_clone = members.clone();
 
         cx.background_spawn(async move {
             let client = nostr_client();
-            let signer = client.signer().await?;
-            let public_key = signer.get_public_key().await?;
 
-            let send = Filter::new()
+            let filter = Filter::new()
                 .kind(Kind::PrivateDirectMessage)
-                .author(public_key)
+                .authors(members.clone())
                 .pubkeys(members.clone());
 
-            let recv = Filter::new()
-                .kind(Kind::PrivateDirectMessage)
-                .authors(members)
-                .pubkey(public_key);
-
-            let send_events = client.database().query(send).await?;
-            let recv_events = client.database().query(recv).await?;
-
-            let events = send_events
-                .merge(recv_events)
+            let events = client
+                .database()
+                .query(filter)
+                .await?
                 .into_iter()
                 .sorted_by_key(|ev| ev.created_at)
-                .filter(|ev| ev.compare_pubkeys(&members_clone))
+                .filter(|ev| ev.compare_pubkeys(&members))
                 .collect::<Vec<_>>();
 
             Ok(events)
diff --git a/locales/app.yml b/locales/app.yml
index fbcf76b..b50b130 100644
--- a/locales/app.yml
+++ b/locales/app.yml
@@ -33,6 +33,8 @@ common:
     en: "Clear"
   open_browser:
     en: "Open Browser"
+  refreshed:
+    en: "Refreshed"
 
 auto_update:
   updating: