parent
e07a5f75ec
commit
bfda86e31c
1
NEWS
1
NEWS
|
@ -23,6 +23,7 @@ Bug fixes
|
||||||
- [web] improved CSS sanitizer for HTML messages (#3700)
|
- [web] improved CSS sanitizer for HTML messages (#3700)
|
||||||
- [web] fixed toolbar of mail editor when sender address was too long (#3705)
|
- [web] fixed toolbar of mail editor when sender address was too long (#3705)
|
||||||
- [web] fixed decoding of filename in attachments (quotes and Cyrillic characters) (#2272)
|
- [web] fixed decoding of filename in attachments (quotes and Cyrillic characters) (#2272)
|
||||||
|
- [web] fixed recipients when replying from a message in the Sent mailbox (#2625)
|
||||||
- [core] strip X- tags when securing content (#3695)
|
- [core] strip X- tags when securing content (#3695)
|
||||||
- [eas] when using EAS/ItemOperations, use IMAP PEEK operation
|
- [eas] when using EAS/ItemOperations, use IMAP PEEK operation
|
||||||
|
|
||||||
|
|
|
@ -735,6 +735,7 @@ static NSString *userAgent = nil;
|
||||||
//
|
//
|
||||||
- (void) _fillInReplyAddresses: (NSMutableDictionary *) _info
|
- (void) _fillInReplyAddresses: (NSMutableDictionary *) _info
|
||||||
replyToAll: (BOOL) _replyToAll
|
replyToAll: (BOOL) _replyToAll
|
||||||
|
fromSentMailbox: (BOOL) _fromSentMailbox
|
||||||
envelope: (NGImap4Envelope *) _envelope
|
envelope: (NGImap4Envelope *) _envelope
|
||||||
{
|
{
|
||||||
/*
|
/*
|
||||||
|
@ -746,8 +747,6 @@ static NSString *userAgent = nil;
|
||||||
Note: we cannot check reply-to, because Cyrus even sets a reply-to in the
|
Note: we cannot check reply-to, because Cyrus even sets a reply-to in the
|
||||||
envelope if none is contained in the message itself! (bug or
|
envelope if none is contained in the message itself! (bug or
|
||||||
feature?)
|
feature?)
|
||||||
|
|
||||||
TODO: what about sender (RFC 822 3.6.2)
|
|
||||||
*/
|
*/
|
||||||
NSMutableArray *to, *addrs, *allRecipients;
|
NSMutableArray *to, *addrs, *allRecipients;
|
||||||
NSArray *envelopeAddresses;
|
NSArray *envelopeAddresses;
|
||||||
|
@ -789,7 +788,9 @@ static NSString *userAgent = nil;
|
||||||
|
|
||||||
addrs = [NSMutableArray array];
|
addrs = [NSMutableArray array];
|
||||||
envelopeAddresses = [_envelope replyTo];
|
envelopeAddresses = [_envelope replyTo];
|
||||||
if ([envelopeAddresses count])
|
if (_fromSentMailbox)
|
||||||
|
[addrs setArray: [_envelope to]];
|
||||||
|
else if ([envelopeAddresses count])
|
||||||
[addrs setArray: envelopeAddresses];
|
[addrs setArray: envelopeAddresses];
|
||||||
else
|
else
|
||||||
[addrs setArray: [_envelope from]];
|
[addrs setArray: [_envelope from]];
|
||||||
|
@ -963,17 +964,21 @@ static NSString *userAgent = nil;
|
||||||
- (void) fetchMailForReplying: (SOGoMailObject *) sourceMail
|
- (void) fetchMailForReplying: (SOGoMailObject *) sourceMail
|
||||||
toAll: (BOOL) toAll
|
toAll: (BOOL) toAll
|
||||||
{
|
{
|
||||||
|
BOOL fromSentMailbox;
|
||||||
NSString *msgID;
|
NSString *msgID;
|
||||||
NSMutableDictionary *info;
|
NSMutableDictionary *info;
|
||||||
NGImap4Envelope *sourceEnvelope;
|
NGImap4Envelope *sourceEnvelope;
|
||||||
|
|
||||||
|
fromSentMailbox = [[sourceMail container] isKindOfClass: [SOGoSentFolder class]];
|
||||||
[sourceMail fetchCoreInfos];
|
[sourceMail fetchCoreInfos];
|
||||||
|
|
||||||
info = [NSMutableDictionary dictionaryWithCapacity: 16];
|
info = [NSMutableDictionary dictionaryWithCapacity: 16];
|
||||||
[info setObject: [sourceMail subjectForReply] forKey: @"subject"];
|
[info setObject: [sourceMail subjectForReply] forKey: @"subject"];
|
||||||
|
|
||||||
sourceEnvelope = [sourceMail envelope];
|
sourceEnvelope = [sourceMail envelope];
|
||||||
[self _fillInReplyAddresses: info replyToAll: toAll
|
[self _fillInReplyAddresses: info
|
||||||
|
replyToAll: toAll
|
||||||
|
fromSentMailbox: fromSentMailbox
|
||||||
envelope: sourceEnvelope];
|
envelope: sourceEnvelope];
|
||||||
msgID = [sourceEnvelope messageID];
|
msgID = [sourceEnvelope messageID];
|
||||||
if ([msgID length] > 0)
|
if ([msgID length] > 0)
|
||||||
|
|
Loading…
Reference in New Issue