Index: lams_common/src/java/org/lamsfoundation/lams/util/Emailer.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/util/Emailer.java,v
diff -u -r1.3.2.2 -r1.3.2.3
--- lams_common/src/java/org/lamsfoundation/lams/util/Emailer.java	16 Oct 2010 11:24:51 -0000	1.3.2.2
+++ lams_common/src/java/org/lamsfoundation/lams/util/Emailer.java	22 Oct 2010 13:40:32 -0000	1.3.2.3
@@ -111,18 +111,22 @@
 	throws AddressException, MessagingException, UnsupportedEncodingException {
 
 		Session session = getMailSession(mailServerConfig);
-		MimeMessage message = new MimeMessage(session);
+		boolean useInternalSMTPServer = Boolean.parseBoolean(Configuration.get(ConfigurationKeys.USE_INTERNAL_SMTP_SERVER));
 		
+		MimeMessage message = new MimeMessage(session);
 		message.setFrom(new InternetAddress(from, fromPerson));
 		message.addRecipient(RecipientType.TO, new InternetAddress(to, toPerson));
-		message.setSubject(subject);
-		message.setText(body);
-
-		boolean useInternalSMTPServer = Boolean.parseBoolean(Configuration.get(ConfigurationKeys.USE_INTERNAL_SMTP_SERVER));
 		if (useInternalSMTPServer) {
+			message.setSubject(subject);
+			message.setText(body);
+			
 			MailQue myMailQue = new MailQue();
 			myMailQue.queMail(message);	    
 		} else {
+			message.setSubject(subject, "UTF-8");
+			message.setText(body, "UTF-8");
+			message.addHeader("Content-Type", "text/plain; charset=UTF-8");
+		    
 			Transport.send(message);    
 		}