Index: userreview.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/userreview/userreview.module,v
retrieving revision 1.7.2.4
diff -u -F^f -r1.7.2.4 userreview.module
--- userreview.module	4 Jul 2006 01:27:04 -0000	1.7.2.4
+++ userreview.module	21 Jul 2006 07:43:35 -0000
@@ -587,7 +587,9 @@ function userreview_view(&$node, $teaser
  * removed the "preview" button.
  */
 function userreview_form_alter($form_id, &$form) {
-  if ($form_id == 'userreview_node_form') {
+  $op = isset($_POST['op']) ? $_POST['op'] : '';
+  if ($form_id == 'userreview_node_form' && 
+    !(variable_get('node_preview', 0) && (form_get_errors() || $op != t('Preview')))) {
     unset($form['preview']);
   }
 }
@@ -667,10 +669,11 @@ function theme_userreview_teaser($node) 
  * gray background to set it apart from the reviewed node.
  */
 function theme_userreview_included_form($title, $form_html) {
+    $op = isset($_POST['op']) ? $_POST['op'] : '';
     $output = '';
     $display = array(
       '#collapsible' => variable_get('userreview_form_collapsible', true),
-      '#collapsed' => variable_get('userreview_form_collapsed', true),
+      '#collapsed' => variable_get('userreview_form_collapsed', true) && $op != t('Preview'),
       '#title' => $title,
       '#children' => $form_html
     );