diff --git a/modules/Twitter.py b/modules/Twitter.py
index a0eaf7c..2ffb56e 100644
--- a/modules/Twitter.py
+++ b/modules/Twitter.py
@@ -328,14 +328,16 @@ class Twitter(Module):
                 output_channel = self._get_output_channel()
 
                 if since_id is not None and output_channel != '':
-                    tweets = self.twit.GetFriendsTimeline(since_id=since_id)
-                    tweets.reverse()
-                    for tweet in tweets:
-                        tweet_text = self._return_tweet_or_retweet_text(tweet=tweet, print_source=True)
-                        self.sendmsg(self.connection, output_channel.encode('utf-8', 'ignore'), tweet_text)
-
-                    # friends timeline printed, find the latest id
-                    new_since_id = self._get_latest_tweet_id(tweets, since_id)
+                    # TODO: make this an option in the settings, just
+                    # disabled in code for now
+                    #tweets = self.twit.GetFriendsTimeline(since_id=since_id)
+                    #tweets.reverse()
+                    #for tweet in tweets:
+                    #    tweet_text = self._return_tweet_or_retweet_text(tweet=tweet, print_source=True)
+                    #    self.sendmsg(self.connection, output_channel.encode('utf-8', 'ignore'), tweet_text)
+                    #
+                    ## friends timeline printed, find the latest id
+                    #new_since_id = self._get_latest_tweet_id(tweets, since_id)
 
                     tweets = self.twit.GetMentions(since_id=since_id)
                     tweets.reverse()