diff --git a/EnvelopeGenerator.Application/Contracts/Services/IEnvelopeReceiverService.cs b/EnvelopeGenerator.Application/Contracts/Services/IEnvelopeReceiverService.cs
index f8f688ff..1599df10 100644
--- a/EnvelopeGenerator.Application/Contracts/Services/IEnvelopeReceiverService.cs
+++ b/EnvelopeGenerator.Application/Contracts/Services/IEnvelopeReceiverService.cs
@@ -4,6 +4,7 @@ using DigitalData.Core.Abstraction.Application.DTO;
 using EnvelopeGenerator.Application.Dto.EnvelopeReceiver;
 using EnvelopeGenerator.Application.Dto.Messaging;
 using EnvelopeGenerator.Application.Envelopes;
+using EnvelopeGenerator.Application.Envelopes.Queries.Read;
 using EnvelopeGenerator.Application.Receivers.Queries.Read;
 using EnvelopeGenerator.Domain.Entities;
 
@@ -120,7 +121,7 @@ public interface IEnvelopeReceiverService : IBasicCRUDService<EnvelopeReceiverDt
     /// <param name="receiverQuery"></param>
     /// <param name="ignore_statuses"></param>
     /// <returns></returns>
-    Task<DataResult<IEnumerable<EnvelopeReceiverDto>>> ReadByUsernameAsync(string username, int? min_status = null, int? max_status = null, EnvelopeQuery? envelopeQuery = null, ReadReceiverQuery? receiverQuery = null, params int[] ignore_statuses);
+    Task<DataResult<IEnumerable<EnvelopeReceiverDto>>> ReadByUsernameAsync(string username, int? min_status = null, int? max_status = null, ReadEnvelopeQuery? envelopeQuery = null, ReadReceiverQuery? receiverQuery = null, params int[] ignore_statuses);
 
     /// <summary>
     /// 
diff --git a/EnvelopeGenerator.Application/Envelopes/EnvelopeQuery.cs b/EnvelopeGenerator.Application/Envelopes/EnvelopeQuery.cs
deleted file mode 100644
index 6c30fab4..00000000
--- a/EnvelopeGenerator.Application/Envelopes/EnvelopeQuery.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using MediatR;
-
-namespace EnvelopeGenerator.Application.Envelopes;
-
-/// <summary>
-/// Repräsentiert eine Abfrage für Umschläge.
-/// </summary>
-/// <param name="Id">Die eindeutige Kennung des Umschlags.</param>
-/// <param name="Status">Der Status des Umschlags.</param>
-/// <param name="Uuid">Die universell eindeutige Kennung des Umschlags.</param>
-public record EnvelopeQuery(
-    int? Id = null,
-    int? Status = null,
-    string? Uuid = null) : IRequest
-{
-};
\ No newline at end of file
diff --git a/EnvelopeGenerator.Application/Envelopes/Queries/Read/ReadEnvelopeQuery.cs b/EnvelopeGenerator.Application/Envelopes/Queries/Read/ReadEnvelopeQuery.cs
index 30092482..f4a79d21 100644
--- a/EnvelopeGenerator.Application/Envelopes/Queries/Read/ReadEnvelopeQuery.cs
+++ b/EnvelopeGenerator.Application/Envelopes/Queries/Read/ReadEnvelopeQuery.cs
@@ -1,8 +1,16 @@
-namespace EnvelopeGenerator.Application.Envelopes.Queries.Read;
+using MediatR;
+
+namespace EnvelopeGenerator.Application.Envelopes.Queries.Read;
 
 /// <summary>
-/// Stellt eine Abfrage zum Lesen von Briefumschlägen dar.
+/// Repräsentiert eine Abfrage für Umschläge.
 /// </summary>
-public record ReadEnvelopeQuery : EnvelopeQuery
+/// <param name="Id">Die eindeutige Kennung des Umschlags.</param>
+/// <param name="Status">Der Status des Umschlags.</param>
+/// <param name="Uuid">Die universell eindeutige Kennung des Umschlags.</param>
+public record ReadEnvelopeQuery(
+    int? Id = null,
+    int? Status = null,
+    string? Uuid = null) : IRequest
 {
-}
+};
\ No newline at end of file
diff --git a/EnvelopeGenerator.Application/Services/EnvelopeReceiverService.cs b/EnvelopeGenerator.Application/Services/EnvelopeReceiverService.cs
index d80242d0..39adbff0 100644
--- a/EnvelopeGenerator.Application/Services/EnvelopeReceiverService.cs
+++ b/EnvelopeGenerator.Application/Services/EnvelopeReceiverService.cs
@@ -12,6 +12,7 @@ using EnvelopeGenerator.Application.Dto.Messaging;
 using EnvelopeGenerator.Application.Contracts.Services;
 using EnvelopeGenerator.Application.Envelopes;
 using EnvelopeGenerator.Application.Receivers.Queries.Read;
+using EnvelopeGenerator.Application.Envelopes.Queries.Read;
 
 namespace EnvelopeGenerator.Application.Services;
 
@@ -236,7 +237,7 @@ public class EnvelopeReceiverService : BasicCRUDService<IEnvelopeReceiverReposit
     /// <param name="receiverQuery"></param>
     /// <param name="ignore_statuses"></param>
     /// <returns></returns>
-    public async Task<DataResult<IEnumerable<EnvelopeReceiverDto>>> ReadByUsernameAsync(string username, int? min_status = null, int? max_status = null, EnvelopeQuery? envelopeQuery = null, ReadReceiverQuery? receiverQuery = null, params int[] ignore_statuses)
+    public async Task<DataResult<IEnumerable<EnvelopeReceiverDto>>> ReadByUsernameAsync(string username, int? min_status = null, int? max_status = null, ReadEnvelopeQuery? envelopeQuery = null, ReadReceiverQuery? receiverQuery = null, params int[] ignore_statuses)
     {
         var er_list = await _repository.ReadByUsernameAsync(username: username, min_status: min_status, max_status: max_status, ignore_statuses: ignore_statuses);