Index: mailtool/src/java/org/sakaiproject/tool/mailtool/Mailtool.java
===================================================================
--- mailtool/src/java/org/sakaiproject/tool/mailtool/Mailtool.java	(revision 59057)
+++ mailtool/src/java/org/sakaiproject/tool/mailtool/Mailtool.java	(working copy)
@@ -786,23 +786,17 @@
 				.getString("smtp@org.sakaiproject.email.api.EmailService");
 		// String smtp_port = ServerConfigurationService.getString("smtp.port");
 		try {
-			Properties props = new Properties();
-			props.put("mail.smtp.host", smtp_server);
-			props.put("mail.smtp.sendpartial", "true");
-			// props.put("mail.smtp.port", smtp_port);
-			Session s = Session.getInstance(props, null);
-
 			MimeMessage message = new MimeMessage(s);
 
-			InternetAddress from = new InternetAddress(fromString);
+			InternetAddress from = new InternetAddress(fromEmail, fromDisplay);
 			message.setFrom(from);
+			message.setSentDate(new Date(System.currentTimeMillis()));
 			String reply = getReplyToSelected().trim().toLowerCase();
 			if (reply.equals("yes")) {
 				// "reply to sender" is default. So do nothing
 			} else if (reply.equals("no")) {
-				String noreply = getSiteTitle() + " <noreply@" + smtp_server
-						+ ">";
-				InternetAddress noreplyemail = new InternetAddress(noreply);
+				String noreply =  "noreply@" + smtp_server;
+				InternetAddress noreplyemail = new InternetAddress(noreply, getSiteTitle());
 				message.setFrom(noreplyemail);
 			} else if (reply.equals("otheremail")
 					&& getReplyToOtherEmail().equals("") != true) {
@@ -814,7 +808,6 @@
 			message.setSubject(MimeUtility.encodeText( subject, "UTF-8", "Q" ));
 			String text = m_body;
 			String attachmentdirectory = getUploadDirectory();
-
 			// Create the message part
 			MimeBodyPart messageBodyPart = new MimeBodyPart();