amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-08-20 06:03:20 +00:00
Code Issues Projects Releases Wiki Activity

Use matching recipient address when replying

Browse Source 
Fixes #4495
This commit is contained in:
Francis Lachapelle
2018-07-09 15:49:36 -04:00
parent d6f85efa8a
commit 120f1280a4
3 changed files with 37 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/MailerUI/UIxMailEditor.m
+29 -3
View File
@@ -253,11 +253,37 @@ static NSArray *infoKeys = nil;
- (NSString *) from
{
NSArray *identities;
NSEnumerator *allIdentities;
NSDictionary *identity;
NSRange r;
BOOL valid;
if (!from)
identities = [[[self clientObject] mailAccountFolder] identities];
if ([identities count])
{
identities = [[[self clientObject] mailAccountFolder] identities];
if ([identities count])
if (from)
{
allIdentities = [identities objectEnumerator];
valid = NO;
while ((identity = [allIdentities nextObject]) && !valid)
{
// from ivar must contain a valid email address surrounded by pointy brackets
r = [[from lowercaseString] rangeOfString: [NSString stringWithFormat: @"<%@>", [[identity objectForKey: @"email"] lowercaseString]]];
if (r.length > 0)
{
valid = YES;
[from release];
from = [self _emailFromIdentity: identity];
[from retain];
}
}
if (!valid)
{
[from release];
from = nil;
}
}
if (!from)
{
from = [self _emailFromIdentity: [identities objectAtIndex: 0]];
[from retain];