1 files changed, 7 insertions, 5 deletions
diff --git a/activity.py b/activity.py
index dac1b26..b885842 100644
--- a/activity.py
+++ b/activity.py
@@ -50,12 +50,12 @@ SMILIES_COLUMNS = 5
 class Chat(activity.Activity):
 
     def __init__(self, handle):
-        super(Chat, self).__init__(handle)
-
         smilies.init()
+        self.chatbox = ChatBox()
+
+        super(Chat, self).__init__(handle)
 
         self.entry = None
-        self.chatbox = None
 
         root = self.make_root()
         self.set_canvas(root)
@@ -267,8 +267,6 @@ class Chat(activity.Activity):
         entry.connect('key-press-event', self.entry_key_press_cb)
         self.entry = entry
 
-        self.chatbox = ChatBox()
-
         hbox = gtk.HBox()
         hbox.add(entry)
 
@@ -418,6 +416,10 @@ class TextChannelWrapper(object):
         Converts sender to a Buddy.
         Calls self._activity_cb which is a callback to the activity.
         """
+        if type_ != 0:
+            # Exclude any auxiliary messages
+            return
+
         if self._activity_cb:
             try:
                 self._text_chan[CHANNEL_INTERFACE_GROUP]