Index: faq.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/faq/faq.module,v
retrieving revision 1.1.4.52.2.106
diff -u -p -r1.1.4.52.2.106 faq.module
--- faq.module	24 Jun 2009 11:56:03 -0000	1.1.4.52.2.106
+++ faq.module	24 Jun 2009 15:45:29 -0000
@@ -295,10 +295,6 @@ function faq_view($node, $teaser = FALSE
   $node->detailed_question = check_markup($node->detailed_question, $node->format, FALSE);
   $content = $node->content['body']['#value'];
 
-  $question_length = variable_get('faq_question_length', 'short');
-  if (!empty($node->detailed_question) && $question_length == 'both') {
-    $node->content['body']['#value'] = '<div class="faq-detailed-question">'. $node->detailed_question .'</div>'. $content;
-  }
   return $node;
 }
 
@@ -1072,6 +1068,10 @@ function faq_view_question(&$data, $node
       $question = l($node->title, "node/$node->nid", array("attributes" => array("name" => "$anchor", "id" => "$anchor")));
     }
   }
+
+  if (!empty($node->detailed_question) && variable_get('faq_question_length', 'short') == 'both') {
+    $question .= '<div class="faq-detailed-question">'. $node->detailed_question .'</div>';
+  }
   $data['question'] = $question;
 }