1 files changed, 15 insertions, 0 deletions
diff --git a/filamento/src/logic/process_stanza.rs b/filamento/src/logic/process_stanza.rs
index 51e20a4..1a29f70 100644
--- a/filamento/src/logic/process_stanza.rs
+++ b/filamento/src/logic/process_stanza.rs
@@ -26,6 +26,7 @@ use crate::{
     files::FileStore,
     presence::{Offline, Online, Presence, PresenceType, Show},
     roster::Contact,
+    user::User,
 };
 
 use super::ClientLogic;
@@ -103,11 +104,25 @@ pub async fn recv_message<Fs: FileStore + Clone>(
                 }
             };
 
+            let from_user = match logic.db().read_user(from.as_bare()).await {
+                Ok(u) => u,
+                Err(e) => {
+                    error!("{}", e);
+                    User {
+                        jid: from.as_bare(),
+                        nick: None,
+                        avatar: None,
+                        cached_status_message: None,
+                    }
+                }
+            };
+
             // update the client with the new message
             logic
                 .update_sender()
                 .send(UpdateMessage::Message {
                     to: from.as_bare(),
+                    from: from_user,
                     message,
                 })
                 .await;