--- a/iaupdate/IAD/ui/src/iaupdatemaincontainer.cpp	Fri Mar 19 09:33:35 2010 +0200
+++ b/iaupdate/IAD/ui/src/iaupdatemaincontainer.cpp	Fri Apr 16 15:05:20 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-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"
@@ -129,7 +129,8 @@
     iEikonEnv->CreateResourceReaderLC( reader, R_IAUPDATE_UPDATES_LIST );
     iListBox->ConstructFromResourceL( reader );
     CleanupStack::PopAndDestroy();
-    
+
+    iListBox->EnableStretching( EFalse );
     iListBox->ItemDrawer()->ColumnData()->EnableMarqueeL( ETrue );
 
     // Setup scroll bars
@@ -426,19 +427,17 @@
             CleanupStack::PopAndDestroy( buffer );
             CleanupStack::PopAndDestroy( name );
             }
-
         
         if ( node->NodeType() == MIAUpdateAnyNode::ENodeTypeFw ) 
             {
-            MIAUpdateFwNode* fwnode = static_cast<MIAUpdateFwNode*>( node );
+            HBufC* firmwareHeader = StringLoader::LoadLC(R_IAUPDATE_MAIN_DEVICE_FW);
             HBufC* firmwarename = HBufC::NewLC( node->Base().Name().Length() +
-                                                KSpace.iTypeLength +
-                                                fwnode->FwVersion1().Length() );  
+                                                KSpace.iTypeLength + 
+                                                firmwareHeader->Length() );
             firmwarename->Des() = node->Base().Name();
             firmwarename->Des() += KSpace();
-            firmwarename->Des() += fwnode->FwVersion1();
-            
-            
+            firmwarename->Des() += *firmwareHeader;
+                     
             HBufC* buffer = HBufC::NewLC( KOne.iTypeLength +
                                           KTabulator.iTypeLength + 
                                           firmwarename->Length() + 
@@ -457,6 +456,7 @@
             iItemTextArray->AppendL( *buffer );
             CleanupStack::PopAndDestroy( buffer );
             CleanupStack::PopAndDestroy( firmwarename );
+            CleanupStack::PopAndDestroy( firmwareHeader );
             }
         
         CleanupStack::PopAndDestroy( importanceDescription );