--- a/src/hbplugins/inputmethods/touchinput/hbinput12keytouchkeyboard.cpp	Thu May 27 13:10:59 2010 +0300
+++ b/src/hbplugins/inputmethods/touchinput/hbinput12keytouchkeyboard.cpp	Fri Jun 11 13:58:22 2010 +0300
@@ -195,7 +195,7 @@
                     QChar numChr;
                     const HbKeyboardMap *keyboardMap = mKeymap->keyboard(HbKeyboardVirtual12Key);
                     if (keyboardMap && key < keyboardMap->keys.count()) {
-                        numChr = HbInputUtils::findFirstNumberCharacterBoundToKey(keyboardMap->keys.at(key), mKeymap->language());
+                        numChr = numberCharacterBoundToKey(key);
                     }
 
                     if (numChr > 0) {
@@ -214,7 +214,7 @@
                     const HbKeyboardMap *keyboardMap = mKeymap->keyboard(HbKeyboardVirtual12Key);
                     if (keyboardMap && key < keyboardMap->keys.count()) {
                         keydata = keyboardMap->keys.at(key)->characters(mModifiers);
-                        numChr = HbInputUtils::findFirstNumberCharacterBoundToKey(keyboardMap->keys.at(key), mKeymap->language());
+                        numChr = numberCharacterBoundToKey(key);
                     }
 
                     QString title("");
@@ -226,7 +226,7 @@
                         title.append(keydata.left(numberOfCharactersToShow(key)));
                     }
 
-                    if (numChr == QChar('0')) {
+                    if (key == 9 && numChr == numberCharacterBoundToKey(key)) {
                         item->setText(numChr, HbInputButton::ButtonTextIndexPrimary);
                         item->setIcon(HbIcon(HbInputButtonIconSpace2), HbInputButton::ButtonIconIndexSecondaryFirstRow);
                         // Set space as secondaty text so that the layout is correct if icon is not found. This can be removed when