diff --git a/source/org/jivesoftware/smack/ChatManager.java b/source/org/jivesoftware/smack/ChatManager.java
index ce9a21940..6f54e0a4a 100644
--- a/source/org/jivesoftware/smack/ChatManager.java
+++ b/source/org/jivesoftware/smack/ChatManager.java
@@ -102,13 +102,13 @@ public class ChatManager {
                 Message message = (Message) packet;
                 Chat chat;
                 if (message.getThread() == null) {
-                    chat = getUserChat(StringUtils.parseBareAddress(message.getFrom()));
+                	chat = getUserChat(message.getFrom());
                 }
                 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()));
+                    	chat = getUserChat(message.getFrom());
                     }
                 }