diff --git a/src-ui/src/app/components/manage/mail/mail.component.ts b/src-ui/src/app/components/manage/mail/mail.component.ts
index 6a11d85b3..f664b6276 100644
--- a/src-ui/src/app/components/manage/mail/mail.component.ts
+++ b/src-ui/src/app/components/manage/mail/mail.component.ts
@@ -27,7 +27,7 @@ import { MailRuleEditDialogComponent } from '../../common/edit-dialog/mail-rule-
 import { PageHeaderComponent } from '../../common/page-header/page-header.component'
 import { PermissionsDialogComponent } from '../../common/permissions-dialog/permissions-dialog.component'
 import { ComponentWithPermissions } from '../../with-permissions/with-permissions.component'
-import { ProcessedMailsDialogComponent } from './processed-mails-dialog/processed-mails-dialog.component'
+import { ProcessedMailDialogComponent } from './processed-mail-dialog/processed-mail-dialog.component'
 
 @Component({
   selector: 'pngx-mail',
@@ -349,7 +349,7 @@ export class MailComponent
   }
 
   viewProcessedMails(rule: MailRule) {
-    const modal = this.modalService.open(ProcessedMailsDialogComponent, {
+    const modal = this.modalService.open(ProcessedMailDialogComponent, {
       backdrop: 'static',
       size: 'xl',
     })
diff --git a/src-ui/src/app/components/manage/mail/processed-mails-dialog/processed-mails-dialog.component.html b/src-ui/src/app/components/manage/mail/processed-mail-dialog/processed-mail-dialog.component.html
similarity index 97%
rename from src-ui/src/app/components/manage/mail/processed-mails-dialog/processed-mails-dialog.component.html
rename to src-ui/src/app/components/manage/mail/processed-mail-dialog/processed-mail-dialog.component.html
index 916619534..1639cc952 100644
--- a/src-ui/src/app/components/manage/mail/processed-mails-dialog/processed-mails-dialog.component.html
+++ b/src-ui/src/app/components/manage/mail/processed-mail-dialog/processed-mail-dialog.component.html
@@ -1,5 +1,5 @@
 <div class="modal-header">
-  <h6 class="modal-title" id="modal-basic-title" i18n>Processed Mails for <em>{{ rule.name }}</em></h6>
+  <h6 class="modal-title" id="modal-basic-title" i18n>Processed Mail for <em>{{ rule.name }}</em></h6>
   <button class="btn btn-sm btn-link text-muted me-auto p-0 p-md-2" title="What's this?" i18n-title type="button" [ngbPopover]="infoPopover" [autoClose]="true">
     <i-bs name="question-circle"></i-bs>
   </button>
@@ -17,7 +17,7 @@
       </div>
     </div>
   } @else if (processedMails.length === 0) {
-    <span i18n>No processed mails found.</span>
+    <span i18n>No processed email messages found.</span>
   } @else {
     <div class="table-responsive">
       <table class="table table-hover table-sm align-middle">
diff --git a/src-ui/src/app/components/manage/mail/processed-mails-dialog/processed-mails-dialog.component.scss b/src-ui/src/app/components/manage/mail/processed-mail-dialog/processed-mail-dialog.component.scss
similarity index 100%
rename from src-ui/src/app/components/manage/mail/processed-mails-dialog/processed-mails-dialog.component.scss
rename to src-ui/src/app/components/manage/mail/processed-mail-dialog/processed-mail-dialog.component.scss
diff --git a/src-ui/src/app/components/manage/mail/processed-mails-dialog/processed-mails-dialog.component.spec.ts b/src-ui/src/app/components/manage/mail/processed-mail-dialog/processed-mail-dialog.component.spec.ts
similarity index 93%
rename from src-ui/src/app/components/manage/mail/processed-mails-dialog/processed-mails-dialog.component.spec.ts
rename to src-ui/src/app/components/manage/mail/processed-mail-dialog/processed-mail-dialog.component.spec.ts
index ebc4e0006..6bc44f975 100644
--- a/src-ui/src/app/components/manage/mail/processed-mails-dialog/processed-mails-dialog.component.spec.ts
+++ b/src-ui/src/app/components/manage/mail/processed-mail-dialog/processed-mail-dialog.component.spec.ts
@@ -11,11 +11,11 @@ import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'
 import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons'
 import { ToastService } from 'src/app/services/toast.service'
 import { environment } from 'src/environments/environment'
-import { ProcessedMailsDialogComponent } from './processed-mails-dialog.component'
+import { ProcessedMailDialogComponent } from './processed-mail-dialog.component'
 
-describe('ProcessedMailsDialogComponent', () => {
-  let component: ProcessedMailsDialogComponent
-  let fixture: ComponentFixture<ProcessedMailsDialogComponent>
+describe('ProcessedMailDialogComponent', () => {
+  let component: ProcessedMailDialogComponent
+  let fixture: ComponentFixture<ProcessedMailDialogComponent>
   let httpTestingController: HttpTestingController
   let toastService: ToastService
 
@@ -24,7 +24,7 @@ describe('ProcessedMailsDialogComponent', () => {
   beforeEach(async () => {
     await TestBed.configureTestingModule({
       imports: [
-        ProcessedMailsDialogComponent,
+        ProcessedMailDialogComponent,
         FormsModule,
         NgxBootstrapIconsModule.pick(allIcons),
       ],
@@ -38,7 +38,7 @@ describe('ProcessedMailsDialogComponent', () => {
 
     httpTestingController = TestBed.inject(HttpTestingController)
     toastService = TestBed.inject(ToastService)
-    fixture = TestBed.createComponent(ProcessedMailsDialogComponent)
+    fixture = TestBed.createComponent(ProcessedMailDialogComponent)
     component = fixture.componentInstance
     component.rule = rule
   })
diff --git a/src-ui/src/app/components/manage/mail/processed-mails-dialog/processed-mails-dialog.component.ts b/src-ui/src/app/components/manage/mail/processed-mail-dialog/processed-mail-dialog.component.ts
similarity index 92%
rename from src-ui/src/app/components/manage/mail/processed-mails-dialog/processed-mails-dialog.component.ts
rename to src-ui/src/app/components/manage/mail/processed-mail-dialog/processed-mail-dialog.component.ts
index 14c72daa6..a4d3275c4 100644
--- a/src-ui/src/app/components/manage/mail/processed-mails-dialog/processed-mails-dialog.component.ts
+++ b/src-ui/src/app/components/manage/mail/processed-mail-dialog/processed-mail-dialog.component.ts
@@ -16,7 +16,7 @@ import { ProcessedMailService } from 'src/app/services/rest/processed-mail.servi
 import { ToastService } from 'src/app/services/toast.service'
 
 @Component({
-  selector: 'pngx-processed-mails-dialog',
+  selector: 'pngx-processed-mail-dialog',
   imports: [
     ConfirmButtonComponent,
     CustomDatePipe,
@@ -28,10 +28,10 @@ import { ToastService } from 'src/app/services/toast.service'
     ReactiveFormsModule,
     SlicePipe,
   ],
-  templateUrl: './processed-mails-dialog.component.html',
-  styleUrl: './processed-mails-dialog.component.scss',
+  templateUrl: './processed-mail-dialog.component.html',
+  styleUrl: './processed-mail-dialog.component.scss',
 })
-export class ProcessedMailsDialogComponent implements OnInit {
+export class ProcessedMailDialogComponent implements OnInit {
   private activeModal = inject(NgbActiveModal)
   private processedMailService = inject(ProcessedMailService)
   private toastService = inject(ToastService)