diff --git a/ChangeLog b/ChangeLog
index ac74fd60f..9acf1b60a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2011-01-11  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* OpenChange/MAPIStoreContext.m (-openMessage:forKey:inTable:):
+	avoid taking NULL values into account when returning the basic
+	properties.
+
 	* OpenChange/SOGoContactGCSEntry+MAPIStore.m
 	(-setMAPIProperties:): added support for work address and its
 	corresponding addresse label. Preliminary support for
diff --git a/OpenChange/MAPIStoreContext.m b/OpenChange/MAPIStoreContext.m
index e8b8bf841..499758b67 100644
--- a/OpenChange/MAPIStoreContext.m
+++ b/OpenChange/MAPIStoreContext.m
@@ -803,11 +803,13 @@ _prepareContextClass (struct mapistore_context *newMemCtx,
 		    @" returned for proptag %s(0x%.8x)",
 		    propName, tags[count]];
 	    }
-
-	  set_SPropValue_proptag (properties->lpProps + properties->cValues,
-				  tags[count],
-				  propValue);
-	  properties->cValues++;
+	  else
+	    {
+	      set_SPropValue_proptag (properties->lpProps + properties->cValues,
+				      tags[count],
+				      propValue);
+	      properties->cValues++;
+	    }
 	}
     }
   msg->properties = properties;