diff --git a/xta-adapter/src/main/java/de/ozgcloud/eingang/xta/XtaIncomingFilesMapper.java b/xta-adapter/src/main/java/de/ozgcloud/eingang/xta/XtaIncomingFilesMapper.java
index 34a807f7001122a0561f319e767c06b08904f25b..1ef661f3e778725c4a5afd95b69c7d67457ce2e8 100644
--- a/xta-adapter/src/main/java/de/ozgcloud/eingang/xta/XtaIncomingFilesMapper.java
+++ b/xta-adapter/src/main/java/de/ozgcloud/eingang/xta/XtaIncomingFilesMapper.java
@@ -57,9 +57,6 @@ class XtaIncomingFilesMapper {
 	}
 
 	IncomingFile toIncomingFile(XtaFile messageFile) {
-		if (!messageFile.contentType().equals(ZIP_CONTENT_TYPE)) {
-			LOG.warn("Expected XTA messageFile to be of content type " + ZIP_CONTENT_TYPE + ". Instead was " + messageFile.contentType());
-		}
 		return IncomingFile.builder()
 				.name(messageFile.name())
 				.contentType(messageFile.contentType())
diff --git a/xta-adapter/src/main/java/de/ozgcloud/eingang/xta/XtaService.java b/xta-adapter/src/main/java/de/ozgcloud/eingang/xta/XtaService.java
index ddf3babeff2b9600aeb2829d3bd2b7ddb2ec63ff..60bef9e3483f044ad27aa524852fafa0abd1c8c4 100644
--- a/xta-adapter/src/main/java/de/ozgcloud/eingang/xta/XtaService.java
+++ b/xta-adapter/src/main/java/de/ozgcloud/eingang/xta/XtaService.java
@@ -59,14 +59,9 @@ class XtaService {
 	}
 
 	boolean isSupportedMessageType(XtaMessageMetaData metaData) {
-		if (StringUtils.equals(metaData.getMessageType(), XDOMEA_0201_MESSAGE_TYPE)) {
+		if (isXDomeaMessageType(metaData.getMessageType()) || isFimMessageType(metaData.getMessageType())) {
 			return true;
 		}
-
-		if (StringUtils.startsWith(metaData.getMessageType(), FIM_MESSAGE_TYPE_PREFIX)) {
-			return true;
-		}
-
 		LOG.warn("Ignoring XTA-Message of type '{}'.", metaData.getMessageType());
 		return false;
 	}
@@ -95,16 +90,24 @@ class XtaService {
 	}
 
 	RepresentationsAttachmentsPair getRepresentationsAttachmentsPair(XtaMessageMetaData metaData, List<IncomingFile> incomingFiles) {
-		if (StringUtils.equals(metaData.getMessageType(), XDOMEA_0201_MESSAGE_TYPE)) {
+		if (isXDomeaMessageType(metaData.getMessageType())) {
 			return xdomeaMessageDataMapper.mapIncomingFilesToRepresentationsAttachmentsPair(incomingFiles);
 		}
-		if (StringUtils.startsWith(metaData.getMessageType(), FIM_MESSAGE_TYPE_PREFIX)) {
+		if (isFimMessageType(metaData.getMessageType())) {
 			return mapIncomingFilesToRepresentations(incomingFiles);
 		}
 
 		throw new TechnicalException("Unexpected XTA message type: %s".formatted(metaData.getMessageType()));
 	}
 
+	private boolean isXDomeaMessageType(String messageType) {
+		return StringUtils.equals(messageType, XDOMEA_0201_MESSAGE_TYPE);
+	}
+
+	private boolean isFimMessageType(String messageType) {
+		return StringUtils.startsWith(messageType, FIM_MESSAGE_TYPE_PREFIX);
+	}
+
 	RepresentationsAttachmentsPair mapIncomingFilesToRepresentations(List<IncomingFile> incomingFiles) {
 		return RepresentationsAttachmentsPair.builder()
 				.representations(incomingFiles)