diff --git a/Monal/another.im/AnotherIMApp.swift b/Monal/another.im/AnotherIMApp.swift
index 748a07c..52be48f 100644
--- a/Monal/another.im/AnotherIMApp.swift
+++ b/Monal/another.im/AnotherIMApp.swift
@@ -4,7 +4,7 @@ import SwiftUI
 @main
 struct AnotherIMApp: App {
     @UIApplicationDelegateAdaptor(AppDelegate.self) var appDelegate
-    @StateObject var wrapper = WrapperXMPP()
+    let wrapper = WrapperXMPP()
 
     init() {
         // DDLog.add(DDOSLogger.sharedInstance, with: .all)
diff --git a/Monal/another.im/XMPP/Models/Message.swift b/Monal/another.im/XMPP/Models/Message.swift
index f84a1e5..bfc8741 100644
--- a/Monal/another.im/XMPP/Models/Message.swift
+++ b/Monal/another.im/XMPP/Models/Message.swift
@@ -28,7 +28,7 @@ struct Message: Identifiable {
     init?(_ obj: MLMessage) {
         guard let accId = obj.accountID as? Int, let dbId = obj.messageDBId as? Int else { return nil }
         accountId = accId
-        participantJid = obj.participantJid
+        participantJid = obj.actualFrom
         self.dbId = dbId
         messageId = obj.messageId
         stanzaId = obj.stanzaId