Index: modules/comment/comment.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/comment/comment.module,v
retrieving revision 1.872
diff -u -p -r1.872 comment.module
--- modules/comment/comment.module	28 Apr 2010 16:08:51 -0000	1.872
+++ modules/comment/comment.module	3 May 2010 12:54:24 -0000
@@ -2172,10 +2172,15 @@ function template_preprocess_comment(&$v
   $variables['picture']   = theme_get_setting('toggle_comment_user_picture') ? theme('user_picture', array('account' => $comment)) : '';
   $variables['signature'] = $comment->signature;
 
-  $uri = entity_uri('comment', $comment);
-  $variables['title']     = l($comment->subject, $uri['path'], $uri['options']);
-  $variables['permalink'] = l('#', $uri['path'], $uri['options']);
-
+  if ($comment->cid) {
+    $uri = entity_uri('comment', $comment);
+    $variables['title']     = l($comment->subject, $uri['path'], $uri['options']);
+    $variables['permalink'] = l('#', $uri['path'], $uri['options']);
+  }
+  else {
+    $variables['title'] = $comment->subject;
+  }
+
   // Preprocess fields.
   field_attach_preprocess('comment', $comment, $variables['elements'], $variables);