diff --git a/modules/Twitter.py b/modules/Twitter.py
index e7db497..1fd83ff 100644
--- a/modules/Twitter.py
+++ b/modules/Twitter.py
@@ -39,8 +39,8 @@ class Twitter(Module):
         Module.__init__(self, irc, config, server)
 
         # setup regexes
-        getstatuspattern = "^!twitter\s+getstatus(\s+noid)?\s+(\S+)$"
-        getuserstatuspattern = "^!twitter\s+getuserstatus(\s+noid)?\s+(\S+)(\s+.*|$)"
+        getstatuspattern = "^!twitter\s+getstatus(\s+nosource)?(\s+noid)?\s+(\S+)$"
+        getuserstatuspattern = "^!twitter\s+getuserstatus(\s+nosource)?(\s+noid)?\s+(\S+)(\s+.*|$)"
         tweetpattern = "^!twitter\s+tweet\s+(.*)"
         gettokenpattern = "^!twitter\s+gettoken$"
         authpattern = "^!twitter\s+auth\s+(\S+)$"
@@ -165,13 +165,16 @@ class Twitter(Module):
 
         match = self.getstatusre.search(what)
         if match:
+            print_source = True
             print_id = True
             if match.group(1):
+                print_source = False
+            if match.group(2):
                 print_id = False
-            status = match.group(2)
+            status = match.group(3)
             try:
                 tweet = self.twit.GetStatus(status)
-                return self._return_tweet_or_retweet_text(tweet=tweet, print_source=True, print_id=print_id)
+                return self._return_tweet_or_retweet_text(tweet=tweet, print_source=print_source, print_id=print_id)
             except twitter.TwitterError as e:
                 return "Couldn't obtain status: " + str(e)
 
@@ -180,11 +183,14 @@ class Twitter(Module):
 
         match = self.getuserstatusre.search(what)
         if match:
+            print_source = True
             print_id = True
             if match.group(1):
+                print_source = False
+            if match.group(2):
                 print_id = False
-            user = match.group(2)
-            index = match.group(3)
+            user = match.group(3)
+            index = match.group(4)
 
             try:
                 if index:
@@ -203,7 +209,7 @@ class Twitter(Module):
                 tweets = self.twit.GetUserTimeline(screen_name=user, count=count, include_rts=True)
                 if tweets:
                     tweet = tweets[-1*index]
-                    return self._return_tweet_or_retweet_text(tweet=tweet, print_id=print_id)
+                    return self._return_tweet_or_retweet_text(tweet=tweet, print_source=print_source, print_id=print_id)
             except twitter.TwitterError as e:
                 return "Couldn't obtain status: " + str(e)
             except ValueError as e: