diff --git a/gxmail/src/main/java/com/genexus/internet/POP3SessionJavaMail.java b/gxmail/src/main/java/com/genexus/internet/POP3SessionJavaMail.java
index aca7c802f..f7a9208a3 100644
--- a/gxmail/src/main/java/com/genexus/internet/POP3SessionJavaMail.java
+++ b/gxmail/src/main/java/com/genexus/internet/POP3SessionJavaMail.java
@@ -6,12 +6,12 @@
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.PrintStream;
-import java.util.Arrays;
 import java.util.Enumeration;
 import java.util.Hashtable;
 import java.util.Properties;
 
+import com.genexus.diagnostics.core.ILogger;
+import com.genexus.diagnostics.core.LogManager;
 import jakarta.mail.Flags;
 import jakarta.mail.Folder;
 import jakarta.mail.Header;
@@ -31,9 +31,7 @@
 
 public class POP3SessionJavaMail  implements GXInternetConstants,IPOP3Session
 {
-
-	static private boolean DEBUG = GXInternetConstants.DEBUG;
-	static private PrintStream logOutput;
+	public static final ILogger logger = LogManager.getLogger(POP3SessionJavaMail.class);
 
 	private String user;
 	private String password;
@@ -57,21 +55,6 @@ public class POP3SessionJavaMail  implements GXInternetConstants,IPOP3Session
 	Message[] messages;
 	POP3Folder emailFolder;
 
-	static
-	{
-		if	(DEBUG)
-		{
-			try
-			{
-				logOutput = new PrintStream(new FileOutputStream(new File("_gx_pop3.log"), true));
-			}
-			catch (IOException e)
-			{
-				System.out.println("Can't open POP3 log file pop3.log");
-			}
-		}		
-	}
-
 	public POP3SessionJavaMail()
 	{
 	}
@@ -101,10 +84,9 @@ public void login(GXPOP3Session sessionInfo)
 		props.setProperty("mail.pop3.ssl.enable", String.valueOf(secureConnection));
 		
 		session = Session.getInstance(props);
-		if	(DEBUG)
+		if	(logger.isDebugEnabled())
 		{
 			session.setDebug(true);
-			session.setDebugOut(logOutput);
 		}		
 		try
 		{
@@ -407,8 +389,6 @@ public void setAttachmentsPath(String _attachmentsPath)
 	
 	private void log(String text)
 	{
-		if	(DEBUG)
-			if (logOutput != null)
-				logOutput.println(text);
+		logger.debug(text);
 	}
 }
\ No newline at end of file
diff --git a/gxmail/src/main/java/com/genexus/internet/SMTPSessionJavaMail.java b/gxmail/src/main/java/com/genexus/internet/SMTPSessionJavaMail.java
index 843c9db1c..1dd2bda20 100644
--- a/gxmail/src/main/java/com/genexus/internet/SMTPSessionJavaMail.java
+++ b/gxmail/src/main/java/com/genexus/internet/SMTPSessionJavaMail.java
@@ -8,15 +8,15 @@
 import jakarta.mail.internet.MimeMultipart;
 
 import com.genexus.CommonUtil;
+import com.genexus.diagnostics.core.ILogger;
+import com.genexus.diagnostics.core.LogManager;
 
 import jakarta.mail.internet.MimeBodyPart;
 import jakarta.activation.*;
 
 public final class SMTPSessionJavaMail implements GXInternetConstants,ISMTPSession
 {
-	static private boolean DEBUG = GXInternetConstants.DEBUG;
-	
-	static private PrintStream logOutput;
+	public static final ILogger logger = LogManager.getLogger(SMTPSessionJavaMail.class);
 
 	protected String host;
 	protected int port;
@@ -36,21 +36,6 @@ public final class SMTPSessionJavaMail implements GXInternetConstants,ISMTPSessi
 	private Session session;
 	private Transport t;
 	MimeMessage mailMessage;
-
-	static
-	{	
-		if	(DEBUG)
-		{
-			try
-			{
-				logOutput = new PrintStream(new FileOutputStream(new File("_gx_smtp.log"), true));
-			}
-			catch (IOException e)
-			{
-				System.out.println("Can't open SMTP log file smtp.log");
-			}
-		}
-	}
     	
 	public SMTPSessionJavaMail()
 	{
@@ -96,10 +81,9 @@ public void login(GXSMTPSession sessionInfo, boolean useTLS)
 			props.setProperty("mail.smtp.user", user);
 		}
 		session = Session.getInstance(props);
-		if	(DEBUG)
+		if	(logger.isDebugEnabled())
 		{
 			session.setDebug(true);
-			session.setDebugOut(logOutput);
 		}
 		try
 		{	
@@ -287,11 +271,6 @@ public void setAttachments(String attachments)
 
 	protected void log(String text)
 	{
-		if	(DEBUG)
-			if (logOutput != null)
-			{
-				logOutput.println(text);
-				logOutput.flush();
-			}
+		logger.debug(text);
 	}
 }
\ No newline at end of file