diff --git a/CS2JLibrary/.classpath b/CS2JLibrary/.classpath
index e4b673d..f1b88c0 100644
--- a/CS2JLibrary/.classpath
+++ b/CS2JLibrary/.classpath
@@ -1,8 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry exported="true" kind="lib" path="lib/commons-lang-2.4.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/commons-codec-1.4.jar"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry exported="true" kind="lib" path="lib/commons-lang-2.4.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/commons-codec-1.4.jar"/>
+	<classpathentry kind="lib" path="lib/mail.jar"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/CS2JLibrary/NetFramework/System/Net/Mail/MailMessage.xml b/CS2JLibrary/NetFramework/System/Net/Mail/MailMessage.xml
index 287880a..8ca3a8c 100644
--- a/CS2JLibrary/NetFramework/System/Net/Mail/MailMessage.xml
+++ b/CS2JLibrary/NetFramework/System/Net/Mail/MailMessage.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Class xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:www.twigletsoftware.com:schemas:txtemplate:1:0">
   <Imports>
-    <Import>RusticiSoftware.ScormContentPlayer.Util.MailMessage</Import>
+    <Import>RusticiSoftware.System.Net.Mail.MailMessage</Import>
   </Imports>
   <Java>MailMessage</Java>
   <Name>System.Net.Mail.MailMessage</Name>
diff --git a/CS2JLibrary/lib/README-3rdPARTY-LICENSES.txt b/CS2JLibrary/lib/README-3rdPARTY-LICENSES.txt
index e3b7ea9..094aaa9 100644
--- a/CS2JLibrary/lib/README-3rdPARTY-LICENSES.txt
+++ b/CS2JLibrary/lib/README-3rdPARTY-LICENSES.txt
@@ -1,5 +1,7 @@
-3rd Party Software                                License
+3rd Party Software                                         License
 
-commons-lang, commons-codec                       Apache 2.0
+commons-lang, commons-codec                Apache 2.0
 
-  
\ No newline at end of file
+mail jar                                                         Sun ENTITLEMENT (see http://kenai.com/projects/javamail/pages/License)
+
+  
diff --git a/CS2JLibrary/lib/mail.jar b/CS2JLibrary/lib/mail.jar
new file mode 100644
index 0000000..5954377
Binary files /dev/null and b/CS2JLibrary/lib/mail.jar differ
diff --git a/CS2JLibrary/src/RusticiSoftware/System/Net/Mail/MailMessage.java b/CS2JLibrary/src/RusticiSoftware/System/Net/Mail/MailMessage.java
new file mode 100755
index 0000000..d891a72
--- /dev/null
+++ b/CS2JLibrary/src/RusticiSoftware/System/Net/Mail/MailMessage.java
@@ -0,0 +1,66 @@
+package RusticiSoftware.System.Net.Mail;
+
+import javax.mail.internet.InternetAddress;
+import RusticiSoftware.System.Collections.ArrayListSupport;
+
+public class MailMessage 
+{
+
+    public MailMessage() throws Exception
+    {
+        _bcc = new ArrayListSupport();
+        _cc = new ArrayListSupport();
+        _to = new ArrayListSupport();
+    }
+    private ArrayListSupport _bcc;
+    private ArrayListSupport _cc;
+    private ArrayListSupport _to;
+    private String _body;
+    private InternetAddress _from;
+    private String _subject;
+
+    public ArrayListSupport getBcc() throws Exception
+    {
+        return _bcc;
+    }
+
+    public ArrayListSupport getCC() throws Exception
+    {
+        return _cc;
+    }
+
+    public ArrayListSupport getTo() throws Exception
+    {
+        return _to;
+    }
+
+    public String getBody() throws Exception
+    {
+        return _body;
+    }
+
+    public void setBody(String value) throws Exception
+    {
+        _body = value;
+    }
+
+    public InternetAddress getFrom() throws Exception
+    {
+        return _from;
+    }
+
+    public void setFrom(InternetAddress value) throws Exception
+    {
+        _from = value;
+    }
+
+    public String getSubject() throws Exception
+    {
+        return _subject;
+    }
+
+    public void setSubject(String value) throws Exception
+    {
+        _subject = value;
+    }
+}