diff --git a/Main/GNUmakefile.preamble b/Main/GNUmakefile.preamble
index 1132d88bc..99bdcff36 100644
--- a/Main/GNUmakefile.preamble
+++ b/Main/GNUmakefile.preamble
@@ -21,7 +21,7 @@ $(SOGOD)_TOOL_LIBS += \
 	-lGDLContentStore	\
 	-lGDLAccess		\
 	-lWEExtensions		\
-	-lNGiCal		\
+	-lNGCards		\
 	-lNGObjWeb		\
 	-lNGMime -lNGLdap	\
 	-lNGStreams -lNGExtensions -lEOControl \
diff --git a/OGoContentStore/GNUmakefile.preamble b/OGoContentStore/GNUmakefile.preamble
index 354dafbed..faf4e378b 100644
--- a/OGoContentStore/GNUmakefile.preamble
+++ b/OGoContentStore/GNUmakefile.preamble
@@ -3,7 +3,7 @@
 libOGoContentStore_LIBRARIES_DEPEND_UPON += \
 	-lGDLContentStore	\
 	-lGDLAccess	\
-	-lNGiCal	\
+	-lNGCards	\
 	-lNGExtensions	\
 	-lEOControl	\
 	-lSaxObjC
@@ -24,7 +24,7 @@ test_quick_extract_TOOL_LIBS += \
 	-lSaxObjC		\
 	-lDOM			\
 	-lNGExtensions		\
-	-lNGiCal		\
+	-lNGCards		\
 	-lGDLContentStore	\
 	-lGDLAccess		\
 	-lOGoContentStore
diff --git a/OGoContentStore/OCSContactFieldExtractor.m b/OGoContentStore/OCSContactFieldExtractor.m
index 36e8a7c22..cdce2121a 100644
--- a/OGoContentStore/OCSContactFieldExtractor.m
+++ b/OGoContentStore/OCSContactFieldExtractor.m
@@ -24,7 +24,7 @@
 @interface OCSContactFieldExtractor : GCSFieldExtractor
 @end
 
-#include <NGiCal/NGVCard.h>
+#include <NGCards/NGVCard.h>
 #include "common.h"
 
 @implementation OCSContactFieldExtractor
diff --git a/OGoContentStore/OCSiCalFieldExtractor.m b/OGoContentStore/OCSiCalFieldExtractor.m
index a35e75760..3190df7da 100644
--- a/OGoContentStore/OCSiCalFieldExtractor.m
+++ b/OGoContentStore/OCSiCalFieldExtractor.m
@@ -22,7 +22,7 @@
 #include "OCSiCalFieldExtractor.h"
 #include "common.h"
 #include <SaxObjC/SaxObjC.h>
-#include <NGiCal/NGiCal.h>
+#include <NGCards/NGCards.h>
 #include "iCalEntityObject+OCS.h"
 #include "iCalRepeatableEntityObject+OCS.h"
 
@@ -45,7 +45,7 @@ static NSNumber                  *distantFutureNumber = nil;
 	        retain];
   if (parser == nil)
     NSLog(@"ERROR: did not find a parser for text/calendar!");
-  sax = [[SaxObjectDecoder alloc] initWithMappingNamed:@"NGiCal"];
+  sax = [[SaxObjectDecoder alloc] initWithMappingNamed:@"NGCards"];
   if (sax == nil)
       NSLog(@"ERROR: could not create the iCal SAX handler!");
   [parser setContentHandler:sax];
diff --git a/OGoContentStore/iCalRepeatableEntityObject+OCS.h b/OGoContentStore/iCalRepeatableEntityObject+OCS.h
index 87c83728c..36371ede4 100644
--- a/OGoContentStore/iCalRepeatableEntityObject+OCS.h
+++ b/OGoContentStore/iCalRepeatableEntityObject+OCS.h
@@ -24,7 +24,7 @@
 #ifndef	__OGoContentStore_iCalRepeatableEntityObject_OCS_H_
 #define	__OGoContentStore_iCalRepeatableEntityObject_OCS_H_
 
-#include <NGiCal/NGiCal.h>
+#include <NGCards/NGCards.h>
 
 @interface iCalRepeatableEntityObject (OCS)
 
diff --git a/Protocols/common.make b/Protocols/common.make
index 59752b3bf..0cc98888b 100644
--- a/Protocols/common.make
+++ b/Protocols/common.make
@@ -31,6 +31,6 @@ BUNDLE_LIBS +=					\
 	-lOGoContentStore			\
 	-lGDLAccess				\
 	-lNGObjWeb				\
