diff --git a/include/conversation.php b/include/conversation.php
index 4a9142bb20..67445c2904 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -582,7 +582,9 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
 				}	
 
 				$override_comment_box = ((($page_writeable) && ($item_writeable)) ? true : false);
-				$show_comment_box = ((($page_writeable) && ($item_writeable) && ($comments_seen == $comments[$item['parent']])) ? true : false);
+				// The comment box should now appear under each writable item, not only at the end of the thread, don't bother with $comments_seen
+				//$show_comment_box = ((($page_writeable) && ($item_writeable) && ($comments_seen == $comments[$item['parent']])) ? true : false);
+				$show_comment_box = ((($page_writeable) && ($item_writeable)) ? true : false);
 
 
 				if(($comments[$item['parent']] > 2) && ($comments_seen <= ($comments[$item['parent']] - 2)) && ($item['gravity'] == 6)) {
@@ -681,12 +683,13 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
 					}
 
 					if(($show_comment_box) || (($show_comment_box == false) && ($override_comment_box == false) && ($item['last-child']))) {
+						// The parent is now the item itself, not his parent
 						$comment = replace_macros($cmnt_tpl,array(
 							'$return_path' => '', 
 							'$jsreload' => (($mode === 'display') ? $_SESSION['return_url'] : ''),
 							'$type' => (($mode === 'profile') ? 'wall-comment' : 'net-comment'),
 							'$id' => $item['item_id'],
-							'$parent' => $item['parent'],
+							'$parent' => $item['item_id'],
 							'$qcomment' => $qcomment,
 							'$profile_uid' =>  $profile_owner,
 							'$mylink' => $a->contact['url'],
diff --git a/mod/item.php b/mod/item.php
index fddc3fd124..cc1e628c80 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -77,14 +77,15 @@ function item_post(&$a) {
 			);
 		}
 		// if this isn't the real parent of the conversation, find it
-		if($r !== false && count($r)) {
+		// We are now threading the comments, the parent may have a parent
+		/*if($r !== false && count($r)) {
 			$parid = $r[0]['parent'];
 			if($r[0]['id'] != $r[0]['parent']) {
 				$r = q("SELECT * FROM `item` WHERE `id` = `parent` AND `parent` = %d LIMIT 1",
 					intval($parid)
 				);
 			}
-		}
+		}*/
 
 		if(($r === false) || (! count($r))) {
 			notice( t('Unable to locate original post.') . EOL);