--- premium.module	2010-06-17 08:28:38.000000000 -0500
+++ premium.module.teaser-view-option	2010-06-17 09:25:30.000000000 -0500
@@ -56,7 +56,7 @@ function premium_nodeapi(&$node, $op, $t
       
     case 'view':
       if (!$node->premium_access) {
-        $node->content['body']['#value'] = theme('premium_body', $node);
+        $node->content['body']['#value'] = theme('premium_body', array("node" => $node, "teaser" => $teaser));
       }
       return;
   }
@@ -184,6 +184,14 @@ function premium_settings() {
     '#description' => t('Update all existing nodes of the types selected above with the new premium settings.'),
   );
   
+
+  $form['premium_message_in_teaser'] = array(
+    '#type'          => 'checkbox',
+    '#title'         => t('Display premium message in teaser view?'),
+    '#description'   => t('If selected, the premium message will only be displayed in a full node view'),
+    '#default_value' => variable_get('premium_message_in_teaser', TRUE)
+  );
+
   $form['premium_message'] = array(
     '#type'          => 'textarea', 
     '#title'         => t('Premium body text'), 
@@ -336,6 +344,12 @@ function premium_theme() {
 /**
  * Reformat the message body with a premium content message
  */
-function theme_premium_body($node) {
-  return check_markup($node->teaser, $node->format, FALSE) .'<div class="premium-message">'. check_markup(variable_get('premium_message', t('Full text available to premium subscribers only')), variable_get('premium_format', FILTER_FORMAT_DEFAULT), FALSE) .'</div>';
+function theme_premium_body($args) {
+  $node = $args["node"] ;
+  $teaser = $args["teaser"] ;
+  if ($teaser && !variable_get('premium_message_in_teaser', TRUE)) {
+    return check_markup($node->teaser, $node->format, FALSE) ;
+  } else {
+    return check_markup($node->teaser, $node->format, FALSE) .'<div class="premium-message">'. check_markup(variable_get('premium_message', t('Full text available to premium subscribers only')), variable_get('premium_format', FILTER_FORMAT_DEFAULT), FALSE) .'</div>';
+  }
 }