-	-lNGMime -lNGiCal -lNGLdap 		\
+	-lNGMime -lNGCards -lNGLdap 		\
 	-lNGStreams -lNGExtensions -lEOControl	\
 	-lXmlRpc -lDOM -lSaxObjC
diff --git a/Protocols/iCalHTTP/SOGoICalFilePublish.m b/Protocols/iCalHTTP/SOGoICalFilePublish.m
index 9be217e93..1dd9a3c5e 100644
--- a/Protocols/iCalHTTP/SOGoICalFilePublish.m
+++ b/Protocols/iCalHTTP/SOGoICalFilePublish.m
@@ -31,8 +31,8 @@
 #include <SoObjects/Appointments/SOGoAppointmentFolder.h>
 #include <SoObjects/Appointments/SOGoAppointmentObject.h>
 #include <SOGo/SOGoAppointment.h>
-#include <NGiCal/NGiCal.h>
-#include <NGiCal/iCalRenderer.h>
+#include <NGCards/NGCards.h>
+#include <NGCards/iCalRenderer.h>
 #include <SaxObjC/SaxObjC.h>
 #include "common.h"
 
@@ -51,7 +51,7 @@ static SaxObjectDecoder          *sax   = nil;
       NSLog(@"ERROR: did not find a parser for text/calendar!");
   }
   if (sax == nil) {
-    sax = [[SaxObjectDecoder alloc] initWithMappingNamed:@"NGiCal"];
+    sax = [[SaxObjectDecoder alloc] initWithMappingNamed:@"NGCards"];
     if (sax == nil)
       NSLog(@"ERROR: could not create the iCal SAX handler!");
   }
diff --git a/SoObjects/Appointments/SOGoAppointmentFolder.m b/SoObjects/Appointments/SOGoAppointmentFolder.m
index a14177caf..e9f2f71dc 100644
--- a/SoObjects/Appointments/SOGoAppointmentFolder.m
+++ b/SoObjects/Appointments/SOGoAppointmentFolder.m
@@ -25,7 +25,7 @@
 #include <SOGo/AgenorUserManager.h>
 #include <GDLContentStore/GCSFolder.h>
 #include <SaxObjC/SaxObjC.h>
-#include <NGiCal/NGiCal.h>
+#include <NGCards/NGCards.h>
 #include <NGExtensions/NGCalendarDateRange.h>
 #include "common.h"
 
diff --git a/SoObjects/Appointments/SOGoAppointmentObject.m b/SoObjects/Appointments/SOGoAppointmentObject.m
index d9e1804a3..764346eb7 100644
--- a/SoObjects/Appointments/SOGoAppointmentObject.m
+++ b/SoObjects/Appointments/SOGoAppointmentObject.m
@@ -23,7 +23,7 @@
 #include <SOGo/AgenorUserManager.h>
 #include <SOGo/SOGoAppointment.h>
 #include <SaxObjC/SaxObjC.h>
-#include <NGiCal/NGiCal.h>
+#include <NGCards/NGCards.h>
 #include <NGMime/NGMime.h>
 #include <NGMail/NGMail.h>
 #include <NGMail/NGSendMail.h>
@@ -78,7 +78,7 @@ static NSString                  *mailTemplateDefaultLanguage = nil;
     retain];
   if (parser == nil)
     [logger fatalWithFormat:@"did not find a parser for text/calendar!"];
-  sax = [[SaxObjectDecoder alloc] initWithMappingNamed:@"NGiCal"];
+  sax = [[SaxObjectDecoder alloc] initWithMappingNamed:@"NGCards"];
   if (sax == nil)
     [logger fatalWithFormat:@"could not create the iCal SAX handler!"];
   
diff --git a/SoObjects/Appointments/SOGoFreeBusyObject.m b/SoObjects/Appointments/SOGoFreeBusyObject.m
index 1cff82c53..dc0bed2e3 100644
--- a/SoObjects/Appointments/SOGoFreeBusyObject.m
+++ b/SoObjects/Appointments/SOGoFreeBusyObject.m
@@ -23,11 +23,11 @@
 #include "SOGoFreeBusyObject.h"
 #include "common.h"
 #include <SOGo/AgenorUserManager.h>
-#include <NGiCal/NGiCal.h>
-#include <NGiCal/iCalRenderer.h>
+#include <NGCards/NGCards.h>
+#include <NGCards/iCalRenderer.h>
 
 @interface NSDate(UsedPrivates)
