--- a/plugins/PrivateMessages.php	Fri Jul 30 21:31:30 2010 -0400
+++ b/plugins/PrivateMessages.php	Fri Jul 30 21:32:05 2010 -0400
@@ -275,7 +275,7 @@
 			{
 				if ( ( $argv[1]=='to' || $argv[1]=='To' ) && $argv[2] )
 				{
-					$to = htmlspecialchars($argv[2]);
+					$to = htmlspecialchars(str_replace('_', ' ', dirtify_page_id($argv[2])));
 				}
 				else
 				{
@@ -753,7 +753,7 @@
 					echo '<br /><div class="tblholder"><table border="0" width="100%" cellspacing="1" cellpadding="4"><tr><th colspan="3">' . $lang->get('privmsgs_th_buddy_list', array('username' => htmlspecialchars($session->username))) . '</th></tr>';
 					if($db->numrows() < 1) echo '<tr><td class="row3">' . $lang->get('privmsgs_msg_no_buddies') . '</td></tr>';
 					$cls = 'row2';
-					while ( $row = $db->fetchrow() )
+					while ( $row = $db->fetchrow($q) )
 					{
 						if($cls=='row2') $cls = 'row1';
 						else $cls = 'row2';
@@ -825,7 +825,7 @@
 					echo '<br /><div class="tblholder"><table border="0" width="100%" cellspacing="1" cellpadding="4"><tr><th colspan="3">' . $lang->get('privmsgs_th_foe_list', array('username' => htmlspecialchars($session->username))) . '</th></tr>';
 					if($db->numrows() < 1) echo '<tr><td class="row3">' . $lang->get('privmsgs_msg_no_foes') . '</td></tr>';
 					$cls = 'row2';
-					while ( $row = $db->fetchrow() )
+					while ( $row = $db->fetchrow($q) )
 					{
 						if($cls=='row2') $cls = 'row1';
 						else $cls = 'row2';