diff --git a/network/pom.xml b/network/pom.xml
index 474a7b9..480ce9e 100644
--- a/network/pom.xml
+++ b/network/pom.xml
@@ -49,8 +49,8 @@ limitations under the License.
     </dependency>
 
     <dependency>
-      <artifactId>javax.mail</artifactId>
-      <groupId>com.sun.mail</groupId>
+      <groupId>jakarta.mail</groupId>
+      <artifactId>jakarta.mail-api</artifactId>
     </dependency>
     <dependency>
       <artifactId>ews-java-api</artifactId>
diff --git a/network/src/main/java/de/muehlencord/shared/network/mail/DefaultMailReader.java b/network/src/main/java/de/muehlencord/shared/network/mail/DefaultMailReader.java
index 93f1912..5ad0e4d 100644
--- a/network/src/main/java/de/muehlencord/shared/network/mail/DefaultMailReader.java
+++ b/network/src/main/java/de/muehlencord/shared/network/mail/DefaultMailReader.java
@@ -16,20 +16,20 @@
 package de.muehlencord.shared.network.mail;
 
 import de.muehlencord.shared.util.StringUtil;
+import jakarta.mail.Flags;
+import jakarta.mail.Folder;
+import jakarta.mail.Message;
+import jakarta.mail.MessagingException;
+import jakarta.mail.Session;
+import jakarta.mail.Store;
+import jakarta.mail.internet.MimeMessage;
+import jakarta.mail.search.MessageIDTerm;
+import jakarta.mail.search.SearchTerm;
+import jakarta.mail.util.SharedByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Properties;
-import javax.mail.Flags;
-import javax.mail.Folder;
-import javax.mail.Message;
-import javax.mail.MessagingException;
-import javax.mail.Session;
-import javax.mail.Store;
-import javax.mail.internet.MimeMessage;
-import javax.mail.search.MessageIDTerm;
-import javax.mail.search.SearchTerm;
-import javax.mail.util.SharedByteArrayInputStream;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/network/src/main/java/de/muehlencord/shared/network/mail/MailMessage.java b/network/src/main/java/de/muehlencord/shared/network/mail/MailMessage.java
index 8396d5f..edf7bd1 100644
--- a/network/src/main/java/de/muehlencord/shared/network/mail/MailMessage.java
+++ b/network/src/main/java/de/muehlencord/shared/network/mail/MailMessage.java
@@ -15,12 +15,12 @@
  */
 package de.muehlencord.shared.network.mail;
 
+import jakarta.mail.Address;
+import jakarta.mail.internet.InternetAddress;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.LinkedList;
 import java.util.List;
-import javax.mail.Address;
-import javax.mail.internet.InternetAddress;
 
 /**
  * A mail message
diff --git a/network/src/main/java/de/muehlencord/shared/network/mail/MailMessageUtils.java b/network/src/main/java/de/muehlencord/shared/network/mail/MailMessageUtils.java
index cd98c60..5185b65 100644
--- a/network/src/main/java/de/muehlencord/shared/network/mail/MailMessageUtils.java
+++ b/network/src/main/java/de/muehlencord/shared/network/mail/MailMessageUtils.java
@@ -16,18 +16,19 @@
 package de.muehlencord.shared.network.mail;
 
 import static de.muehlencord.shared.util.StringUtil.getStackTraceString;
+
+import jakarta.mail.BodyPart;
+import jakarta.mail.Message;
+import jakarta.mail.MessagingException;
+import jakarta.mail.Multipart;
+import jakarta.mail.internet.MimeMessage;
+import jakarta.mail.internet.MimeMultipart;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.Reader;
 import java.io.StringWriter;
 import java.util.Locale;
-import javax.mail.BodyPart;
-import javax.mail.Message;
-import javax.mail.MessagingException;
-import javax.mail.Multipart;
-import javax.mail.internet.MimeMessage;
-import javax.mail.internet.MimeMultipart;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/network/src/main/java/de/muehlencord/shared/network/mail/imap/ImapMailReader.java b/network/src/main/java/de/muehlencord/shared/network/mail/imap/ImapMailReader.java
index fc18ee1..301671b 100644
--- a/network/src/main/java/de/muehlencord/shared/network/mail/imap/ImapMailReader.java
+++ b/network/src/main/java/de/muehlencord/shared/network/mail/imap/ImapMailReader.java
@@ -19,7 +19,7 @@ import de.muehlencord.shared.network.mail.DefaultMailReader;
 import de.muehlencord.shared.network.mail.MailProtocol;
 import de.muehlencord.shared.network.mail.MailReaderConfiguration;
 import de.muehlencord.shared.network.mail.MailReaderConnectionException;
-import javax.mail.Session;
+import jakarta.mail.Session;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/network/src/test/java/de/muehlencord/shared/network/mail/TestSendMail.java b/network/src/test/java/de/muehlencord/shared/network/mail/TestSendMail.java
index 3cebecf..41da943 100644
--- a/network/src/test/java/de/muehlencord/shared/network/mail/TestSendMail.java
+++ b/network/src/test/java/de/muehlencord/shared/network/mail/TestSendMail.java
@@ -15,6 +15,19 @@
  */
 package de.muehlencord.shared.network.mail;
 
