diff --git a/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/BescheidMapper.java b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/BescheidMapper.java
index ab9ef90ae1d809f602f0a716747a9e79dd1525b4..1f33829993896e91c6fe074218bf9fca44f2dd2e 100644
--- a/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/BescheidMapper.java
+++ b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/BescheidMapper.java
@@ -21,12 +21,13 @@ import org.mapstruct.NullValuePropertyMappingStrategy;
 import org.mapstruct.ReportingPolicy;
 import org.springframework.beans.factory.annotation.Autowired;
 
-import de.ozgcloud.document.bescheid.vorgang.VorgangId;
 import de.ozgcloud.command.Command;
-import de.ozgcloud.document.common.attached_item.AttachedItem;
-import de.ozgcloud.document.common.attached_item.AttachedItemService;
 import de.ozgcloud.common.binaryfile.FileId;
 import de.ozgcloud.common.datatype.StringBasedValue;
+import de.ozgcloud.document.bescheid.Bescheid.SendBy;
+import de.ozgcloud.document.bescheid.vorgang.VorgangId;
+import de.ozgcloud.document.common.attached_item.AttachedItem;
+import de.ozgcloud.document.common.attached_item.AttachedItemService;
 
 @Mapper(uses = { SentInfoMapper.class }, //
 		unmappedTargetPolicy = ReportingPolicy.WARN, //
@@ -58,7 +59,7 @@ public abstract class BescheidMapper {
 	@Mapping(target = "nachrichtText", expression = "java(fromOptional(bescheid.getNachrichtText()))")
 	@Mapping(target = "nachrichtSubject", expression = "java(fromOptional(bescheid.getNachrichtSubject()))")
 	@Mapping(target = "attachmentsList", source = "attachments")
-	abstract GrpcBescheid toBescheid(Bescheid bescheid);
+	public abstract GrpcBescheid toBescheid(Bescheid bescheid);
 
 	String toString(FileId fileId) {
 		return fileId.toString();
@@ -83,7 +84,7 @@ public abstract class BescheidMapper {
 	@Mapping(target = "unknownFields", ignore = true)
 	@Mapping(target = "versionBytes", ignore = true)
 	@Mapping(target = "allFields", ignore = true)
-	abstract GrpcBescheidManagerConfigResponse fromBescheidManagerConfig(BescheidManagerConfig bescheidManagerConfig);
+	public abstract GrpcBescheidManagerConfigResponse fromBescheidManagerConfig(BescheidManagerConfig bescheidManagerConfig);
 
 	@Mapping(target = "defaultInstanceForType", ignore = true)
 	@Mapping(target = "bescheidOrBuilder", ignore = true)
@@ -95,7 +96,7 @@ public abstract class BescheidMapper {
 	@Mapping(target = "mergeUnknownFields", ignore = true)
 	@Mapping(target = "unknownFields", ignore = true)
 	@Mapping(target = "allFields", ignore = true)
-	abstract GrpcGetBescheidResponse toGetBescheidResponse(Bescheid bescheid);
+	public abstract GrpcGetBescheidResponse toGetBescheidResponse(Bescheid bescheid);
 
 	@Mapping(target = "defaultInstanceForType", ignore = true)
 	@Mapping(target = "bescheidOrBuilder", ignore = true)
@@ -106,7 +107,7 @@ public abstract class BescheidMapper {
 	@Mapping(target = "mergeUnknownFields", ignore = true)
 	@Mapping(target = "unknownFields", ignore = true)
 	@Mapping(target = "allFields", ignore = true)
-	abstract GrpcGetBescheidDraftResponse toGetBescheidDraftResponse(Bescheid bescheid);
+	public abstract GrpcGetBescheidDraftResponse toGetBescheidDraftResponse(Bescheid bescheid);
 
 	Bescheid mapFromAttachedItem(AttachedItem item) {
 		return buildBescheidBuilder(item.getItem())