@@ -348,9 +348,22 @@ function workspace_build_rows($result, $
 
       $link = l(t('delete'), "comment/delete/$comment->cid");
       $delete_link = $comment_links['comment_delete'] ? $link : '';
-
+      $row_options = array(
+        'attributes' => array(),
+        'query' => NULL,
+        'fragment' => "comment-$row->cid",
+        'absolute' => FALSE,
+        'html' => TRUE,
+      );
+      
+      if(module_exists('talk')) {
+        $row_link = l($row->subject, "node/$row->nid/talk", $row_options);
+      } else {
+        $row_link = l($row->subject, "node/$row->nid", $row_options);
+      }
+      
       $rows[] = array(
-        l($row->subject, "node/$row->nid", array(), NULL, "comment-$row->cid", FALSE, TRUE),
+      	$row_link,
         $row->status ? $no : $yes, 
         format_date($row->timestamp, 'small'), 
         array('data' => $num_replies, 'align' => 'right'),