diff --git a/duniter4j-core-shared/pom.xml b/duniter4j-core-shared/pom.xml
index 99e919fdc48763088d4453cde7ad69ad7b3ab3fb..ed6782c279f2f3ba416de424006393d213e6adb3 100644
--- a/duniter4j-core-shared/pom.xml
+++ b/duniter4j-core-shared/pom.xml
@@ -83,8 +83,12 @@
 
     </dependency>
     <dependency>
-      <groupId>javax.mail</groupId>
-      <artifactId>mail</artifactId>
+      <groupId>jakarta.mail</groupId>
+      <artifactId>jakarta.mail-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.sun.mail</groupId>
+      <artifactId>jakarta.mail</artifactId>
     </dependency>
 
     <!-- Unit test -->
diff --git a/duniter4j-core-shared/src/main/java/org/duniter/core/service/MailServiceImpl.java b/duniter4j-core-shared/src/main/java/org/duniter/core/service/MailServiceImpl.java
index f6fd0ace6401d1761bd4ddf2a27fba344502b161..5c1771767c45a47ca123134fec8ed76ba594183a 100644
--- a/duniter4j-core-shared/src/main/java/org/duniter/core/service/MailServiceImpl.java
+++ b/duniter4j-core-shared/src/main/java/org/duniter/core/service/MailServiceImpl.java
@@ -28,6 +28,8 @@ import org.duniter.core.model.SmtpConfig;
 import org.duniter.core.util.CollectionUtils;
 import org.duniter.core.util.Preconditions;
 import org.duniter.core.util.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.activation.CommandMap;
 import javax.activation.MailcapCommandMap;
@@ -41,6 +43,7 @@ import java.util.stream.Collectors;
 
 public class MailServiceImpl implements MailService, Closeable {
 
+    private static Logger log = LoggerFactory.getLogger(MailServiceImpl.class);
     private SmtpConfig smtpConfig;
     private static Session session;
     private static Transport transport;
@@ -280,6 +283,9 @@ public class MailServiceImpl implements MailService, Closeable {
         if (config.isStartTLS()) {
             props.put("mail.smtp.starttls.enable", "true");
         }
+        if (log.isDebugEnabled()) {
+            props.put("mail.debug", "true");
+        }
 
         boolean useAuth = false;
         // auto set authentification if smtp user name is provided
diff --git a/duniter4j-core-shared/src/test/resources/disabled_tlsv1.properties b/duniter4j-core-shared/src/test/resources/disabled_tlsv1.properties
new file mode 100644
index 0000000000000000000000000000000000000000..8938070f516d4106e3b3bf06fcc354485ee3f00b
--- /dev/null
+++ b/duniter4j-core-shared/src/test/resources/disabled_tlsv1.properties
@@ -0,0 +1 @@
+jdk.tls.disabledAlgorithms=MD5withRSA, DH keySize < 768,TLSv1,TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA,TLS_DHE_RSA_WITH_AES_128_CBC_SHA,TLS_DHE_RSA_WITH_AES_128_GCM_SHA256,TLS_DHE_RSA_WITH_AES_256_CBC_SHA,TLS_DHE_RSA_WITH_AES_256_CBC_SHA256,TLS_DHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA,TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA,TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_RSA_WITH_3DES_EDE_CBC_SHA,TLS_RSA_WITH_AES_128_GCM_SHA256,TLS_RSA_WITH_AES_256_CBC_SHA256,TLS_RSA_WITH_AES_256_GCM_SHA384,TLS_RSA_WITH_RC4_128_MD5,TLS_RSA_WITH_RC4_128_SHA
diff --git a/pom.xml b/pom.xml
index 417cac1c3216bdfd056af7c3106f3d1e8b99dd48..ed1b9295e08681ad530ea76ba5aca68ec5b901e2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,6 +43,7 @@
     <!-- UI versions -->
     <spring.version>4.2.1.RELEASE</spring.version>
     <aspectj.version>1.8.7</aspectj.version>
+    <javaMail.version>1.6.7</javaMail.version>
 
     <!-- Unit test -->
     <junit.version>4.12</junit.version>
@@ -223,9 +224,15 @@
         <version>2.6</version>
       </dependency>
       <dependency>
-        <groupId>javax.mail</groupId>
-        <artifactId>mail</artifactId>
-        <version>1.4.7</version>
+        <groupId>jakarta.mail</groupId>
+        <artifactId>jakarta.mail-api</artifactId>
+        <version>${javaMail.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>com.sun.mail</groupId>
+        <artifactId>jakarta.mail</artifactId>
+        <version>${javaMail.version}</version>
+        <scope>provided</scope>
       </dependency>
       <dependency>
         <groupId>org.apache.commons</groupId>