diff --git a/include/items.php b/include/items.php
index 69b4a0f259..ef164bc2ce 100644
--- a/include/items.php
+++ b/include/items.php
@@ -464,12 +464,27 @@ function get_atom_elements($feed, $item, $contact = array()) {
 
 	// look for a photo. We should check media size and find the best one,
 	// but for now let's just find any author photo
+	// Additionally we look for an alternate author link. On OStatus this one is the one we want.
+
+	// Search for ostatus conversation url
+	$authorlinks = $item->feed->data["child"][SIMPLEPIE_NAMESPACE_ATOM_10]["feed"][0]["child"][SIMPLEPIE_NAMESPACE_ATOM_10]["author"][0]["child"]["http://www.w3.org/2005/Atom"]["link"];
+	if (is_array($authorlinks)) {
+		foreach ($authorlinks as $link) {
+			$linkdata = array_shift($link["attribs"]);
+
+			if ($linkdata["rel"] == "alternate")
+				$res["author-link"] = $linkdata["href"];
+		};
+	}
 
 	$rawauthor = $item->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10,'author');
 
 	if($rawauthor && $rawauthor[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link']) {
 		$base = $rawauthor[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link'];
 		foreach($base as $link) {
+			if($link['attribs']['']['rel'] === 'alternate')
+				$res['author-link'] = unxmlify($link['attribs']['']['href']);
+
 			if(!x($res, 'author-avatar') || !$res['author-avatar']) {
 				if($link['attribs']['']['rel'] === 'photo' || $link['attribs']['']['rel'] === 'avatar')
 					$res['author-avatar'] = unxmlify($link['attribs']['']['href']);
@@ -828,7 +843,7 @@ function get_atom_elements($feed, $item, $contact = array()) {
 		logger('get_atom_elements: Looking for status.net repeated message');
 
 		$message = $child["http://activitystrea.ms/spec/1.0/"]["object"][0]["child"][SIMPLEPIE_NAMESPACE_ATOM_10]["content"][0]["data"];
-		$orig_uri = $child["http://activitystrea.ms/spec/1.0/"]["object"][0]["child"][SIMPLEPIE_NAMESPACE_ATOM_10]["id"][0]["data"];
+		$orig_id = ostatus_convert_href($child["http://activitystrea.ms/spec/1.0/"]["object"][0]["child"][SIMPLEPIE_NAMESPACE_ATOM_10]["id"][0]["data"]);
 		$author = $child[SIMPLEPIE_NAMESPACE_ATOM_10]["author"][0]["child"][SIMPLEPIE_NAMESPACE_ATOM_10];
 		$uri = $author["uri"][0]["data"];
 		$name = $author["name"][0]["data"];
@@ -836,10 +851,10 @@ function get_atom_elements($feed, $item, $contact = array()) {
 		$avatar = $avatar["href"];
 
 		if (($name != "") and ($uri != "") and ($avatar != "") and ($message != "")) {
-			logger('get_atom_elements: fixing sender of repeated message.');
+			logger('get_atom_elements: fixing sender of repeated message. '.$orig_id, LOGGER_DEBUG);
 
 			if (!intval(get_config('system','wall-to-wall_share'))) {
-				$prefix = share_header($name, $uri, $avatar, "", "", $orig_uri);
+				$prefix = share_header($name, $uri, $avatar, "", "", $orig_link);
 
 				$res["body"] = $prefix.html2bbcode($message)."[/share]";
 			} else {
@@ -866,6 +881,9 @@ function get_atom_elements($feed, $item, $contact = array()) {
 			if ($conversation["rel"] == "ostatus:conversation") {
 				$res["ostatus_conversation"] = ostatus_convert_href($conversation["href"]);
 				logger('get_atom_elements: found conversation url '.$res["ostatus_conversation"]);
+			} elseif ($conversation["rel"] == "alternate") {
+				$res["plink"] = $conversation["href"];
+				logger('get_atom_elements: found plink '.$res["plink"]);
 			}
 		};
 	}
@@ -2212,6 +2230,12 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
 		return;
 	}
 
+	// Test - remove before flight
+//	if ($contact['network'] === NETWORK_OSTATUS) {
+//		$tempfile = tempnam(get_temppath(), "ostatus");
+//		file_put_contents($tempfile, $xml);
+//	}
+
 	$feed = new SimplePie();
 	$feed->set_raw_data($xml);
 	if($datedir)
diff --git a/include/ostatus_conversation.php b/include/ostatus_conversation.php
index a03330a820..f40c4827b9 100644
--- a/include/ostatus_conversation.php
+++ b/include/ostatus_conversation.php
@@ -139,30 +139,15 @@ function complete_conversation($itemid, $conversation_url, $only_add_conversatio
 
 		logger("Got id ".$single_conv->id, LOGGER_DEBUG);
 
-		//if (!isset($single_conv->id) AND isset($single_conv->object->id))
-		//	$single_conv->id = $single_conv->object->id;
-		//elseif (!isset($single_conv->id) AND isset($single_conv->object->url))
-		//	$single_conv->id = $single_conv->object->url;
-
 		$plink = ostatus_convert_href($single_conv->id);
 		if (isset($single_conv->object->url))
 			$plink = ostatus_convert_href($single_conv->object->url);
 
 		logger("Got url ".$plink, LOGGER_DEBUG);
 
-		//if (isset($single_conv->provider->url) AND isset($single_conv->statusnet_notice_info->local_id))
-		//	$plink = $single_conv->provider->url."notice/".$single_conv->statusnet_notice_info->local_id;
-		//elseif (isset($single_conv->provider->url) AND isset($single_conv->statusnet->notice_info->local_id))
-		//	$plink = $single_conv->provider->url."notice/".$single_conv->statusnet->notice_info->local_id;
-		//elseif (isset($single_conv->provider->url) AND isset($single_conv->status_net->notice_info->local_id))
-		//	$plink = $single_conv->provider->url."notice/".$single_conv->status_net->notice_info->local_id;
-
 		if (@!$single_conv->id)
 			continue;
 
-		//logger("OStatus conversation id ".$single_conv->id, LOGGER_DEBUG);
-		//logger("OStatus conversation data ".print_r($single_conv, true), LOGGER_DEBUG);
-
 		if ($first_id == "") {
 			$first_id = $single_conv->id;