+import static org.junit.jupiter.api.Assumptions.assumeFalse;
+
+import jakarta.mail.Message;
+import jakarta.mail.MessagingException;
+import jakarta.mail.Multipart;
+import jakarta.mail.PasswordAuthentication;
+import jakarta.mail.Session;
+import jakarta.mail.Transport;
+import jakarta.mail.internet.AddressException;
+import jakarta.mail.internet.InternetAddress;
+import jakarta.mail.internet.MimeBodyPart;
+import jakarta.mail.internet.MimeMessage;
+import jakarta.mail.internet.MimeMultipart;
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
@@ -22,18 +35,6 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Properties;
-import javax.mail.Message;
-import javax.mail.MessagingException;
-import javax.mail.Multipart;
-import javax.mail.PasswordAuthentication;
-import javax.mail.Session;
-import javax.mail.Transport;
-import javax.mail.internet.AddressException;
-import javax.mail.internet.InternetAddress;
-import javax.mail.internet.MimeBodyPart;
-import javax.mail.internet.MimeMessage;
-import javax.mail.internet.MimeMultipart;
-import static org.junit.jupiter.api.Assumptions.assumeFalse;
 import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -63,7 +64,7 @@ public class TestSendMail {
         props.put("mail.smtp.port", "587");
         props.put("mail.debug", "true");
 
-        Session mailSession = Session.getInstance(props, new javax.mail.Authenticator() {
+      Session mailSession = Session.getInstance(props, new jakarta.mail.Authenticator() {
             @Override
             protected PasswordAuthentication getPasswordAuthentication() {
                 return new PasswordAuthentication(RECEIVER, PASSWORD);
diff --git a/pom.xml b/pom.xml
index 08d5278..7b5241e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -99,7 +99,7 @@ limitations under the License.
     <fusionauth.version>5.3.1</fusionauth.version>
     <bouncycastle.version>1.70</bouncycastle.version>
     <hibernate.version>6.2.15.Final</hibernate.version>
-    <com-sun-mail.version>1.6.2</com-sun-mail.version>
+    <jakarta.mail.version>2.1.2</jakarta.mail.version>
 
     <jakarta-faces.version>4.0.5</jakarta-faces.version>
     <joinfaces.version>5.1.6</joinfaces.version>
@@ -165,9 +165,9 @@ limitations under the License.
 
       <!-- mail -->
       <dependency>
-        <artifactId>javax.mail</artifactId>
-        <groupId>com.sun.mail</groupId>
-        <version>${com-sun-mail.version}</version>
+        <groupId>jakarta.mail</groupId>
+        <artifactId>jakarta.mail-api</artifactId>
+        <version>${jakarta.mail.version}</version>
       </dependency>
       <dependency>
         <artifactId>ews-java-api</artifactId>