diff --git a/framework/dependencies.yml b/framework/dependencies.yml
index fbeaaf7cd2..ab02258267 100644
--- a/framework/dependencies.yml
+++ b/framework/dependencies.yml
@@ -21,7 +21,7 @@ require:    &allDependencies
     - com.ning -> async-http-client 1.9.40
     - commons-beanutils 1.9.2 
     - commons-codec 1.10
-    - org.apache.commons -> commons-email 1.4
+    - org.apache.commons -> commons-email 1.5
     - commons-fileupload 1.3.2
     - commons-io 2.5
     - com.google.code.maven-play-plugin.org.apache.commons -> commons-javaflow 1590792
@@ -30,7 +30,7 @@ require:    &allDependencies
     - dom4j 1.6.1
     - com.h2database -> h2 1.4.196
     - javax.activation -> activation 1.1.1
-    - javax.mail -> mail 1.4.7
+    - com.sun.mail -> javax.mail 1.6.2
     - javax.inject 1.0
     - javax.validation -> validation-api 1.1.0.Final
     - jaxen 1.1.6
diff --git a/framework/lib/commons-email-1.4.jar b/framework/lib/commons-email-1.4.jar
deleted file mode 100644
index 99fd402837..0000000000
Binary files a/framework/lib/commons-email-1.4.jar and /dev/null differ
diff --git a/framework/lib/commons-email-1.5.jar b/framework/lib/commons-email-1.5.jar
new file mode 100644
index 0000000000..291bd194f4
Binary files /dev/null and b/framework/lib/commons-email-1.5.jar differ
diff --git a/framework/lib/javax.mail-1.6.2.jar b/framework/lib/javax.mail-1.6.2.jar
new file mode 100644
index 0000000000..0cd05289b6
Binary files /dev/null and b/framework/lib/javax.mail-1.6.2.jar differ
diff --git a/framework/lib/mail-1.4.7.jar b/framework/lib/mail-1.4.7.jar
deleted file mode 100644
index 236fcdb64d..0000000000
Binary files a/framework/lib/mail-1.4.7.jar and /dev/null differ