diff -urp /Users/jbitner/Sites/contrib/flag_abuse/flag_abuse.module sites/all/modules/contrib/flag_abuse/flag_abuse.module
--- /Users/jbitner/Sites/contrib/flag_abuse/flag_abuse.module	2010-08-26 15:37:10.000000000 -0400
+++ sites/all/modules/contrib/flag_abuse/flag_abuse.module	2010-08-27 17:27:33.000000000 -0400
@@ -44,7 +44,6 @@ function flag_abuse_preprocess_flag(&$va
     // is this one of our abuse flags
     // @todo: should be dynamic
     if (in_array($vars['flag']->name, array('abuse_node', 'abuse_comment', 'abuse_user'))) {
-      $vars['action'] = 'reset';
       $vars['link_text'] = t('Reset flags');
       $vars['link_title'] = t('Remove all flags on this content');
     }
@@ -92,18 +91,38 @@ function flag_abuse_flag_access($flag, $
 }
 
 /**
- * Implementation of hook_form_FORM_ID_alter().
+ * Implementation of hook_form_alter().
  */
-function flag_abuse_form_flag_confirm_alter(&$form, &$form_state) {
+function flag_abuse_form_alter(&$form, &$form_state, $form_id) {
   global $user;
+  $account = $user;
+  $flag_name = $form['flag_name']['#value'];
+  $access = user_access('reset abuse flags', $account);
+  $abuse_flag = in_array($flag_name, array('abuse_node', 'abuse_comment', 'abuse_user'));
+  
+  // @todo: We could make these configurable.
+  $title = t('Flag reset');
+  $description = t('Are you sure you want to reset all offensive flag on this content? Once doing so, users will not be able to flag this content again.');
+  $button = t('Reset flags');
+  
   // Permmission check instead of a role.
-  if (user_access('reset abuse flags', $account)) {
-    $flag_name = $form['flag_name']['#value'];
+  if ($access) {
     // Is this one of our abuse flags?
-    if (in_array($flag_name, array('abuse_node', 'abuse_comment', 'abuse_user'))) {
-      drupal_set_title(t('Flag reset'));
-      $form['description']['#value'] = t('Are you sure you want to reset all offensive flag on this content? Once doing so, users will not be able to flag this content again.');
-      $form['actions']['submit']['#value'] = t('Reset flags');
+    if ($abuse_flag) {
+      // Standard flag confirmation form
+      if ($form_id == 'flag_confirm') {
+        drupal_set_title($title);
+        $form['description']['#value'] = $description;
+        $form['actions']['submit']['#value'] = $button;
+      }
+      // Support for flag note module
+      if ($form_id == 'flag_note_form') {
+        drupal_set_title(t('Flag reset'));
+        $form['note']['#title'] = $title;
+        $form['note']['#description'] = $description;
+        $form['submit']['#value'] = $button;
+      }
     }
   }
-}
\ No newline at end of file
+
+}
Only in /Users/jbitner/Sites/contrib/flag_abuse/includes: CVS
diff -urp /Users/jbitner/Sites/contrib/flag_abuse/includes/flag_abuse.views_default.inc sites/all/modules/contrib/flag_abuse/includes/flag_abuse.views_default.inc
--- /Users/jbitner/Sites/contrib/flag_abuse/includes/flag_abuse.views_default.inc	2010-08-26 11:41:56.000000000 -0400
+++ sites/all/modules/contrib/flag_abuse/includes/flag_abuse.views_default.inc	2010-08-27 17:28:32.000000000 -0400
@@ -514,3 +514,139 @@ function _flag_abuse_views_default_abuse
   ));
   $views[$view->name] = $view;
 }
