diff --git a/pumpio/pumpio.css b/pumpio/pumpio.css
index 020f3697..86dc5a0d 100755
--- a/pumpio/pumpio.css
+++ b/pumpio/pumpio.css
@@ -1,11 +1,11 @@
 
-#pumpio-mirror-label,#pumpio-public-label, #pumpio-enable-label, #pumpio-username-label, #pumpio-servername-label, #pumpio-bydefault-label, #pumpio-delete-label {
+#pumpio-import-label,#pumpio-mirror-label,#pumpio-public-label, #pumpio-enable-label, #pumpio-username-label, #pumpio-servername-label, #pumpio-bydefault-label, #pumpio-delete-label {
 	float: left;
 	width: 200px;
 	margin-top: 10px;
 }
 
-#pumpio-mirror,#pumpio-public, #pumpio-checkbox, #pumpio-username, #pumpio-servername, #pumpio-bydefault, #pumpio-delete {
+#pumpio-import,#pumpio-mirror,#pumpio-public, #pumpio-checkbox, #pumpio-username, #pumpio-servername, #pumpio-bydefault, #pumpio-delete {
 	float: left;
 	margin-top: 10px;
 }
diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php
index 60d8e82f..d378127a 100755
--- a/pumpio/pumpio.php
+++ b/pumpio/pumpio.php
@@ -2,7 +2,7 @@
 /**
  * Name: pump.io Post Connector
  * Description: Post to pump.io
- * Version: 0.1
+ * Version: 0.2
  * Author: Michael Vogel <http://pirati.ca/profile/heluecht>
  */
 require('addon/pumpio/oauth/http.php');
@@ -17,8 +17,9 @@ function pumpio_install() {
     register_hook('connector_settings',      'addon/pumpio/pumpio.php', 'pumpio_settings');
     register_hook('connector_settings_post', 'addon/pumpio/pumpio.php', 'pumpio_settings_post');
     register_hook('cron', 'addon/pumpio/pumpio.php', 'pumpio_cron');
-
+    register_hook('queue_predeliver', 'addon/pumpio/pumpio.php', 'pumpio_queue_hook');
 }
