diff --git a/ChangeLog b/ChangeLog
index d6407a6dc..8d415e848 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2007-06-01  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* SoObjects/Contacts/SOGoContactGCSEntry.m ([SOGoContactGCSEntry
+	-vCard]): directly use the "content" ivar since it is initialized
+	during object creation.
+
 	* SoObjects/Contacts/SOGoContactLDAPFolder.m
 	([SOGoContactLDAPFolder -init]): no longer handle the
 	nameInContainer no the container ivars. They were removed because
diff --git a/SoObjects/Contacts/SOGoContactGCSEntry.m b/SoObjects/Contacts/SOGoContactGCSEntry.m
index 39aca0a4b..b56e5a928 100644
--- a/SoObjects/Contacts/SOGoContactGCSEntry.m
+++ b/SoObjects/Contacts/SOGoContactGCSEntry.m
@@ -40,8 +40,7 @@
 
 - (void) dealloc
 {
-  if (card)
-    [card release];
+  [card release];
   [super dealloc];
 }
 
@@ -49,13 +48,10 @@
 
 - (NGVCard *) vCard
 {
-  NSString *contentStr;
-
   if (!card)
     {
-      contentStr = [self contentAsString];
-      if ([[contentStr uppercaseString] hasPrefix:@"BEGIN:VCARD"])
-        card = [NGVCard parseSingleFromSource: contentStr];
+      if ([[content uppercaseString] hasPrefix: @"BEGIN:VCARD"])
+        card = [NGVCard parseSingleFromSource: content];
       else
         card = [NGVCard cardWithUid: [self nameInContainer]];
       [card retain];