--- a/emailuis/emailui/src/FreestyleEmailUiShortcutBinding.cpp	Thu Jul 15 18:19:25 2010 +0300
+++ b/emailuis/emailui/src/FreestyleEmailUiShortcutBinding.cpp	Thu Aug 19 09:38:05 2010 +0300
@@ -253,6 +253,7 @@
 #endif // RD_INTELLIGENT_TEXT_INPUT
         if ( iQwertyMappings )
             {
+            iQwertyMappings->SetKeyboardType( static_cast<TPtiKeyboardType>( kbType ) );
             iQwertyMappings->GetDataForKey( static_cast<TPtiKey>(aKey.iScanCode), 
                     keyData, caseMode );
             }
@@ -263,7 +264,8 @@
         // Map the key to the corresponding character in the Fn mode
         if ( iHalfQwertyMappings )
             {
-#ifdef RD_INTELLIGENT_TEXT_INPUT        
+#ifdef RD_INTELLIGENT_TEXT_INPUT 
+            iQwertyMappings->SetKeyboardType( static_cast<TPtiKeyboardType>( kbType ) );
             iHalfQwertyMappings->GetDataForKey( static_cast<TPtiKey>(aKey.iScanCode), 
                     keyData, EPtiCaseFnLower );
 #endif // RD_INTELLIGENT_TEXT_INPUT
@@ -420,9 +422,9 @@
         static_cast<CPtiCoreLanguage*>( iPtiEngine->GetLanguage( ELangEnglish ) );
     if (lang)
         {
-        iQwertyMappings = static_cast<CPtiKeyMappings*>( lang->GetQwertyKeymappings() );
+        iQwertyMappings = static_cast<CPtiQwertyKeyMappings*>( lang->GetQwertyKeymappings() );
 #ifdef RD_INTELLIGENT_TEXT_INPUT        
-        iHalfQwertyMappings = static_cast<CPtiKeyMappings*>( lang->GetHalfQwertyKeymappings() );
+        iHalfQwertyMappings = static_cast<CPtiHalfQwertyKeyMappings*>( lang->GetHalfQwertyKeymappings() );
 #endif // RD_INTELLIGENT_TEXT_INPUT        
         }
     lang = NULL; // owned by iPtiEngine