diff --git a/comment_timer.install b/comment_timer.install
index 02ce9ff..44d2713 100644
--- a/comment_timer.install
+++ b/comment_timer.install
@@ -24,6 +24,14 @@ function comment_timer_schema() {
         'not null' => TRUE,
         'default' => 0,
       ),
+      'status' => array(
+        'type' => 'int',
+        'unsigned' => TRUE,
+        'not null' => TRUE,
+        'default' => 1,
+        'size' => 'tiny',
+        'description' => 'The status of a comment time. (0 = Excluded from node time, 1 = Included in node time)',
+      ),
     ),
     'primary key' => array('cid'),
     'indexes' => array(
@@ -86,3 +94,20 @@ function comment_timer_uninstall() {
     variable_del('comment_timer_comment_label_' . $node_type->type);
   }
 }
+
+/**
+ * Create status colum for {comment_timer_comment} and set it to 1.
+ */
+function comment_timer_update_7000() {
+  // Add the status column to comment_timer_comment.
+  $status = array(
+    'type' => 'int',
+    'unsigned' => TRUE,
+    'not null' => TRUE,
+    'default' => 1,
+    'size' => 'tiny',
+    'description' => 'The status of a comment time. (0 = Excluded from node time, 1 = Included in node time)',
+    'initial' => 1,
+  );
+  db_add_field( 'comment_timer_comment', 'status', $status);
+}
diff --git a/comment_timer.module b/comment_timer.module
index a7d9f09..de5c2d5 100644
--- a/comment_timer.module
+++ b/comment_timer.module
@@ -74,6 +74,11 @@ function comment_timer_field_extra_fields() {
         'description' => t('Time spent on this comment.'),
         'weight' => 0,
       );
