Index: test/keystrokes/firefox/label_guess_entries.py
===================================================================
--- test/keystrokes/firefox/label_guess_entries.py	(revision 4392)
+++ test/keystrokes/firefox/label_guess_entries.py	(working copy)
@@ -410,9 +410,8 @@
 sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "Next form field", 
-    ["BUG? - Need a space between the EOL symbol and bandaid",
-     "BRAILLE LINE:  ' $lbandaid graphic redux Image'",
-     "     VISIBLE:  ' $lbandaid graphic redux Image', cursor=1",
+    ["BRAILLE LINE:  ' $l bandaid graphic redux Image'",
+     "     VISIBLE:  ' $l bandaid graphic redux Image', cursor=1",
      "SPEECH OUTPUT: 'bandaid graphic redux text'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -425,8 +424,6 @@
      "     VISIBLE:  'tab to me and I disappear $l', cursor=26",
      "BRAILLE LINE:  'Magic disappearing text trick:   $l'",
      "     VISIBLE:  ' $l', cursor=1",
-     "BRAILLE LINE:  'Magic disappearing text trick:   $l'",
-     "     VISIBLE:  ' $l', cursor=1",
      "SPEECH OUTPUT: 'Magic disappearing text trick: text'"]))
 
 sequence.append(utils.StartRecordingAction())
Index: test/keystrokes/firefox/label_guess_bug_546815.py
===================================================================
--- test/keystrokes/firefox/label_guess_bug_546815.py	(revision 4392)
+++ test/keystrokes/firefox/label_guess_bug_546815.py	(working copy)
@@ -67,8 +67,7 @@
 sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "Next form field",
-    ["BUG? - Should have a space between the EOL indicator and Image",
-     "BRAILLE LINE:  '2. Enter your City:  $l 3. Enter your State:  $l 4. Enter your Country: US $lImage text field using value'",
+    ["BRAILLE LINE:  '2. Enter your City:  $l 3. Enter your State:  $l 4. Enter your Country: US $l Image text field using value'",
      "     VISIBLE:  ' $l 3. Enter your State:  $l 4. ', cursor=1",
      "SPEECH OUTPUT: '2. Enter your City: text'"]))
 
@@ -78,8 +77,7 @@
 sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "Next form field", 
-    ["BUG? - Should have a space between the EOL indicator and Image",
-     "BRAILLE LINE:  '2. Enter your City:  $l 3. Enter your State:  $l 4. Enter your Country: US $lImage text field using value'",
+    ["BRAILLE LINE:  '2. Enter your City:  $l 3. Enter your State:  $l 4. Enter your Country: US $l Image text field using value'",
      "     VISIBLE:  ' $l 4. Enter your Country: US $l', cursor=1",
      "SPEECH OUTPUT: '3. Enter your State: text'"]))
 
@@ -89,8 +87,7 @@
 sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "Next form field", 
-    ["BUG? - Should have a space between the EOL indicator and Image",
-     "BRAILLE LINE:  '2. Enter your City:  $l 3. Enter your State:  $l 4. Enter your Country: Image US $l text field using value'",
+    ["BRAILLE LINE:  '2. Enter your City:  $l 3. Enter your State:  $l 4. Enter your Country: Image US $l text field using value'",
      "     VISIBLE:  'US $l text field using value', cursor=1",
      "SPEECH OUTPUT: '4. Enter your Country: text US'"]))
 
Index: src/orca/scripts/toolkits/Gecko/script.py
===================================================================
--- src/orca/scripts/toolkits/Gecko/script.py	(revision 4393)
+++ src/orca/scripts/toolkits/Gecko/script.py	(working copy)
@@ -2265,7 +2265,8 @@
                 if line.regions[-1].__class__ == regions[0].__class__ \
                    or line.regions[-1].__class__ in [braille.Component,
                                                      braille.Region] \
-                   or lastObj.getRole() == pyatspi.ROLE_IMAGE:
+                   or lastObj.getRole() == pyatspi.ROLE_IMAGE \
+                   or obj.getRole() == pyatspi.ROLE_IMAGE:
                     line.addRegion(braille.Region(" "))
 
                 # The above check will catch table cells with uniform
