diff --git a/nachrichten-manager-server/src/main/java/de/ozgcloud/nachrichten/antragraum/AntragraumGrpcService.java b/nachrichten-manager-server/src/main/java/de/ozgcloud/nachrichten/antragraum/AntragraumGrpcService.java
index 45f6901b9a2f7089c36d3943e013962b0a834f2f..b7d094f1fccb6cdf8ca0bee9a02dbfd8c8cc296f 100644
--- a/nachrichten-manager-server/src/main/java/de/ozgcloud/nachrichten/antragraum/AntragraumGrpcService.java
+++ b/nachrichten-manager-server/src/main/java/de/ozgcloud/nachrichten/antragraum/AntragraumGrpcService.java
@@ -23,10 +23,11 @@
 
 package de.ozgcloud.nachrichten.antragraum;
 
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+
 import io.grpc.stub.StreamObserver;
 import lombok.RequiredArgsConstructor;
 import net.devh.boot.grpc.server.service.GrpcService;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 
 @GrpcService
 @RequiredArgsConstructor
@@ -48,7 +49,8 @@ class AntragraumGrpcService extends AntragraumServiceGrpc.AntragraumServiceImplB
 	public void sendRueckfrageAnswer(GrpcSendRueckfrageAnswerRequest request, StreamObserver<GrpcSendRueckfrageAnswerResponse> streamObserver) {
 		var answer = request.getAnswer();
 
-		var commandId = antragraumService.sendRueckfrageAnswer(request.getSamlToken(), answer.getRueckfrageId(), mapper.toPostfachNachricht(answer));
+		var commandId = antragraumService.sendRueckfrageAnswer(request.getSamlToken(), answer.getRueckfrageId(),
+				mapper.fromRueckfrage(answer));
 
 		streamObserver.onNext(GrpcSendRueckfrageAnswerResponse.newBuilder().setCommandId(commandId).build());
 		streamObserver.onCompleted();
diff --git a/nachrichten-manager-server/src/main/java/de/ozgcloud/nachrichten/antragraum/AntragraumNachrichtMapper.java b/nachrichten-manager-server/src/main/java/de/ozgcloud/nachrichten/antragraum/AntragraumNachrichtMapper.java
index cb54984efbb573241ed2aeca1fc2f08fc56d2e8e..4fe613e735f028c4299ee6e2e07a69830d3a61ea 100644
--- a/nachrichten-manager-server/src/main/java/de/ozgcloud/nachrichten/antragraum/AntragraumNachrichtMapper.java
+++ b/nachrichten-manager-server/src/main/java/de/ozgcloud/nachrichten/antragraum/AntragraumNachrichtMapper.java
@@ -46,7 +46,7 @@ interface AntragraumNachrichtMapper {
 	@Mapping(target = "attachments", source = "attachmentFileIdList")
 	@Mapping(target = "createdAt", ignore = true)
 	@Mapping(target = "createdBy", ignore = true)
-	@Mapping(target = "direction", ignore = true)
+	@Mapping(target = "direction", constant = "IN")
 	@Mapping(target = "id", ignore = true)
 	@Mapping(target = "messageCode", ignore = true)
 	@Mapping(target = "messageId", source = "rueckfrageId")
@@ -57,5 +57,5 @@ interface AntragraumNachrichtMapper {
 	@Mapping(target = "sentSuccessful", ignore = true)
 	@Mapping(target = "subject", ignore = true)
 	@Mapping(target = "vorgangId", ignore = true)
-	PostfachNachricht toPostfachNachricht(GrpcRueckfrageAnswer answer);
+	PostfachNachricht fromRueckfrage(GrpcRueckfrageAnswer answer);
 }
diff --git a/nachrichten-manager-server/src/test/java/de/ozgcloud/nachrichten/antragraum/AntragraumGrpcServiceTest.java b/nachrichten-manager-server/src/test/java/de/ozgcloud/nachrichten/antragraum/AntragraumGrpcServiceTest.java
index e5ab9a259721945777073af44b7a539ad2d2a2e3..9772bf5e28617ec83d267d9d2593d7ea07b6c26e 100644
--- a/nachrichten-manager-server/src/test/java/de/ozgcloud/nachrichten/antragraum/AntragraumGrpcServiceTest.java
+++ b/nachrichten-manager-server/src/test/java/de/ozgcloud/nachrichten/antragraum/AntragraumGrpcServiceTest.java
@@ -20,9 +20,12 @@
 
 package de.ozgcloud.nachrichten.antragraum;
 
-import de.ozgcloud.nachrichten.postfach.PostfachNachricht;
-import de.ozgcloud.nachrichten.postfach.PostfachNachrichtTestFactory;
-import io.grpc.stub.StreamObserver;
+import static org.mockito.ArgumentMatchers.*;
+import static org.mockito.Mockito.*;
+
+import java.util.UUID;
+import java.util.stream.Stream;
+
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
@@ -30,11 +33,9 @@ import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.Spy;
 
-import java.util.UUID;
-import java.util.stream.Stream;
-
-import static org.mockito.ArgumentMatchers.*;
-import static org.mockito.Mockito.*;
+import de.ozgcloud.nachrichten.postfach.PostfachNachricht;
+import de.ozgcloud.nachrichten.postfach.PostfachNachrichtTestFactory;
+import io.grpc.stub.StreamObserver;
 
 class AntragraumGrpcServiceTest {
 	@Spy
@@ -91,14 +92,14 @@ class AntragraumGrpcServiceTest {
 		void setup() {
 			when(antragraumService.sendRueckfrageAnswer(anyString(), anyString(), any(PostfachNachricht.class)))
 					.thenReturn(UUID.randomUUID().toString());
-			when(mapper.toPostfachNachricht(any(GrpcRueckfrageAnswer.class))).thenReturn(PostfachNachrichtTestFactory.create());
+			when(mapper.fromRueckfrage(any(GrpcRueckfrageAnswer.class))).thenReturn(PostfachNachrichtTestFactory.create());
 		}
 
 		@Test
 		void shouldCallMapper() {
 			antragsraumGrpcService.sendRueckfrageAnswer(GrpcSendRueckfrageAnswerRequestTestFactory.create(), streamObserver);
 
-			verify(mapper).toPostfachNachricht(any(GrpcRueckfrageAnswer.class));
+			verify(mapper).fromRueckfrage(any(GrpcRueckfrageAnswer.class));
 		}
 
 		@Test
diff --git a/nachrichten-manager-server/src/test/java/de/ozgcloud/nachrichten/antragraum/AntragraumNachrichtMapperTest.java b/nachrichten-manager-server/src/test/java/de/ozgcloud/nachrichten/antragraum/AntragraumNachrichtMapperTest.java
index 5ff78a92ed2d37b75e8c380ea47c87d41a50790c..c0b9812dc5a088e6f872fac24956cd4f7026c44c 100644
--- a/nachrichten-manager-server/src/test/java/de/ozgcloud/nachrichten/antragraum/AntragraumNachrichtMapperTest.java
+++ b/nachrichten-manager-server/src/test/java/de/ozgcloud/nachrichten/antragraum/AntragraumNachrichtMapperTest.java
@@ -29,6 +29,7 @@ import org.junit.jupiter.api.Test;
 import org.mapstruct.factory.Mappers;
 
 import de.ozgcloud.nachrichten.postfach.PostfachNachricht;
+import de.ozgcloud.nachrichten.postfach.PostfachNachricht.Direction;
 import de.ozgcloud.nachrichten.postfach.PostfachNachrichtTestFactory;
 import de.ozgcloud.nachrichten.postfach.osi.MessageTestFactory;
 
@@ -118,8 +119,15 @@ class AntragraumNachrichtMapperTest {
 			assertThat(result.getAttachments()).isEqualTo(GrpcRueckfrageAnswerTestFactory.ATTACHMENT_ID_LIST);
 		}
 
+		@Test
+		void shouldMapDirection() {
+			var result = map();
+
+			assertThat(result.getDirection()).isEqualTo(Direction.IN);
+		}
+
 		private PostfachNachricht map() {
-			return mapper.toPostfachNachricht(GrpcRueckfrageAnswerTestFactory.create());
+			return mapper.fromRueckfrage(GrpcRueckfrageAnswerTestFactory.create());
 		}
 	}
 }
\ No newline at end of file