Index: src/orca/where_am_I.py
===================================================================
--- src/orca/where_am_I.py	(revision 3315)
+++ src/orca/where_am_I.py	(working copy)
@@ -512,34 +512,42 @@
         """Tree Tables present the following information (an example is
         'Tree table, Mike Pedersen, item 8 of 10, tree level 2'):
 
-        1. label, if any
-        2. role
-        3. current row (regardless of speak cell/row setting)
-        4. relative position
-        5. if expandable/collapsible: expanded/collapsed
-        6. if applicable, the level
-
-        Nautilus and Gaim
+        1. parent's role
+        2. column header of object
+        3. object's role
+        4. object's contents, if there are multiple columns
+        5. current row (regardless of speak cell/row setting)
+        6. relative position
+        7. if expandable/collapsible: expanded/collapsed
+        8. if applicable, the level
         """
 
-        # Speak the first two items (and possibly the position)
         utterances = []
         if obj.parent.getRole() == pyatspi.ROLE_TABLE_CELL:
             obj = obj.parent
         parent = obj.parent
 
-        text = self._getObjLabel(obj)
+        text = rolenames.getSpeechForRoleName(parent)
         utterances.append(text)
 
+        table = parent.queryTable()
+        column = table.getColumnAtIndex(obj.getIndexInParent())
+        text = table.getColumnHeader(column).name
+        utterances.append(text)
+
         text = rolenames.getSpeechForRoleName(obj)
         utterances.append(text)
+
+        if table.nColumns > 1:
+            text = self._getTableCell(obj)
+            utterances.append(text)
+
         debug.println(self._debugLevel, "first table cell utterances=%s" % \
                       utterances)
         speech.speakUtterances(utterances)
 
         utterances = []
         if doubleClick:
-            table = parent.queryTable()
             row = table.getRowAtIndex(
               orca_state.locusOfFocus.getIndexInParent())
             # Translators: this in reference to a row in a table.
