--- a/mpxplugins/viewplugins/views/collectionviewhg/src/mpxcollectionviewhgcontainer.cpp	Tue Jan 26 11:56:33 2010 +0200
+++ b/mpxplugins/viewplugins/views/collectionviewhg/src/mpxcollectionviewhgcontainer.cpp	Tue Feb 02 00:09:33 2010 +0200
@@ -1415,7 +1415,7 @@
             {
             iListWidget->ResizeL( aCount );
             ProvideDataWithoutThumbnailsL(aMediaArray);
-            iListWidget->SetSelectedIndex( CurrentLbxItemIndex() );
+            iListWidget->SetSelectedIndex( index );
             }
         else
             {
@@ -1426,13 +1426,12 @@
         {
         // In case of mediawall components we switch to different view type if orientation changes
         // so there is no need to set new client rect for mediawall.
-
+        TInt index = iMediaWall->SelectedIndex();
         iMediaWall->Reset();
         if ( aCount )
             {
             iMediaWall->ResizeL( aCount );
             ProvideDataWithoutThumbnailsMwL(aMediaArray);
-            TInt index = CurrentLbxItemIndex();
             index = index >= 0 ? index : 0;
             iMediaWall->SetSelectedIndex( index );
             OpenAlbumL( index );
@@ -1470,6 +1469,7 @@
         iListWidget->ClearFlags( CHgScroller::EHgScrollerKeyMarkingDisabled );
         iListWidget->SetFocus(ETrue);
         iListWidget->SetScrollBarTypeL( CHgScroller::EHgScrollerLetterStripLite );
+        iListWidget->DrawableWindow()->SetOrdinalPosition( -1 );
         ProvideDataWithoutThumbnailsL(aMediaArray);
         }
     else
@@ -1987,6 +1987,7 @@
     if( iContext == EContextGroupAlbum )
         {
         iAlbumIndex = aIndex;
+        iSelectedAlbumIndex = aIndex;
         SaveSelectedAlbumItemL(aIndex);
         }
 
@@ -3598,7 +3599,7 @@
     else
         {
         //no albumart supported
-        SetDefaultIconL(aIndex);
+        iThumbnailReqMap[aIndex] = ETrue;
         RefreshL(aIndex);
         }
     }