diff --git a/mail-service/src/main/java/de/itvsh/ozg/mail/postfach/PostfachService.java b/mail-service/src/main/java/de/itvsh/ozg/mail/postfach/PostfachService.java
index 491d56927460240f3849a05bed9f95c11a078575..11ab95054f077b2f1a6b7ae99d231c6ecd9fa008 100644
--- a/mail-service/src/main/java/de/itvsh/ozg/mail/postfach/PostfachService.java
+++ b/mail-service/src/main/java/de/itvsh/ozg/mail/postfach/PostfachService.java
@@ -29,6 +29,8 @@ import java.util.Optional;
 import java.util.function.Predicate;
 import java.util.stream.Stream;
 
+import jakarta.validation.Valid;
+
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationEventPublisher;
@@ -39,7 +41,6 @@ import de.itvsh.ozg.mail.attributes.ClientAttributeService;
 import de.itvsh.ozg.mail.postfach.PostfachNachricht.Direction;
 import de.itvsh.ozg.mail.postfach.osi.OsiPostfachServerProcessException;
 import de.itvsh.ozg.pluto.common.callcontext.CurrentUserService;
-import jakarta.validation.Valid;
 import lombok.NonNull;
 import lombok.extern.log4j.Log4j2;
 
diff --git a/mail-service/src/main/java/de/itvsh/ozg/mail/postfach/bayernid/BayernIdPostfachRemoteService.java b/mail-service/src/main/java/de/itvsh/ozg/mail/postfach/bayernid/BayernIdPostfachRemoteService.java
index 5c0378643d2cda6206c437ffe26323b325f80e68..4911c8cbf61f061f0bf662172ffb4486bf7784eb 100644
--- a/mail-service/src/main/java/de/itvsh/ozg/mail/postfach/bayernid/BayernIdPostfachRemoteService.java
+++ b/mail-service/src/main/java/de/itvsh/ozg/mail/postfach/bayernid/BayernIdPostfachRemoteService.java
@@ -2,6 +2,9 @@ package de.itvsh.ozg.mail.postfach.bayernid;
 
 import java.util.stream.Stream;
 
+import jakarta.annotation.PostConstruct;
+import jakarta.xml.bind.JAXBElement;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.oxm.jaxb.Jaxb2Marshaller;
@@ -17,8 +20,6 @@ import de.akdb.egov.bsp.nachrichten.BspQuittung;
 import de.itvsh.ozg.mail.postfach.PostfachNachricht;
 import de.itvsh.ozg.mail.postfach.PostfachRemoteService;
 import de.itvsh.ozg.mail.postfach.PostfachRuntimeException;
-import jakarta.annotation.PostConstruct;
-import jakarta.xml.bind.JAXBElement;
 import lombok.extern.log4j.Log4j2;
 
 @Log4j2
diff --git a/mail-service/src/main/java/de/itvsh/ozg/mail/postfach/bayernid/BayernIdProperties.java b/mail-service/src/main/java/de/itvsh/ozg/mail/postfach/bayernid/BayernIdProperties.java
index b6a6b28ab43c85d335cdc4de64cc9c35137ebe99..c5404ab485c780e8ad6c052a261d761045d4f34e 100644
--- a/mail-service/src/main/java/de/itvsh/ozg/mail/postfach/bayernid/BayernIdProperties.java
+++ b/mail-service/src/main/java/de/itvsh/ozg/mail/postfach/bayernid/BayernIdProperties.java
@@ -1,12 +1,13 @@
 package de.itvsh.ozg.mail.postfach.bayernid;
 
+import jakarta.validation.constraints.NotEmpty;
+
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.boot.context.properties.ConfigurationPropertiesScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.validation.annotation.Validated;
 
-import jakarta.validation.constraints.NotEmpty;
 import lombok.Getter;
 import lombok.Setter;
 
diff --git a/mail-service/src/main/java/de/itvsh/ozg/mail/postfach/osi/OsiPostfachRemoteService.java b/mail-service/src/main/java/de/itvsh/ozg/mail/postfach/osi/OsiPostfachRemoteService.java
index 9625d099d758756a2f6787fc49629d03fb75d159..098eed562a119767b0c0caca1f072dc726d413b9 100644
--- a/mail-service/src/main/java/de/itvsh/ozg/mail/postfach/osi/OsiPostfachRemoteService.java
+++ b/mail-service/src/main/java/de/itvsh/ozg/mail/postfach/osi/OsiPostfachRemoteService.java
@@ -28,6 +28,8 @@ import java.util.Objects;
 import java.util.function.Supplier;
 import java.util.stream.Stream;
 
+import jakarta.annotation.PostConstruct;
+
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
@@ -44,7 +46,6 @@ import de.itvsh.ozg.mail.postfach.PostfachBadRequestException;
 import de.itvsh.ozg.mail.postfach.PostfachNachricht;
 import de.itvsh.ozg.mail.postfach.PostfachRemoteService;
 import de.itvsh.ozg.mail.postfach.PostfachRuntimeException;
-import jakarta.annotation.PostConstruct;
 import lombok.extern.log4j.Log4j2;
 
 @Service
diff --git a/mail-service/src/test/java/de/itvsh/ozg/mail/email/EMailServiceTest.java b/mail-service/src/test/java/de/itvsh/ozg/mail/email/EMailServiceTest.java
index 2912e143e9b7005146a7c49ee6b387c2a3b087bf..f5e60b1b23805b5df113fc07effad859f368c375 100644
--- a/mail-service/src/test/java/de/itvsh/ozg/mail/email/EMailServiceTest.java
+++ b/mail-service/src/test/java/de/itvsh/ozg/mail/email/EMailServiceTest.java
@@ -27,6 +27,10 @@ import static de.itvsh.ozg.mail.email.MailSendRequestTestFactory.*;
 import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 
+import jakarta.activation.DataSource;
+import jakarta.mail.MessagingException;
+import jakarta.mail.internet.MimeMessage;
+
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
@@ -38,9 +42,6 @@ import org.springframework.mail.MailSendException;
 import org.springframework.mail.javamail.JavaMailSender;
 import org.springframework.mail.javamail.MimeMessageHelper;
 
-import jakarta.activation.DataSource;
-import jakarta.mail.MessagingException;
-import jakarta.mail.internet.MimeMessage;
 import lombok.SneakyThrows;
 
 class EMailServiceTest {