diff --git a/SOPE/NGCards/CardElement.m b/SOPE/NGCards/CardElement.m
index 80b6a0c7b..c9d9943d2 100644
--- a/SOPE/NGCards/CardElement.m
+++ b/SOPE/NGCards/CardElement.m
@@ -319,7 +319,10 @@
                        aValue];
   index = [self _namedValue: aValueName];
   if (index == NSNotFound)
-    [self addValue: newValue];
+    {
+      if ([aValue length])
+	[self addValue: newValue];
+    }
   else
     {
       if ([aValue length])
diff --git a/SOPE/NGCards/ChangeLog b/SOPE/NGCards/ChangeLog
index 64682c35a..ce782ad2d 100644
--- a/SOPE/NGCards/ChangeLog
+++ b/SOPE/NGCards/ChangeLog
@@ -1,3 +1,8 @@
+2010-08-24  Francis Lachapelle  <flachapelle@inverse.ca>
+
+	* CardElement.m (-setNamedValue:to:): don't add the value if nil
+	and not already defined.
+
 2010-08-19  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* iCalAlarm.m (-setComment, -setSummary, -setAction)