Index: /main/waeup.kofa/trunk/src/waeup/kofa/browser/pages.py
===================================================================
--- /main/waeup.kofa/trunk/src/waeup/kofa/browser/pages.py	(revision 8414)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/browser/pages.py	(revision 8415)
@@ -260,4 +260,6 @@
 
 class EnquiriesForm(ContactAdminForm):
+    """Captcha'd page to let anonymous send emails to the administrator.
+    """
     grok.name('enquiries')
     grok.require('waeup.Public')
@@ -266,6 +268,17 @@
                           'fullname', 'email_from', 'body')
 
+    def update(self):
+        # Handle captcha
+        self.captcha = getUtility(ICaptchaManager).getCaptcha()
+        self.captcha_result = self.captcha.verify(self.request)
+        self.captcha_code = self.captcha.display(self.captcha_result.error_code)
+        return super(EnquiriesForm, self).update()
+
     @action(_('Send now'), style='primary')
     def send(self, *args, **data):
+        if not self.captcha_result.is_valid:
+            # Captcha will display error messages automatically.
+            # No need to flash something.
+            return
         kofa_utils = getUtility(IKofaUtils)
         success = kofa_utils.sendContactForm(
@@ -480,4 +493,5 @@
         self.widgets['title'].displayWidth = 30
         self.widgets['description'].height = 3
+        return
 
     @action(_('Save'), style='primary')
Index: /main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/contactform.pt
===================================================================
--- /main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/contactform.pt	(revision 8414)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/contactform.pt	(revision 8415)
@@ -18,8 +18,15 @@
   </tal:block>
 
-  <div tal:condition="view/availableActions">
-    <input tal:repeat="action view/actions"
-           tal:replace="structure action/render"
-           />
-  </div>
+  <tal:captcha condition="view/captcha_code|nothing">
+    <p tal:content="structure view/captcha_code"></p>
+    <p i18n:translate="">
+      Please solve the captcha to prevent misuse of this service.
+    </p>
+  </tal:captcha>
+
+    <div tal:condition="view/availableActions">
+      <input tal:repeat="action view/actions"
+             tal:replace="structure action/render"
+             />
+    </div>
 </form>
