diff --git a/include/diaspora.php b/include/diaspora.php
index 6b42e3c555..689f5765b3 100755
--- a/include/diaspora.php
+++ b/include/diaspora.php
@@ -1473,6 +1473,8 @@ function diaspora_comment($importer,$xml,$msg) {
 	DiasporaFetchGuid($datarray);
 	$message_id = item_store($datarray);
 
+	$datarray['id'] = $message_id;
+
 	//if($message_id) {
 		//q("update item set plink = '%s' where id = %d",
 		//	//dbesc($a->get_baseurl() . '/display/' . $importer['nickname'] . '/' . $message_id),
diff --git a/include/items.php b/include/items.php
index 1fecc44215..ff31e84f7c 100644
--- a/include/items.php
+++ b/include/items.php
@@ -3660,6 +3660,9 @@ function local_delivery($importer,$data) {
 				$parent = 0;
 
 				if($posted_id) {
+
+					$datarray["id"] = $posted_id;
+
 					$r = q("SELECT `parent`, `parent-uri` FROM `item` WHERE `id` = %d AND `uid` = %d LIMIT 1",
 						intval($posted_id),
 						intval($importer['importer_uid'])
diff --git a/mod/ping.php b/mod/ping.php
index 6545ab458b..82265530db 100644
--- a/mod/ping.php
+++ b/mod/ping.php
@@ -22,6 +22,10 @@ function ping_init(&$a) {
 
 		$firehose = intval(get_pconfig(local_user(),'system','notify_full'));
 
+/*
+select notify.id, notify.type, iid, visible, deleted, CASE notify.iid WHEN 0 THEN 1 ELSE item.visible END as vis, CASE notify.iid WHEN 0 THEN 0 ELSE item.deleted END as del from notify left join item on item.id = notify.iid where notify.uid=1 group by notify.parent order by notify.id desc limit 10;
+*/
+
 		$t = q("select count(*) as `total` from `notify` where `uid` = %d and `seen` = 0 AND `msg` != '' GROUP BY `parent`",
 			intval(local_user())
 		);