Index: comment.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/project_issue/comment.inc,v
retrieving revision 1.106
diff -u -p -r1.106 comment.inc
--- comment.inc	20 Oct 2007 23:36:49 -0000	1.106
+++ comment.inc	21 Oct 2007 20:26:32 -0000
@@ -55,15 +55,28 @@ function project_issue_comment(&$arg, $o
       $form['issue_info']['#weight'] = -1;
       $form['#prefix'] = '<div class="project-issue"><div class="node-form"><div class="standard">';
       $form['#suffix'] = '</div></div></div>';
-      $form['title'] = array(
+
+      $form['original_issue'] = array(
+        '#type' => 'fieldset',
+        '#title' => t('Original issue'),
+        '#description' => t('Note: changing any of these items will update the original issue description.'),
+        '#weight' => 3,
+      );
+
+      $form['original_issue']['title'] = array(
         '#type' => 'textfield',
         '#title' => t('Issue title'),
         '#maxlength' => 128,
         '#default_value' => $node->title,
         '#weight' => -30,
         '#required' => TRUE,
-        '#description' => '<em>'. t('Note: modifying this value will change the title of the entire issue, not your follow-up comment.') .'</em>',
       );
+
+      // Restructure the UI to de-emphasize the original project form inputs.
+      $form['original_issue']['project_info'] = $form['project_info'];
+      $form['original_issue']['issue_info'] = $form['issue_info'];
+      unset($form['project_info'], $form['issue_info']);
+
       // Mark necessary required fields now, as these aren't added in the initial
       // building of the project issue form.
       _project_issue_form_add_required_fields($form, FALSE);
Index: project_issue.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/project_issue/project_issue.module,v
retrieving revision 1.63
diff -u -p -r1.63 project_issue.module
--- project_issue.module	21 Oct 2007 19:01:19 -0000	1.63
+++ project_issue.module	21 Oct 2007 20:26:32 -0000
@@ -79,9 +79,11 @@ function project_issue_form_alter($form_
           $form['#pre_render'][] = 'project_issue_comment_pre_render';
         }
 
-        // Make sure the 'File attachments' fieldset is expanded.
+        // Make sure the 'File attachments' fieldset is expanded and before the
+        // original issue fieldset.
         if (isset($form['attachments'])) {
           $form['attachments']['#collapsed'] = FALSE;
+          $form['attachments']['#weight'] = 2;
         }
 
       }
