Index: src/orca/scripts/gnome-mud.py
===================================================================
--- src/orca/scripts/gnome-mud.py	(revision 3330)
+++ src/orca/scripts/gnome-mud.py	(working copy)
@@ -32,6 +32,7 @@
 import orca.input_event as input_event
 import orca.keybindings as keybindings
 import orca.orca_state as orca_state
+import orca.settings as settings
 import orca.speech as speech
 
 from orca.orca_i18n import _ # for gettext support
@@ -124,28 +125,26 @@
 
         keyBindings = default.Script.getKeyBindings(self)
 
-        #Here we define keybindings alt+1 to alt+0. We chosen the alt modifier
-        #to don't interfere with the laptop keybindings 7, 8 and 9.
-        messageKeys = [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "0"]
-        for i in range(0, len(messageKeys)):
+        # Here we define keybindings Orca+F1 to Orca+F9 for reading a previous
+        # message.
+        messageKeys = [ "F1", "F2", "F3", "F4", "F5", "F6", "F7", "F8", "F9"]
+        for messagekey in messageKeys:
             keyBindings.add(
                 keybindings.KeyBinding(
-                    messageKeys[i],
-                    1 << pyatspi.MODIFIER_ALT,
-                    1 << pyatspi.MODIFIER_ALT,
+                    messagekey,
+                    1 << settings.MODIFIER_ORCA,
+                    1 << settings.MODIFIER_ORCA,
                     self.inputEventHandlers["readPreviousMessageHandler"]))
 
         return keyBindings
 
     def readPreviousMessage(self, inputEvent):
-        #This function speaks the latest n messages. Alt+1 the latest one, 
-        #alt+2 the latest two and so.
+        #This function speaks the latest n messages. Orca+F1 the latest one, 
+        #Orca+F2 the latest two and so.
 
         debug.println(self.debugLevel, "gnome-mud.readPreviousMessage.")
 
-        if inputEvent.event_string == "0":
-            inputEvent.event_string = "10"
-        i = int(inputEvent.event_string)
+        i = int(inputEvent.event_string[1:])
         messageNo = Script.MESSAGE_LIST_LENGTH - i
      
         text = ""
Index: src/orca/scripts/gaim.py
===================================================================
--- src/orca/scripts/gaim.py	(revision 3330)
+++ 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 3330)
+++ src/orca/default.py	(working copy)
@@ -1268,18 +1268,21 @@
         Returns an instance of keybindings.KeyBindings.
         """
 
-        orcaModMask         = 1 << settings.MODIFIER_ORCA
-        orcaShiftModMask = (1 << settings.MODIFIER_ORCA |
-                            1 << pyatspi.MODIFIER_SHIFT)
-        orcaControlModMask  = (1 << settings.MODIFIER_ORCA |
-                               1 << pyatspi.MODIFIER_CONTROL)
-        orcaAltModMask      = (1 << settings.MODIFIER_ORCA |
-                               1 << pyatspi.MODIFIER_ALT)
-        orcaShiftAltModMask = (1 << settings.MODIFIER_ORCA |
-                               1 << pyatspi.MODIFIER_ALT |
-                               1 << pyatspi.MODIFIER_SHIFT)
-        shiftAltModMask     = (1 << pyatspi.MODIFIER_SHIFT |
-                               1 << pyatspi.MODIFIER_ALT)
+        orcaModMask           = 1 << settings.MODIFIER_ORCA
+        orcaShiftModMask      = (1 << settings.MODIFIER_ORCA |
+                                 1 << pyatspi.MODIFIER_SHIFT)
+        orcaControlModMask    = (1 << settings.MODIFIER_ORCA |
+                                 1 << pyatspi.MODIFIER_CONTROL)
+        orcaAltModMask        = (1 << settings.MODIFIER_ORCA |
+                                 1 << pyatspi.MODIFIER_ALT)
+        orcaShiftAltModMask   = (1 << settings.MODIFIER_ORCA |
+                                 1 << pyatspi.MODIFIER_ALT |
+                                 1 << pyatspi.MODIFIER_SHIFT)
+        orcaControlAltModMask = (1 << settings.MODIFIER_ORCA |
+                                 1 << pyatspi.MODIFIER_CONTROL |
+                                 1 << pyatspi.MODIFIER_ALT)
+        shiftAltModMask       = (1 << pyatspi.MODIFIER_SHIFT |
+                                 1 << pyatspi.MODIFIER_ALT)
         keyBindings = script.Script.getKeyBindings(self)
 
         if settings.keyboardLayout == settings.GENERAL_KEYBOARD_LAYOUT_DESKTOP:
@@ -1319,16 +1322,9 @@
 
         keyBindings.add(
             keybindings.KeyBinding(
-                "F3",
+                "h",
                 orcaModMask,
                 orcaModMask,
-                self.inputEventHandlers["reportScriptInfoHandler"]))
-
-        keyBindings.add(
-            keybindings.KeyBinding(
-                "F1",
-                orcaModMask,
-                orcaModMask,
                 self.inputEventHandlers["enterLearnModeHandler"]))
 
         keyBindings.add(
@@ -1361,47 +1357,32 @@
 
         keyBindings.add(
             keybindings.KeyBinding(
-                "F5",
-                orcaControlModMask,
-                orcaModMask,
+                "End",
+                orcaControlAltModMask,
+                orcaControlAltModMask,
                 self.inputEventHandlers["listAppsHandler"]))
 
         keyBindings.add(
             keybindings.KeyBinding(
-                "F4",
-                orcaModMask,
-                orcaModMask,
-                self.inputEventHandlers["cycleDebugLevelHandler"]))
-
-        keyBindings.add(
-            keybindings.KeyBinding(
-                "F6",
-                orcaModMask,
-                orcaModMask,
+                "Home",
+                orcaControlAltModMask,
+                orcaControlAltModMask,
                 self.inputEventHandlers["printActiveAppHandler"]))
 
         keyBindings.add(
             keybindings.KeyBinding(
-                "F7",
-                orcaControlModMask,
-                orcaModMask,
+                "Page_Up",
+                orcaControlAltModMask,
+                orcaControlAltModMask,
                 self.inputEventHandlers["printAncestryHandler"]))
 
         keyBindings.add(
             keybindings.KeyBinding(
-                "F8",
-                orcaControlModMask,
-                orcaModMask,
+                "Page_Down",
+                orcaControlAltModMask,
+                orcaControlAltModMask,
                 self.inputEventHandlers["printHierarchyHandler"]))
 
-        if settings.debugMemoryUsage:
-            keyBindings.add(
-                keybindings.KeyBinding(
-                    "F8",
-                    orcaControlModMask,
-                    orcaControlModMask,
-                    self.inputEventHandlers["printMemoryUsageHandler"]))
-                    
         #####################################################################
         #                                                                   #
         #  Bookmark key bindings                                            #
@@ -1466,6 +1447,28 @@
                 None,
                 0,
                 0,
+                self.inputEventHandlers["reportScriptInfoHandler"]))
+
+        keyBindings.add(
+            keybindings.KeyBinding(
+                None,
+                0,
+                0,
+                self.inputEventHandlers["cycleDebugLevelHandler"]))
+
+        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(
