diff --git a/framework/src/com/phonegap/KeyboardHandler.java b/framework/src/com/phonegap/KeyboardHandler.java
index 953ac717..d10988cf 100644
--- a/framework/src/com/phonegap/KeyboardHandler.java
+++ b/framework/src/com/phonegap/KeyboardHandler.java
@@ -19,7 +19,6 @@ public class KeyboardHandler extends Plugin {
         return null;
     }
 
-    @Override
     public void onMessage(String id, Object data)
     {
         if(id.equals("keyboardHidden"))
diff --git a/framework/src/com/phonegap/LinearLayoutSoftKeyboardDetect.java b/framework/src/com/phonegap/LinearLayoutSoftKeyboardDetect.java
index c1e455d1..1ef6001b 100644
--- a/framework/src/com/phonegap/LinearLayoutSoftKeyboardDetect.java
+++ b/framework/src/com/phonegap/LinearLayoutSoftKeyboardDetect.java
@@ -67,13 +67,13 @@ public class LinearLayoutSoftKeyboardDetect extends LinearLayout {
         // gone away.
         else if (height > oldHeight) {
             if(app != null)
-                app.postMessage("hideKeyboard", null);
+                app.sendJavascript("PhoneGap.fireDocumentEvent('hidekeyboard');");
         } 
         // If the height as gotten smaller then we will assume the soft keyboard has 
         // been displayed.
         else if (height < oldHeight) {
             if(app != null)
-                app.postMessage("keyboardVisible", null);
+                app.sendJavascript("PhoneGap.fireDocumentEvent('showkeyboard');");
         }
 
         // Update the old height for the next event