diff --git a/build.gradle b/build.gradle
index ceaa4f1..c910109 100644
--- a/build.gradle
+++ b/build.gradle
@@ -12,7 +12,8 @@ repositories {
 dependencies {
     compile group: 'org.bouncycastle', name: 'bcmail-jdk15on', version: '1.53'
     compile group: 'org.bouncycastle', name: 'bcprov-jdk15on', version: '1.53'
-    compile group: 'javax.mail', name: 'mail', version: '1.4.4'
+    compile group: 'javax.mail', name: 'javax.mail-api', version: '1.5.4'
+    compile group: 'com.sun.mail', name: 'javax.mail', version: '1.5.4'
     testCompile group: 'junit', name: 'junit', version: '4.12'
 }
 
diff --git a/pom.xml b/pom.xml
index a0b5b7c..0f1bdb8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,10 +63,14 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
             <version>1.53</version>
         </dependency>
         <dependency>
-        <groupId>javax.mail</groupId>
-            <artifactId>mail</artifactId>
-            <version>1.4.4</version>
-            <scope>compile</scope>
+            <groupId>javax.mail</groupId>
+            <artifactId>javax.mail-api</artifactId>
+            <version>1.5.4</version>
+        </dependency>
+        <dependency>
+            <groupId>com.sun.mail</groupId>
+            <artifactId>javax.mail</artifactId>
+            <version>1.5.4</version>
         </dependency>
     </dependencies>