diff -uNr old/data/plugin/action/EmailActivation.py new/data/plugin/action/EmailActivation.py
--- old/data/plugin/action/EmailActivation.py	2007-11-22 22:17:56.000000000 +0100
+++ new/data/plugin/action/EmailActivation.py	2008-03-29 19:51:54.000000000 +0100
@@ -31,4 +31,4 @@
     message, html = action(pagename, request)
     if message:
         pagename = request.cfg.page_front_page
-    Page.Page(request, pagename).send_page(request, msg=message)
+    Page.Page(request, pagename).send_page(msg=message)
diff -uNr old/data/plugin/action/__init__.py new/data/plugin/action/__init__.py
--- old/data/plugin/action/__init__.py	2007-04-09 03:24:06.000000000 +0200
+++ new/data/plugin/action/__init__.py	1970-01-01 01:00:00.000000000 +0100
@@ -1,5 +0,0 @@
-# -*- coding: iso-8859-1 -*-
-
-from MoinMoin.util import pysupport
-
-modules = pysupport.getPackageModules(__file__)
diff -uNr old/data/plugin/action/userform.py new/data/plugin/action/userform.py
--- old/data/plugin/action/userform.py	2007-11-22 22:17:56.000000000 +0100
+++ new/data/plugin/action/userform.py	2008-03-29 19:57:59.000000000 +0100
@@ -57,4 +57,5 @@
 	    new_message = userform_action(request, u)
 	    if new_message != None:
 		message = new_message
-    Page.Page(request, pagename).send_page(request, msg=message)
+    Page.Page(request, pagename).send_page(msg=message)
+
diff -uNr old/data/plugin/macro/EmailActivation.py new/data/plugin/macro/EmailActivation.py
--- old/data/plugin/macro/EmailActivation.py	2007-11-22 22:17:56.000000000 +0100
+++ new/data/plugin/macro/EmailActivation.py	2008-03-29 21:32:10.000000000 +0100
@@ -27,6 +27,7 @@
 from MoinMoin import user
 from MoinMoin import util
 from MoinMoin import wikiutil
+from MoinMoin.mail.sendmail import sendmail
 
 #
 # Macro entry point.
@@ -78,7 +79,7 @@
         u.disabled = 1
         u.valid = 0
         u.save()
-        mailok, msg = util.mail.sendmail(
+        mailok, msg = sendmail(
                 request, email_to, email_subject, email_text)
     return message
 
@@ -137,8 +138,8 @@
           <b>Thanks for coming back!</b>
         </font></p>
         <ul>
-          <li>Name: %(user-name)s.</li>
-          <li>Email: %(user-email)s.</li>
+          <li>Name: %(user-name)s</li>
+          <li>Email: %(user-email)s</li>
         </ul>
         <p>
           If these details are correct then click the
@@ -582,7 +583,7 @@
         email_data = emailActivation_email('activate', request, u, url)
         if email_data != None:
             email_to, email_subject, email_text, cookie_expire, message = email_data
-            mailok, msg = util.mail.sendmail(
+            mailok, msg = sendmail(
                   request, email_to, email_subject, email_text)
     return modified
 
@@ -599,7 +600,7 @@
         email_data = emailActivation_email('cancel', request, u, '')
         if email_data != None:
             email_to, email_subject, email_text, cookie_expire, message = email_data
-            mailok, msg = util.mail.sendmail(
+            mailok, msg = sendmail(
                   request, email_to, email_subject, email_text)
     return 1
 
diff -uNr old/underlay/pages/EmailActivation/revisions/00000000 new/underlay/pages/EmailActivation/revisions/00000000
--- old/underlay/pages/EmailActivation/revisions/00000000	2007-04-09 04:05:28.000000000 +0200
+++ new/underlay/pages/EmailActivation/revisions/00000000	2008-03-29 19:50:19.000000000 +0100
@@ -1,7 +1,7 @@
 = Activate your Wiki Account! =
 
-[[EmailActivation]]
+<<EmailActivation>>
 
 ----
 
-This page was generated by the [http://moinmoin.wikiwikiweb.de/RussellStuart/EmailActivation MoinMoin EmailActivation plugin].
+This page was generated by the [[http://moinmo.in/RussellStuart/EmailActivation|MoinMoin EmailActivation plugin]].