--- a/commondrm/drmrightsmanagerui/src/DRMCommonUtilities.cpp	Tue Feb 02 00:21:44 2010 +0200
+++ b/commondrm/drmrightsmanagerui/src/DRMCommonUtilities.cpp	Fri Feb 19 23:05:49 2010 +0200
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2003-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -308,10 +308,18 @@
     TUint32 drmScheme( EDrmSchemeUnknownDrm );
     params = new( ELeave )CArrayFixFlat<TPtrC>( sizeof( TPtrC ) );
     CleanupStack::PushL( params );
-
+	TChar ch;
+		
+	aLex.Mark();
     while ( !aLex.Eos() )                // Extract the parameters
         {
-        params->AppendL( aLex.NextToken() );
+        ch = aLex.Get();
+        if ( ch == '\x00' ) {
+        	aLex.UnGet();
+            params->AppendL( aLex.MarkedToken() );
+        	aLex.Get();
+            aLex.Mark();
+        	}
         }
 
     TInt startParam = KMaxTInt;