-- (NSString *)icalString; // declared in NGiCal
+- (NSString *)icalString; // declared in NGCards
 @end
 
 @interface SOGoFreeBusyObject (PrivateAPI)
diff --git a/SoObjects/Contacts/GNUmakefile b/SoObjects/Contacts/GNUmakefile
index fb2d7dd44..99db1eafc 100644
--- a/SoObjects/Contacts/GNUmakefile
+++ b/SoObjects/Contacts/GNUmakefile
@@ -17,8 +17,6 @@ Contacts_OBJC_FILES =			\
 					\
 	NSDictionary+Contact.m		\
 	NGLdapEntry+Contact.m		\
-	NGVCard+Contact.m		\
-	NGVCardSimpleValue+Contact.m	\
 
 Contacts_RESOURCE_FILES +=		\
 	Version				\
diff --git a/SoObjects/SOGo/SOGoAppointment.m b/SoObjects/SOGo/SOGoAppointment.m
index 63710860a..440040bf8 100644
--- a/SoObjects/SOGo/SOGoAppointment.m
+++ b/SoObjects/SOGo/SOGoAppointment.m
@@ -21,7 +21,7 @@
 
 #include "SOGoAppointment.h"
 #include <SaxObjC/SaxObjC.h>
-#include <NGiCal/NGiCal.h>
+#include <NGCards/NGCards.h>
 #include <EOControl/EOControl.h>
 #include "SOGoAppointmentICalRenderer.h"
 #include "common.h"
@@ -52,7 +52,7 @@ static NGLogger                  *logger = nil;
     retain];
   if (parser == nil)
     [logger fatalWithFormat:@"did not find a parser for text/calendar!"];
-  sax = [[SaxObjectDecoder alloc] initWithMappingNamed:@"NGiCal"];
+  sax = [[SaxObjectDecoder alloc] initWithMappingNamed:@"NGCards"];
   if (sax == nil)
     [logger fatalWithFormat:@"could not create the iCal SAX handler!"];
   