+
+/**
+ * Implementation of hook_views_pre_view().
+ *
+ * Add in the flag note relationship and field handlers to our views.
+ */
+function flag_abuse_views_pre_view(&$view, &$display_id, &$args) {
+  if (module_exists('flag_note')) {
+    // Add in a relationship and field.
+    switch ($view->name) {
+      case 'all_flag_abuse_node':
+        $view->display['default']->handler->options['relationships']['flag_note_node_rel'] = array(
+          'label' => 'Flag note on node',
+          'required' => 1,
+          'flag' => 'abuse_node',
+          'user_scope' => 'any',
+          'id' => 'flag_note_node_rel',
+          'table' => 'node',
+          'field' => 'flag_note_node_rel',
+          'relationship' => 'none',
+        );
+        $view->display['default']->handler->options['fields']['note'] = array(
+          'label' => 'Note text',
+          'alter' => array(
+            'alter_text' => 0,
+            'text' => '',
+            'make_link' => 0,
+            'path' => '',
+            'link_class' => '',
+            'alt' => '',
+            'prefix' => '',
+            'suffix' => '',
+            'target' => '',
+            'help' => '',
+            'trim' => 0,
+            'max_length' => '',
+            'word_boundary' => 1,
+            'ellipsis' => 1,
+            'html' => 0,
+            'strip_tags' => 0,
+          ),
+          'empty' => '',
+          'hide_empty' => 0,
+          'empty_zero' => 0,
+          'exclude' => 0,
+          'id' => 'note',
+          'table' => 'flag_note',
+          'field' => 'note',
+          'relationship' => 'flag_note_node_rel',
+        );
+        break;
+      case 'all_flag_abuse_comment':
+        $view->display['default']->handler->options['relationships']['flag_note_comments_rel'] = array(
+          'label' => 'Flag note on comment',
+          'required' => 1,
+          'flag' => 'abuse_comment',
+          'user_scope' => 'any',
+          'id' => 'flag_note_comments_rel',
+          'table' => 'comments',
+          'field' => 'flag_note_comments_rel',
+          'relationship' => 'none',
+        );
+        $view->display['default']->handler->options['fields']['note'] = array(
+          'label' => 'Note text',
+          'alter' => array(
+            'alter_text' => 0,
+            'text' => '',
+            'make_link' => 0,
+            'path' => '',
+            'link_class' => '',
+            'alt' => '',
+            'prefix' => '',
+            'suffix' => '',
+            'target' => '',
+            'help' => '',
+            'trim' => 0,
+            'max_length' => '',
+            'word_boundary' => 1,
+            'ellipsis' => 1,
+            'html' => 0,
+            'strip_tags' => 0,
+          ),
+          'empty' => '',
+          'hide_empty' => 0,
+          'empty_zero' => 0,
+          'exclude' => 0,
+          'id' => 'note',
+          'table' => 'flag_note',
+          'field' => 'note',
+          'relationship' => 'flag_note_comments_rel',
+        );
+        break;
+      case 'all_flag_abuse_user':
+        $view->display['default']->handler->options['relationships']['flag_note_user_rel'] = array(
+          'label' => 'Flag note on user',
+          'required' => 1,
+          'flag' => 'abuse_user',
+          'user_scope' => 'any',
+          'id' => 'flag_note_user_rel',
+          'table' => 'users',
+          'field' => 'flag_note_user_rel',
+          'relationship' => 'none',
+        );
+        $view->display['default']->handler->options['fields']['note'] = array(
+          'label' => 'Note text',
+          'alter' => array(
+            'alter_text' => 0,
+            'text' => '',
+            'make_link' => 0,
+            'path' => '',
+            'link_class' => '',
+            'alt' => '',
+            'prefix' => '',
+            'suffix' => '',
+            'target' => '',
+            'help' => '',
+            'trim' => 0,
+            'max_length' => '',
+            'word_boundary' => 1,
+            'ellipsis' => 1,
+            'html' => 0,
+            'strip_tags' => 0,
+          ),
+          'empty' => '',
+          'hide_empty' => 0,
+          'empty_zero' => 0,
+          'exclude' => 0,
+          'id' => 'note',
+          'table' => 'flag_note',
+          'field' => 'note',
+          'relationship' => 'flag_note_user_rel',
+        );
+        break;
+    }
+  }
+}
\ No newline at end of file