diff --git a/gxmail/pom.xml b/gxmail/pom.xml
index c1213a328..2ca63bc30 100644
--- a/gxmail/pom.xml
+++ b/gxmail/pom.xml
@@ -19,10 +19,15 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
-        	<groupId>com.sun.mail</groupId>
+        	<groupId>org.eclipse.angus</groupId>
         	<artifactId>jakarta.mail</artifactId>
-        	<version>2.0.1</version>
-        </dependency>        
+        	<version>2.0.3</version>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.mail</groupId>
+            <artifactId>jakarta.mail-api</artifactId>
+            <version>2.1.3</version>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/gxmail/src/main/java/com/genexus/internet/POP3SessionJavaMail.java b/gxmail/src/main/java/com/genexus/internet/POP3SessionJavaMail.java
index c496647bf..a50d5475b 100644
--- a/gxmail/src/main/java/com/genexus/internet/POP3SessionJavaMail.java
+++ b/gxmail/src/main/java/com/genexus/internet/POP3SessionJavaMail.java
@@ -24,8 +24,8 @@
 import jakarta.mail.internet.MimeUtility;
 
 import com.genexus.common.interfaces.SpecificImplementation;
-import com.sun.mail.pop3.POP3Folder;
-import com.sun.mail.pop3.POP3Store;
+import org.eclipse.angus.mail.pop3.POP3Folder;
+import org.eclipse.angus.mail.pop3.POP3Store;
 
 public class POP3SessionJavaMail implements GXInternetConstants, IPOP3Session {
 	public static final ILogger logger = LogManager.getLogger(POP3SessionJavaMail.class);
diff --git a/wrapperjakarta/pom.xml b/wrapperjakarta/pom.xml
index 081e17d78..2bd38e442 100644
--- a/wrapperjakarta/pom.xml
+++ b/wrapperjakarta/pom.xml
@@ -43,6 +43,10 @@
 					<groupId>com.sun.xml.fastinfoset</groupId>
 					<artifactId>FastInfoset</artifactId>
 				</exclusion>
+                <exclusion>
+                    <groupId>com.sun.mail</groupId>
+                    <artifactId>jakarta.mail</artifactId>
+                </exclusion>
 			</exclusions>			
 		</dependency>
         <dependency>
diff --git a/wrapperjavax/pom.xml b/wrapperjavax/pom.xml
index f9ef8c0f4..5367fa4db 100644
--- a/wrapperjavax/pom.xml
+++ b/wrapperjavax/pom.xml
@@ -98,6 +98,10 @@
 					<groupId>com.sun.xml.fastinfoset</groupId>
 					<artifactId>FastInfoset</artifactId>
 				</exclusion>
+                <exclusion>
+                    <groupId>com.sun.mail</groupId>
+                    <artifactId>jakarta.mail</artifactId>
+                </exclusion>
     	</exclusions>
 		</dependency>
     </dependencies>