--- ../../../src/smack/org/jivesoftware/smack/ChatManager.java	2010-02-23 19:27:26.000000000 +0100
+++ org/jivesoftware/smack/ChatManager.java	2010-02-23 19:37:47.000000000 +0100
@@ -111,7 +111,9 @@
                     	chat = getUserChat(message.getFrom());
                     }
                 }
-
+		if (chat == null) {
+                	chat = getUserChat(StringUtils.parseBareAddress(message.getFrom()));
+		}
                 if(chat == null) {
                     chat = createChat(message);
                 }