diff -uprN -x CVS facebook_status-DRUPAL-6--3/submodules/fbss_twitter/fbss_twitter.module facebook_status/submodules/fbss_twitter/fbss_twitter.module
--- facebook_status-DRUPAL-6--3/submodules/fbss_twitter/fbss_twitter.module	2011-01-17 12:35:16.000000000 +0000
+++ facebook_status/submodules/fbss_twitter/fbss_twitter.module	2011-02-09 01:59:54.000000000 +0000
@@ -12,15 +12,17 @@
  * Implementation of hook_facebook_status_save().
  */
 function fbss_twitter_facebook_status_save($status, $context, $edit) {
-  if (user_access('use global twitter account', $poster)
+  $sender = _facebook_status_user_load($status->sender);
+  $recipient = $context['handler']->load_recipient($status->recipient);
+  if (user_access('use global twitter account', $sender)
     && variable_get('facebook_status_twitter_special', 0)
-    && $owner->name == variable_get('facebook_status_special_user', '')
-    && $owner->uid == $poster->uid) {
+    && $recipient->name == variable_get('facebook_status_special_user', '')
+    && $context['handler']->recipient_id($recipient) == $sender->uid) {
     module_load_include('inc', 'twitter');
-    $twitter_accounts = twitter_get_user_accounts($poster->uid);
+    $twitter_accounts = twitter_get_user_accounts($sender->uid);
     foreach ($twitter_accounts as $twitter_account_available) {
       if ($twitter_account_available->is_global == 1) {
-        twitter_set_status($twitter_account_available, $new_status);
+        twitter_set_status($twitter_account_available, $status->message);
         break;
       }
     }
@@ -59,7 +61,7 @@ function fbss_twitter_facebook_status_bo
   //Don't tweet the status if it wasn't changed from the default.
   if ($new_status != $default) {
     if (!empty($form_state['values']['twitter'])) {
-      facebook_status_twitter($account, $new_status);
+      fbss_twitter_twitter($account, $new_status);
     }
   }
 }
@@ -74,7 +76,7 @@ function fbss_twitter_form_twitter_accou
     watchdog('facebook_status', 'The 2.x branch of the Twitter module is no longer supported by the Facebook-style Statuses module.');
     return;
   }
-  $account = user_load(array('uid' => arg(1)));
+  $account = _facebook_status_user_load(arg(1));
   if (!user_access('update own statuses', $account)) {
     return;
   }