Index: flag_abuse.module
===================================================================
--- flag_abuse.module	(revision 4513)
+++ flag_abuse.module	(working copy)
@@ -44,7 +44,7 @@
     // 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['flag_classes'] .= ' flag-abuse-reset';
       $vars['link_text'] = t('Reset flags');
       $vars['link_title'] = t('Remove all flags on this content');
     }
@@ -106,4 +106,33 @@
       $form['actions']['submit']['#value'] = t('Reset flags');
     }
   }
-}
\ No newline at end of file
+}
+
+/**
+ * Implementation of hook_form_FORM_ID_alter().
+ */
+function flag_abuse_form_flag_note_form_alter(&$form, &$form_state) {
+  global $user;
+  // Permmission check instead of a role.
+  if (user_access('reset abuse flags', $account)) {
+    $flag_name = $form['flag_note']['flag_name']['#value'];
+    // 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'));
+      foreach ($form['flag_note'] as $key => $element) {
+        if (substr($key, 0, 1) != '#') {
+          if (!in_array($key, array('action', 'flag_name', 'content_id', 'submit'))) {
+            unset($form['flag_note'][$key]);
+          }
+        }
+      }
+      // remove fieldset legend
+      unset($form['flag_note']['#title']);
+      $form['flag_note']['description'] = array(
+        '#value' => t('<p>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.</p>'),
+        '#weight' => -10,
+      );
+      $form['flag_note']['submit']['#value'] = t('Reset flags');
+    }
+  }
+}
Index: includes/flag_abuse.views_default.inc
===================================================================
--- includes/flag_abuse.views_default.inc	(revision 4514)
+++ includes/flag_abuse.views_default.inc	(working copy)
@@ -514,3 +514,139 @@
   ));
   $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;
+    }
+  }
+}