diff --git a/root/converse.php b/root/converse.php
index 5711e6d..d244cc4 100644
--- a/root/converse.php
+++ b/root/converse.php
@@ -2218,7 +2218,7 @@ case 'do_search':
 			} else {
 				$goto_unread = '';
 				$newmsg_url = cnv_get_conv_link($row['cid'], 'unread');
-				if ($row['read_dateline'] < $row['lastmsg']) {
+				if ($row['read_dateline'] < $row['msg_dateline']) {
 					$new_class = 'subject_new';
 					eval('$goto_unread = "'.$templates->get('converse_goto_unread').'";');
 				} else	$new_class = 'subject_old';
diff --git a/root/inc/plugins/converse/converse-functions.php b/root/inc/plugins/converse/converse-functions.php
index bd69164..da96907 100644
--- a/root/inc/plugins/converse/converse-functions.php
+++ b/root/inc/plugins/converse/converse-functions.php
@@ -2243,7 +2243,7 @@ FROM            mybb_cnv_conversations c
 LEFT OUTER JOIN mybb_cnv_groups g
 ON              c.cgid = g.cgid
 LEFT OUTER JOIN mybb_cnv_participants p
-ON              c.cid = p.cid AND c.uid <> '{$viewer_uid}'
+ON              c.cid = p.cid AND (c.uid <> '{$viewer_uid}' OR c.uid IS NULL)
 LEFT OUTER JOIN mybb_cnv_group_participants gp
 ON              c.cgid = gp.cgid AND c.uid <> '{$viewer_uid}' AND g.uid <> '{$viewer_uid}' AND (p.uid = '{$viewer_uid}' OR p.uid IS NULL) AND gp.uid = '{$viewer_uid}'
 {$msg_join}
diff --git a/root/inc/plugins/converse/converse-pm-datahandler-override.php b/root/inc/plugins/converse/converse-pm-datahandler-override.php
index 21cc9fa..5d48a18 100644
--- a/root/inc/plugins/converse/converse-pm-datahandler-override.php
+++ b/root/inc/plugins/converse/converse-pm-datahandler-override.php
@@ -134,10 +134,8 @@ class PMDataHandler extends PMDataHandler_Original {
 			// single-message conversations.
 			$query = $db->query($sql = '
 SELECT * FROM (
-               SELECT           c.cid,
-                                c.uid,
-                                GROUP_CONCAT(p.uid) AS puids,
-                                c.subject
+               SELECT           p.cid,
+                                GROUP_CONCAT(p.uid) AS puids
                FROM            '.TABLE_PREFIX.'cnv_conversations c
                LEFT OUTER JOIN '.TABLE_PREFIX.'cnv_participants p
                ON              p.cid = c.cid