(fix) addition fix for #3152
parent
96b2e0e1f5
commit
e71a1c9974
|
@ -2490,6 +2490,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
else
|
else
|
||||||
[map setObject: email forKey: @"from"];
|
[map setObject: email forKey: @"from"];
|
||||||
|
|
||||||
|
if ([[mailObject envelope] messageId])
|
||||||
|
[map setObject: [[mailObject envelope] messageId] forKey: @"in-reply-to"];
|
||||||
|
|
||||||
messageToSend = [[[NGMimeMessage alloc] initWithHeader: map] autorelease];
|
messageToSend = [[[NGMimeMessage alloc] initWithHeader: map] autorelease];
|
||||||
body = [[[NGMimeMultipartBody alloc] initWithPart: messageToSend] autorelease];
|
body = [[[NGMimeMultipartBody alloc] initWithPart: messageToSend] autorelease];
|
||||||
|
|
||||||
|
|
|
@ -973,10 +973,19 @@ struct GlobalObjectId {
|
||||||
[s appendFormat: @"</Categories>"];
|
[s appendFormat: @"</Categories>"];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if ([[[context request] headerForKey: @"MS-ASProtocolVersion"] isEqualToString: @"14.0"] &&
|
||||||
|
[[[context request] headerForKey: @"MS-ASProtocolVersion"] isEqualToString: @"14.1"])
|
||||||
|
{
|
||||||
|
if ([self inReplyTo])
|
||||||
|
[s appendFormat: @"<ConversationId xmlns=\"Email2:\">%@</ConversationId>", [[[self inReplyTo] dataUsingEncoding: NSUTF8StringEncoding] activeSyncRepresentationInContext: context]];
|
||||||
|
else if ([self messageId])
|
||||||
|
[s appendFormat: @"<ConversationId xmlns=\"Email2:\">%@</ConversationId>", [[[self messageId] dataUsingEncoding: NSUTF8StringEncoding] activeSyncRepresentationInContext: context]];
|
||||||
|
}
|
||||||
|
|
||||||
// FIXME - support these in the future
|
// FIXME - support these in the future
|
||||||
//[s appendString: @"<ConversationId xmlns=\"Email2:\">foobar</ConversationId>"];
|
|
||||||
//[s appendString: @"<ConversationIndex xmlns=\"Email2:\">zot=</ConversationIndex>"];
|
//[s appendString: @"<ConversationIndex xmlns=\"Email2:\">zot=</ConversationIndex>"];
|
||||||
|
|
||||||
|
|
||||||
// NativeBodyType -- http://msdn.microsoft.com/en-us/library/ee218276(v=exchg.80).aspx
|
// NativeBodyType -- http://msdn.microsoft.com/en-us/library/ee218276(v=exchg.80).aspx
|
||||||
// This is a required child element.
|
// This is a required child element.
|
||||||
// 1 -> plain/text, 2 -> HTML and 3 -> RTF
|
// 1 -> plain/text, 2 -> HTML and 3 -> RTF
|
||||||
|
|
Loading…
Reference in New Issue