diff --git a/src/twitter/buffers/indibidual.py b/src/twitter/buffers/indibidual.py
index 0da7ecaf..20d1987b 100644
--- a/src/twitter/buffers/indibidual.py
+++ b/src/twitter/buffers/indibidual.py
@@ -34,7 +34,11 @@ class streamer(TwythonStreamer):
      tweet_event.SetItem(data)
      announce = _(u"One tweet from %s in the list %s") % (data["user"]["name"], self.parent.nb.GetPage(i).name_buffer[:-5])
      tweet_event.SetAnnounce(announce)
-     wx.PostEvent(self.parent.nb.GetPage(i), tweet_event)
+     usr = data["in_reply_to_user_id"]
+     if (usr != None and usr in self.friends) or data.has_key("retweeted_status"):
+      wx.PostEvent(self.parent.nb.GetPage(i), tweet_event)
+     elif usr == None:
+      wx.PostEvent(self.parent.nb.GetPage(i), tweet_event)
     except ValueError:
      pass
 
@@ -42,5 +46,7 @@ class streamer(TwythonStreamer):
   try:
    if data.has_key("text"):
     self.check_tls(data)
+   elif "friends" in data:
+    self.friends = data["friends"]
   except:
    pass
\ No newline at end of file
diff --git a/src/twitter/buffers/stream.py b/src/twitter/buffers/stream.py
index 86a8c298..4a4435de 100644
--- a/src/twitter/buffers/stream.py
+++ b/src/twitter/buffers/stream.py
@@ -68,7 +68,7 @@ class streamer(TwythonStreamer):
    tweet_event.SetItem(data["direct_message"])
    text = _(u"One direct message")
    tweet_event.SetAnnounce(text)
-   wx.PostEvent(self.parent.search_buffer("buffer", "direct_messages"), tweet_event)
+   wx.PostEvent(self.parent.search_buffer("direct_message", "direct_messages"), tweet_event)
 
  def check_follower(self, data):
   if data["target"]["screen_name"] == self.db.settings["user_name"] and config.main["other_buffers"]["show_followers"] == True: