diff --git a/distribution/modules/build.xml b/distribution/modules/build.xml
index 3c87a2f543..308854c4d2 100755
--- a/distribution/modules/build.xml
+++ b/distribution/modules/build.xml
@@ -49,7 +49,6 @@
         <module-def name="org.bouncycastle">
             <maven-resource group="org.bouncycastle" artifact="bcprov-jdk15on"/>
             <maven-resource group="org.bouncycastle" artifact="bcpkix-jdk15on"/>
-            <maven-resource group="org.bouncycastle" artifact="bcmail-jdk15on"/>
         </module-def>
 
         <module-def name="org.keycloak.keycloak-broker-core">
diff --git a/distribution/modules/pom.xml b/distribution/modules/pom.xml
index aa14cb033a..714788eb19 100755
--- a/distribution/modules/pom.xml
+++ b/distribution/modules/pom.xml
@@ -145,11 +145,6 @@
             <artifactId>aesh</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.bouncycastle</groupId>
-            <artifactId>bcmail-jdk15on</artifactId>
-        </dependency>
-
     </dependencies>
 
     <build>
diff --git a/distribution/modules/src/main/resources/modules/org/bouncycastle/main/module.xml b/distribution/modules/src/main/resources/modules/org/bouncycastle/main/module.xml
index c32565fb26..6d41eebee4 100644
--- a/distribution/modules/src/main/resources/modules/org/bouncycastle/main/module.xml
+++ b/distribution/modules/src/main/resources/modules/org/bouncycastle/main/module.xml
@@ -3,7 +3,6 @@
 <module xmlns="urn:jboss:module:1.1" name="org.bouncycastle">
     <resources>
         <resource-root path="bcprov-jdk15on-1.50.jar"/>
-        <resource-root path="bcmail-jdk15on-1.50.jar"/>
         <resource-root path="bcpkix-jdk15on-1.50.jar"/>
     </resources>
     <dependencies>
diff --git a/pom.xml b/pom.xml
index e5552162af..45861e41bf 100755
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,6 @@
         <apacheds.codec.version>1.0.0-M23</apacheds.codec.version>
         <base64.version>2.3.8</base64.version>
         <bouncycastle.crypto.version>1.50</bouncycastle.crypto.version>
-        <bouncycastle.mail.version>1.50</bouncycastle.mail.version>
         <jackson.version>1.9.9</jackson.version>
         <keycloak.apache.httpcomponents.version>4.2.1</keycloak.apache.httpcomponents.version>
         <resteasy.version>2.3.7.Final</resteasy.version>
@@ -142,11 +141,6 @@
 			    <artifactId>bcpkix-jdk15on</artifactId>
                 <version>${bouncycastle.crypto.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.bouncycastle</groupId>
-                <artifactId>bcmail-jdk15on</artifactId>
-                <version>${bouncycastle.mail.version}</version>
-            </dependency>
             <dependency>
                 <groupId>net.iharder</groupId>
                 <artifactId>base64</artifactId>
diff --git a/testsuite/performance-web/pom.xml b/testsuite/performance-web/pom.xml
index 48d350f3cc..8c3a9178b8 100755
--- a/testsuite/performance-web/pom.xml
+++ b/testsuite/performance-web/pom.xml
@@ -97,14 +97,6 @@
                     <groupId>org.bouncycastle</groupId>
                     <artifactId>bcprov-jdk15on</artifactId>
                 </exclusion>
-                <exclusion>
-                    <groupId>org.bouncycastle</groupId>
-                    <artifactId>bcmail-jdk15on</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.bouncycastle</groupId>
-                    <artifactId>bcmail-jdk15</artifactId>
-                </exclusion>
                 <exclusion>
                     <groupId>org.apache.tika</groupId>
                     <artifactId>tika-parsers</artifactId>
diff --git a/testsuite/performance/pom.xml b/testsuite/performance/pom.xml
index f407cd3c2a..3ac443cece 100755
--- a/testsuite/performance/pom.xml
+++ b/testsuite/performance/pom.xml
@@ -85,14 +85,6 @@
                     <groupId>org.bouncycastle</groupId>
                     <artifactId>bcprov-jdk15on</artifactId>
                 </exclusion>
-                <exclusion>
-                    <groupId>org.bouncycastle</groupId>
-                    <artifactId>bcmail-jdk15on</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.bouncycastle</groupId>
-                    <artifactId>bcmail-jdk15</artifactId>
-                </exclusion>
                 <exclusion>
                     <groupId>org.apache.tika</groupId>
                     <artifactId>tika-parsers</artifactId>