--- a/src/hbcore/inputfw/hbinputkeymap.cpp	Wed Aug 18 10:05:37 2010 +0300
+++ b/src/hbcore/inputfw/hbinputkeymap.cpp	Thu Sep 02 20:44:51 2010 +0300
@@ -252,17 +252,8 @@
 const HbKeyboardMap *HbKeymap::keyboard(HbKeyboardType keyboard) const
 {
     HbKeyboardMap *keyboardMap = 0;
-    HbKeyboardType newKb = keyboard;
-    if (keyboard == HbKeyboardVirtual12KeyEmail ||
-        keyboard == HbKeyboardVirtual12KeyUrl) {
-            newKb = HbKeyboardTouchPortrait;
-        }
-    if (keyboard == HbKeyboardSctEmail ||
-        keyboard == HbKeyboardSctUrl) {
-            newKb = HbKeyboardSctPortrait;
-        }
-    if (mPrivate->mKeyboards.contains(newKb)) {
-        keyboardMap = mPrivate->mKeyboards.value(newKb);
+    if (mPrivate->mKeyboards.contains(keyboard)) {
+        keyboardMap = mPrivate->mKeyboards.value(keyboard);
     }
     return keyboardMap;
 }