diff --git a/twitter.inc b/twitter.inc
index 3bcd894..cd3d1a4 100644
--- a/twitter.inc
+++ b/twitter.inc
@@ -156,7 +156,7 @@ function twitter_status_save($status) {
     'twitter_id' => $status->id,
     'screen_name' => $status->user->screen_name,
     'created_time' => strtotime($status->created_at),
-    'text' => $status->text,
+    'text' => !isset($status->retweeted_status) ? $status->text : 'RT @'.$status->retweeted_status->user->screen_name.': '.$status->retweeted_status->text,
     'source' => $status->source,
     'in_reply_to_status_id' => ($status->in_reply_to_status_id > 0) ? (string) $status->in_reply_to_status_id : NULL,
     'in_reply_to_user_id' => (int) $status->in_reply_to_user_id,
diff --git a/twitter.lib.php b/twitter.lib.php
index b1639e6..638b1dc 100644
--- a/twitter.lib.php
+++ b/twitter.lib.php
@@ -1271,6 +1271,8 @@ class TwitterStatus {
 
   public $entities;
 
+  public $retweeted_status;
+
   /**
    * Constructor for TwitterStatus
    */
@@ -1288,6 +1290,10 @@ class TwitterStatus {
     if (isset($values['user'])) {
       $this->user = new TwitterUser($values['user']);
     }
+    // load full retweeted_status (original tweet) if retweet detected
+    if (isset($values['retweeted_status'])) {
+      $this->retweeted_status = new TwitterStatus($values['retweeted_status']);
+    }
   }
 
   /**