From 17e97fe0ee8fba03176ed3ddeb8b522f92d4fe25 Mon Sep 17 00:00:00 2001
From: Gaston Dombiak <gaston@jivesoftware.com>
Date: Thu, 8 Dec 2005 21:07:01 +0000
Subject: [PATCH] Optimization work. SMACK-109

git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@3177 b35dd754-fafc-0310-a699-88a17e54d16e
---
 source/org/jivesoftware/smack/XMPPConnection.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/source/org/jivesoftware/smack/XMPPConnection.java b/source/org/jivesoftware/smack/XMPPConnection.java
index cb5ac4977..b1c9c92a2 100644
--- a/source/org/jivesoftware/smack/XMPPConnection.java
+++ b/source/org/jivesoftware/smack/XMPPConnection.java
@@ -27,8 +27,8 @@ import org.jivesoftware.smack.packet.Message;
 import org.jivesoftware.smack.packet.Packet;
 import org.jivesoftware.smack.packet.Presence;
 import org.jivesoftware.smack.packet.XMPPError;
-import org.jivesoftware.smack.util.StringUtils;
 import org.jivesoftware.smack.util.DNSUtil;
+import org.jivesoftware.smack.util.StringUtils;
 
 import javax.net.SocketFactory;
 import javax.net.ssl.SSLContext;
@@ -857,7 +857,9 @@ public class XMPPConnection {
                     // already be associated with a Chat. This will miss messages
                     // with new thread ID values, but we can only assume that a
                     // listener is registered to deal with this case.
-                    if (message.getThread() == null) {
+                    if (message.getThread() == null &&
+                            message.getType() != Message.Type.GROUP_CHAT &&
+                            message.getType() != Message.Type.HEADLINE) {
                         WeakReference chatRef = (WeakReference)chats.get(
                                 StringUtils.parseBareAddress(message.getFrom()));
                         if (chatRef != null) {