Index: libmapi/IMAPIProp.c
===================================================================
--- libmapi/IMAPIProp.c	(revision 2595)
+++ libmapi/IMAPIProp.c	(working copy)
@@ -196,7 +196,6 @@
 	struct EcDoRpc_MAPI_REQ	*mapi_req;
 	struct SetProps_req	request;
 	struct mapi_session	*session;
-	struct mapi_nameid	*nameid;
 	struct SPropTagArray	*SPropTagArray = NULL;
 	NTSTATUS		status;
 	enum MAPISTATUS		retval;
@@ -217,18 +216,6 @@
 
 	mem_ctx = talloc_named(NULL, 0, "SetProps");
 	size = 0;
-
-	/* Named property mapping */
-	nameid = mapi_nameid_new(mem_ctx);
-	retval = mapi_nameid_lookup_SPropValue(nameid, lpProps, PropCount);
-	if (retval == MAPI_E_SUCCESS) {
-		named = true;
-		SPropTagArray = talloc_zero(mem_ctx, struct SPropTagArray);
-		retval = GetIDsFromNames(obj, nameid->count, nameid->nameid, 0, &SPropTagArray);
-		OPENCHANGE_RETVAL_IF(retval, retval, mem_ctx);
-		mapi_nameid_map_SPropValue(nameid, lpProps, PropCount, SPropTagArray);
-		MAPIFreeBuffer(SPropTagArray);
-	}
 	errno = 0;
 
 	/* build the array */
@@ -269,11 +256,6 @@
 
 	OPENCHANGE_CHECK_NOTIFICATION(session, mapi_response);
 
-	if (named == true) {
-		mapi_nameid_unmap_SPropValue(nameid, lpProps, PropCount);
-	}
-	talloc_free(nameid);
-
 	talloc_free(mapi_response);
 	talloc_free(mem_ctx);
 
