Index: lams_common/src/java/org/lamsfoundation/lams/util/Emailer.java
===================================================================
diff -u -r2ef18e4c87e2e7929950dbeb990c6715ef16c0c2 -red8a664168cd4bb221555d68f3df3b62bdcbeecf
--- lams_common/src/java/org/lamsfoundation/lams/util/Emailer.java	(.../Emailer.java)	(revision 2ef18e4c87e2e7929950dbeb990c6715ef16c0c2)
+++ lams_common/src/java/org/lamsfoundation/lams/util/Emailer.java	(.../Emailer.java)	(revision ed8a664168cd4bb221555d68f3df3b62bdcbeecf)
@@ -11,7 +11,7 @@
 import javax.mail.internet.InternetAddress;
 import javax.mail.internet.MimeMessage;
 
-import org.masukomi.aspirin.Aspirin;
+import org.masukomi.aspirin.core.MailQue;
 
 /**
  * A class that handles emails
@@ -47,8 +47,8 @@
      */
     public static Session getMailSession(Properties properties) {
 	Session session;
-	boolean useInternalSMTPServer = Boolean
-		.parseBoolean(Configuration.get(ConfigurationKeys.USE_INTERNAL_SMTP_SERVER));
+	boolean useInternalSMTPServer = Boolean.parseBoolean(Configuration
+		.get(ConfigurationKeys.USE_INTERNAL_SMTP_SERVER));
 	if (!useInternalSMTPServer) {
 	    String smtpServer = Configuration.get(ConfigurationKeys.SMTP_SERVER);
 	    properties.put("mail.smtp.host", smtpServer);
@@ -107,12 +107,12 @@
      *            whether the message is of HTML content-type or plain text
      */
     public static void send(String subject, String to, String toPerson, String from, String fromPerson, String body,
-	    boolean isHtmlFormat, Properties mailServerConfig)
-		    throws AddressException, MessagingException, UnsupportedEncodingException {
+	    boolean isHtmlFormat, Properties mailServerConfig) throws AddressException, MessagingException,
+	    UnsupportedEncodingException {
 
 	Session session = Emailer.getMailSession(mailServerConfig);
-	boolean useInternalSMTPServer = Boolean
-		.parseBoolean(Configuration.get(ConfigurationKeys.USE_INTERNAL_SMTP_SERVER));
+	boolean useInternalSMTPServer = Boolean.parseBoolean(Configuration
+		.get(ConfigurationKeys.USE_INTERNAL_SMTP_SERVER));
 
 	MimeMessage message = new MimeMessage(session);
 	message.setFrom(new InternetAddress(from, fromPerson));
@@ -123,7 +123,9 @@
 	message.addHeader("Content-Type", contentType);
 
 	if (useInternalSMTPServer) {
-	    Aspirin.add(message);
+	    MailQue myMailQue = new MailQue();
+	    myMailQue.queMail(message);
+
 	} else {
 	    Transport.send(message);
 	}