Index: mollom.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/mollom/mollom.module,v
retrieving revision 1.2.2.110
diff -u -p -r1.2.2.110 mollom.module
--- mollom.module	3 Jan 2010 11:26:44 -0000	1.2.2.110
+++ mollom.module	4 Jan 2010 22:53:20 -0000
@@ -1030,6 +1030,11 @@ function mollom_validate_captcha($form, 
     'captcha_result' => $form_state['values']['mollom']['captcha'],
     'author_ip' => ip_address(),
   ));
+  // Store the response for #submit handlers.
+  $GLOBALS['mollom_response'] = array(
+    'session_id' => $form_state['mollom']['session_id'],
+    'spam' => (int) $result,
+  );
 
   // Explictly check for TRUE, since mollom.checkCaptcha() can also return an
   // error message (e.g. expired or invalid session_id).
@@ -1669,6 +1674,7 @@ function mollom_mail_alter(&$message) {
   // any mails sent by Drupal since they should never be reported as spam.
   $valid_ids = array('contact_page_mail', 'contact_page_copy', 'contact_user_mail', 'contact_user_copy');
   if (isset($GLOBALS['mollom_response']['session_id']) && in_array($message['id'], $valid_ids)) {
+    mollom_data_save('contact', $message['id']);
     $report_link = t('Report as inappropriate: @link', array(
       '@link' => url('mollom/report/session/' . $GLOBALS['mollom_response']['session_id'], array('absolute' => TRUE)),
     ));