diff --git a/gxmail/pom.xml b/gxmail/pom.xml
index beabd76fd..1c7ce7a36 100644
--- a/gxmail/pom.xml
+++ b/gxmail/pom.xml
@@ -19,15 +19,15 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>com.sun.mail</groupId>
-            <artifactId>javax.mail</artifactId>
-            <version>1.6.2</version>
+        	<groupId>com.sun.mail</groupId>
+        	<artifactId>jakarta.mail</artifactId>
+        	<version>2.0.1</version>
         </dependency>
         <dependency>
             <groupId>javax.xml.ws</groupId>
             <artifactId>jaxws-api</artifactId>
             <version>2.3.1</version>
-        </dependency>
+        </dependency>        
     </dependencies>
 
     <build>
diff --git a/gxmail/src/main/java/com/genexus/internet/GXPOP3Session.java b/gxmail/src/main/java/com/genexus/internet/GXPOP3Session.java
index d22dfb5a9..984b6fb3f 100644
--- a/gxmail/src/main/java/com/genexus/internet/GXPOP3Session.java
+++ b/gxmail/src/main/java/com/genexus/internet/GXPOP3Session.java
@@ -25,7 +25,7 @@ public GXPOP3Session()
 	{
 		try
 		{		
-			Class c = Class.forName("javax.mail.Session");
+			Class c = Class.forName("jakarta.mail.Session");
 			session = new POP3SessionJavaMail();
 		}
 		catch(Throwable e)
diff --git a/gxmail/src/main/java/com/genexus/internet/GXSMTPSession.java b/gxmail/src/main/java/com/genexus/internet/GXSMTPSession.java
index edf448ce1..2ff63bd16 100644
--- a/gxmail/src/main/java/com/genexus/internet/GXSMTPSession.java
+++ b/gxmail/src/main/java/com/genexus/internet/GXSMTPSession.java
@@ -22,7 +22,7 @@ public GXSMTPSession()
 	{
 		try
 		{		
-			Class c = Class.forName("javax.mail.Session");
+			Class c = Class.forName("jakarta.mail.Session");
 			session = new SMTPSessionJavaMail();
 		}
 		catch(Throwable e)
diff --git a/gxmail/src/main/java/com/genexus/internet/POP3SessionJavaMail.java b/gxmail/src/main/java/com/genexus/internet/POP3SessionJavaMail.java
index f673ee522..0c3f1abb9 100644
--- a/gxmail/src/main/java/com/genexus/internet/POP3SessionJavaMail.java
+++ b/gxmail/src/main/java/com/genexus/internet/POP3SessionJavaMail.java
@@ -12,18 +12,18 @@
 import java.util.Hashtable;
 import java.util.Properties;
 
-import javax.mail.Flags;
-import javax.mail.Folder;
-import javax.mail.Header;
-import javax.mail.Message;
-import javax.mail.MessagingException;
-import javax.mail.Multipart;
-import javax.mail.NoSuchProviderException;
-import javax.mail.Part;
-import javax.mail.Session;
-import javax.mail.internet.InternetAddress;
-import javax.mail.internet.MimeMessage;
-import javax.mail.internet.MimeUtility;
+import jakarta.mail.Flags;
+import jakarta.mail.Folder;
+import jakarta.mail.Header;
+import jakarta.mail.Message;
+import jakarta.mail.MessagingException;
+import jakarta.mail.Multipart;
+import jakarta.mail.NoSuchProviderException;
+import jakarta.mail.Part;
+import jakarta.mail.Session;
+import jakarta.mail.internet.InternetAddress;
+import jakarta.mail.internet.MimeMessage;
+import jakarta.mail.internet.MimeUtility;
 
 import com.genexus.common.interfaces.SpecificImplementation;
 import com.sun.mail.pop3.POP3Folder;
diff --git a/gxmail/src/main/java/com/genexus/internet/SMTPSessionJavaMail.java b/gxmail/src/main/java/com/genexus/internet/SMTPSessionJavaMail.java
index 445d9b918..843c9db1c 100644
--- a/gxmail/src/main/java/com/genexus/internet/SMTPSessionJavaMail.java
+++ b/gxmail/src/main/java/com/genexus/internet/SMTPSessionJavaMail.java
@@ -2,15 +2,15 @@
 
 import java.io.*;
 import java.util.*;
-import javax.mail.*;
-import javax.mail.internet.InternetAddress;
-import javax.mail.internet.MimeMessage;
-import javax.mail.internet.MimeMultipart;
+import jakarta.mail.*;
+import jakarta.mail.internet.InternetAddress;
+import jakarta.mail.internet.MimeMessage;
+import jakarta.mail.internet.MimeMultipart;
 
 import com.genexus.CommonUtil;
 
-import javax.mail.internet.MimeBodyPart;
-import javax.activation.*;
+import jakarta.mail.internet.MimeBodyPart;
+import jakarta.activation.*;
 
 public final class SMTPSessionJavaMail implements GXInternetConstants,ISMTPSession
 {