Index: viewselect.inc
===================================================================
--- viewselect.inc	(revision 9)
+++ viewselect.inc	(working copy)
@@ -37,7 +37,10 @@
     'webform_viewselect_option_text' => array(
       'arguments' => array('rendered' => FALSE, 'row' => NULL, 'field' => NULL),
     ),
-   );
+    'webform_display_viewselect' => array(
+      'arguments' => array('element' => NULL),
+    ),
+  );
 }
 
 /**
@@ -245,9 +248,9 @@
     '#title' => $component['name'],
     '#weight' => $component['weight'],
     '#theme' => 'webform_display_viewselect',
-    '#theme_wrappers' => $format == 'html' ? array('webform_element') : array('webform_element_text'),
+    '#theme_wrappers' => $format == 'html' ? array('webform_element', 'webform_element_wrapper') : array('webform_element_text'),
     '#post_render' => array('webform_element_wrapper'),
-    '#component' => $component,
+    '#webform_component' => $component,
     '#format' => $format,
     '#value' => $value,
   );
@@ -564,4 +567,43 @@
   } else {
     return html_entity_decode(_webform_filter_xss($row['title'])); 
   }  
-}
\ No newline at end of file
+}
+
+/**
+ * Format the text output for this component.
+ */
+function theme_webform_display_viewselect($element) {
+  $component = $element['#webform_component'];
+
+  $items = array();
+  if ($component['extra']['multiple']) {
+    foreach ((array) $element['#value'] as $option_value) {
+      if ($option_value !== '') {
+        $items[] = $element['#format'] == 'html' ? _webform_filter_xss($option_value) : $option_value;
+      }
+    }
+  }
+  else {
+    if (count($element['#value']) && ($option_value = array_shift($element['#value'])) !== '') {
+      $items[] = $element['#format'] == 'html' ? _webform_filter_xss($option_value) : $option_value;
+    }
+  }
+
+  if ($element['#format'] == 'html') {
+    $output = count($items) > 1 ? theme('item_list', $items) : (isset($items[0]) ? $items[0] : ' ');
+  }
+  else {
+    if (count($items) > 1) {
+      foreach ($items as $key => $item) {
+        $items[$key] = ' - ' . $item;
+      }
+      $output = implode("\n", $items);
+    }
+    else {
+      $output = isset($items[0]) ? $items[0] : ' ';
+    }
+  }
+
+  return $output;
+}
+