diff --git a/editor/ui/dialogs/content/EdImageProps.xul b/editor/ui/dialogs/content/EdImageProps.xul
index 40039b36cf..a4031a637c 100644
--- a/editor/ui/dialogs/content/EdImageProps.xul
+++ b/editor/ui/dialogs/content/EdImageProps.xul
@@ -44,13 +44,8 @@
           <label control="hrefInput"
                  accesskey="&LinkURLEditField2.accessKey;"
                  width="1">&LinkURLEditField2.label;</label>
-          <textbox id="hrefInput" type="autocomplete"
-                   autocompletesearch="unifiedcomplete" timeout="50" maxrows="6"
-                   class="uri-element padded" oninput="ChangeLinkLocation();">
-            <menupopup class="autocomplete-history-popup"
-                       popupalign="topleft" popupanchor="bottomleft"
-                       oncommand="this.parentNode.value = event.target.getAttribute('label'); ChangeLinkLocation();"/>
-          </textbox>
+          <textbox id="hrefInput" type="text"
+                   class="uri-element padded" oninput="ChangeLinkLocation();"/>
           <hbox align="center">
             <checkbox id="MakeRelativeLink"
                       for="hrefInput"
diff --git a/editor/ui/dialogs/content/EdLinkProps.xul b/editor/ui/dialogs/content/EdLinkProps.xul
index a0f795ef08..5f621deef9 100644
--- a/editor/ui/dialogs/content/EdLinkProps.xul
+++ b/editor/ui/dialogs/content/EdLinkProps.xul
@@ -40,13 +40,8 @@
         <label control="hrefInput"
                accesskey="&LinkURLEditField2.accessKey;"
                width="1">&LinkURLEditField2.label;</label>
-        <textbox id="hrefInput" type="autocomplete"
-                 autocompletesearch="unifiedcomplete" timeout="50" maxrows="6"
-                 class="uri-element padded" oninput="ChangeLinkLocation();">
-          <menupopup class="autocomplete-history-popup"
-                     popupalign="topleft" popupanchor="bottomleft"
-                     oncommand="this.parentNode.value = event.target.getAttribute('label'); ChangeLinkLocation();"/>
-        </textbox>
+        <textbox id="hrefInput" type="text"
+                 class="uri-element padded" oninput="ChangeLinkLocation();"/>
         <hbox align="center">
           <checkbox id="MakeRelativeLink"
                     for="hrefInput"
diff --git a/mail/base/content/mainMailToolbox.inc.xul b/mail/base/content/mainMailToolbox.inc.xul
index f13635584a..9f79d3a9b9 100644
--- a/mail/base/content/mainMailToolbox.inc.xul
+++ b/mail/base/content/mainMailToolbox.inc.xul
@@ -324,6 +324,15 @@
                  align="center"
                  flex="1"
                  class="chromeclass-toolbar-additional">
+        <!-- Mimic the search/clear buttons of the standard search textbox,
+             but adjust for the reality that clear doesn't make much sense
+             since gloda results only show in a tab and the idiom for closing
+             tabs is closing the tab.  Our binding does process escape to
+             clear the box, if people want to clear it that way...
+             -->
+        <hbox>
+          <image class="gloda-search-icon"/>
+        </hbox>
         <textbox id="searchInput"
                  class="searchBox"
                  flex="1"
@@ -337,18 +346,7 @@
                  placeholder=""
                  emptytextbase="&search.label.base1;"
                  keyLabelNonMac="&search.keyLabel.nonmac;"
-                 keyLabelMac="&search.keyLabel.mac;"
-                 >
-          <!-- Mimic the search/clear buttons of the standard search textbox,
-               but adjust for the reality that clear doesn't make much sense
-               since gloda results only show in a tab and the idiom for closing
-               tabs is closing the tab.  Our binding does process escape to
-               clear the box, if people want to clear it that way...
-               -->
-          <hbox>
-            <image class="gloda-search-icon"/>
-          </hbox>
-        </textbox>
+                 keyLabelMac="&search.keyLabel.mac;"/>
     </toolbaritem>
 #endif
     <toolbarbutton id="button-compact" class="toolbarbutton-1"
diff --git a/mail/base/content/messenger.xul b/mail/base/content/messenger.xul
index 374b57889a..a64b1e1fa9 100644
--- a/mail/base/content/messenger.xul
+++ b/mail/base/content/messenger.xul
@@ -763,6 +763,9 @@
             <spacer flex="1" />
             <spacer flex="1" />
             <hbox flex="1" class="remote-gloda-search-container">
+              <hbox>
+                <image class="gloda-search-icon" />
+              </hbox>
               <textbox class="remote-gloda-search searchBox"
                        flex="1"
                        type="glodacomplete"
@@ -775,11 +778,7 @@
                        placeholder=""
                        emptytextbase="&search.label.base1;"
                        keyLabelNonMac="&search.keyLabel.nonmac;"
-                       keyLabelMac="&search.keyLabel.mac;">
-                <hbox>
-                  <image class="gloda-search-icon" />
-                </hbox>
-              </textbox>
+                       keyLabelMac="&search.keyLabel.mac;"/>
             </hbox>
           </hbox>
         </vbox>
