Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-09-07 00:17:03 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Resolve #370

Browse source
This commit is contained in:
the-djmaze 2022-05-06 15:55:02 +02:00
parent bf5f478dcc
commit f671adceb3
1 changed files with 13 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

27
dev/View/Popup/Compose.js
View file

@ -914,7 +914,6 @@ export class ComposePopupView extends AbstractViewPopup {
mEmail = AccountUserStore.email(), mEmail = AccountUserStore.email(),
lineComposeType = sType || ComposeType.Empty; lineComposeType = sType || ComposeType.Empty;
oMessageOrArray = oMessageOrArray || null;
if (oMessageOrArray) { if (oMessageOrArray) {
message = message =
1 === arrayLength(oMessageOrArray) 1 === arrayLength(oMessageOrArray)
@ -952,7 +951,7 @@ export class ComposePopupView extends AbstractViewPopup {
if (lineComposeType && message) { if (lineComposeType && message) {
sDate = timestampToString(message.dateTimeStampInUTC(), 'FULL'); sDate = timestampToString(message.dateTimeStampInUTC(), 'FULL');
sSubject = message.subject(); sSubject = message.subject();
aDraftInfo = message.aDraftInfo; aDraftInfo = message.draftInfo;
switch (lineComposeType) { switch (lineComposeType) {
case ComposeType.Empty: case ComposeType.Empty:
@ -963,8 +962,8 @@ export class ComposePopupView extends AbstractViewPopup {
this.subject(replySubjectAdd('Re', sSubject)); this.subject(replySubjectAdd('Re', sSubject));
this.prepareMessageAttachments(message, lineComposeType); this.prepareMessageAttachments(message, lineComposeType);
this.aDraftInfo = ['reply', message.uid, message.folder]; this.aDraftInfo = ['reply', message.uid, message.folder];
this.sInReplyTo = message.sMessageId; this.sInReplyTo = message.messageId;
this.sReferences = (this.sInReplyTo + ' ' + message.sReferences).trim(); this.sReferences = (message.messageId + ' ' + message.references).trim();
break; break;
case ComposeType.ReplyAll: { case ComposeType.ReplyAll: {
@ -974,8 +973,8 @@ export class ComposePopupView extends AbstractViewPopup {
this.subject(replySubjectAdd('Re', sSubject)); this.subject(replySubjectAdd('Re', sSubject));
this.prepareMessageAttachments(message, lineComposeType); this.prepareMessageAttachments(message, lineComposeType);
this.aDraftInfo = ['reply', message.uid, message.folder]; this.aDraftInfo = ['reply', message.uid, message.folder];
this.sInReplyTo = message.sMessageId; this.sInReplyTo = message.messageId;
this.sReferences = (this.sInReplyTo + ' ' + message.references).trim(); this.sReferences = (message.messageId + ' ' + message.references).trim();
break; break;
} }
@ -983,16 +982,16 @@ export class ComposePopupView extends AbstractViewPopup {
this.subject(replySubjectAdd('Fwd', sSubject)); this.subject(replySubjectAdd('Fwd', sSubject));
this.prepareMessageAttachments(message, lineComposeType); this.prepareMessageAttachments(message, lineComposeType);
this.aDraftInfo = ['forward', message.uid, message.folder]; this.aDraftInfo = ['forward', message.uid, message.folder];
this.sInReplyTo = message.sMessageId; this.sInReplyTo = message.messageId;
this.sReferences = (this.sInReplyTo + ' ' + message.sReferences).trim(); this.sReferences = (message.messageId + ' ' + message.references).trim();
break; break;
case ComposeType.ForwardAsAttachment: case ComposeType.ForwardAsAttachment:
this.subject(replySubjectAdd('Fwd', sSubject)); this.subject(replySubjectAdd('Fwd', sSubject));
this.prepareMessageAttachments(message, lineComposeType); this.prepareMessageAttachments(message, lineComposeType);
this.aDraftInfo = ['forward', message.uid, message.folder]; this.aDraftInfo = ['forward', message.uid, message.folder];
this.sInReplyTo = message.sMessageId; this.sInReplyTo = message.messageId;
this.sReferences = (this.sInReplyTo + ' ' + message.sReferences).trim(); this.sReferences = (message.messageId + ' ' + message.references).trim();
break; break;
case ComposeType.Draft: case ComposeType.Draft:
@ -1010,8 +1009,8 @@ export class ComposePopupView extends AbstractViewPopup {
this.prepareMessageAttachments(message, lineComposeType); this.prepareMessageAttachments(message, lineComposeType);
this.aDraftInfo = 3 === arrayLength(aDraftInfo) ? aDraftInfo : null; this.aDraftInfo = 3 === arrayLength(aDraftInfo) ? aDraftInfo : null;
this.sInReplyTo = message.sInReplyTo; this.sInReplyTo = message.inReplyTo;
this.sReferences = message.sReferences; this.sReferences = message.references;
break; break;
case ComposeType.EditAsNew: case ComposeType.EditAsNew:
@ -1024,8 +1023,8 @@ export class ComposePopupView extends AbstractViewPopup {
this.prepareMessageAttachments(message, lineComposeType); this.prepareMessageAttachments(message, lineComposeType);
this.aDraftInfo = 3 === arrayLength(aDraftInfo) ? aDraftInfo : null; this.aDraftInfo = 3 === arrayLength(aDraftInfo) ? aDraftInfo : null;
this.sInReplyTo = message.sInReplyTo; this.sInReplyTo = message.inReplyTo;
this.sReferences = message.sReferences; this.sReferences = message.references;
break; break;
// no default // no default
} }