This commit is contained in:
Ludovic Marcotte
2013-11-19 11:39:45 -05:00
parent 854fed529c
commit eb7d1f08bc
2 changed files with 64 additions and 14 deletions
+25 -3
View File
@@ -253,11 +253,33 @@ static NSArray *infoKeys = nil;
- (NSString *) replyTo
{
SOGoUserDefaults *ud;
NSString *value;
value = nil;
ud = [[context activeUser] userDefaults];
//
// We add the correct replyTo here. That is, the one specified in the defaults
// for the main "SOGo mail account" versus the one specified in the auxiliary
// IMAP accounts.
//
if ([[[[self clientObject] mailAccountFolder] nameInContainer] intValue] == 0)
{
SOGoUserDefaults *ud;
ud = [[context activeUser] userDefaults];
value = [ud mailReplyTo];
}
else
{
NSArray *identities;
identities = [[[self clientObject] mailAccountFolder] identities];
return [ud mailReplyTo];
if ([identities count])
value = [[identities objectAtIndex: 0] objectForKey: @"replyTo"];
}
return value;
}
- (void) setSubject: (NSString *) newSubject