diff --git a/src/XMPPThread/Stanzas/Message.c b/src/XMPPThread/Stanzas/Message.c
index c105b33..cc2e026 100644
--- a/src/XMPPThread/Stanzas/Message.c
+++ b/src/XMPPThread/Stanzas/Message.c
@@ -24,6 +24,7 @@ MessageStanza(ParseeData *args, XMLElement *stanza, XMPPThread *thr)
     char *retracted = XMPPGetRetractedID(stanza);
     char *reply_to  = XMPPGetReply(stanza);
     char *moderated = XMPPGetModeration(stanza);
+    bool chat       = StrEquals(HashMapGet(stanza->attrs, "type"), "chat");
     size_t i;
 
     to = NULL;
@@ -182,7 +183,7 @@ MessageStanza(ParseeData *args, XMLElement *stanza, XMPPThread *thr)
      * ISSUE. 
      *
      * I HATE THIS. I NEED TO FIND A BETTER WAY. */
-    if (mroom_id)
+    if (!chat)
     {
         if (strncmp(HashMapGet(stanza->attrs, "to"), "parsee@", 7))
         {
@@ -195,7 +196,6 @@ MessageStanza(ParseeData *args, XMLElement *stanza, XMPPThread *thr)
         char *res = ParseeGetResource(from);
         char *encoded   = ParseeGetBridgedUser(args, stanza);
         char *event_id  = NULL;
-        bool chat       = StrEquals(HashMapGet(stanza->attrs, "type"), "chat");
 
         {
             char *parsee = ParseeJID(args);