Index: src/orca/Gecko.py
===================================================================
--- src/orca/Gecko.py	(revision 2262)
+++ src/orca/Gecko.py	(working copy)
@@ -2247,7 +2247,8 @@
         # EMBEDDED_OBJECT_CHARACTER model of Gecko.  For all other
         # things, however, we can defer to the default scripts.
         #
-        if not self.inDocumentContent():
+        if not self.inDocumentContent() or \
+           obj.role == rolenames.ROLE_ENTRY:
             default.Script.sayLine(self, obj)
             return
 
@@ -2265,11 +2266,7 @@
                 print "YIKES in Gecko.sayLine!"
                 characterOffset -= 1
 
-        # We don't want to speak the role if we're in an entry.
-        #
-        speakRole = (obj.role != rolenames.ROLE_ENTRY)
-        self.speakContents(self.getLineContentsAtOffset(obj, characterOffset),
-                           speakRole)
+        self.speakContents(self.getLineContentsAtOffset(obj, characterOffset))
 
     ####################################################################
     #                                                                  #
