From 10ac445f7cc7c1b361fee583696e7a16d4e2a29b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrique=20J=2E=20Hern=C3=A1ndez=20Blasco?= Date: Mon, 27 Jul 2015 11:18:14 +0200 Subject: [PATCH] oc-mail: Fallback to PidTagSubject unicode when creating new mail Some clients such as OpenChange client does not send the following properties PidTagNormalizedSubject or PidTagSubjectPrefix as suggested by [MS-OXCMAIL]. --- OpenChange/MAPIStoreMailVolatileMessage.m | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/OpenChange/MAPIStoreMailVolatileMessage.m b/OpenChange/MAPIStoreMailVolatileMessage.m index ca9f1c42e..f2581a54a 100644 --- a/OpenChange/MAPIStoreMailVolatileMessage.m +++ b/OpenChange/MAPIStoreMailVolatileMessage.m @@ -771,6 +771,12 @@ FillMessageHeadersFromProperties (NGMutableHashMap *headers, subjectData = [mailProperties objectForKey: MAPIPropertyKey (PR_NORMALIZED_SUBJECT_UNICODE)]; if (subjectData) [subject appendString: subjectData]; + if ([subject length] == 0) + { + subjectData = [mailProperties objectForKey: MAPIPropertyKey (PR_SUBJECT_UNICODE)]; + if (subjectData) + [subject appendString: subjectData]; + } [headers setObject: [subject asQPSubjectString: @"utf-8"] forKey: @"subject"]; messageId = [mailProperties objectForKey: MAPIPropertyKey (PR_INTERNET_MESSAGE_ID_UNICODE)];