diff --git a/include/attach.php b/include/attach.php
index 673e438bf..a6757744f 100644
--- a/include/attach.php
+++ b/include/attach.php
@@ -968,7 +968,8 @@ function file_activity($channel_id, $hash, $cloudpath, $allow_cid, $allow_gid, $
 
 	$item_flags = ITEM_WALL|ITEM_ORIGIN|ITEM_UNSEEN;
 
-	$links = array(
+	$links   = array();
+	$links[] = array(
 		'rel' => 'alternate',
 		'type' => 'text/html',
 		'href' => $url
diff --git a/mod/sharedwithme.php b/mod/sharedwithme.php
index 53884788d..ff93051da 100644
--- a/mod/sharedwithme.php
+++ b/mod/sharedwithme.php
@@ -1,5 +1,6 @@
 <?php
 require_once('include/conversation.php');
+require_once('include/text.php');
 
 function sharedwithme_content(&$a) {
 	if(! local_user()) {
@@ -105,7 +106,7 @@ function sharedwithme_content(&$a) {
 	if($r) {
 		foreach($r as $rr) {
 			$object = json_decode($rr['object'],true);
-			$url = rawurldecode($object['link']['href']);
+			$url = rawurldecode(get_rel_link($object['link'],'alternate'));
 			$o .= '<a href="' . $url . '?f=&zid=' . $channel['xchan_addr'] . '">' . $url . '</a>&nbsp;<a href="/sharedwithme/' . $rr['id'] . '/drop" onclick="return confirmDelete();"><i class="icon-trash drop-icons"></i></a><br><br>';
 		}
 	}