diff --git a/EnvelopeGenerator.Application/Common/Dto/EmailTemplateDto.cs b/EnvelopeGenerator.Application/Common/Dto/EmailTemplateDto.cs
index 6998c1d7..c5d1aa6f 100644
--- a/EnvelopeGenerator.Application/Common/Dto/EmailTemplateDto.cs
+++ b/EnvelopeGenerator.Application/Common/Dto/EmailTemplateDto.cs
@@ -1,40 +1,37 @@
-using Microsoft.AspNetCore.Mvc;
+namespace EnvelopeGenerator.Application.Common.Dto;
 
-namespace EnvelopeGenerator.Application.Common.Dto
+/// <summary>
+/// 
+/// </summary>
+public record EmailTemplateDto
 {
     /// <summary>
     /// 
     /// </summary>
-    public record EmailTemplateDto
-    {
-        /// <summary>
-        /// 
-        /// </summary>
-        public int Id { get; init; }
+    public int Id { get; init; }
 
-        /// <summary>
-        /// 
-        /// </summary>
-        public required string Name { get; init; }
+    /// <summary>
+    /// 
+    /// </summary>
+    public required string Name { get; init; }
 
-        /// <summary>
-        /// Das Datum und die Uhrzeit, wann die Vorlage hinzugefügt wurde.
-        /// </summary>
-        public DateTime AddedWhen { get; init; }
+    /// <summary>
+    /// Das Datum und die Uhrzeit, wann die Vorlage hinzugefügt wurde.
+    /// </summary>
+    public DateTime AddedWhen { get; init; }
 
-        /// <summary>
-        /// Der Inhalt (Body) der E-Mail-Vorlage. Kann null sein.
-        /// </summary>
-        public string? Body { get; init; }
+    /// <summary>
+    /// Der Inhalt (Body) der E-Mail-Vorlage. Kann null sein.
+    /// </summary>
+    public string? Body { get; init; }
 
-        /// <summary>
-        /// Der Betreff der E-Mail-Vorlage. Kann null sein.
-        /// </summary>
-        public string? Subject { get; init; }
+    /// <summary>
+    /// Der Betreff der E-Mail-Vorlage. Kann null sein.
+    /// </summary>
+    public string? Subject { get; init; }
 
-        /// <summary>
-        /// Das Datum und die Uhrzeit, wann die Vorlage zuletzt geändert wurde. Kann null sein.
-        /// </summary>
-        public DateTime? ChangedWhen { get; init; }
-    };
-}
\ No newline at end of file
+    /// <summary>
+    /// Das Datum und die Uhrzeit, wann die Vorlage zuletzt geändert wurde. Kann null sein.
+    /// </summary>
+    public DateTime? ChangedWhen { get; init; }
+};
\ No newline at end of file
diff --git a/EnvelopeGenerator.Application/EmailTemplates/Commands/Update/UpdateEmailTemplateCommandHandler.cs b/EnvelopeGenerator.Application/EmailTemplates/Commands/Update/UpdateEmailTemplateCommandHandler.cs
index 2a676c91..b4ac207a 100644
--- a/EnvelopeGenerator.Application/EmailTemplates/Commands/Update/UpdateEmailTemplateCommandHandler.cs
+++ b/EnvelopeGenerator.Application/EmailTemplates/Commands/Update/UpdateEmailTemplateCommandHandler.cs
@@ -62,12 +62,6 @@ public class UpdateEmailTemplateCommandHandler : IRequestHandler<UpdateEmailTemp
             throw new NotFoundException();
         }
 
-        if (request.Body is not null)
-            tempDto.Body = request.Body;
-
-        if (request.Subject is not null)
-            tempDto.Subject = request.Subject;
-
         await _repository.UpdateAsync(tempDto, t => t.Id == tempDto.Id, cancel);
     }
 }
diff --git a/EnvelopeGenerator.Application/EmailTemplates/MappingProfile.cs b/EnvelopeGenerator.Application/EmailTemplates/MappingProfile.cs
deleted file mode 100644
index d9b35b70..00000000
--- a/EnvelopeGenerator.Application/EmailTemplates/MappingProfile.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using AutoMapper;
-using EnvelopeGenerator.Application.EmailTemplates.Queries.Read;
-using EnvelopeGenerator.Domain.Entities;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace EnvelopeGenerator.Application.EmailTemplates;
-
-/// <summary>
-/// 
-/// </summary>
-public class MappingProfile : Profile
-{
-    /// <summary>
-    /// 
-    /// </summary>
-    public MappingProfile()
-    {
-        CreateMap<EmailTemplate, ReadEmailTemplateResponse>();
-    }
-}
diff --git a/EnvelopeGenerator.Application/EmailTemplates/Queries/Read/ReadEmailTemplateQuery.cs b/EnvelopeGenerator.Application/EmailTemplates/Queries/Read/ReadEmailTemplateQuery.cs
index 58dd98bf..50d81b1c 100644
--- a/EnvelopeGenerator.Application/EmailTemplates/Queries/Read/ReadEmailTemplateQuery.cs
+++ b/EnvelopeGenerator.Application/EmailTemplates/Queries/Read/ReadEmailTemplateQuery.cs
@@ -2,22 +2,22 @@
 using MediatR;
 using EnvelopeGenerator.Application.Common.Interfaces.Repositories;
 using EnvelopeGenerator.Domain.Constants;
