--- a/mobilemessaging/smsui/viewersrc/MsgSmsViewerAppUi.cpp	Tue May 25 12:38:02 2010 +0300
+++ b/mobilemessaging/smsui/viewersrc/MsgSmsViewerAppUi.cpp	Wed Jun 09 09:37:26 2010 +0300
@@ -1130,11 +1130,11 @@
         //Added to remove Copy-option when sender number is not valid (for example it has alphabets)    
         if ( iFlags.iValidSenderNumber || IsBodyFocused() )
         	{
+            iFindItemMenu->SetSenderHighlightStatus( ( senderHighlighted && 
+                            iView->ControlById( EMsgComponentIdFrom ) == iView->FocusedControl() ) );
+            iFindItemMenu->SetSenderDisplayText( senderNumber );
 	        if( !iFlags.iVoIPNumber )
 	            {
-	            iFindItemMenu->SetSenderHighlightStatus( 
-	                iView->ControlById( EMsgComponentIdFrom ) == iView->FocusedControl() );
-	            iFindItemMenu->SetSenderDisplayText( senderNumber );
 	            iFindItemMenu->AddItemFindMenuL( 
 	                FindItemHighlighted() ? iView->ItemFinder() : 0,
 	                aMenuPane, EFindItemMenuPlaceHolder,
@@ -1143,9 +1143,6 @@
 	            }
 	        else
 	            {
-	            iFindItemMenu->SetSenderHighlightStatus( 
-	                iView->ControlById( EMsgComponentIdFrom ) == iView->FocusedControl() );
-	            iFindItemMenu->SetSenderDisplayText( senderNumber );
 	            iFindItemMenu->AddItemFindMenuL( 
 	                FindItemHighlighted() ? iView->ItemFinder() : 0,
 	                aMenuPane, EFindItemMenuPlaceHolder,
@@ -2059,7 +2056,10 @@
     //to reduce flickering after sending a message.
 	if (!(iEditorBaseFeatures & EStayInViewerAfterReply ))
         {
-        iToolbar->SetToolbarVisibility( EFalse );
+			if(iToolbar)
+			{
+        		iToolbar->SetToolbarVisibility( EFalse );
+			}
         iView->MakeVisible( EFalse );
         iNaviDecorator->MakeVisible( EFalse );
         }
@@ -2069,7 +2069,10 @@
         {
         iNaviDecorator->MakeVisible( ETrue );
         iView->MakeVisible( ETrue );
-        iToolbar->SetToolbarVisibility( ETrue );
+			if(iToolbar)
+			{
+        		iToolbar->SetToolbarVisibility( ETrue );
+			}
         }    
     
     }