diff --git a/src/agents/store/object-model.c b/src/agents/store/object-model.c
index 8404bd7..f46b247 100644
--- a/src/agents/store/object-model.c
+++ b/src/agents/store/object-model.c
@@ -750,15 +750,13 @@ StoreObjectIterQueryBuilder(StoreClient *client, QueryBuilder *builder, BOOL sho
 	if (MsgSQLCommitTransaction(client->storedb))
 		goto abort;
 	
-	if (builder->output_mode != MODE_PROPGET) {
-		// we don't output a final success code in PROPGET 
-		if (show_total) {
-			ConnWriteF(client->conn, "1000 %ld\r\n", total);
-		} else {
-			ConnWriteStr(client->conn, MSG1000OK);
-		}
+	if (show_total) {
+		ConnWriteF(client->conn, "1000 %ld\r\n", total);
+	} else {
+		ConnWriteStr(client->conn, MSG1000OK);
 	}
 	
+	
 	QueryBuilderFinish(builder);
 	return 1000;
 
diff --git a/src/libs/python/bongo/store/StoreClient.py b/src/libs/python/bongo/store/StoreClient.py
index d936541..9b76c39 100644
--- a/src/libs/python/bongo/store/StoreClient.py
+++ b/src/libs/python/bongo/store/StoreClient.py
@@ -717,6 +717,7 @@ class StoreClient:
             # eat the \r\n afterward
             self.stream.Read(2)
             r = self.stream.GetResponse()
+        
         # automatically pull out imap_uid from Bongo 0.3.
         if name is None and not props.has_key("nmap.mail.imapuid"):
             self.stream.Write("PROPGET %s nmap.mail.imapuid" % (doc))