diff --git a/ChangeLog b/ChangeLog
index 987f6cecc..5ff9c0b4a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-01-11  Ludovic Marcotte  <lmarcotte@inverse.ca>
+
+	* OpenChange/MAPIStoreContactsMessageTable.m
+	Added more properties: home/work URL, nickname	
+	and department.
+
 2011-01-11  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* OpenChange/MAPIStoreContactsMessageTable.m
diff --git a/OpenChange/MAPIStoreContactsMessageTable.m b/OpenChange/MAPIStoreContactsMessageTable.m
index f173037b4..c4dd5ffe6 100644
--- a/OpenChange/MAPIStoreContactsMessageTable.m
+++ b/OpenChange/MAPIStoreContactsMessageTable.m
@@ -121,12 +121,23 @@
       break;
 
     case PR_COMPANY_NAME_UNICODE:
-      child = [self lookupChild: childKey];
-      /* that's buggy but it's for the demo */
-      stringValue = [[[child vCard] org] componentsJoinedByString: @", "];
-      if (!stringValue)
-	stringValue = @"";
-      *data = [stringValue asUnicodeInMemCtx: memCtx];
+    case PR_DEPARTMENT_NAME_UNICODE:
+      {
+	NSArray *values;
+	
+	child = [self lookupChild: childKey];
+	values = [[child vCard] org];
+	stringValue = nil;
+
+	if (proptag == PR_COMPANY_NAME_UNICODE && [values count] > 0)
+	  stringValue = [values objectAtIndex: 0];
+	else if (proptag == PR_DEPARTMENT_NAME_UNICODE && [values count] > 1)
+	  stringValue = [values objectAtIndex: 1];
+	
+	if (!stringValue)
+	  stringValue = @"";
+	*data = [stringValue asUnicodeInMemCtx: memCtx];
+      }
       break;
 
     case PR_SUBJECT_UNICODE:
@@ -192,6 +203,26 @@
       *data = [stringValue asUnicodeInMemCtx: memCtx];
       break;
 
+    case PR_BUSINESS_HOME_PAGE_UNICODE:
+    case PR_PERSONAL_HOME_PAGE_UNICODE:
+      {
+	NSString *type;
+
+	type = (proptag == PR_BUSINESS_HOME_PAGE_UNICODE ? @"work" : @"home");
+
+	child = [self lookupChild: childKey];
+	
+	element = [self _element: @"url" ofType: type
+			excluding: nil
+			inCard: [child vCard]];
+	if (element)
+	  stringValue = [element value: 0];
+	else
+	  stringValue = @"";
+	*data = [stringValue asUnicodeInMemCtx: memCtx];
+      }
+      break;
+      
     case PidLidEmail1AddressType:
     case PidLidEmail2AddressType:
     case PidLidEmail3AddressType:
@@ -374,6 +405,13 @@
       *data = [stringValue asUnicodeInMemCtx: memCtx];
       break;
 
+      // PidTagNickname
+    case PR_NICKNAME_UNICODE:
+      child = [self lookupChild: childKey];
+      stringValue = [[child vCard] nickname];
+      *data = [stringValue asUnicodeInMemCtx: memCtx];
+      break;
+      
     default:
       rc = [super getChildProperty: data
 			    forKey: childKey
diff --git a/UI/Scheduler/UIxComponentEditor.m b/UI/Scheduler/UIxComponentEditor.m
index 6c44fda8c..891796575 100644
--- a/UI/Scheduler/UIxComponentEditor.m
+++ b/UI/Scheduler/UIxComponentEditor.m
@@ -1253,9 +1253,9 @@ iRANGE(2);
 	  currentOwnerIdentity = [currentUser defaultIdentity];
 
 	  currentOwnerProfile = [NSMutableDictionary dictionary];
-	  [currentOwnerProfile setObject: [currentOwnerIdentity objectForKey: @"fullName"]
+	  [currentOwnerProfile setObject: ([currentOwnerIdentity objectForKey: @"fullName"] == nil ? @"" : [currentOwnerIdentity objectForKey: @"fullName"])
 				  forKey: @"name"];
-	  [currentOwnerProfile setObject: [currentOwnerIdentity objectForKey: @"email"]
+	  [currentOwnerProfile setObject: ([currentOwnerIdentity objectForKey: @"email"] == nil ? @"" : [currentOwnerIdentity objectForKey: @"email"])
 				  forKey: @"email"];
 	  [currentOwnerProfile setObject: @"accepted"
 				  forKey: @"partstat"];