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

Merge pull request #1304 from tkasch/reply-fix

Browse source 
Fix threading view in Thunderbird (others?)
This commit is contained in:
the-djmaze 2023-11-14 17:05:00 +01:00 • committed by GitHub
commit 442c4f5eb5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -864,7 +864,7 @@ export class ComposePopupView extends AbstractViewPopup {
this.prepareMessageAttachments(oLastMessage, options.mode); this.prepareMessageAttachments(oLastMessage, options.mode);
this.aDraftInfo = ['reply', oLastMessage.uid, oLastMessage.folder]; this.aDraftInfo = ['reply', oLastMessage.uid, oLastMessage.folder];
this.sInReplyTo = oLastMessage.messageId; this.sInReplyTo = oLastMessage.messageId;
this.sReferences = (oLastMessage.messageId + ' ' + oLastMessage.references).trim(); this.sReferences = (oLastMessage.references + ' ' + oLastMessage.messageId).trim();
// OpenPGP “Transferable Public Key” // OpenPGP “Transferable Public Key”
// oLastMessage.autocrypt?.keydata // oLastMessage.autocrypt?.keydata
break; break;
@ -875,7 +875,7 @@ export class ComposePopupView extends AbstractViewPopup {
this.prepareMessageAttachments(oLastMessage, options.mode); this.prepareMessageAttachments(oLastMessage, options.mode);
this.aDraftInfo = ['forward', oLastMessage.uid, oLastMessage.folder]; this.aDraftInfo = ['forward', oLastMessage.uid, oLastMessage.folder];
this.sInReplyTo = oLastMessage.messageId; this.sInReplyTo = oLastMessage.messageId;
this.sReferences = (oLastMessage.messageId + ' ' + oLastMessage.references).trim(); this.sReferences = (oLastMessage.references + ' ' + oLastMessage.messageId).trim();
break; break;
case ComposeType.Draft: case ComposeType.Draft:

5
snappymail/v/0.0.0/app/libraries/MailSo/Mime/Header.php
View file

@ -156,8 +156,9 @@ class Header
} }
} }
// https://www.rfc-editor.org/rfc/rfc2822#section-2.1.1 // https://www.rfc-editor.org/rfc/rfc2822#section-2.1.1, avoid folding immediately after the header name
return \wordwrap($this->NameWithDelimitrom() . $sResult, 78, "\r\n "); return $this->NameWithDelimitrom() . \wordwrap($sResult, 78 - \strlen($this->NameWithDelimitrom()) - 1, "\r\n ");
} }
public function IsSubject() : bool public function IsSubject() : bool