--- a/uifw/EikStd/coctlsrc/EIKLBX.CPP	Mon Mar 15 12:41:34 2010 +0200
+++ b/uifw/EikStd/coctlsrc/EIKLBX.CPP	Wed Mar 31 21:59:52 2010 +0300
@@ -944,7 +944,6 @@
         {
         EnableHighlight( EFalse );
         iListBox.iView->DrawItem( iLongTappedItem );
-        iListBox.iView->SetCurrentItemIndex( 0 );
         iLongTappedItem = KErrNotFound;
         }
     }
@@ -2101,7 +2100,7 @@
             {
             if ( iListBoxExt && iListBoxExt->iSingleClickEnabled )
                 {
-                // is single click is enabled, highlight must also be visible
+                // If single click is enabled, highlight must also be visible
                 if ( iListBoxExt->CollectionState()
                         & MAknCollection::EStateHighlightVisible )
                     {
@@ -2402,7 +2401,7 @@
     iView->SetDisableRedraw(redrawDisabled);
     
     if ( iListBoxExt && iListBoxExt->iPhysics && aItemIndex == 0 )
-        {
+        {    
         iView->SetItemOffsetInPixels( 0 );        
         }
     _AKNTRACE_FUNC_EXIT;
@@ -3094,6 +3093,12 @@
     UpdateScrollBarThumbs();
     iView->ClearFlags(CListBoxView::EItemCountModified);
 
+
+    if ( iListBoxExt->iLongTappedItem != KErrNotFound )
+        {
+        iListBoxExt->EnableHighlight( EFalse );
+        }
+
     FireItemChange();
     
     if ( iListBoxExt && iListBoxExt->iPhysics )
@@ -4693,13 +4698,6 @@
             {
             iListBoxExt->iFeedbackType = ETouchFeedbackList;
             }
-        
-        if ( !iListBoxExt->iPhysics || itemIndex == iView->CurrentItemIndex() )
-            {
-            iListBoxExt->ImmediateFeedback( iListBoxExt->iFeedbackType,
-                                            TTouchFeedbackType(ETouchFeedbackVibra | ETouchFeedbackAudio),
-                                            aPointerEvent );
-            }
         }
     iListBoxExt->iEventModifiers = aPointerEvent.iModifiers;
     CListBoxView::TSelectionMode selectionMode = CListBoxView::ENoSelection;
@@ -5809,11 +5807,6 @@
             	{
                 Window().Invalidate( TRect( View()->ItemPos(index), 
             		                 View()->ItemSize() ) );
-                if( iItemDrawer->Flags() & 
-                            CListItemDrawer::ESingleClickDisabledHighlight )
-                    {
-                    iView->SetCurrentItemIndex( 0 );
-                    }
             	}
             break;
             }