--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/doc/asmack-beem/beem_patches/50-fix-chatmanager.patch	Fri Mar 05 03:26:13 2010 +0100
@@ -0,0 +1,13 @@
+--- ../../../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);
+                 }