--- spam/spam.module	2008-12-26 18:26:16.000000000 +0100
+++ spam/spam.module	2008-12-30 20:16:02.000000000 +0100
@@ -1473,7 +1473,7 @@
  */
 function spam_spam_operations() {
   $operations = array(
-    'notspam' => array(
+    'not_spam' => array(
       'label' => t('Mark as not spam'),
       'callback' => 'spam_operations_callback',
       'callback arguments' => array('mark_as_not_spam'),
@@ -1495,7 +1495,7 @@
 /**
  * Callback function for admin mass editing spam.  Mark as spam.
  */
-function spam_operations_callback(&$form_state, $spam, $op) {
+function spam_operations_callback($spam, $op) {
   foreach ($spam as $content) {
     $pieces = explode('-', $content);
     if (drupal_strlen($pieces[0]) && is_numeric($pieces[1]) && drupal_strlen($op)) {
@@ -1704,7 +1704,7 @@
 
       if ($score >= variable_get('spam_threshold', SPAM_DEFAULT_THRESHOLD)) {
         $links['spam'] = array('title' => t('spam (@score)', array('@score' => $score)));
-        $links['mark-as-not-spam'] = array('href' => "spam/$type/$id/notspam", 'title' => t('mark as not spam'));
+        $links['mark-as-not-spam'] = array('href' => "spam/$type/$id/not_spam", 'title' => t('mark as not spam'));
       }
       else {
         $links['spam'] = array('title' => t('not spam (@score)', array('@score' => $score)));