diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php
index 866ac26be4..919bfc331d 100644
--- a/include/bb2diaspora.php
+++ b/include/bb2diaspora.php
@@ -18,7 +18,7 @@ function diaspora2bb($s) {
 	$s = html_entity_decode($s,ENT_COMPAT,'UTF-8');
 
 	// Remove CR to avoid problems with following code
-	//$s = str_replace("\r","",$s);
+	$s = str_replace("\r","",$s);
 
 	$s = str_replace("\n"," \n",$s);
 
diff --git a/mod/network.php b/mod/network.php
index c180252f44..0f9b0d2339 100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -708,7 +708,7 @@ die("ss");
 			if (!get_config("system", "like_no_comment"))
 				$sql_extra4 = "(`item`.`deleted` = 0 OR `item`.`verb` = '".ACTIVITY_LIKE."' OR `item`.`verb` = '".ACTIVITY_DISLIKE."')";
 			else
-				$sql_extra4 = "`item`.`deleted` = 0";
+				$sql_extra4 = "`item`.`deleted` = 0 AND `item`.`verb` = '".ACTIVITY_POST."'";
 
 			$r = q("SELECT `item`.`parent` AS `item_id`, `item`.`network` AS `item_network`, `contact`.`uid` AS `contact_uid`
 				FROM $sql_table $sql_post_table INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id`