--- a/webengine/osswebengine/WebKit/s60/webcoresupport/WebEditorClient.cpp	Wed Mar 31 23:16:40 2010 +0300
+++ b/webengine/osswebengine/WebKit/s60/webcoresupport/WebEditorClient.cpp	Wed Apr 14 17:06:56 2010 +0300
@@ -385,7 +385,7 @@
                     event->setDefaultHandled();
                 }
                 else {
-                    m_shouldEndEditing = !m_webView->fepTextEditor()->IsTextAreaFocused();
+                    m_shouldEndEditing = !(m_webView->fepTextEditor()->IsTextAreaFocused() || m_webView->fepTextEditor()->IsInputElementFocused());
                 }
                 break;
 
@@ -408,7 +408,7 @@
                     event->setDefaultHandled();
                 }
                 else {
-                    m_shouldEndEditing = !m_webView->fepTextEditor()->IsTextAreaFocused();
+                    m_shouldEndEditing = !(m_webView->fepTextEditor()->IsTextAreaFocused() || m_webView->fepTextEditor()->IsInputElementFocused());
                 }
                 break;
 
@@ -559,12 +559,9 @@
 //-----------------------------------------------------------------------------
 bool WebEditorClient::doTextFieldCommandFromEvent(Element*, KeyboardEvent*)
 {
-    /*
-     * Check here from WAP css property. Returning true will cause
-     * HTMLInputElement::defaultEventHandler(Event* evt) stop handling
-     * keyboard event end set it as default handled.
-     */
-    return !m_webView->fepTextEditor()->validateTextFormat();    
+     
+   notImplemented();
+   return false;
 }
 
 //-----------------------------------------------------------------------------