Index: lams_admin/.classpath
===================================================================
diff -u -r109a71a895d44a4bb8294b9b4c127e741cb2f772 -r9414a312296ddf8c3992a6207a2ce21cdb56c95f
--- lams_admin/.classpath	(.../.classpath)	(revision 109a71a895d44a4bb8294b9b4c127e741cb2f772)
+++ lams_admin/.classpath	(.../.classpath)	(revision 9414a312296ddf8c3992a6207a2ce21cdb56c95f)
@@ -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
===================================================================
diff -u -r389bb9c0679d86c2446517dbe83a46b6ab5dc840 -r9414a312296ddf8c3992a6207a2ce21cdb56c95f
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/EmailUserAction.java	(.../EmailUserAction.java)	(revision 389bb9c0679d86c2446517dbe83a46b6ab5dc840)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/EmailUserAction.java	(.../EmailUserAction.java)	(revision 9414a312296ddf8c3992a6207a2ce21cdb56c95f)
@@ -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");
     }