@@ -422,8 +422,8 @@ static NGLogger                  *logger = nil;
 
 
 /*
- NOTE: this is not the same API as used by NGiCal!
- SOGo/OGo cannot deal with the complete NGiCal API properly, although
+ NOTE: this is not the same API as used by NGCards!
+ SOGo/OGo cannot deal with the complete NGCards API properly, although
  SOGo COULD do so in the future
 */
 - (void)setRecurrenceRule:(iCalRecurrenceRule *)_rrule {
diff --git a/SoObjects/SOGo/SOGoAppointmentICalRenderer.m b/SoObjects/SOGo/SOGoAppointmentICalRenderer.m
index 4c737f53e..6718d94d6 100644
--- a/SoObjects/SOGo/SOGoAppointmentICalRenderer.m
+++ b/SoObjects/SOGo/SOGoAppointmentICalRenderer.m
@@ -21,14 +21,14 @@
 
 #include "SOGoAppointmentICalRenderer.h"
 #include "SOGoAppointment.h"
-#include <NGiCal/NGiCal.h>
-#include <NGiCal/iCalRenderer.h>
+#include <NGCards/NGCards.h>
+#include <NGCards/iCalRenderer.h>
 #include "common.h"
 
-// TODO: the basic renderer should be part of NGiCal
+// TODO: the basic renderer should be part of NGCards
 
 @interface NSDate(UsedPrivates)
-- (NSString *)icalString; // declared in NGiCal
+- (NSString *)icalString; // declared in NGCards
 @end
 
 @implementation SOGoAppointmentICalRenderer
diff --git a/SoObjects/common.make b/SoObjects/common.make
index 2c0f2b812..8b1fb43d9 100644
--- a/SoObjects/common.make
+++ b/SoObjects/common.make
@@ -25,7 +25,7 @@ BUNDLE_LIBS += \
 	-lGDLContentStore			\
 	-lGDLAccess				\
 	-lNGObjWeb				\
-	-lNGiCal -lNGMime -lNGLdap		\
+	-lNGCards -lNGMime -lNGLdap		\
 	-lNGStreams -lNGExtensions -lEOControl	\
 	-lXmlRpc -lDOM -lSaxObjC
 
diff --git a/UI/Contacts/UIxContactEditorBase.h b/UI/Contacts/UIxContactEditorBase.h
index af041c69b..f3016c295 100644
--- a/UI/Contacts/UIxContactEditorBase.h
+++ b/UI/Contacts/UIxContactEditorBase.h
@@ -28,7 +28,6 @@
 
 @interface UIxContactEditorBase : UIxComponent
 {
-  NSString *contentString;
   NSString *errorText;
   NSString *anaisCN;
   NSMutableDictionary *snapshot; /* contains the values for editing */
diff --git a/UI/Contacts/UIxContactEditorBase.m b/UI/Contacts/UIxContactEditorBase.m
index ee2027cd3..5a20484c5 100644
--- a/UI/Contacts/UIxContactEditorBase.m
+++ b/UI/Contacts/UIxContactEditorBase.m
@@ -38,25 +38,11 @@
   [self->snapshot      release];
   [self->anaisCN      release];
   [self->errorText     release];
-  [self->contentString release];
   [super dealloc];
 }
 
 /* accessors */
 
-- (void)setContentString:(NSString *)_cstr
-{
-  ASSIGNCOPY(self->contentString, _cstr);
-}
-
-- (NSString *)contentString {
-  return self->contentString;
-}
-
-- (NSString *)contentStringTemplate {
-  return @"{}"; /* empty property list */
-}
-
 - (NSMutableDictionary *) snapshot
 {
   NSString *email;
@@ -92,24 +78,6 @@
 
 /* load/store content format */
 
-- (void)loadValuesFromContentString:(NSString *)_s {
-  NSDictionary *plist;
-
-  if ([_s hasPrefix:@"BEGIN:VCARD"]) {
-    // TODO: load vCard values
-    [self errorWithFormat:@"Editing of vCard's is not yet supported!"];
-    return;
-  }
-  
-  if ((plist = [_s propertyList]) == nil) {
-    [self errorWithFormat:@"could not parse content string!"];
-    return;
-  }
-  
-  [self->snapshot removeAllObjects];
-  [self->snapshot addEntriesFromDictionary:plist];
-}
-
 - (void)_fixupSnapshot {
   // TODO: perform sanity checking, eg build CN on demand
   NSString *cn, *gn, *sn;
diff --git a/UI/MailPartViewers/UIxMailPartICalViewer.m b/UI/MailPartViewers/UIxMailPartICalViewer.m
index 427c2813f..9f7f9dc52 100644
--- a/UI/MailPartViewers/UIxMailPartICalViewer.m
+++ b/UI/MailPartViewers/UIxMailPartICalViewer.m
@@ -51,7 +51,7 @@
 #include <SoObjects/Appointments/SOGoAppointmentFolder.h>
 #include <SoObjects/Appointments/SOGoAppointmentObject.h>
 #include <SoObjects/Mailer/SOGoMailObject.h>
-#include <NGiCal/NGiCal.h>
+#include <NGCards/NGCards.h>
 #include <NGImap4/NGImap4EnvelopeAddress.h>
 #include "common.h"
 
diff --git a/UI/Scheduler/UIxAppointmentEditor.m b/UI/Scheduler/UIxAppointmentEditor.m
index e672bd151..e5e3132d3 100644
--- a/UI/Scheduler/UIxAppointmentEditor.m
+++ b/UI/Scheduler/UIxAppointmentEditor.m
@@ -88,7 +88,7 @@
 @end
 
 #include "common.h"
-#include <NGiCal/NGiCal.h>
+#include <NGCards/NGCards.h>
 #include <NGExtensions/NGCalendarDateRange.h>
 #include <SOGoUI/SOGoDateFormatter.h>
 #include <SOGo/SOGoAppointment.h>
@@ -103,7 +103,7 @@
 @end
 
 @interface NSDate(UsedPrivates)
-- (NSString *)icalString; // TODO: this is in NGiCal
+- (NSString *)icalString; // TODO: this is in NGCards
 @end
 
 @implementation UIxAppointmentEditor
diff --git a/UI/Scheduler/UIxAppointmentProposal.m b/UI/Scheduler/UIxAppointmentProposal.m
index 4f180d834..283acfbba 100644
--- a/UI/Scheduler/UIxAppointmentProposal.m
+++ b/UI/Scheduler/UIxAppointmentProposal.m
@@ -57,7 +57,7 @@
 #include <SoObjects/Appointments/SOGoAppointmentFolder.h>
 #include <SoObjects/Appointments/SOGoFreeBusyObject.h>
 #include <NGExtensions/NGCalendarDateRange.h>
-#include <NGiCal/NGiCal.h>
+#include <NGCards/NGCards.h>
 #include "common.h"
 
 @implementation UIxAppointmentProposal
diff --git a/UI/Scheduler/UIxAppointmentView.m b/UI/Scheduler/UIxAppointmentView.m
index aef7ef5e3..65b53ecc0 100644
--- a/UI/Scheduler/UIxAppointmentView.m
+++ b/UI/Scheduler/UIxAppointmentView.m
@@ -20,7 +20,7 @@
 */
 
 #include "UIxAppointmentView.h"
-#include <NGiCal/NGiCal.h>
+#include <NGCards/NGCards.h>
 #include <SOGo/SOGoAppointment.h>
 #include <SOGo/WOContext+Agenor.h>
 #include <Appointments/SOGoAppointmentObject.h>
diff --git a/UI/Scheduler/UIxCalDateLabel.m b/UI/Scheduler/UIxCalDateLabel.m
index 5a53fde8a..c75ba5ba5 100644
--- a/UI/Scheduler/UIxCalDateLabel.m
+++ b/UI/Scheduler/UIxCalDateLabel.m
@@ -37,7 +37,7 @@
 @end
 
 #include "common.h"
-#include <NGiCal/NGiCal.h>
+#include <NGCards/NGCards.h>
 
 @implementation UIxCalDateLabel
 
diff --git a/UI/Scheduler/UIxCalParticipationStatusView.m b/UI/Scheduler/UIxCalParticipationStatusView.m
index 983ee26c6..63dd22f2a 100644
--- a/UI/Scheduler/UIxCalParticipationStatusView.m
+++ b/UI/Scheduler/UIxCalParticipationStatusView.m
@@ -31,7 +31,7 @@
 
 @end
 
-#include <NGiCal/NGiCal.h> /* for iCalPersonPartStat */
+#include <NGCards/NGCards.h> /* for iCalPersonPartStat */
 #include "common.h"
 
 @implementation UIxCalParticipationStatusView
diff --git a/UI/Scheduler/UIxCalView.m b/UI/Scheduler/UIxCalView.m
index e74d07b08..e08d0229e 100644
--- a/UI/Scheduler/UIxCalView.m
+++ b/UI/Scheduler/UIxCalView.m
@@ -7,7 +7,7 @@
 #include <NGObjWeb/SoUser.h>
 #include <SOGoUI/SOGoAptFormatter.h>
 #include <NGExtensions/NGCalendarDateRange.h>
-#include <NGiCal/NGiCal.h>
+#include <NGCards/NGCards.h>
 #include "UIxComponent+Agenor.h"
 
 @interface UIxCalView (PrivateAPI)
diff --git a/UI/Scheduler/iCalPerson+UIx.h b/UI/Scheduler/iCalPerson+UIx.h
index f14bd25a5..10667cd70 100644
--- a/UI/Scheduler/iCalPerson+UIx.h
+++ b/UI/Scheduler/iCalPerson+UIx.h
@@ -23,7 +23,7 @@
 #ifndef __iCalPerson_UIx_H__
 #define __iCalPerson_UIx_H__
 
-#include <NGiCal/NGiCal.h>
+#include <NGCards/NGCards.h>
 
 @class NSString;
 
diff --git a/UI/Scheduler/iCalRecurrenceRule+SOGo.m b/UI/Scheduler/iCalRecurrenceRule+SOGo.m
index 6d42ca804..004c6c436 100644
--- a/UI/Scheduler/iCalRecurrenceRule+SOGo.m
+++ b/UI/Scheduler/iCalRecurrenceRule+SOGo.m
@@ -19,7 +19,7 @@
   02111-1307, USA.
 */
 
-#include <NGiCal/NGiCal.h>
+#include <NGCards/NGCards.h>
 #include "common.h"
 
 /* HACK ALERT
diff --git a/UI/common.make b/UI/common.make
index ecb62dbf7..f1c5fdb8f 100644
--- a/UI/common.make
+++ b/UI/common.make
@@ -43,6 +43,6 @@ BUNDLE_LIBS += \
 	-lGDLContentStore			\
 	-lGDLAccess				\
 	-lNGObjWeb				\
-	-lNGMime -lNGiCal -lNGLdap		\
+	-lNGMime -lNGCards -lNGLdap		\
 	-lNGStreams -lNGExtensions -lEOControl	\
 	-lXmlRpc -lDOM -lSaxObjC