--- a/webengine/widgetregistry/Client/src/WidgetRegistryClient.cpp	Tue Aug 31 16:17:46 2010 +0300
+++ b/webengine/widgetregistry/Client/src/WidgetRegistryClient.cpp	Wed Sep 01 12:28:30 2010 +0100
@@ -19,8 +19,7 @@
 #include <e32base.h>
 #include <f32file.h>
 #include <s32mem.h>
-#include "WidgetRegistryClient.h"
-
+#include <widgetregistryclient.h>
 
 // ============================================================================
 // Starts the widget registry server
@@ -626,14 +625,14 @@
 CBufFlat* RWidgetRegistryClientSession::MarshalPropertyValuesL(
     const RPointerArray<CWidgetPropertyValue>&  aPropertyValues ) const
     {
-    CBufFlat* buf = CBufFlat::NewL( 512 );
+    CBufFlat* buf = CBufFlat::NewL( 4096 );
     CleanupStack::PushL( buf );
 
     RBufWriteStream stream( *buf );
     CleanupClosePushL( stream );
 
     TInt i = 0;
-    for ( ; i < EWidgetPropertyIdCount; ++i )
+    for ( ; i < aPropertyValues.Count(); ++i )
         {
         aPropertyValues[i]->SerializeL( stream );
         }