diff --git a/mail/base/content/search.xml b/mail/base/content/search.xml
index c4a5242cc5..e02d3edfdc 100644
--- a/mail/base/content/search.xml
+++ b/mail/base/content/search.xml
@@ -78,8 +78,9 @@
           this.collapsed = !this.glodaEnabled;
 
           // make sure we set our emptytext here from the get-go
-        if (this.hasAttribute("placeholder"))
-          this.placeholder = this.getAttribute("placeholder");
+          if (this.hasAttribute("placeholder")) {
+            this.placeholder = this.getAttribute("placeholder");
+          }
         } catch (e) {
           let { logException } = ChromeUtils.import("resource:///modules/errUtils.js");
           logException(e, true);
diff --git a/mail/components/addrbook/content/abEditListDialog.xul b/mail/components/addrbook/content/abEditListDialog.xul
index 0fb7618a60..efd22e9f24 100644
--- a/mail/components/addrbook/content/abEditListDialog.xul
+++ b/mail/components/addrbook/content/abEditListDialog.xul
@@ -58,6 +58,7 @@
     <richlistbox id="addressingWidget" style="height: 15em;" onclick="awClickEmptySpace(event.target, true)">
       <richlistitem class="addressingWidgetItem" allowevents="true">
         <hbox class="addressingWidgetCell" flex="1">
+          <image onclick="this.nextElementSibling.select();" class="person-icon"/>
           <textbox id="addressCol1#1" class="plain textbox-addressingWidget uri-element"
                    type="autocomplete" flex="1"
                    autocompletesearch="addrbook ldap"
@@ -67,9 +68,7 @@
                    minresultsforpopup="3"
                    ontextentered="awRecipientTextCommand(param, this); if (param &amp;&amp; this.value != '') param.preventDefault();"
                    onkeydown="awRecipientKeyDown(event, this);"
-                   onclick="awNotAnEmptyArea(event);">
-            <image onclick="this.parentNode.select();" class="person-icon"/>
-          </textbox>
+                   onclick="awNotAnEmptyArea(event);"/>
         </hbox>
       </richlistitem>
     </richlistbox>
diff --git a/mail/components/addrbook/content/abMailListDialog.xul b/mail/components/addrbook/content/abMailListDialog.xul
index a61b232c91..5d8da9e435 100644
--- a/mail/components/addrbook/content/abMailListDialog.xul
+++ b/mail/components/addrbook/content/abMailListDialog.xul
@@ -69,6 +69,7 @@
     <richlistbox id="addressingWidget" style="height: 15em;" onclick="awClickEmptySpace(event.target, true)">
       <richlistitem class="addressingWidgetItem" allowevents="true">
         <hbox class="addressingWidgetCell" flex="1">
+          <image onclick="this.nextElementSibling.select();" class="person-icon"/>
           <textbox id="addressCol1#1" class="plain textbox-addressingWidget uri-element"
                    type="autocomplete" flex="1"
                    autocompletesearch="addrbook ldap"
@@ -78,9 +79,7 @@
                    minresultsforpopup="3"
                    ontextentered="awRecipientTextCommand(param, this); if (param &amp;&amp; this.value != '') param.preventDefault();"
                    onkeydown="awRecipientKeyDown(event, this);"
-                   onclick="awNotAnEmptyArea(event);">
-            <image onclick="this.parentNode.select();" class="person-icon"/>
-          </textbox>
+                   onclick="awNotAnEmptyArea(event);"/>
         </hbox>
       </richlistitem>
     </richlistbox>
diff --git a/mail/components/im/content/chat-messenger.inc.xul b/mail/components/im/content/chat-messenger.inc.xul
index 39f4f534c4..e21c1ab0ee 100644
--- a/mail/components/im/content/chat-messenger.inc.xul
+++ b/mail/components/im/content/chat-messenger.inc.xul
@@ -58,6 +58,15 @@
                            align="center"
                            flex="1"
                            class="chromeclass-toolbar-additional">
+                <!-- Mimic the search/clear buttons of the standard search textbox,
+                     but adjust for the reality that clear doesn't make much sense
+                     since gloda results only show in a tab and the idiom for closing
+                     tabs is closing the tab.  Our binding does process escape to
+                     clear the box, if people want to clear it that way...
+                  -->
+                <hbox>
+                  <image class="gloda-search-icon"/>
+                </hbox>
                 <textbox id="IMSearchInput"
                          class="searchBox"
                          flex="1"
@@ -71,18 +80,7 @@
                          placeholder=""
                          emptytextbase="&search.label.base1;"
                          keyLabelNonMac="&search.keyLabel.nonmac;"
-                         keyLabelMac="&search.keyLabel.mac;"
-                         >
-                  <!-- Mimic the search/clear buttons of the standard search textbox,
-                       but adjust for the reality that clear doesn't make much sense
-                       since gloda results only show in a tab and the idiom for closing
-                       tabs is closing the tab.  Our binding does process escape to
-                       clear the box, if people want to clear it that way...
-                    -->
-                  <hbox>
-                    <image class="gloda-search-icon"/>
-                  </hbox>
-                </textbox>
+                         keyLabelMac="&search.keyLabel.mac;"/>
               </toolbaritem>
               <toolbarbutton is="toolbarbutton-appmenu" id="button-chat-appmenu"
                              type="menu"