Index: src/orca/scripts/gaim.py
===================================================================
--- src/orca/scripts/gaim.py	(revision 3313)
+++ src/orca/scripts/gaim.py	(working copy)
@@ -370,10 +370,9 @@
                 _("Toggle whether we prefix chat room messages with " \
                   "the name of the chat room."))
 
-        # In gaim/pidgin, we are overriding the default script's bookmark
-        # feature and keybindings to provide chat room message history.
+        # Add the chat room message history event handler.
         #
-        self.inputEventHandlers["goToBookmark"] = \
+        self.inputEventHandlers["reviewMessage"] = \
             input_event.InputEventHandler(
                 Script.readPreviousMessage,
                 _("Speak and braille a previous chat room message."))
@@ -396,17 +395,16 @@
                 1 << settings.MODIFIER_ORCA,
                 self.inputEventHandlers["togglePrefixHandler"]))
 
-        # In gaim/pidgin, we are overriding the default script's bookmark
-        # feature and keybindings to provide chat room message history.
+        # keybindings to provide chat room message history.
         #
-        messageKeys = [ "1", "2", "3", "4", "5", "6", "7", "8", "9" ]
+        messageKeys = [ "F1", "F2", "F3", "F4", "F5", "F6", "F7", "F8", "F9" ]
         for messageKey in messageKeys:
             keyBindings.add(
                 keybindings.KeyBinding(
                     messageKey,
                     1 << settings.MODIFIER_ORCA,
                     1 << settings.MODIFIER_ORCA,
-                    self.inputEventHandlers["goToBookmark"]))
+                    self.inputEventHandlers["reviewMessage"]))
 
         return keyBindings
 
Index: src/orca/default.py
===================================================================
--- src/orca/default.py	(revision 3313)
+++ src/orca/default.py	(working copy)
@@ -1319,16 +1319,9 @@
 
         keyBindings.add(
             keybindings.KeyBinding(
-                "F3",
+                "h",
                 orcaModMask,
                 orcaModMask,
-                self.inputEventHandlers["reportScriptInfoHandler"]))
-
-        keyBindings.add(
-            keybindings.KeyBinding(
-                "F1",
-                orcaModMask,
-                orcaModMask,
                 self.inputEventHandlers["enterLearnModeHandler"]))
 
         keyBindings.add(
@@ -1359,48 +1352,6 @@
                 orcaModMask,
                 self.inputEventHandlers["toggleSilenceSpeechHandler"]))
 
-        keyBindings.add(
-            keybindings.KeyBinding(
-                "F5",
-                orcaControlModMask,
-                orcaModMask,
-                self.inputEventHandlers["listAppsHandler"]))
-
-        keyBindings.add(
-            keybindings.KeyBinding(
-                "F4",
-                orcaModMask,
-                orcaModMask,
-                self.inputEventHandlers["cycleDebugLevelHandler"]))
-
-        keyBindings.add(
-            keybindings.KeyBinding(
-                "F6",
-                orcaModMask,
-                orcaModMask,
-                self.inputEventHandlers["printActiveAppHandler"]))
-
-        keyBindings.add(
-            keybindings.KeyBinding(
-                "F7",
-                orcaControlModMask,
-                orcaModMask,
-                self.inputEventHandlers["printAncestryHandler"]))
-
-        keyBindings.add(
-            keybindings.KeyBinding(
-                "F8",
-                orcaControlModMask,
-                orcaModMask,
-                self.inputEventHandlers["printHierarchyHandler"]))
-
-        if settings.debugMemoryUsage:
-            keyBindings.add(
-                keybindings.KeyBinding(
-                    "F8",
-                    orcaControlModMask,
-                    orcaControlModMask,
-                    self.inputEventHandlers["printMemoryUsageHandler"]))
                     
         #####################################################################
         #                                                                   #
@@ -1466,6 +1417,56 @@
                 None,
                 0,
                 0,
+                self.inputEventHandlers["reportScriptInfoHandler"]))
+
+        keyBindings.add(
+            keybindings.KeyBinding(
+                None,
+                0,
+                0,
+                self.inputEventHandlers["listAppsHandler"]))
+
+        keyBindings.add(
+            keybindings.KeyBinding(
+                None,
+                0,
+                0,
+                self.inputEventHandlers["cycleDebugLevelHandler"]))
+
+        keyBindings.add(
+            keybindings.KeyBinding(
+                None,
+                0,
+                0,
+                self.inputEventHandlers["printActiveAppHandler"]))
+
+        keyBindings.add(
+            keybindings.KeyBinding(
+                None,
+                0,
+                0,
+                self.inputEventHandlers["printAncestryHandler"]))
+
+        keyBindings.add(
+            keybindings.KeyBinding(
+                None,
+                0,
+                0,
+                self.inputEventHandlers["printHierarchyHandler"]))
+
+        if settings.debugMemoryUsage:
+            keyBindings.add(
+                keybindings.KeyBinding(
+                    None,
+                    0,
+                    0,
+                    self.inputEventHandlers["printMemoryUsageHandler"]))
+
+        keyBindings.add(
+            keybindings.KeyBinding(
+                None,
+                0,
+                0,
                 self.inputEventHandlers["decreaseSpeechRateHandler"]))
 
         keyBindings.add(