+
 function pumpio_uninstall() {
     unregister_hook('post_local',       'addon/pumpio/pumpio.php', 'pumpio_post_local');
     unregister_hook('notifier_normal',  'addon/pumpio/pumpio.php', 'pumpio_send');
@@ -26,6 +27,7 @@ function pumpio_uninstall() {
     unregister_hook('connector_settings',      'addon/pumpio/pumpio.php', 'pumpio_settings');
     unregister_hook('connector_settings_post', 'addon/pumpio/pumpio.php', 'pumpio_settings_post');
     unregister_hook('cron', 'addon/pumpio/pumpio.php', 'pumpio_cron');
+    unregister_hook('queue_predeliver', 'addon/pumpio/pumpio.php', 'pumpio_queue_hook');
 }
 
 function pumpio_module() {}
@@ -83,10 +85,6 @@ function pumpio_registerclient($a, $host) {
         if ($curl_info["http_code"] == "200") {
                 $values = json_decode($s);
 		return($values);
-                $pumpio = array();
-                $pumpio["client_id"] = $values->client_id;
-                $pumpio["client_secret"] = $values->client_secret;
-                print_r($values);
         }
 	return(false);
 }
@@ -178,6 +176,9 @@ function pumpio_settings(&$a,&$s) {
 
     /* Get the current state of our config variables */
 
+    $import_enabled = get_pconfig(local_user(),'pumpio','import');
+    $import_checked = (($import_enabled) ? ' checked="checked" ' : '');
+
     $enabled = get_pconfig(local_user(),'pumpio','post');
     $checked = (($enabled) ? ' checked="checked" ' : '');
 
@@ -218,9 +219,12 @@ function pumpio_settings(&$a,&$s) {
 		$s .= '<div id="pumpio-authenticate-wrapper">';
 		$s .= '<a href="'.$a->get_baseurl().'/pumpio/connect">'.t("Authenticate your pump.io connection").'</a>';
 		$s .= '</div><div class="clear"></div>';
-
-		//$s .= t("You are not authenticated to pumpio");
 	} else {
+		$s .= '<div id="pumpio-import-wrapper">';
+		$s .= '<label id="pumpio-import-label" for="pumpio-import">' . t('Import the remote timeline') . '</label>';
+		$s .= '<input id="pumpio-import" type="checkbox" name="pumpio_import" value="1" ' . $import_checked . '/>';
+		$s .= '</div><div class="clear"></div>';
+
 		$s .= '<div id="pumpio-enable-wrapper">';
 		$s .= '<label id="pumpio-enable-label" for="pumpio-checkbox">' . t('Enable pump.io Post Plugin') . '</label>';
 		$s .= '<input id="pumpio-checkbox" type="checkbox" name="pumpio" value="1" ' . $checked . '/>';
@@ -245,11 +249,6 @@ function pumpio_settings(&$a,&$s) {
 		$s .= '<label id="pumpio-delete-label" for="pumpio-delete">' . t('Check to delete this preset') . '</label>';
 		$s .= '<input id="pumpio-delete" type="checkbox" name="pumpio_delete" value="1" />';
 		$s .= '</div><div class="clear"></div>';
-
-		//$s .= '<div id="pumpio-authenticate-wrapper">';
-		//$s .= '<a href="'.$a->get_baseurl().'/pumpio/connect">'.t("Reauthenticate your pump.io connection").'</a>';
-		//$s .= '</div><div class="clear"></div>';
-
 	}
 
 	$s .= '</div><div class="clear"></div>';
@@ -289,6 +288,7 @@ function pumpio_settings_post(&$a,&$b) {
 			$host = str_replace(array("https://", "http://"), array("", ""), $host);
 
 			set_pconfig(local_user(),'pumpio','post',intval($_POST['pumpio']));
+			set_pconfig(local_user(),'pumpio','import',$_POST['pumpio_import']);
 			set_pconfig(local_user(),'pumpio','host',$host);
 			set_pconfig(local_user(),'pumpio','user',$user);
 			set_pconfig(local_user(),'pumpio','public',$_POST['pumpio_public']);
@@ -300,17 +300,9 @@ function pumpio_settings_post(&$a,&$b) {
 
 function pumpio_post_local(&$a,&$b) {
 
-	// This can probably be changed to allow editing by pointing to a different API endpoint
-
-	if($b['edit'])
-		return;
-
 	if((! local_user()) || (local_user() != $b['uid']))
 		return;
 
-	if($b['private'] || $b['parent'])
-		return;
-
 	$pumpio_post   = intval(get_pconfig(local_user(),'pumpio','post'));
 
 	$pumpio_enable = (($pumpio_post && x($_REQUEST,'pumpio_enable')) ? intval($_REQUEST['pumpio_enable']) : 0);
@@ -332,19 +324,63 @@ function pumpio_post_local(&$a,&$b) {
 
 function pumpio_send(&$a,&$b) {
 
-	if($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited']))
+	if (!get_pconfig($b["uid"],'pumpio','import')) {
+		if($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited']))
+			return;
+	}
+
+	logger("pumpio_send: parameter ".print_r($b, true));
+
+	if($b['parent'] != $b['id']) {
+		// Looking if its a reply to a pumpio post
+		$r = q("SELECT item.* FROM item, contact WHERE item.id = %d AND item.uid = %d AND contact.id = `contact-id` AND contact.network='%s'LIMIT 1",
+			intval($b["parent"]),
+			intval($b["uid"]),
+			dbesc(NETWORK_PUMPIO));
+
+		if(!count($r)) {
+			logger("pumpio_send: no pumpio post ".$b["parent"]);
+			return;
+		} else {
+			$iscomment = true;
+			$orig_post = $r[0];
+		}
+	} else {
+		$iscomment = false;
+
+		$receiver = pumpio_getreceiver($a, $b);
+
+		logger("pumpio_send: receiver ".print_r($receiver, true));
+
+		if (!count($receiver) AND ($b['private'] OR !strstr($b['postopts'],'pumpio')))
+			return;
+	}
+
+	if($b['verb'] == ACTIVITY_LIKE) {
+		if ($b['deleted'])
+			pumpio_action($a, $b["uid"], $b["thr-parent"], "unlike");
+		else
+			pumpio_action($a, $b["uid"], $b["thr-parent"], "like");
+		return;
+	}
+
+	if($b['verb'] == ACTIVITY_DISLIKE)
 		return;
 
-	if(! strstr($b['postopts'],'pumpio'))
-		return;
+	if (($b['verb'] == ACTIVITY_POST) AND ($b['created'] !== $b['edited']) AND !$b['deleted'])
+			pumpio_action($a, $b["uid"], $b["uri"], "update", $b["body"]);
 
-	if($b['parent'] != $b['id'])
+	if (($b['verb'] == ACTIVITY_POST) AND $b['deleted'])
+			pumpio_action($a, $b["uid"], $b["uri"], "delete");
+
+	if($b['deleted'] || ($b['created'] !== $b['edited']))
 		return;
 
 	// if post comes from pump.io don't send it back
 	if($b['app'] == "pump.io")
 		return;
 
+
 	$oauth_token = get_pconfig($b['uid'], "pumpio", "oauth_token");
 	$oauth_token_secret = get_pconfig($b['uid'], "pumpio", "oauth_token_secret");
 	$consumer_key = get_pconfig($b['uid'], "pumpio","consumer_key");
@@ -378,14 +414,32 @@ function pumpio_send(&$a,&$b) {
 
 		$params["verb"] = "post";
 
-		$params["object"] = array(
-					'objectType' => "note",
-					'content' => $title.$content);
+		if (!$iscomment) {
+			$params["object"] = array(
+						'objectType' => "note",
+						'content' => $title.$content);
 
-		if ($public)
-			$params["to"] = array(Array(
-						"objectType" => "collection",
-						"id" => "http://activityschema.org/collection/public"));
+			if (count($receiver["to"]))
+				$params["to"] = $receiver["to"];
+
+			if (count($receiver["bto"]))
+				$params["bto"] = $receiver["bto"];
+
+			if (count($receiver["cc"]))
+				$params["cc"] = $receiver["cc"];
+
+			if (count($receiver["bcc"]))
+				$params["bcc"] = $receiver["bcc"];
+
+		 } else {
+			$inReplyTo = array("id" => $orig_post["uri"],
+					"objectType" => "note");
+
+			$params["object"] = array(
+						'objectType' => "comment",
+						'content' => $title.$content,
+						'inReplyTo' => $inReplyTo);
+		}
 
 		$client = new oauth_client_class;
 		$client->oauth_version = '1.0a';
@@ -397,19 +451,107 @@ function pumpio_send(&$a,&$b) {
 		$client->client_secret = $consumer_secret;
 
 		$username = $user.'@'.$host;
+		$url = 'https://'.$host.'/api/user/'.$user.'/feed';
 
-		$success = $client->CallAPI(
-					'https://'.$host.'/api/user/'.$user.'/feed',
-					'POST', $params, array('FailOnAccessError'=>true, 'RequestContentType'=>'application/json'), $user);
+		$success = $client->CallAPI($url, 'POST', $params, array('FailOnAccessError'=>true, 'RequestContentType'=>'application/json'), $user);
 
-		if($success)
-			logger('pumpio_send '.$username.': success');
-		else
-			logger('pumpio_send '.$username.': general error: ' . print_r($user,true));
+		if($success) {
+			$post_id = $user->object->id;
+			logger('pumpio_send '.$username.': success '.$post_id);
+			if($post_id AND $iscomment) {
+				logger('pumpio_send '.$username.': Update extid '.$post_id." for post id ".$b['id']);
+				q("UPDATE `item` SET `extid` = '%s' WHERE `id` = %d LIMIT 1",
+					dbesc($post_id),
+					intval($b['id'])
+				);
+			}
+		} else {
+			logger('pumpio_send '.$username.': '.$url.' general error: ' . print_r($user,true));
+
+			$r = q("SELECT `id` FROM `contact` WHERE `uid` = %d AND `self`", $b['uid']);
+			if (count($r))
+				$a->contact = $r[0]["id"];
+
+			$s = serialize(array('url' => $url, 'item' => $b['id'], 'post' => $params));
+			require_once('include/queue_fn.php');
+			add_to_queue($a->contact,NETWORK_PUMPIO,$s);
+			notice(t('Pump.io post failed. Queued for retry.').EOL);
+		}
 
 	}
 }
 
+function pumpio_action($a, $uid, $uri, $action, $content) {
+
+	// Don't do likes and other stuff if you don't import the timeline
+	if (!get_pconfig($uid,'pumpio','import'))
+		return;
+
+	$ckey    = get_pconfig($uid, 'pumpio', 'consumer_key');
+	$csecret = get_pconfig($uid, 'pumpio', 'consumer_secret');
+	$otoken  = get_pconfig($uid, 'pumpio', 'oauth_token');
+	$osecret = get_pconfig($uid, 'pumpio', 'oauth_token_secret');
+	$hostname = get_pconfig($uid, 'pumpio','host');
+	$username = get_pconfig($uid, "pumpio", "user");
+
+	$r = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
+				dbesc($uri),
+				intval($uid)
+	);
+
+	if (!count($r))
+		return;
+
+	$orig_post = $r[0];
+
+	if ($orig_post["extid"] AND !strstr($orig_post["extid"], "/proxy/"))
+		$uri = $orig_post["extid"];
+	else
+		$uri = $orig_post["uri"];
+
+	if (strstr($uri, "/api/comment/"))
+		$objectType = "comment";
+	elseif (strstr($uri, "/api/note/"))
+		$objectType = "note";
+	elseif (strstr($uri, "/api/image/"))
+		$objectType = "image";
+
+	$params["verb"] = $action;
+	$params["object"] = array('id' => $uri,
+				"objectType" => $objectType,
+				"content" => $content);
+
+	$client = new oauth_client_class;
+	$client->oauth_version = '1.0a';
+	$client->authorization_header = true;
+	$client->url_parameters = false;
+
+	$client->client_id = $ckey;
+	$client->client_secret = $csecret;
+	$client->access_token = $otoken;
+	$client->access_token_secret = $osecret;
+
+	$url = 'https://'.$hostname.'/api/user/'.$username.'/feed';
+
+	$success = $client->CallAPI($url, 'POST', $params, array('FailOnAccessError'=>true, 'RequestContentType'=>'application/json'), $user);
+
+	if($success)
+		logger('pumpio_action '.$username.' '.$action.': success '.$uri);
+	else {
+		logger('pumpio_action '.$username.' '.$action.': general error: '.$uri.' '.print_r($user,true));
+
+		$r = q("SELECT `id` FROM `contact` WHERE `uid` = %d AND `self`", $b['uid']);
+		if (count($r))
+			$a->contact = $r[0]["id"];
+
+		$s = serialize(array('url' => $url, 'item' => $orig_post["id"], 'post' => $params));
+		require_once('include/queue_fn.php');
+		add_to_queue($a->contact,NETWORK_PUMPIO,$s);
+		notice(t('Pump.io like failed. Queued for retry.').EOL);
+	}
+}
+
+
 function pumpio_cron($a,$b) {
         $last = get_config('pumpio','last_poll');
 
@@ -429,14 +571,34 @@ function pumpio_cron($a,$b) {
         $r = q("SELECT * FROM `pconfig` WHERE `cat` = 'pumpio' AND `k` = 'mirror' AND `v` = '1' ORDER BY RAND() ");
         if(count($r)) {
                 foreach($r as $rr) {
-                        logger('pumpio: fetching for user '.$rr['uid']);
+                        logger('pumpio: mirroring user '.$rr['uid']);
                         pumpio_fetchtimeline($a, $rr['uid']);
                 }
         }
 
-        logger('pumpio: cron_end');
+	$r = q("SELECT * FROM `pconfig` WHERE `cat` = 'pumpio' AND `k` = 'import' AND `v` = '1' ORDER BY RAND() ");
+	if(count($r)) {
+		foreach($r as $rr) {
+			logger('pumpio: importing timeline from user '.$rr['uid']);
+			pumpio_fetchinbox($a, $rr['uid']);
 
-        set_config('pumpio','last_poll', time());
+			// check for new contacts once a day
+			$last_contact_check = get_pconfig($rr['uid'],'pumpio','contact_check');
+			if($last_contact_check)
+				$next_contact_check = $last_contact_check + 86400;
+			else
+				$next_contact_check = 0;
+
+			if($next_contact_check <= time()) {
+				pumpio_getallusers($a, $rr["uid"]);
+				set_pconfig($rr['uid'],'pumpio','contact_check',time());
+			}
+		}
+	}
+
+	logger('pumpio: cron_end');
+
+	set_config('pumpio','last_poll', time());
 }
 
 function pumpio_fetchtimeline($a, $uid) {
@@ -532,15 +694,832 @@ function pumpio_fetchtimeline($a, $uid) {
 				logger('pumpio: posting for user '.$uid);
 
 				require_once('mod/item.php');
-				//print_r($_REQUEST);
+
 				item_post($a);
 				logger('pumpio: posting done - user '.$uid);
 			}
 		}
 	}
 
-	//$lastdate = '2013-05-16T20:22:12Z';
-
 	if ($lastdate != 0)
 		set_pconfig($uid,'pumpio','lastdate', $lastdate);
 }
+
+function pumpio_dounlike(&$a, $uid, $self, $post, $own_id) {
+	// Searching for the unliked post
+	// Two queries for speed issues
+	$r = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
+				dbesc($post->object->id),
+				intval($uid)
+		);
+
+	if (count($r))
+		$orig_post = $r[0];
+	else {
+		$r = q("SELECT * FROM `item` WHERE `extid` = '%s' AND `uid` = %d LIMIT 1",
+					dbesc($post->object->id),
+					intval($uid)
+			);
+
+		if (!count($r))
+			return;
+		else
+			$orig_post = $r[0];
+	}
+
+	$contactid = 0;
+
+	if(link_compare($post->actor->url, $own_id)) {
+		$contactid = $self[0]['id'];
+	} else {
+		$r = q("SELECT * FROM `contact` WHERE `url` = '%s' AND `uid` = %d AND `blocked` = 0 AND `readonly` = 0 LIMIT 1",
+			dbesc($post->actor->url),
+			intval($uid)
+		);
+
+		if(count($r))
+			$contactid = $r[0]['id'];
+
+		if($contactid == 0)
+			$contactid = $orig_post['contact-id'];
+	}
+
+	$r = q("UPDATE `item` SET `deleted` = 1, `unseen` = 1, `changed` = '%s' WHERE `verb` = '%s' AND `uid` = %d AND `contact-id` = %d AND `thr-parent` = '%s'",
+		dbesc(datetime_convert()),
+		dbesc(ACTIVITY_LIKE),
+		intval($uid),
+		intval($contactid),
+		dbesc($orig_post['uri'])
+	);
+
+	if(count($r))
+		logger("pumpio_dounlike: unliked existing like. User ".$own_id." ".$uid." Contact: ".$contactid." Url ".$orig_post['uri']);
+	else
+		logger("pumpio_dounlike: not found. User ".$own_id." ".$uid." Contact: ".$contactid." Url ".$orig_post['uri']);
+}
+
+function pumpio_dolike(&$a, $uid, $self, $post, $own_id) {
+
+	// Searching for the liked post
+	// Two queries for speed issues
+	$r = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
+				dbesc($post->object->id),
+				intval($uid)
+		);
+
+	if (count($r))
+		$orig_post = $r[0];
+	else {
+		$r = q("SELECT * FROM `item` WHERE `extid` = '%s' AND `uid` = %d LIMIT 1",
+					dbesc($post->object->id),
+					intval($uid)
+			);
+
+		if (!count($r))
+			return;
+		else
+			$orig_post = $r[0];
+	}
+
+	$contactid = 0;
+
+	if(link_compare($post->actor->url, $own_id)) {
+		$contactid = $self[0]['id'];
+		$post->actor->displayName = $self[0]['name'];
+		$post->actor->url = $self[0]['url'];
+		$post->actor->image->url = $self[0]['photo'];
+	} else {
+		$r = q("SELECT * FROM `contact` WHERE `url` = '%s' AND `uid` = %d AND `blocked` = 0 AND `readonly` = 0 LIMIT 1",
+			dbesc($post->actor->url),
+			intval($uid)
+		);
+
+		if(count($r))
+			$contactid = $r[0]['id'];
+
+		if($contactid == 0)
+			$contactid = $orig_post['contact-id'];
+	}
+
+	$r = q("SELECT parent FROM `item` WHERE `verb` = '%s' AND `uid` = %d AND `contact-id` = %d AND `thr-parent` = '%s' LIMIT 1",
+		dbesc(ACTIVITY_LIKE),
+		intval($uid),
+		intval($contactid),
+		dbesc($orig_post['uri'])
+	);
+
+	if(count($r)) {
+		logger("pumpio_dolike: found existing like. User ".$own_id." ".$uid." Contact: ".$contactid." Url ".$orig_post['uri']);
+		return;
+	}
+
+	$likedata = array();
+	$likedata['parent'] = $orig_post['id'];
+	$likedata['verb'] = ACTIVITY_LIKE;
+	$likedata['gravity'] = 3;
+	$likedata['uid'] = $uid;
+	$likedata['wall'] = 0;
+	$likedata['uri'] = item_new_uri($a->get_baseurl(), $uid);
+	$likedata['parent-uri'] = $orig_post["uri"];
+	$likedata['contact-id'] = $contactid;
+	$likedata['app'] = $post->generator->displayName;
+	$likedata['verb'] = ACTIVITY_LIKE;
+	$likedata['author-name'] = $post->actor->displayName;
+	$likedata['author-link'] = $post->actor->url;
+	$likedata['author-avatar'] = $post->actor->image->url;
+
+	$author  = '[url=' . $likedata['author-link'] . ']' . $likedata['author-name'] . '[/url]';
+	$objauthor =  '[url=' . $orig_post['author-link'] . ']' . $orig_post['author-name'] . '[/url]';
+	$post_type = t('status');
+	$plink = '[url=' . $orig_post['plink'] . ']' . $post_type . '[/url]';
+	$likedata['object-type'] = ACTIVITY_OBJ_NOTE;
+
+	$likedata['body'] = sprintf( t('%1$s likes %2$s\'s %3$s'), $author, $objauthor, $plink);
+
+	$likedata['object'] = '<object><type>' . ACTIVITY_OBJ_NOTE . '</type><local>1</local>' .
+		'<id>' . $orig_post['uri'] . '</id><link>' . xmlify('<link rel="alternate" type="text/html" href="' . xmlify($orig_post['plink']) . '" />') . '</link><title>' . $orig_post['title'] . '</title><content>' . $orig_post['body'] . '</content></object>';
+
+	$ret = item_store($likedata);
+
+	logger("pumpio_dolike: ".$ret." User ".$own_id." ".$uid." Contact: ".$contactid." Url ".$orig_post['uri']);
+}
+
+function pumpio_get_contact($uid, $contact) {
+
+	$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `url` = '%s' LIMIT 1",
+		intval($uid), dbesc($contact->url));
+
+	if(!count($r)) {
+		// create contact record
+		q("INSERT INTO `contact` ( `uid`, `created`, `url`, `nurl`, `addr`, `alias`, `notify`, `poll`,
+					`name`, `nick`, `photo`, `network`, `rel`, `priority`,
+					`writable`, `blocked`, `readonly`, `pending` )
+				VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, %d, 0, 0, 0 ) ",
+			intval($uid),
+			dbesc(datetime_convert()),
+			dbesc($contact->url),
+			dbesc(normalise_link($contact->url)),
+			dbesc(str_replace("acct:", "", $contact->id)),
+			dbesc(''),
+			dbesc($contact->id), // What is it for?
+			dbesc('pump.io ' . $contact->id), // What is it for?
+			dbesc($contact->displayName),
+			dbesc($contact->preferredUsername),
+			dbesc($contact->image->url),
+			dbesc(NETWORK_PUMPIO),
+			intval(CONTACT_IS_FRIEND),
+			intval(1),
+			intval(1)
+		);
+
+		$r = q("SELECT * FROM `contact` WHERE `url` = '%s' AND `uid` = %d LIMIT 1",
+			dbesc($contact->url),
+			intval($uid)
+			);
+
+		if(! count($r))
+			return(false);
+
+		$contact_id  = $r[0]['id'];
+
+		$g = q("select def_gid from user where uid = %d limit 1",
+			intval($uid)
+		);
+
+		if($g && intval($g[0]['def_gid'])) {
+			require_once('include/group.php');
+			group_add_member($uid,'',$contact_id,$g[0]['def_gid']);
+		}
+
+		require_once("Photo.php");
+
+		$photos = import_profile_photo($contact->image->url,$uid,$contact_id);
+
+		q("UPDATE `contact` SET `photo` = '%s',
+					`thumb` = '%s',
+					`micro` = '%s',
+					`name-date` = '%s',
+					`uri-date` = '%s',
+					`avatar-date` = '%s'
+				WHERE `id` = %d LIMIT 1
+	                ",
+		dbesc($photos[0]),
+		dbesc($photos[1]),
+		dbesc($photos[2]),
+		dbesc(datetime_convert()),
+		dbesc(datetime_convert()),
+		dbesc(datetime_convert()),
+		intval($contact_id)
+		);
+	} else {
+		// update profile photos once every two weeks as we have no notification of when they change.
+
+		$update_photo = (($r[0]['avatar-date'] < datetime_convert('','','now -14 days')) ? true : false);
+
+		// check that we have all the photos, this has been known to fail on occasion
+
+		if((! $r[0]['photo']) || (! $r[0]['thumb']) || (! $r[0]['micro']) || ($update_photo)) {
+			require_once("Photo.php");
+
+			$photos = import_profile_photo($contact->image->url, $uid, $r[0]['id']);
+
+			q("UPDATE `contact` SET `photo` = '%s',
+                                        `thumb` = '%s',
+                                        `micro` = '%s',
+                                        `name-date` = '%s',
+                                        `uri-date` = '%s',
+                                        `avatar-date` = '%s'
+                                        WHERE `id` = %d LIMIT 1
+                                ",
+			dbesc($photos[0]),
+			dbesc($photos[1]),
+			dbesc($photos[2]),
+			dbesc(datetime_convert()),
+			dbesc(datetime_convert()),
+			dbesc(datetime_convert()),
+			intval($r[0]['id'])
+			);
+		}
+
+	}
+
+	return($r[0]["id"]);
+}
+
+function pumpio_dodelete(&$a, $uid, $self, $post, $own_id) {
+
+	// Two queries for speed issues
+	$r = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
+				dbesc($post->object->id),
+				intval($uid)
+		);
+
+	if (count($r))
+		return drop_item($r[0]["id"], $false);
+
+	$r = q("SELECT * FROM `item` WHERE `extid` = '%s' AND `uid` = %d LIMIT 1",
+				dbesc($post->object->id),
+				intval($uid)
+		);
+
+	if (count($r))
+		return drop_item($r[0]["id"], $false);
+}
+
+function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id) {
+	require_once('include/items.php');
+
+	if (($post->verb == "like") OR ($post->verb == "favorite"))
+		return pumpio_dolike(&$a, $uid, $self, $post, $own_id);
+
+	if (($post->verb == "unlike") OR ($post->verb == "unfavorite"))
+		return pumpio_dounlike(&$a, $uid, $self, $post, $own_id);
+
+	if ($post->verb == "delete")
+		return pumpio_dodelete(&$a, $uid, $self, $post, $own_id);
+
+	if ($post->verb != "update") {
+		// Two queries for speed issues
+		$r = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
+					dbesc($post->object->id),
+					intval($uid)
+			);
+
+		if (count($r))
+			return false;
+
+		$r = q("SELECT * FROM `item` WHERE `extid` = '%s' AND `uid` = %d LIMIT 1",
+					dbesc($post->object->id),
+					intval($uid)
+			);
+
+		if (count($r))
+			return false;
+	}
+
+	// Only handle these three types
+	if (!strstr("post|share|update", $post->verb))
+		return false;
+
+	$receiptians = array();
+	if (@is_array($post->cc))
+		$receiptians = array_merge($receiptians, $post->cc);
+
+	if (@is_array($post->to))
+		$receiptians = array_merge($receiptians, $post->to);
+
+	foreach ($receiptians AS $receiver)
+		if (is_string($receiver->objectType))
+			if ($receiver->id == "http://activityschema.org/collection/public")
+				$public = true;
+
+	$postarray = array();
+	$postarray['gravity'] = 0;
+	$postarray['uid'] = $uid;
+	$postarray['wall'] = 0;
+	$postarray['uri'] = $post->object->id;
+
+	if ($post->object->objectType != "comment") {
+		$contact_id = pumpio_get_contact($uid, $post->actor);
+
+		if (!$contact_id)
+			$contact_id = $self[0]['id'];
+
+		$postarray['parent-uri'] = $post->object->id;
+	} else {
+		$contact_id = 0;
+
+		if(link_compare($post->actor->url, $own_id)) {
+			$contact_id = $self[0]['id'];
+			$post->actor->displayName = $self[0]['name'];
+			$post->actor->url = $self[0]['url'];
+			$post->actor->image->url = $self[0]['photo'];
+		} else {
+			// Take an existing contact, the contact of the note or - as a fallback - the id of the user
+			$r = q("SELECT * FROM `contact` WHERE `url` = '%s' AND `uid` = %d AND `blocked` = 0 AND `readonly` = 0 LIMIT 1",
+				dbesc($post->actor->url),
+				intval($uid)
+			);
+
+			if(count($r))
+				$contact_id = $r[0]['id'];
+			else {
+				$r = q("SELECT * FROM `contact` WHERE `url` = '%s' AND `uid` = %d AND `blocked` = 0 AND `readonly` = 0 LIMIT 1",
+					dbesc($post->actor->url),
+					intval($uid)
+				);
+
+				if(count($r))
+					$contact_id = $r[0]['id'];
+				else
+					$contact_id = $self[0]['id'];
+			}
+		}
+
+		$reply->verb = "note";
+		$reply->cc = $post->cc;
+		$reply->to = $post->to;
+		$reply->object->objectType = $post->object->inReplyTo->objectType;
+		$reply->object->content = $post->object->inReplyTo->content;
+		$reply->object->id = $post->object->inReplyTo->id;
+		$reply->actor = $post->object->inReplyTo->author;
+		$reply->url = $post->object->inReplyTo->url;
+		$reply->generator->displayName = "pumpio";
+		$reply->published = $post->object->inReplyTo->published;
+		$reply->received = $post->object->inReplyTo->updated;
+		$reply->url = $post->object->inReplyTo->url;
+		pumpio_dopost(&$a, $client, $uid, $self, $reply, $own_id);
+
+		$postarray['parent-uri'] = $post->object->inReplyTo->id;
+	}
+
+	if ($post->object->pump_io->proxyURL)
+		$postarray['extid'] = $post->object->pump_io->proxyURL;
+
+	$postarray['contact-id'] = $contact_id;
+	$postarray['verb'] = ACTIVITY_POST;
+	$postarray['owner-name'] = $post->actor->displayName;
+	$postarray['owner-link'] = $post->actor->url;
+	$postarray['owner-avatar'] = $post->actor->image->url;
+	$postarray['author-name'] = $post->actor->displayName;
+	$postarray['author-link'] = $post->actor->url;
+	$postarray['author-avatar'] = $post->actor->image->url;
+	$postarray['plink'] = $post->object->url;
+	$postarray['app'] = $post->generator->displayName;
+	$postarray['body'] = html2bbcode($post->object->content);
+
+	if ($post->object->fullImage->url != "")
+		$postarray["body"] = "[url=".$post->object->fullImage->url."][img]".$post->object->image->url."[/img][/url]\n".$postarray["body"];
+
+	if ($post->object->displayName != "")
+		$postarray['title'] = $post->object->displayName;
+
+	$postarray['created'] = datetime_convert('UTC','UTC',$post->published);
+	$postarray['edited'] = datetime_convert('UTC','UTC',$post->received);
+	if (!$public) {
+		$postarray['private'] = 1;
+		$postarray['allow_cid'] = '<' . $self[0]['id'] . '>';
+	}
+
+	if ($post->verb == "share") {
+		$postarray['body'] = "[share author='".$post->object->author->displayName.
+                                "' profile='".$post->object->author->url.
+                                "' avatar='".$post->object->author->image->url.
+                                "' link='".$post->links->self->href."']".$postarray['body']."[/share]";
+	}
+
+	if (trim($postarray['body']) == "")
+		return false;
+
+	$top_item = item_store($postarray);
+
+	if (($top_item == 0) AND ($post->verb == "update")) {
+		$r = q("UPDATE `item` SET `title` = '%s', `body` = '%s' , `changed` = '%s' WHERE `uri` = '%s' AND `uid` = %d",
+			dbesc($postarray["title"]),
+			dbesc($postarray["body"]),
+			dbesc($postarray["edited"]),
+			dbesc($postarray["uri"]),
+			intval($uid)
+			);
+	}
+
+	if ($post->object->objectType == "comment") {
+
+		pumpio_fetchallcomments($a, $uid, $postarray['parent-uri']);
+
+		$user = q("SELECT * FROM `user` WHERE `uid` = %d AND `account_expired` = 0 LIMIT 1",
+				intval($uid)
+			);
+
+		if(!count($user))
+			return $top_item;
+
+		$importer_url = $a->get_baseurl() . '/profile/' . $user[0]['nickname'];
+
+		if (link_compare($own_id, $postarray['author-link']))
+			return $top_item;
+
+		$myconv = q("SELECT `author-link`, `author-avatar`, `parent` FROM `item` WHERE `parent-uri` = '%s' AND `uid` = %d AND `parent` != 0 AND `deleted` = 0",
+				dbesc($postarray['parent-uri']),
+				intval($uid)
+				);
+
+		if(count($myconv)) {
+
+			foreach($myconv as $conv) {
+				// now if we find a match, it means we're in this conversation
+
+				if(!link_compare($conv['author-link'],$importer_url) AND !link_compare($conv['author-link'],$own_id))
+					continue;
+
+				require_once('include/enotify.php');
+
+				$conv_parent = $conv['parent'];
+
+				notification(array(
+					'type'         => NOTIFY_COMMENT,
+					'notify_flags' => $user[0]['notify-flags'],
+					'language'     => $user[0]['language'],
+					'to_name'      => $user[0]['username'],
+					'to_email'     => $user[0]['email'],
+					'uid'          => $user[0]['uid'],
+					'item'         => $postarray,
+					'link'             => $a->get_baseurl() . '/display/' . $user[0]['nickname'] . '/' . $top_item,
+					'source_name'  => $postarray['author-name'],
+					'source_link'  => $postarray['author-link'],
+					'source_photo' => $postarray['author-avatar'],
+					'verb'         => ACTIVITY_POST,
+					'otype'        => 'item',
+					'parent'       => $conv_parent,
+					));
+
+				// only send one notification
+				break;
+			}
+		}
+	}
+
+	return $top_item;
+}
+
+function pumpio_fetchinbox($a, $uid) {
+
+        $ckey    = get_pconfig($uid, 'pumpio', 'consumer_key');
+        $csecret = get_pconfig($uid, 'pumpio', 'consumer_secret');
+        $otoken  = get_pconfig($uid, 'pumpio', 'oauth_token');
+        $osecret = get_pconfig($uid, 'pumpio', 'oauth_token_secret');
+        $lastdate = get_pconfig($uid, 'pumpio', 'lastdate');
+        $hostname = get_pconfig($uid, 'pumpio','host');
+        $username = get_pconfig($uid, "pumpio", "user");
+
+	$own_id = "https://".$hostname."/".$username;
+
+	$self = q("SELECT * FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1",
+		intval($uid));
+
+        $client = new oauth_client_class;
+        $client->oauth_version = '1.0a';
+        $client->authorization_header = true;
+        $client->url_parameters = false;
+
+        $client->client_id = $ckey;
+        $client->client_secret = $csecret;
+        $client->access_token = $otoken;
+        $client->access_token_secret = $osecret;
+
+	$last_id = get_pconfig($uid,'pumpio','last_id');
+
+	$url = 'https://'.$hostname.'/api/user/'.$username.'/inbox';
+
+	if ($last_id != "")
+		$url .= '?since='.urlencode($last_id);
+
+        $success = $client->CallAPI($url, 'GET', array(), array('FailOnAccessError'=>true), $user);
+        $posts = array_reverse($user->items);
+
+	if (count($posts))
+		foreach ($posts as $post) {
+			$last_id = $post->id;
+			pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id);
+		}
+
+	set_pconfig($uid,'pumpio','last_id', $last_id);
+}
+
+function pumpio_getallusers($a, $uid) {
+        $ckey    = get_pconfig($uid, 'pumpio', 'consumer_key');
+        $csecret = get_pconfig($uid, 'pumpio', 'consumer_secret');
+        $otoken  = get_pconfig($uid, 'pumpio', 'oauth_token');
+        $osecret = get_pconfig($uid, 'pumpio', 'oauth_token_secret');
+        $hostname = get_pconfig($uid, 'pumpio','host');
+        $username = get_pconfig($uid, "pumpio", "user");
+
+        $client = new oauth_client_class;
+        $client->oauth_version = '1.0a';
+        $client->authorization_header = true;
+        $client->url_parameters = false;
+
+        $client->client_id = $ckey;
+        $client->client_secret = $csecret;
+        $client->access_token = $otoken;
+        $client->access_token_secret = $osecret;
+
+	$url = 'https://'.$hostname.'/api/user/'.$username.'/following';
+
+        $success = $client->CallAPI($url, 'GET', array(), array('FailOnAccessError'=>true), $users);
+
+	if ($users->totalItems > count($users->items)) {
+		$url = 'https://'.$hostname.'/api/user/'.$username.'/following?count='.$users->totalItems;
+
+	        $success = $client->CallAPI($url, 'GET', array(), array('FailOnAccessError'=>true), $users);
+	}
+
+	foreach ($users->items AS $user)
+		echo pumpio_get_contact($uid, $user)."\n";
+}
+
+function pumpio_queue_hook(&$a,&$b) {
+
+	$qi = q("SELECT * FROM `queue` WHERE `network` = '%s'",
+		dbesc(NETWORK_PUMPIO)
+	);
+	if(! count($qi))
+		return;
+
+	require_once('include/queue_fn.php');
+
+	foreach($qi as $x) {
+		if($x['network'] !== NETWORK_PUMPIO)
+			continue;
+
+		logger('pumpio_queue: run');
+
+		$r = q("SELECT `user`.* FROM `user` LEFT JOIN `contact` on `contact`.`uid` = `user`.`uid` 
+			WHERE `contact`.`self` = 1 AND `contact`.`id` = %d LIMIT 1",
+			intval($x['cid'])
+		);
+		if(! count($r))
+			continue;
+
+		$user = $r[0];
+
+		$oauth_token = get_pconfig($user['uid'], "pumpio", "oauth_token");
+		$oauth_token_secret = get_pconfig($user['uid'], "pumpio", "oauth_token_secret");
+		$consumer_key = get_pconfig($user['uid'], "pumpio","consumer_key");
+		$consumer_secret = get_pconfig($user['uid'], "pumpio","consumer_secret");
+
+		$host = get_pconfig($user['uid'], "pumpio", "host");
+		$user = get_pconfig($user['uid'], "pumpio", "user");
+
+		$success = false;
+
+		if ($oauth_token AND $oauth_token_secret AND
+			$consumer_key AND $consumer_secret) {
+			$username = $user.'@'.$host;
+
+			logger('pumpio_queue: able to post for user '.$username);
+
+			$z = unserialize($x['content']);
+
+			$client = new oauth_client_class;
+			$client->oauth_version = '1.0a';
+			$client->url_parameters = false;
+			$client->authorization_header = true;
+			$client->access_token = $oauth_token;
+			$client->access_token_secret = $oauth_token_secret;
+			$client->client_id = $consumer_key;
+			$client->client_secret = $consumer_secret;
+
+			$success = $client->CallAPI($z['url'], 'POST', $z['post'], array('FailOnAccessError'=>true, 'RequestContentType'=>'application/json'), $user);
+
+			if($success) {
+				$post_id = $user->object->id;
+				logger('pumpio_queue: send '.$username.': success '.$post_id);
+				if($post_id AND $iscomment) {
+					logger('pumpio_send '.$username.': Update extid '.$post_id." for post id ".$z['item']);
+					q("UPDATE `item` SET `extid` = '%s' WHERE `id` = %d LIMIT 1",
+						dbesc($post_id),
+						intval($z['item'])
+					);
+				}
+				remove_queue_item($x['id']);
+			} else
+				logger('pumpio_queue: send '.$username.': '.$url.' general error: ' . print_r($user,true));
+		} else
+			logger("pumpio_queue: Error getting tokens for user ".$user['uid']);
+
+		if (!$success) {
+			logger('pumpio_queue: delayed');
+			update_queue_time($x['id']);
+		}
+	}
+}
+
+function pumpio_getreceiver($a, $b) {
+
+	$receiver = array();
+
+	if (!$b["private"]) {
+
+		if(! strstr($b['postopts'],'pumpio'))
+			return $receiver;
+
+		$public = get_pconfig($b['uid'], "pumpio", "public");
+
+                if ($public)
+			$receiver["to"][] = Array(
+						"objectType" => "collection",
+						"id" => "http://activityschema.org/collection/public");
+	} else {
+		$cids = explode("><", $b["allow_cid"]);
+		$gids = explode("><", $b["allow_gid"]);
+
+		foreach ($cids AS $cid) {
+			$cid = trim($cid, " <>");
+
+			$r = q("SELECT `name`, `nick`, `url` FROM `contact` WHERE `id` = %d AND `uid` = %d AND `network` = '%s' AND `blocked` = 0 AND `readonly` = 0 LIMIT 1",
+				intval($cid),
+				intval($b["uid"]),
+				dbesc(NETWORK_PUMPIO)
+				);
+
+			if (count($r)) {
+				$receiver["bcc"][] = Array(
+							"displayName" => $r[0]["name"],
+							"objectType" => "person",
+							"preferredUsername" => $r[0]["nick"],
+							"url" => $r[0]["url"]);
+			}
+		}
+		foreach ($gids AS $gid) {
+			$gid = trim($gid, " <>");
+
+			$r = q("SELECT `contact`.`name`, `contact`.`nick`, `contact`.`url`, `contact`.`network` ".
+				"FROM `group_member`, `contact` WHERE `group_member`.`gid` = %d AND `group_member`.`uid` = %d ".
+				"AND `contact`.`id` = `group_member`.`contact-id` AND `contact`.`network` = '%s'",
+					intval($gid),
+					intval($b["uid"]),
+					dbesc(NETWORK_PUMPIO)
+				);
+
+			foreach ($r AS $row)
+				$receiver["bcc"][] = Array(
+							"displayName" => $row["name"],
+							"objectType" => "person",
+							"preferredUsername" => $row["nick"],
+							"url" => $row["url"]);
+		}
+	}
+
+	if ($b["inform"] != "") {
+
+		$inform = explode(",", $b["inform"]);
+
+		foreach ($inform AS $cid) {
+			if (substr($cid, 0, 4) != "cid:")
+				continue;
+
+			$cid = str_replace("cid:", "", $cid);
+
+			$r = q("SELECT `name`, `nick`, `url` FROM `contact` WHERE `id` = %d AND `uid` = %d AND `network` = '%s' AND `blocked` = 0 AND `readonly` = 0 LIMIT 1",
+				intval($cid),
+				intval($b["uid"]),
+				dbesc(NETWORK_PUMPIO)
+				);
+
+			if (count($r)) {
+					$receiver["to"][] = Array(
+								"displayName" => $r[0]["name"],
+								"objectType" => "person",
+								"preferredUsername" => $r[0]["nick"],
+								"url" => $r[0]["url"]);
+			}
+		}
+	}
+
+	return $receiver;
+}
+
+function pumpio_fetchallcomments($a, $uid, $id) {
+	$ckey    = get_pconfig($uid, 'pumpio', 'consumer_key');
+	$csecret = get_pconfig($uid, 'pumpio', 'consumer_secret');
+	$otoken  = get_pconfig($uid, 'pumpio', 'oauth_token');
+	$osecret = get_pconfig($uid, 'pumpio', 'oauth_token_secret');
+	$hostname = get_pconfig($uid, 'pumpio','host');
+	$username = get_pconfig($uid, "pumpio", "user");
+
+	$own_id = "https://".$hostname."/".$username;
+
+	logger("pumpio_fetchallcomments: completing comment for user ".$uid." url ".$url);
+
+	$self = q("SELECT * FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1",
+		intval($uid));
+
+	// Fetching the original post - Two queries for speed issues
+	$r = q("SELECT extid FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
+			dbesc($url),
+			intval($uid)
+		);
+
+	if (!count($r)) {
+		$r = q("SELECT extid FROM `item` WHERE `extid` = '%s' AND `uid` = %d LIMIT 1",
+				dbesc($url),
+				intval($uid)
+			);
+
+		if (!count($r))
+			return false;
+	}
+
+	if ($r[0]["extid"])
+		$url = $r[0]["extid"];
+	else
+		$url = $id;
+
+	$client = new oauth_client_class;
+	$client->oauth_version = '1.0a';
+	$client->authorization_header = true;
+	$client->url_parameters = false;
+
+	$client->client_id = $ckey;
+	$client->client_secret = $csecret;
+	$client->access_token = $otoken;
+	$client->access_token_secret = $osecret;
+
+	logger("pumpio_fetchallcomments: fetching comment for user ".$uid." url ".$url);
+
+	$success = $client->CallAPI($url, 'GET', array(), array('FailOnAccessError'=>true), $item);
+
+	if (!$success)
+		return;
+
+	if ($item->replies->totalItems == 0)
+		return;
+
+	foreach ($item->replies->items AS $item) {
+		if ($item->id == $id)
+			continue;
+
+		// Checking if the comment already exists - Two queries for speed issues
+		$r = q("SELECT extid FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
+				dbesc($url),
+				intval($uid)
+			);
+
+		if (count($r))
+			continue;
+
+		$r = q("SELECT extid FROM `item` WHERE `extid` = '%s' AND `uid` = %d LIMIT 1",
+				dbesc($url),
+				intval($uid)
+			);
+
+		if (count($r))
+			continue;
+
+		$post->verb = "post";
+		$post->actor = $item->author;
+		$post->published = $item->published;
+		$post->received = $item->updated;
+		$post->generator->displayName = "pumpio";
+
+		unset($item->author);
+		unset($item->published);
+		unset($item->updated);
+
+		$post->object = $item;
+
+		logger("pumpio_fetchallcomments: posting comment ".$post->object->id);
+		pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id);
+	}
+}
+
+/*
+Bugs:
+ - refresh after post doesn't always happen
+
+To-Do:
+ - edit own notes
+ - delete own notes
+
+*/
diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php
index 795e411a..c19065cf 100755
--- a/statusnet/statusnet.php
+++ b/statusnet/statusnet.php
@@ -550,6 +550,14 @@ function statusnet_shortenmsg($b, $max_char) {
 	if ((strlen(trim($origmsg)) <= $max_char) AND (strpos($origmsg, $msglink) OR ($msglink == "")))
 		return(array("msg"=>trim($origmsg), "image"=>""));
 
+	// If the message is short enough and contains a picture then post the picture as well
+	if ((strlen(trim($origmsg)) <= ($max_char - 20)) AND strpos($origmsg, $msglink))
+		return(array("msg"=>trim($origmsg), "image"=>$image));
+
+	// If the message is short enough and the link exists in the original message don't modify it as well
+	if ((strlen(trim($origmsg)) <= $max_char) AND strpos($origmsg, $msglink))
+		return(array("msg"=>trim($origmsg), "image"=>""));
+
 	// Preserve the unshortened link
 	$orig_link = $msglink;
 
@@ -584,10 +592,10 @@ function statusnet_shortenmsg($b, $max_char) {
 
 	if (($image == $orig_link) OR (substr($mime, 0, 6) == "image/"))
 		return(array("msg"=>trim($msg), "image"=>$orig_link));
-	else if (($image != $orig_link) AND ($image != "") AND (strlen($msg."\n".$msglink) <= ($max_char - 20)))
-		return(array("msg"=>trim($msg."\n".$msglink), "image"=>$image));
+	else if (($image != $orig_link) AND ($image != "") AND (strlen($msg." ".$msglink) <= ($max_char - 20)))
+		return(array("msg"=>trim($msg." ".$msglink)."\n", "image"=>$image));
 	else
-		return(array("msg"=>trim($msg."\n".$msglink), "image"=>""));
+		return(array("msg"=>trim($msg." ".$msglink), "image"=>""));
 }
 
 function statusnet_post_hook(&$a,&$b) {
diff --git a/twitter/twitter.php b/twitter/twitter.php
index ec833ffc..1bee1bdf 100755
--- a/twitter/twitter.php
+++ b/twitter/twitter.php
@@ -70,6 +70,7 @@ function twitter_install() {
 	register_hook('notifier_normal', 'addon/twitter/twitter.php', 'twitter_post_hook');
 	register_hook('jot_networks', 'addon/twitter/twitter.php', 'twitter_jot_nets');
 	register_hook('cron', 'addon/twitter/twitter.php', 'twitter_cron');
+	register_hook('queue_predeliver', 'addon/twitter/twitter.php', 'twitter_queue_hook');
 	logger("installed twitter");
 }
 
@@ -81,6 +82,7 @@ function twitter_uninstall() {
 	unregister_hook('notifier_normal', 'addon/twitter/twitter.php', 'twitter_post_hook');
 	unregister_hook('jot_networks', 'addon/twitter/twitter.php', 'twitter_jot_nets');
 	unregister_hook('cron', 'addon/twitter/twitter.php', 'twitter_cron');
+	unregister_hook('queue_predeliver', 'addon/twitter/twitter.php', 'twitter_queue_hook');
 
 	// old setting - remove only
 	unregister_hook('post_local_end', 'addon/twitter/twitter.php', 'twitter_post_hook');
@@ -363,7 +365,6 @@ function twitter_shortenmsg($b, $shortlink = false) {
 	$html = bbcode($body, false, false, 2);
 
 	// Then convert it to plain text
-	//$msg = trim($b['title']." \n\n".html2plain($html, 0, true));
 	$msg = trim(html2plain($html, 0, true));
 	$msg = html_entity_decode($msg,ENT_QUOTES,'UTF-8');
 
@@ -375,7 +376,7 @@ function twitter_shortenmsg($b, $shortlink = false) {
 	while (strpos($msg, "  ") !== false)
 		$msg = str_replace("  ", " ", $msg);
 
-	$origmsg = $msg;
+	$origmsg = trim($msg);
 
 	// Removing URLs
 	$msg = preg_replace('/(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,]+)/i', "", $msg);
@@ -428,33 +429,25 @@ function twitter_shortenmsg($b, $shortlink = false) {
 		$msglink = $b["plink"];
 
 	// If the message is short enough then don't modify it.
-	if ((strlen(trim($origmsg)) <= $max_char) AND ($msglink == ""))
-		return(array("msg"=>trim($origmsg), "image"=>""));
+	if ((strlen($origmsg) <= $max_char) AND ($msglink == ""))
+		return(array("msg"=>$origmsg, "image"=>""));
 
 	// If the message is short enough and contains a picture then post the picture as well
-	if ((strlen(trim($origmsg)) <= ($max_char - 20)) AND strpos($origmsg, $msglink))
-		return(array("msg"=>trim($origmsg), "image"=>$image));
+	if ((strlen($origmsg) <= ($max_char - 23)) AND strpos($origmsg, $msglink))
+		return(array("msg"=>$origmsg, "image"=>$image));
 
 	// If the message is short enough and the link exists in the original message don't modify it as well
 	// -3 because of the bad shortener of twitter
-	if ((strlen(trim($origmsg)) <= ($max_char - 3)) AND strpos($origmsg, $msglink))
-		return(array("msg"=>trim($origmsg), "image"=>""));
+	if ((strlen($origmsg) <= ($max_char - 3)) AND strpos($origmsg, $msglink))
+		return(array("msg"=>$origmsg, "image"=>""));
 
 	// Preserve the unshortened link
 	$orig_link = $msglink;
 
-	//if (strlen($msglink) > 20)
-	//	$msglink = short_link($msglink);
-	//
-	//if (strlen(trim($msg." ".$msglink)) > ($max_char - 3)) {
-	//	$msg = substr($msg, 0, ($max_char - 3) - (strlen($msglink)));
-
-	// Just replace the message link with a 20 character long string
-	// Twitter shortens it anyway to this length
-	// 15 should be enough - but sometimes posts don't get posted - although they would fit.
+	// Just replace the message link with a 22 character long string
+	// Twitter calculates with this length
 	if (trim($msglink) <> '')
-		$msglink = "123456789012345";
-//		$msglink = "12345678901234567890";
+		$msglink = "1234567890123456789012";
 
 	if (strlen(trim($msg." ".$msglink)) > ($max_char)) {
 		$msg = substr($msg, 0, ($max_char) - (strlen($msglink)));
@@ -480,12 +473,12 @@ function twitter_shortenmsg($b, $shortlink = false) {
 		}
 
 	}
-	//$msg = str_replace("\n", " ", $msg);
-
 	// Removing multiple spaces - again
 	while (strpos($msg, "  ") !== false)
 		$msg = str_replace("  ", " ", $msg);
 
+	$msg = trim($msg);
+
 	// Removing multiple newlines
 	//while (strpos($msg, "\n\n") !== false)
 	//	$msg = str_replace("\n\n", "\n", $msg);
@@ -499,17 +492,17 @@ function twitter_shortenmsg($b, $shortlink = false) {
 	unlink($tempfile);
 
 	if (($image == $orig_link) OR (substr($mime, 0, 6) == "image/"))
-		return(array("msg"=>trim($msg), "image"=>$orig_link));
-	else if (($image != $orig_link) AND ($image != "") AND (strlen($msg."\n".$msglink) <= ($max_char - 20))) {
+		return(array("msg"=>$msg, "image"=>$orig_link));
+	else if (($image != $orig_link) AND ($image != "") AND (strlen($msg." ".$msglink) <= ($max_char - 23))) {
 		if ($shortlink)
 			$orig_link = short_link($orig_link);
 
-		return(array("msg"=>trim($msg."\n".$orig_link), "image"=>$image));
+		return(array("msg"=>$msg." ".$orig_link, "image"=>$image));
 	} else {
 		if ($shortlink)
 			$orig_link = short_link($orig_link);
 
-		return(array("msg"=>trim($msg."\n".$orig_link), "image"=>""));
+		return(array("msg"=>$msg." ".$orig_link, "image"=>""));
 	}
 }
 
@@ -644,8 +637,8 @@ function twitter_post_hook(&$a,&$b) {
 			$tempfile = tempnam(get_config("system","temppath"), "cache");
 			file_put_contents($tempfile, $img_str);
 
-			// For testing purposes
-			// trying a new library for twitter
+			// Twitter had changed something so that the old library doesn't work anymore
+			// so we are using a new library for twitter
 			// To-Do:
 			// Switching completely to this library with all functions
 		        require_once("addon/twitter/codebird.php");
@@ -657,6 +650,7 @@ function twitter_post_hook(&$a,&$b) {
 			unlink($tempfile);
 
 			/*
+			// Old Code
 			$mime = image_type_to_mime_type(exif_imagetype($tempfile));
 			unlink($tempfile);
 
@@ -667,7 +661,8 @@ function twitter_post_hook(&$a,&$b) {
 
 			logger('twitter_post_with_media send, result: ' . print_r($result, true), LOGGER_DEBUG);
 			if ($result->errors OR $result->error) {
-				logger('Send to Twitter failed: "' . $result->errors . '"');
+				logger('Send to Twitter failed: "' . print_r($result->errors, true) . '"');
+
 				// Workaround: Remove the picture link so that the post can be reposted without it
 				$msg .= " ".$image;
 				$image = "";
@@ -675,25 +670,21 @@ function twitter_post_hook(&$a,&$b) {
 		}
 
 		if(strlen($msg) and ($image == "")) {
-			$result = $tweet->post('statuses/update', array('status' => $msg));
+			$url = 'statuses/update';
+			$post = array('status' => $msg);
+			$result = $tweet->post($url, $post);
 			logger('twitter_post send, result: ' . print_r($result, true), LOGGER_DEBUG);
-			if ($result->errors OR $result->error) {
-				logger('Send to Twitter failed: "' . $result->errors . '"');
+			if ($result->errors) {
+				logger('Send to Twitter failed: "' . print_r($result->errors, true) . '"');
 
-				// experimental
-				// Sometims Twitter seems to think that posts are too long - although they aren't
-				// Test 1:
-				// Shorten the urls
-				// Test 2:
-				// Reduce the maximum length
-				if ($intelligent_shortening) {
-					$msgarr = twitter_shortenmsg($b, true);
-					$msg = $msgarr["msg"];
-		                        $image = $msgarr["image"];
-					$result = $tweet->post('statuses/update', array('status' => $msg));
-					logger('twitter_post send, result: ' . print_r($result, true), LOGGER_DEBUG);
-				}
+				$r = q("SELECT `id` FROM `contact` WHERE `uid` = %d AND `self`", $b['uid']);
+				if (count($r))
+					$a->contact = $r[0]["id"];
 
+				$s = serialize(array('url' => $url, 'item' => $b['id'], 'post' => $post));
+				require_once('include/queue_fn.php');
+				add_to_queue($a->contact,NETWORK_TWITTER,$s);
+				notice(t('Twitter post failed. Queued for retry.').EOL);
 			}
 		}
 	}
@@ -824,3 +815,68 @@ function twitter_fetchtimeline($a, $uid) {
 	}
 	set_pconfig($uid, 'twitter', 'lastid', $lastid);
 }
+
+function twitter_queue_hook(&$a,&$b) {
+
+	$qi = q("SELECT * FROM `queue` WHERE `network` = '%s'",
+		dbesc(NETWORK_TWITTER)
+		);
+	if(! count($qi))
+		return;
+
+	require_once('include/queue_fn.php');
+
+	foreach($qi as $x) {
+		if($x['network'] !== NETWORK_TWITTER)
+			continue;
+
+		logger('twitter_queue: run');
+
+		$r = q("SELECT `user`.* FROM `user` LEFT JOIN `contact` on `contact`.`uid` = `user`.`uid` 
+			WHERE `contact`.`self` = 1 AND `contact`.`id` = %d LIMIT 1",
+			intval($x['cid'])
+		);
+		if(! count($r))
+			continue;
+
+		$user = $r[0];
+
+		$ckey    = get_config('twitter', 'consumerkey');
+		$csecret = get_config('twitter', 'consumersecret');
+		$otoken  = get_pconfig($user['uid'], 'twitter', 'oauthtoken');
+		$osecret = get_pconfig($user['uid'], 'twitter', 'oauthsecret');
+
+		$success = false;
+
+		if ($ckey AND $csecret AND $otoken AND $osecret) {
+
+			logger('twitter_queue: able to post');
+
+			$z = unserialize($x['content']);
+
+			require_once("addon/twitter/codebird.php");
+
+			$cb = \Codebird\Codebird::getInstance();
+			$cb->setConsumerKey($ckey, $csecret);
+			$cb->setToken($otoken, $osecret);
+
+			if ($z['url'] == "statuses/update")
+				$result = $cb->statuses_update($z['post']);
+
+			logger('twitter_queue: post result: ' . print_r($result, true), LOGGER_DEBUG);
+
+			if ($result->errors)
+				logger('twitter_queue: Send to Twitter failed: "' . print_r($result->errors, true) . '"');
+			else {
+				$success = true;
+				remove_queue_item($x['id']);
+			}
+		} else
+			logger("twitter_queue: Error getting tokens for user ".$user['uid']);
+
+		if (!$success) {
+			logger('twitter_queue: delayed');
+			update_queue_time($x['id']);
+		}
+	}
+}