mirror of
https://github.com/inverse-inc/sogo.git
synced 2026-11-21 15:02:40 +00:00
Respect signature placement when forwarding a msg
This commit is contained in:
1 parent
940f85fde2
commit
b26e767a10
53 files changed
+387
-93
No files matched your search
@@ -889,7 +889,6 @@ static NSString *userAgent = nil;
|
||||
NSDictionary *info, *attachment;
|
||||
NSString *signature, *nl;
|
||||
SOGoUserDefaults *ud;
|
||||
BOOL asInline;
|
||||
|
||||
[sourceMail fetchCoreInfos];
|
||||
|
||||
@@ -907,10 +906,9 @@ static NSString *userAgent = nil;
|
||||
|
||||
/* attach message */
|
||||
ud = [[context activeUser] userDefaults];
|
||||
asInline = [[ud mailMessageForwarding] isEqualToString: @"inline"];
|
||||
if (asInline)
|
||||
if ([[ud mailMessageForwarding] isEqualToString: @"inline"])
|
||||
{
|
||||
[self setText: [sourceMail contentForReply]];
|
||||
[self setText: [sourceMail contentForInlineForward]];
|
||||
[self _fetchAttachmentsFromMail: sourceMail];
|
||||
}
|
||||
else
|
||||
@@ -921,7 +919,7 @@ static NSString *userAgent = nil;
|
||||
if ([signature length])
|
||||
{
|
||||
nl = (isHTML ? @"<br/>" : @"\n");
|
||||
[self setText: [NSString stringWithFormat: @"%@-- %@%@", nl, nl, signature]];
|
||||
[self setText: [NSString stringWithFormat: @"%@%@-- %@%@", nl, nl, nl, signature]];
|
||||
}
|
||||
attachment = [NSDictionary dictionaryWithObjectsAndKeys:
|
||||
[sourceMail filenameForForward], @"filename",
|
||||
|
||||
Reference in new issue
Block a user