+using EnvelopeGenerator.Application.Common.Dto;
 
 namespace EnvelopeGenerator.Application.EmailTemplates.Queries.Read;
 
-
 /// <summary>
 /// Stellt eine Abfrage dar, um eine E-Mail-Vorlage zu lesen.
 /// Diese Klasse erbt von <see cref="EmailTemplateQuery"/>.
 /// </summary>
-public record ReadEmailTemplateQuery : EmailTemplateQuery, IRequest<ReadEmailTemplateResponse?>
+public record ReadEmailTemplateQuery : EmailTemplateQuery, IRequest<EmailTemplateDto?>
 {
 }
 
 /// <summary>
 /// 
 /// </summary>
-public class ReadEmailTemplateQueryHandler : IRequestHandler<ReadEmailTemplateQuery, ReadEmailTemplateResponse?>
+public class ReadEmailTemplateQueryHandler : IRequestHandler<ReadEmailTemplateQuery, EmailTemplateDto?>
 {
     private readonly IMapper _mapper;
 
@@ -46,7 +46,7 @@ public class ReadEmailTemplateQueryHandler : IRequestHandler<ReadEmailTemplateQu
     /// <returns></returns>
     /// <exception cref="InvalidOperationException"></exception>
     [Obsolete("Use IRepository")]
-    public async Task<ReadEmailTemplateResponse?> Handle(ReadEmailTemplateQuery request, CancellationToken cancellationToken)
+    public async Task<EmailTemplateDto?> Handle(ReadEmailTemplateQuery request, CancellationToken cancellationToken)
     {
         var temp = request.Id is int id
             ? await _repository.ReadByIdAsync(id)
@@ -54,8 +54,6 @@ public class ReadEmailTemplateQueryHandler : IRequestHandler<ReadEmailTemplateQu
                 ? await _repository.ReadByNameAsync(type)
                 : throw new InvalidOperationException("Either a valid integer ID or a valid EmailTemplateType must be provided in the request.");
 
-        var res = _mapper.Map<ReadEmailTemplateResponse>(temp);
-
-        return res;
+        return _mapper.Map<EmailTemplateDto>(temp);
     }
 }
\ No newline at end of file
diff --git a/EnvelopeGenerator.Application/EmailTemplates/Queries/Read/ReadEmailTemplateResponse.cs b/EnvelopeGenerator.Application/EmailTemplates/Queries/Read/ReadEmailTemplateResponse.cs
deleted file mode 100644
index df68fa94..00000000
--- a/EnvelopeGenerator.Application/EmailTemplates/Queries/Read/ReadEmailTemplateResponse.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-namespace EnvelopeGenerator.Application.EmailTemplates.Queries.Read;
-
-/// <summary>
-/// Stellt die Antwort für eine Abfrage von E-Mail-Vorlagen bereit.
-/// </summary>
-public class ReadEmailTemplateResponse
-{
-    /// <summary>
-    /// Die eindeutige Kennung der E-Mail-Vorlage.
-    /// </summary>
-    public int Id { get; set; }
-
-    /// <summary>
-    /// Name des Typs
-    /// </summary>
-    public required string Name { get; set; }
-
-    /// <summary>
-    /// Das Datum und die Uhrzeit, wann die Vorlage hinzugefügt wurde.
-    /// </summary>
-    public DateTime AddedWhen { get; set; }
-
-    /// <summary>
-    /// Der Inhalt (Body) der E-Mail-Vorlage. Kann null sein.
-    /// </summary>
-    public string? Body { get; set; }
-
-    /// <summary>
-    /// Der Betreff der E-Mail-Vorlage. Kann null sein.
-    /// </summary>
-    public string? Subject { get; set; }
-
-    /// <summary>
-    /// Das Datum und die Uhrzeit, wann die Vorlage zuletzt geändert wurde. Kann null sein.
-    /// </summary>
-    public DateTime? ChangedWhen { get; set; }
-}