This commit is contained in:
the-djmaze 2023-05-12 23:21:55 +02:00
parent ffde5ddfb3
commit 2c014caa72

View file

@ -1356,7 +1356,7 @@ export class ComposePopupView extends AbstractViewPopup {
async getMessageRequestParams(sSaveFolder, draft)
{
let Text = this.oEditor.getData().trim(),
l = Text.length,
l,
hasAttachments = 0;
// Prepare ComposeAttachmentModel attachments
@ -1374,10 +1374,6 @@ export class ComposePopupView extends AbstractViewPopup {
}
});
if (!draft && !l && !hasAttachments) {
throw i18n('COMPOSE/ERROR_EMPTY_BODY');
}
const
identity = this.currentIdentity(),
params = {
@ -1426,6 +1422,9 @@ export class ComposePopupView extends AbstractViewPopup {
? await this.mailvelope.createDraft()
: await this.mailvelope.encrypt(recipients);
} else if (sign || encrypt) {
if (!draft && !hasAttachments && !Text.length) {
throw i18n('COMPOSE/ERROR_EMPTY_BODY');
}
let data = new MimePart;
data.headers['Content-Type'] = 'text/'+(isHtml?'html':'plain')+'; charset="utf-8"';
data.headers['Content-Transfer-Encoding'] = 'base64';