diff --git a/src/twitter/compose.py b/src/twitter/compose.py
index 63fdc525..ff9f4fb1 100644
--- a/src/twitter/compose.py
+++ b/src/twitter/compose.py
@@ -51,8 +51,10 @@ def compose_tweet(tweet, db, relative_times):
   user = tweet["user"]["name"]
   source = re.sub(r"(?s)<.*?>", "", tweet["source"])
   if tweet.has_key("retweeted_status"):
-   if tweet.has_key("message") == False:
+   if tweet.has_key("message") == False or tweet["retweeted_status"]["is_quote_status"] == False:
     text = "RT @%s: %s" % (tweet["retweeted_status"]["user"]["screen_name"], StripChars(tweet["retweeted_status"]["text"]))
+   elif tweet["retweeted_status"]["is_quote_status"]:
+    text = "%s" % (StripChars(tweet[value]))
    else:
     text = "RT @%s: %s" % (tweet["retweeted_status"]["user"]["screen_name"], StripChars(tweet[value]))
   if text[-1] in chars: text=text+"."