From e547d4c4e33df9519906237a7291076d4074f934 Mon Sep 17 00:00:00 2001
From: Kjetil <kjetil3@gmail.com>
Date: Fri, 27 Mar 2026 10:52:11 +0100
Subject: [PATCH] fix(compose): confirm empty-subject sends

Warn before sending a message without a subject so users can cancel accidental blank-subject emails.

#1361
---
 src/app/compose/compose.component.spec.ts | 109 ++++++++++++++++++++++
 src/app/compose/compose.component.ts      |   5 +
 2 files changed, 114 insertions(+)
 create mode 100644 src/app/compose/compose.component.spec.ts

diff --git a/src/app/compose/compose.component.spec.ts b/src/app/compose/compose.component.spec.ts
new file mode 100644
index 000000000..c0f43f759
--- /dev/null
+++ b/src/app/compose/compose.component.spec.ts
@@ -0,0 +1,109 @@
+import { NgZone } from '@angular/core';
+import { Location } from '@angular/common';
+import { UntypedFormBuilder } from '@angular/forms';
+import { of, BehaviorSubject } from 'rxjs';
+import { ComposeComponent } from './compose.component';
+import { DraftFormModel } from './draftdesk.service';
+import { MailAddressInfo } from '../common/mailaddressinfo';
+
+describe('ComposeComponent', () => {
+    const createComponent = () => {
+        const snackBar = {
+            open: jasmine.createSpy('open')
+        };
+        const rmmapi = {
+            saveDraft: jasmine.createSpy('saveDraft').and.returnValue(of(['1', 'Sent', '123'])),
+            deleteCachedMessageContents: jasmine.createSpy('deleteCachedMessageContents')
+        };
+        const draftDeskservice = {
+            fromsSubject: new BehaviorSubject([
+                {
+                    nameAndAddress: 'Sender <sender@example.com>',
+                    email: 'sender@example.com',
+                    from_name: 'Sender',
+                    id: 42,
+                    folder: 'Inbox',
+                    reply_to: '',
+                }
+            ]),
+            isEditing: -1,
+            composingNewDraft: null,
+        };
+        const dialogService = {
+            openProgressDialog: jasmine.createSpy('openProgressDialog'),
+            closeProgressDialog: jasmine.createSpy('closeProgressDialog')
+        };
+        const recipientservice = {
+            recentlyUsed: new BehaviorSubject([])
+        };
+        const preferenceService = {
+            preferences: new BehaviorSubject({
+                get: () => 'false'
+            }),
+            prefGroup: 'compose'
+        };
+        const component = new ComposeComponent(
+            {} as any,
+            snackBar as any,
+            rmmapi as any,
+            draftDeskservice as any,
+            { refreshFolderList: jasmine.createSpy('refreshFolderList') } as any,
+            { post: jasmine.createSpy('post') } as any,
+            new UntypedFormBuilder(),
+            {} as Location,
+            dialogService as any,
+            recipientservice as any,
+            preferenceService as any,
+            new NgZone({ enableLongStackTrace: false }),
+        );
+
+        component.model = new DraftFormModel();
+        component.model.to = MailAddressInfo.parse('recipient@example.com');
+        component.model.cc = [];
+        component.model.bcc = [];
+        component.formGroup = new UntypedFormBuilder().group({
+            from: 'Sender <sender@example.com>',
+            subject: '',
+            msg_body: 'Body',
+            useHTML: false,
+        });
+        spyOn(component.draftDeleted, 'emit');
+        spyOn(component as any, 'exitToTable');
+
+        return { component, rmmapi, dialogService };
+    };
+
+    it('asks for confirmation before sending a blank-subject message', () => {
+        const { component, rmmapi, dialogService } = createComponent();
+        spyOn(window, 'confirm').and.returnValue(false);
+
+        component.submit(true);
+
+        expect(window.confirm).toHaveBeenCalledWith('Send this message without a subject?');
+        expect(rmmapi.saveDraft).not.toHaveBeenCalled();
+        expect(dialogService.openProgressDialog).not.toHaveBeenCalled();
+        expect(component.savingInProgress).toBeFalse();
+    });
+
+    it('sends after confirming a blank-subject message', () => {
+        const { component, rmmapi, dialogService } = createComponent();
+        spyOn(window, 'confirm').and.returnValue(true);
+
+        component.submit(true);
+
+        expect(window.confirm).toHaveBeenCalledWith('Send this message without a subject?');
+        expect(dialogService.openProgressDialog).toHaveBeenCalled();
+        expect(rmmapi.saveDraft).toHaveBeenCalled();
+    });
+
+    it('does not ask for confirmation when the subject is present', () => {
+        const { component, rmmapi } = createComponent();
+        component.formGroup.patchValue({ subject: 'Hello' });
+        const confirmSpy = spyOn(window, 'confirm');
+
+        component.submit(true);
+
+        expect(confirmSpy).not.toHaveBeenCalled();
+        expect(rmmapi.saveDraft).toHaveBeenCalled();
+    });
+});
diff --git a/src/app/compose/compose.component.ts b/src/app/compose/compose.component.ts
index e1aa9ecf2..037b06c3b 100644
--- a/src/app/compose/compose.component.ts
+++ b/src/app/compose/compose.component.ts
@@ -693,6 +693,11 @@ export class ComposeComponent implements AfterViewInit, OnDestroy, OnInit {
             return;
         }
 
+        const subject = (this.formGroup?.value?.subject ?? this.model.subject ?? '').trim();
+        if (send && !subject && !window.confirm('Send this message without a subject?')) {
+            return;
+        }
+
         this.savingInProgress = true;
 
         if (send) {