Fix for bug #2119

NEWS

@@ -11,14 +11,16 @@ Enhancements
    SOGoMaximumSubmissionInterval and SOGoMessageSubmissionBlockInterval defaults 
  - now possible to send or not event notifications on a per-event basis
  - now possible to see who created an event/task in a delegated calendar
+ - multi-domain support in OpenChange (implemented as a workaround)
 
 Bug fixes
- - Fixed decoding of the charset parameter when using single quotes (#2306)
- - Fixed potential crash when sending MDN from Sent folder (#2209)
- - Fixed handling of unicode separators (#2309)
- - Fixed public access when SOGoTrustProxyAuthentication is used (#2237)
- - Fixed access right issues with import feature (#2294)
- - Fixed IMAP ACL issue when SOGoForceExternalLoginWithEmail is used (#2313)
+ - fixed decoding of the charset parameter when using single quotes (#2306)
+ - fixed potential crash when sending MDN from Sent folder (#2209)
+ - fixed handling of unicode separators (#2309)
+ - fixed public access when SOGoTrustProxyAuthentication is used (#2237)
+ - fixed access right issues with import feature (#2294)
+ - fixed IMAP ACL issue when SOGoForceExternalLoginWithEmail is used (#2313)
+ - OpenChange stability fixes
 
 2.0.5a (2013-04-17)
 ------------------

OpenChange/MAPIStoreMailMessage.m

@@ -693,7 +693,15 @@ _compareBodyKeysByPriority (id entry1, id entry2, void *data)
   ngAddress = [[NGMailAddressParser mailAddressParserWithString: fullMail]
                 parse];
   if ([ngAddress isKindOfClass: [NGMailAddress class]])
-    cn = [ngAddress displayName];
+    {
+      cn = [ngAddress displayName];
+      
+      // If we don't have a displayName, we use the email address instead. This
+      // avoid bug #2119 - where Outlook won't display anything in the "From" field,
+      // nor in the recipient field if we reply to the email.
+      if (![cn length])
+	cn = [ngAddress address];
+    }
   else
     cn = @"";