diff --git a/include/conversation.php b/include/conversation.php
index e48a8e6d60..ff68462abd 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -447,8 +447,8 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
 				else {
 
 					// prevent private email reply to public conversation from leaking.
-					if($item['private'] && ! $threads[$threadsid]['private'])
-						continue;
+					if($item['network'] === NETWORK_MAIL && local_user() != $item['uid'])
+							continue;
 
 					$comments_seen ++;
 					$comment_lastcollapsed  = false;
diff --git a/include/items.php b/include/items.php
index b1dc1708f0..129499967a 100644
--- a/include/items.php
+++ b/include/items.php
@@ -119,7 +119,7 @@ function get_feed_for(&$a, $dfrn_id, $owner_nick, $last_update, $direction = 0)
 	$check_date = datetime_convert('UTC','UTC',$last_update,'Y-m-d H:i:s');
 
 	$r = q("SELECT `item`.*, `item`.`id` AS `item_id`, 
-		`contact`.`name`, `contact`.`photo`, `contact`.`url`, 
+		`contact`.`name`, `contact`.`network`, `contact`.`photo`, `contact`.`url`, 
 		`contact`.`name-date`, `contact`.`uri-date`, `contact`.`avatar-date`,
 		`contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`, 
 		`contact`.`id` AS `contact-id`, `contact`.`uid` AS `contact-uid`,