Index: lams_admin/.classpath
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/.classpath,v
diff -u -r1.6 -r1.7
--- lams_admin/.classpath	21 Jan 2010 08:18:32 -0000	1.6
+++ lams_admin/.classpath	9 Mar 2010 19:14:16 -0000	1.7
@@ -8,5 +8,6 @@
 	<classpathentry kind="var" path="JBOSS_HOME/common/lib/servlet-api.jar"/>
 	<classpathentry kind="var" path="JBOSS_HOME/common/lib/log4j.jar"/>
 	<classpathentry kind="var" path="JBOSS_HOME/common/lib/quartz.jar"/>
+	<classpathentry kind="var" path="JBOSS_HOME/common/lib/mail.jar"/>
 	<classpathentry kind="output" path="build/classes/java"/>
 </classpath>
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/EmailUserAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/Attic/EmailUserAction.java,v
diff -u -r1.1 -r1.2
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/EmailUserAction.java	6 Mar 2010 22:39:02 -0000	1.1
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/EmailUserAction.java	9 Mar 2010 19:14:16 -0000	1.2
@@ -26,6 +26,7 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.Properties;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -56,6 +57,7 @@
 import org.lamsfoundation.lams.usermanagement.UserOrganisationRole;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
+import org.lamsfoundation.lams.util.Emailer;
 import org.lamsfoundation.lams.util.LanguageUtil;
 import org.lamsfoundation.lams.util.MessageService;
 import org.lamsfoundation.lams.util.WebUtil;
@@ -129,7 +131,8 @@
 	
 	EmailUserAction.log.debug("Administrator " + administrator.getFirstName() + " " + administrator.getLastName()
 		+ " sent email to user " + user.getFirstName() + " " + user.getLastName() + ": \n[subject] " + subject + "\n[message] " + body);
-	eventNotificationService.sendMessage(new Long(userId), DeliveryMethodMail.getInstance(), subject, body);
+	Properties properties = new Properties();
+	Emailer.send(subject, user.getEmail(), administrator.getEmail(), body, properties);
 	
 	return mapping.findForward("usersearch");
     }