diff --git email.module email.module
index ce852017fce33c82580c8a8b4835cb122f3d736c..657871c530a095a48c832c84963d7a28b1adc27d 100644
--- email.module
+++ email.module
@@ -365,9 +365,10 @@ function email_mail_page_form($form_state, $node, $field_name, $email) {
   $form['submit'] = array(
     '#type' => 'submit',
     '#value' => t('Send e-mail'),
-    '#validate' => array('email_mail_page_form_validate'),
     '#submit' => array('email_mail_page_form_submit'),
   );
+  $form['#validate'] = array('email_mail_page_form_validate');
+  
   return $form;
 }
 
@@ -478,3 +479,37 @@ function email_admin_settings() {
   );
   return system_settings_form($form);
 }
+/**
+ * Implementation of hook_mollom_form_list()
+ */
+function email_mollom_form_list() {
+  $forms['email_mail_page_form'] = array(
+    'title' => t('Email contact form'),
+  );
+
+  return $forms;
+}
+
+/**
+ * Implementation of hook_mollom_form_info()
+ */
+function email_mollom_form_info($form_id) {
+  switch ($form_id) {
+    case 'email_mail_page_form':
+      $form_info = array(
+        'mode' => MOLLOM_MODE_ANALYSIS,
+        'elements' => array(
+          'mail' => t('Sender e-mail address'),
+          'name' => t('Sender name'),
+          'subject' => t('Subject'),
+          'message' => t('Message'),
+        ),
+        'mapping' => array(
+          'post_title' => 'subject',
+          'author_name' => 'name',
+          'author_mail' => 'mail',
+        ),
+      );
+      return $form_info;
+  }
+}