From 3e06ceed9c079e5eea77ca354bf9f3313e9952c2 Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Thu, 14 Oct 2010 15:23:01 +0000
Subject: [PATCH] Monotone-Parent: 09bcfb738b2c42b80dc2cb6f86e424832aa7812c
 Monotone-Revision: d51b0bdc42c0c60b209cf5ea1a4e1394f6d8c81d

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-10-14T15:23:01
Monotone-Branch: ca.inverse.sogo
---
 OpenChange/MAPIStoreMailContext.m | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/OpenChange/MAPIStoreMailContext.m b/OpenChange/MAPIStoreMailContext.m
index 10daacc4c..7e1ac3b09 100644
--- a/OpenChange/MAPIStoreMailContext.m
+++ b/OpenChange/MAPIStoreMailContext.m
@@ -242,6 +242,7 @@ static Class SOGoUserFolderK;
   struct SRow *properties;
   NSArray *to;
   NSInteger count, max;
+  NGImap4EnvelopeAddress *currentAddress;
   NSString *name;
   uint32_t tags[] = { PR_SUBJECT_UNICODE, PR_HASATTACH,
                       PR_MESSAGE_DELIVERY_TIME, PR_MESSAGE_FLAGS,
@@ -273,7 +274,10 @@ static Class SOGoUserFolderK;
                                   PR_RECIPIENT_TYPE,
                                   MAPILongValue (memCtx, 0x01));
 
-          name = [[to objectAtIndex: count] personalName];
+          currentAddress = [to objectAtIndex: count];
+          name = [currentAddress personalName];
+          if (![name length])
+            name = [currentAddress baseEMail];
           set_SPropValue_proptag (&(recipients->aRow[count].lpProps[1]),
                                   PR_DISPLAY_NAME,
                                   [name asUnicodeInMemCtx: recipients->aRow[count].lpProps]);