diff --git a/ChangeLog b/ChangeLog
index 14ebd9976..e33a2979d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2012-04-25  Jean Raby  <jraby@inverse.ca>
+
+	* SoObjects/Mailer/SOGoDraftObject.m
+	(-updateFromLDIFRecord:): carry the c_info attribute
+	in vcards through the x-sogo-contactinfo attribute.
+	This functionality was lost a while ago.
+	We used to use the NOTE attribute for this. From now on,
+	the sogo-connector.autoComplete.commentAttribute have to be set to
+	'unprocessed:x-sogo-contactinfo' instead of 'Notes'.
+
+
 2012-04-25  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* UI/PreferencesUI/UIxPreferences.m (_extractMainIdentity:): save
diff --git a/SoObjects/Contacts/NGVCard+SOGo.m b/SoObjects/Contacts/NGVCard+SOGo.m
index b462ad147..0039b73c5 100644
--- a/SoObjects/Contacts/NGVCard+SOGo.m
+++ b/SoObjects/Contacts/NGVCard+SOGo.m
@@ -297,7 +297,11 @@ convention:
   else
     [self setBday: @""];
 
-  [self setNote: [ldifRecord objectForKey: @"description"]];
+  /* hack to carry SOGoLDAPContactInfo to vcards */
+  [[self uniqueChildWithTag: @"x-sogo-contactinfo"]
+    setSingleValue: [ldifRecord objectForKey: @"c_info"]
+            forKey: @""];
+
   [self setCategories: [ldifRecord objectForKey: @"vcardcategories"]];
 
   [self cleanupEmptyChildren];