+      $return['comment']['comment_node_' . $type->type]['display']['comment_time_inclusion'] = array(
+        'label' => t('Comment time inclusion'),
+        'description' => t('Link to include/exclude comment time in node time.'),
+        'weight' => 0,
+      );
       $return['node'][$type->type]['display']['comment_timer'] = array(
         'label' => t('Comment timer'),
         'description' => t('Total time spent on this node\'s comments.'),
@@ -111,7 +116,7 @@ function _comment_timer_hms_to_seconds($string) {
 /**
  * Add comment timer elements to a form.
  */
-function _comment_timer_form_timer(&$form, $seconds = 0) {
+function _comment_timer_form_timer(&$form, $seconds = 0, $status = 1) {
   if (user_access('access comment timer')) {
     // Add a fieldset to contain everything comment_timer related.
     $form['comment_timer'] = array(
@@ -139,6 +144,14 @@ function _comment_timer_form_timer(&$form, $seconds = 0) {
       // This is the ID the JS works on.
       '#id' => 'edit-comment-timer-counter',
     );
+    $form['comment_timer']['status'] = array(
+      '#type' => 'select',
+      '#default_value' => $status,
+      '#options' => array(
+        1 => t('Include in node time'),
+        0 => t('Exclude from node time'),
+      ),
+    );
     $form['comment_timer']['reset'] = array(
       '#type' => 'button',
       '#value' => t('Reset'),
@@ -171,22 +184,26 @@ function comment_timer_form_comment_form_alter(&$form, &$form_state, $form_id) {
       else {
         $seconds = _comment_timer_hms_to_seconds($form_state['values']['comment_timer']['seconds']);
       }
+      $status = $form_state['values']['comment_timer']['status'];
     }
     else {
       // If the form is simply displayed, retrieve timing information from
       // the DB.
       if (isset($form['cid']) && is_array($form['cid']) && isset($form['cid']['#value'])) {
-        $seconds = db_select('comment_timer_comment', 'ctc')
-          ->fields('ctc', array('seconds'))
+        $comment_time_properties = db_select('comment_timer_comment', 'ctc')
+          ->fields('ctc', array('seconds', 'status'))
           ->condition('cid', $form['cid']['#value'])
           ->execute()
-          ->fetchField();
+          ->fetchAssoc();
+        $seconds = $comment_time_properties['seconds'];
+        $status = $comment_time_properties['status'];
       }
       else {
         $seconds = 0;
+        $status = 1;
       }
     }
-    _comment_timer_form_timer($form, $seconds);
+    _comment_timer_form_timer($form, $seconds, $status);
     $form['#validate'][] = 'comment_timer_form_validate';
   }
 }
@@ -225,10 +242,20 @@ function _comment_timer_retrieve_seconds($comment) {
 function comment_timer_comment_insert($comment) {
   // Do not try to save anything if comment_timer is disabled for this comment.
   if (isset($comment->comment_timer)) {
-    $comment_timer = array(
-      'cid' => $comment->cid,
-      'seconds' => _comment_timer_retrieve_seconds($comment),
-    );
+    if (is_array($comment->comment_timer)) {
+      $comment_timer = array(
+        'cid' => $comment->cid,
+        'seconds' => _comment_timer_retrieve_seconds($comment),
+        'status' => $comment->comment_timer['status'],
+      );
+    }
+    else {
+       $comment_timer = array(
+        'cid' => $comment->cid,
+        'seconds' => $comment->comment_timer,
+        'status' => $comment->comment_timer_status,
+      );
+    }
     drupal_write_record('comment_timer_comment', $comment_timer);
     _comment_alter_update_node_timer($comment->nid);
   }
@@ -239,11 +266,12 @@ function comment_timer_comment_insert($comment) {
  */
 function comment_timer_comment_load($comments) {
   $result = db_select('comment_timer_comment', 'ctc')
-    ->fields('ctc', array('cid', 'seconds'))
+    ->fields('ctc', array('cid', 'seconds', 'status'))
     ->condition('cid', array_keys($comments), 'IN')
     ->execute();
   foreach ($result as $row) {
     $comments[$row->cid]->comment_timer = $row->seconds;
+    $comments[$row->cid]->comment_timer_status = $row->status;
   }
 }
 
@@ -258,19 +286,113 @@ function comment_timer_comment_view($comment, $view_mode, $langcode) {
     $seconds = $comment->comment_timer;
     if (is_array($comment->comment_timer)) {
       $seconds = _comment_timer_retrieve_seconds($comment);
+      $status = $comment->comment_timer['status'];
+    }
+    else {
+      $status = $comment->comment_timer_status;
     }
+
     $comment->content['comment_timer'] = array(
       '#theme' => 'comment_timer_hhmmss',
       '#seconds' => $seconds,
+      '#status' => $status,
       '#label' => t('Time spent on this comment'),
       '#label_display' => variable_get('comment_timer_comment_label_' . substr($comment->node_type, 13), 'above'),
       '#prefix' => '<div class="comment-timer-data">',
       '#suffix' => '</div>',
     );
+    $field_view_mode_settings = field_view_mode_settings('comment', $comment->node_type);
+    $real_view_mode = $field_view_mode_settings[$view_mode]['custom_settings'] ? $view_mode : 'default';
+    $field_info_extra_fields = field_info_extra_fields('comment', 'comment_node_issue', 'display');
+    if ($field_info_extra_fields['comment_time_inclusion']['display'][$real_view_mode]['visible']) {
+      if (comment_access('edit', $comment)) {
+        drupal_add_js('misc/ajax.js');
+        $comment->content['links']['comment_timer'] = array(
+          '#theme' => 'links',
+          '#links' => array(
+            'comment-timer-inclusion' => comment_timer_status_link_array($comment),
+          ),
+        );
+      }
+      else {
+        $markup = '<span class="comment-timer-status comment-timer-status-noedit comment-timer-status-' . $comment->comment_timer_status . '">';
+        $markup .= $comment->comment_timer_status ? t('Included in total issue time') : t('Excluded from total issue time');
+        $markup .= '</span>';
+        $comment->content['links']['comment_timer'] = array(
+          '#theme' => 'links',
+          '#links' => array(
+            'comment-timer-inclusion' => array(
+              'title' => $markup,
+              'html' => TRUE,
+            ),
+          ),
+        );
+      }
+    }
   }
 }
 
 /**
+ * Create the ingredients of a comment timer status ajax link.
+ */
+function comment_timer_status_link_array($comment) {
+  return array(
+    'title' => $comment->comment_timer_status ? t('Exclude from issue total time') : t('Include in issue total time'),
+    'href' => 'comment-timer-inclusion-toggle/' . $comment->cid . '/nojs',
+    'attributes' => array(
+      'class' => array('use-ajax'),
+    ),
+  );
+}
+
+/**
+ * Implements hook_menu().
+ */
+function comment_timer_menu() {
+  $items = array();
+  $items['comment-timer-inclusion-toggle/%comment'] = array(
+    'title' => 'Toggle comment timer inclusion',
+    'page callback' => 'comment_timer_inclusion_toggler',
+    'page arguments' => array(1),
+    'access callback' => 'comment_access',
+    'access arguments' => array('edit', 1),
+    'type' => MENU_CALLBACK,
+  );
+  return $items;
+}
+
+/**
+ * Menu callback to toggle the comment time status property.
+ */
+function comment_timer_inclusion_toggler($comment, $type = 'ajax') {
+  if ($comment->comment_timer_status == 0) {
+    $comment->comment_timer_status = 1;
+  }
+  else {
+    $comment->comment_timer_status = 0;
+  }
+  comment_save($comment);
+  if ($type == 'ajax') {
+    $link = comment_timer_status_link_array($comment);
+    $node = node_load($comment->nid, NULL, TRUE);
+    $time = array(
+      '#theme' => 'comment_timer_hhmmss',
+      '#seconds' => isset($node->comment_timer) ? $node->comment_timer : 0,
+      '#label_display' => 'hidden',
+    );
+    $commands = array();
+    $commands[] = ajax_command_html('#comment-' . $comment->cid . '+div .comment-timer-inclusion', l($link['title'], $link['href'], array('attributes' => $link['attributes'])));
+    drupal_alter('comment_timer_commands', $commands, $time);
+    $page = array('#type' => 'ajax', '#commands' => $commands);
+    ajax_deliver($page);
+  }
+  else {
+    drupal_goto('node/' . $comment->nid);
+  }
+}
+
+
+/**
  * Implements hook_comment_delete().
  */
 function comment_timer_comment_delete($comment) {
@@ -291,11 +413,21 @@ function comment_timer_comment_delete($comment) {
 function comment_timer_comment_update($comment) {
   // Do not try to save anything if comment_timer is disabled for this comment.
   if (isset($comment->comment_timer)) {
+    if (is_array($comment->comment_timer)) {
+      $comment_timer = array(
+        'seconds' => _comment_timer_retrieve_seconds($comment),
+        'status' => $comment->comment_timer['status'],
+      );
+    }
+    else {
+      $comment_timer = array(
+        'seconds' => $comment->comment_timer,
+        'status' => $comment->comment_timer_status,
+      );
+    }
     db_merge('comment_timer_comment')
       ->key(array('cid' => $comment->cid))
-      ->fields(array(
-        'seconds' => _comment_timer_retrieve_seconds($comment),
-      ))
+      ->fields($comment_timer)
       ->execute();
     _comment_alter_update_node_timer($comment->nid);
   }
@@ -310,7 +442,8 @@ function comment_timer_comment_update($comment) {
 function _comment_alter_update_node_timer($nid) {
   $query = db_select('comment', 'c')
     ->condition('c.nid', $nid);
-  $query->innerJoin('comment_timer_comment', 'ctc', 'c.cid = %alias.cid');
+  $ctc_alias = $query->innerJoin('comment_timer_comment', 'ctc', 'c.cid = %alias.cid');
+  $query = $query->condition("{$ctc_alias}.status", 1);
   $query->addExpression('SUM(seconds)', 'sumseconds');
   $seconds = $query->execute()->fetchField();
   db_merge('comment_timer_node')
diff --git a/views/comment_timer.views.inc b/views/comment_timer.views.inc
index bb8a8cc..c232e4c 100644
--- a/views/comment_timer.views.inc
+++ b/views/comment_timer.views.inc
@@ -30,6 +30,20 @@ function comment_timer_views_data() {
       'handler' => 'views_handler_filter_numeric',
     ),
   );
+  $data['comment_timer_comment']['status'] = array(
+    'title' => t('Time status'),
+    'help' => t('The status of the comment time.'),
+    'field' => array(
+      'handler' => 'views_handler_field_boolean',
+      'click sortable' => TRUE,
+    ),
+    'sort' => array(
+      'handler' => 'views_handler_sort',
+    ),
+    'filter' => array(
+      'handler' => 'views_handler_filter_boolean_operator',
+    ),
+  );
   $data['comment_timer_node']['table']['group'] = t('Content');
   $data['comment_timer_node']['table']['join'] = array(
     'node' => array(