diff --git a/source/org/jivesoftware/smack/ChatManager.java b/source/org/jivesoftware/smack/ChatManager.java
index 20f9969b7..d45502685 100644
--- a/source/org/jivesoftware/smack/ChatManager.java
+++ b/source/org/jivesoftware/smack/ChatManager.java
@@ -106,6 +106,10 @@ public class ChatManager {
                 }
                 else {
                     chat = getThreadChat(message.getThread());
+                    if (chat == null) {
+                        // Try to locate the chat based on the sender of the message
+                        chat = getUserChat(StringUtils.parseBareAddress(message.getFrom()));
+                    }
                 }
 
                 if(chat == null) {