diff --git a/ballerina/Ballerina.toml b/ballerina/Ballerina.toml
old mode 100755
new mode 100644
index e74a9372..5acd6c68
--- a/ballerina/Ballerina.toml
+++ b/ballerina/Ballerina.toml
@@ -1,7 +1,7 @@
 [package]
 org = "ballerina"
 name = "email"
-version = "2.8.0"
+version = "2.8.1"
 authors = ["Ballerina"]
 keywords = ["email", "SMTP", "POP", "POP3", "IMAP", "mail"]
 repository = "https://github.com/ballerina-platform/module-ballerina-email"
@@ -30,15 +30,21 @@ artifactId = "mimepull"
 version = "1.9.11"
 path = "./lib/mimepull-1.9.11.jar"
 
+[[platform.java11.dependency]]
+groupId = "javax.activation"
+artifactId = "activation"
+version = "1.1.1"
+path = "./lib/activation-1.1.1.jar"
+
 [[platform.java11.dependency]]
 groupId = "io.ballerina.stdlib"
 artifactId = "email-native"
-version = "2.8.0"
-path = "../native/build/libs/email-native-2.8.0.jar"
+version = "2.8.1"
+path = "../native/build/libs/email-native-2.8.1-SNAPSHOT.jar"
 
 [[platform.java11.dependency]]
 groupId = "io.ballerina.stdlib"
 artifactId = "email-test-utils"
-version = "2.8.0"
-path = "../test-utils/build/libs/email-test-utils-2.8.0.jar"
+version = "2.8.1"
+path = "../test-utils/build/libs/email-test-utils-2.8.1-SNAPSHOT.jar"
 scope = "testOnly"
diff --git a/ballerina/CompilerPlugin.toml b/ballerina/CompilerPlugin.toml
index 54c82f32..17680898 100755
--- a/ballerina/CompilerPlugin.toml
+++ b/ballerina/CompilerPlugin.toml
@@ -3,4 +3,4 @@ id = "email-compiler-plugin"
 class = "io.ballerina.stdlib.email.compiler.EmailCompilerPlugin"
 
 [[dependency]]
-path = "../compiler-plugin/build/libs/email-compiler-plugin-2.8.0.jar"
+path = "../compiler-plugin/build/libs/email-compiler-plugin-2.8.1-SNAPSHOT.jar"
diff --git a/ballerina/Dependencies.toml b/ballerina/Dependencies.toml
index 1f9526b6..9e64a5d2 100644
--- a/ballerina/Dependencies.toml
+++ b/ballerina/Dependencies.toml
@@ -10,7 +10,7 @@ distribution-version = "2201.7.0"
 [[package]]
 org = "ballerina"
 name = "email"
-version = "2.8.0"
+version = "2.8.1"
 dependencies = [
 	{org = "ballerina", name = "jballerina.java"},
 	{org = "ballerina", name = "lang.runtime"},
@@ -119,7 +119,7 @@ dependencies = [
 [[package]]
 org = "ballerina"
 name = "log"
-version = "2.8.0"
+version = "2.8.1"
 dependencies = [
 	{org = "ballerina", name = "io"},
 	{org = "ballerina", name = "jballerina.java"},
diff --git a/ballerina/build.gradle b/ballerina/build.gradle
index 829a0f5a..4795ef3b 100644
--- a/ballerina/build.gradle
+++ b/ballerina/build.gradle
@@ -78,6 +78,9 @@ dependencies {
     externalJars(group: 'org.jvnet.mimepull', name: 'mimepull', version: "${mimepullVersion}") {
         transitive = false
     }
+    externalJars(group: 'javax.activation', name: 'activation', version: "${javaxActivationVersion}") {
+        transitive = false
+    }
 }
 
 task updateTomlFiles {
diff --git a/build-config/resources/Ballerina.toml b/build-config/resources/Ballerina.toml
index ed74cc2b..38577de2 100644
--- a/build-config/resources/Ballerina.toml
+++ b/build-config/resources/Ballerina.toml
@@ -30,6 +30,12 @@ artifactId = "mimepull"
 version = "1.9.11"
 path = "./lib/mimepull-1.9.11.jar"
 
+[[platform.java11.dependency]]
+groupId = "javax.activation"
+artifactId = "activation"
+version = "1.1.1"
+path = "./lib/activation-1.1.1.jar"
+
 [[platform.java11.dependency]]
 groupId = "io.ballerina.stdlib"
 artifactId = "email-native"
diff --git a/gradle.properties b/gradle.properties
index 1db4fc04..be3adacd 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,6 +4,7 @@ version=2.8.1-SNAPSHOT
 slf4jVersion=1.7.30
 testngVersion=7.4.0
 javaMailVersion=1.6.2
+javaxActivationVersion=1.1.1
 greenmailVersion=1.5.11
 mimepullVersion=1.9.11
 puppycrawlCheckstyleVersion=8.18
diff --git a/native/src/main/java/io/ballerina/stdlib/email/client/EmailAccessClient.java b/native/src/main/java/io/ballerina/stdlib/email/client/EmailAccessClient.java
index 318f4822..3fe0d97c 100644
--- a/native/src/main/java/io/ballerina/stdlib/email/client/EmailAccessClient.java
+++ b/native/src/main/java/io/ballerina/stdlib/email/client/EmailAccessClient.java
@@ -53,20 +53,6 @@ public class EmailAccessClient {
 
     private EmailAccessClient() {}
 
-    static {
-        Class<?> hostNameCheckerClass = null;
-        try {
-            hostNameCheckerClass = Class.forName(EmailConstants.HOSTNAME_CHECKER_CLASS);
-        } catch (ClassNotFoundException e) {
-            log.error("sun.security.util.HostnameChecker class was not found from EmailAccessClient.");
-        }
-        if (hostNameCheckerClass != null) {
-            String hostNameCheckerPackageName = hostNameCheckerClass.getPackageName();
-            Module emailAccessClientModule = EmailAccessClient.class.getModule();
-            hostNameCheckerClass.getModule().addOpens(hostNameCheckerPackageName, emailAccessClientModule);
-        }
-    }
-
     /**
      * Initializes the BObject object with the POP properties.
      * @param clientEndpoint Represents the POP Client class
diff --git a/native/src/main/java/io/ballerina/stdlib/email/client/SmtpClient.java b/native/src/main/java/io/ballerina/stdlib/email/client/SmtpClient.java
index 345fd0c4..57092c9b 100644
--- a/native/src/main/java/io/ballerina/stdlib/email/client/SmtpClient.java
+++ b/native/src/main/java/io/ballerina/stdlib/email/client/SmtpClient.java
@@ -47,20 +47,6 @@ public class SmtpClient {
 
     private SmtpClient() {}
 
-    static {
-        Class<?> hostNameCheckerClass = null;
-        try {
-            hostNameCheckerClass = Class.forName(EmailConstants.HOSTNAME_CHECKER_CLASS);
-        } catch (ClassNotFoundException e) {
-            log.error("sun.security.util.HostnameChecker class was not found from SmtpClient.");
-        }
-        if (hostNameCheckerClass != null) {
-            String hostNameCheckerPackageName = hostNameCheckerClass.getPackageName();
-            Module smtpClientModule = SmtpClient.class.getModule();
-            hostNameCheckerClass.getModule().addOpens(hostNameCheckerPackageName, smtpClientModule);
-        }
-    }
-
     /**
      * Initializes the BObject object with the SMTP Properties.
      * @param clientEndpoint Represents the SMTP Client class