diff --git a/mod/network.php b/mod/network.php
index 0f9b0d2339..fafee97c07 100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -452,11 +452,6 @@ function network_content(&$a, $update = 0) {
 	}
 	set_pconfig(local_user(), 'network.view', 'net.selected', ($nets ? $nets : 'all'));
 
-/*if ($update) {
-print_r($_GET);
-die("ss");
-}*/
-
 	if(! $update) {
 		if($group) {
 			if(($t = group_public_members($group)) && (! get_pconfig(local_user(),'system','nowarn_insecure'))) {
@@ -471,6 +466,14 @@ die("ss");
 
 		$celeb = ((($a->user['page-flags'] == PAGE_SOAPBOX) || ($a->user['page-flags'] == PAGE_COMMUNITY)) ? true : false);
 
+		$content = "";
+
+		if ($cid) {
+			$contact = q("SELECT `nick` FROM `contact` WHERE `id` = %d AND `uid` = %d AND `forum`", intval($cid), intval(local_user()));
+			if ($contact)
+				$content = "@".$contact[0]["nick"]."+".$cid;
+		}
+
 		$x = array(
 			'is_owner' => true,
 			'allow_location' => $a->user['allow_location'],
@@ -483,6 +486,7 @@ die("ss");
 			'visitor' => 'block',
 			'profile_uid' => local_user(),
 			'acl_data' => construct_acl_data($a, $a->user), // For non-Javascript ACL selector
+			'content' => $content,
 		);
 
 		$o .= status_editor($a,$x);
diff --git a/mod/parse_url.php b/mod/parse_url.php
index 7f4bd29a08..71d767675f 100644
--- a/mod/parse_url.php
+++ b/mod/parse_url.php
@@ -97,15 +97,6 @@ function parseurl_getsiteinfo($url, $no_guessing = false, $do_oembed = true, $co
 		return($siteinfo);
 	}
 
-	if ($do_oembed) {
-		require_once("include/oembed.php");
-
-		$oembed_data = oembed_fetch_url($url);
-
-		if ($oembed_data->type != "error")
-			$siteinfo["type"] = $oembed_data->type;
-	}
-
 	// if the file is too large then exit
 	if ($curl_info["download_content_length"] > 1000000)
 		return($siteinfo);
@@ -114,6 +105,24 @@ function parseurl_getsiteinfo($url, $no_guessing = false, $do_oembed = true, $co
 	if (($curl_info["content_type"] != "") AND !strstr(strtolower($curl_info["content_type"]),"html"))
 		return($siteinfo);
 
+	if ($do_oembed) {
+		require_once("include/oembed.php");
+
+		$oembed_data = oembed_fetch_url($url);
+
+		if ($oembed_data->type != "error")
+			$siteinfo["type"] = $oembed_data->type;
+
+		if (($oembed_data->type == "link") AND ($siteinfo["type"] != "photo")) {
+			if (isset($oembed_data->title))
+				$siteinfo["title"] = $oembed_data->title;
+			if (isset($oembed_data->description))
+				$siteinfo["text"] = trim($oembed_data->description);
+			if (isset($oembed_data->thumbnail_url))
+				$siteinfo["image"] = $oembed_data->thumbnail_url;
+		}
+	}
+
 	$stamp1 = microtime(true);
 
 	// Now fetch the body as well
@@ -283,15 +292,6 @@ function parseurl_getsiteinfo($url, $no_guessing = false, $do_oembed = true, $co
 			}
 	}
 
-	if (isset($oembed_data) AND ($oembed_data->type == "link") AND ($siteinfo["type"] != "photo")) {
-		if (isset($oembed_data->title) AND (trim($oembed_data->title) != ""))
-			$siteinfo["title"] = $oembed_data->title;
-		if (isset($oembed_data->description) AND (trim($oembed_data->description) != ""))
-			$siteinfo["text"] = trim($oembed_data->description);
-		if (isset($oembed_data->thumbnail_url) AND (trim($oembed_data->thumbnail_url) != ""))
-			$siteinfo["image"] = $oembed_data->thumbnail_url;
-	}
-
 	if ((@$siteinfo["image"] == "") AND !$no_guessing) {
 	    $list = $xpath->query("//img[@src]");
 	    foreach ($list as $node) {