--- a/mobilemessaging/smsui/viewersrc/MsgSmsViewerAppUi.cpp	Thu Jul 15 18:34:37 2010 +0300
+++ b/mobilemessaging/smsui/viewersrc/MsgSmsViewerAppUi.cpp	Thu Aug 19 09:51:11 2010 +0300
@@ -763,6 +763,17 @@
                 EMsgHeader );
             // take the number
             iNumber = iSmsHeader->FromAddress();
+            if ( !iFlags.iIsEmailMessage )
+                {
+                iFlags.iValidSenderNumber = CommonPhoneParser::IsValidPhoneNumber(
+                    iNumber, CommonPhoneParser::ESMSNumber );
+                }
+            else
+                {
+                iFlags.iValidSenderNumber =
+                    MsvUiServiceUtilities::IsValidEmailAddressL(
+                        iRecipientstring );
+                }
             break;
         default:
 #if defined ( _DEBUG )
@@ -884,6 +895,7 @@
             {
             // Prepare FindItem
             iFindItemMenu = CFindItemMenu::NewL( EFindItemMenuPlaceHolder );
+            iFindItemMenu->SetCallSubMenuVisibility ( EFalse ); // Click-To-Call
             iFindItemMenu->AttachItemFinderMenuL( R_SMSV_OPTIONSMENUPANE );
             }
         }
@@ -3118,6 +3130,17 @@
               }            
             // take the number
             iNumber = iSmsHeader->FromAddress();
+            if ( !iFlags.iIsEmailMessage )
+                {
+                iFlags.iValidSenderNumber = CommonPhoneParser::IsValidPhoneNumber(
+                    iNumber, CommonPhoneParser::ESMSNumber );
+                }
+            else
+                {
+                iFlags.iValidSenderNumber =
+                    MsvUiServiceUtilities::IsValidEmailAddressL(
+                        iRecipientstring );
+                }
             break;
         default:
 #if defined ( _DEBUG )