diff --git a/include/notifier.php b/include/notifier.php
index 18d0aead8e..a0fd713c20 100644
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -307,6 +307,7 @@ function notifier_run(&$argv, &$argc){
 				$push_notify = true;
 
 				// Send a salmon notification to every person we mentioned in the post
+				// To-Do: Send a Salmon to every Friendica user in that thread
 				$arr = explode(',',$target_item['tag']);
 				foreach($arr as $x) {
 					logger('Checking tag '.$x, LOGGER_DEBUG);
diff --git a/include/ostatus_conversation.php b/include/ostatus_conversation.php
index f897a058a3..cbf0163b7c 100644
--- a/include/ostatus_conversation.php
+++ b/include/ostatus_conversation.php
@@ -152,6 +152,9 @@ function complete_conversation($itemid, $conversation_url, $only_add_conversatio
 		if ($first_id == "") {
 			$first_id = $single_conv->id;
 
+			// To-Do:
+			// Only fetch a new parent if the new one doesn't have parents
+			// It can happen that OStatus servers have incomplete threads.
 			$new_parents = q("SELECT `id`, `uri`, `contact-id`, `type`, `verb`, `visible` FROM `item` WHERE `uid` = %d AND `uri` = '%s' AND `network` IN ('%s','%s') LIMIT 1",
 				intval($message["uid"]), dbesc($first_id),
 				dbesc(NETWORK_OSTATUS), dbesc(NETWORK_DFRN));