diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-smart_browsing.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref-smart_browsing.xul
index 8c00771880c..dae1e0edaf6 100644
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-smart_browsing.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-smart_browsing.xul
@@ -43,7 +43,7 @@
   <script language="JavaScript">
   <![CDATA[
   
-  _elementIDs = ["browserRelatedDisabledForDomains", "addDomain", "browserGoBrowsingEnabled"];
+  _elementIDs = ["browserRelatedDisabledForDomains", "addDomain", "browserGoBrowsingEnabled", "browserAutoCompleteEnabled"];
   
   
   function Startup()
@@ -191,7 +191,7 @@
       </columns>
       <rows>
         <row>
-          <tree class="inset" id="disabledDomains" multiple="true" onkeyup="treeHandleEvent(event)">
+          <tree class="inset" id="disabledDomains" multiple="true" onkeyup="treeHandleEvent(event)" style="height: 100px;" flex="1">
             <treecolgroup>
               <treecol flex="1"/>   
             </treecolgroup>
@@ -232,5 +232,19 @@
     </box>
     
   </titledbox>
+
+  <titledbox orient="vertical">
+ 	  <title><text value="&autoCompleteHeader.label;"/></title>
+ 
+     <html>&autoCompleteDescription.label;</html>
+     
+     <box autostretch="never">
+       <checkbox id="browserAutoCompleteEnabled" value="&autoCompleteEnabled.label;" accesskey="&autoCompleteEnabled.accesskey;"
+                 pref="true" preftype="bool" prefstring="browser.urlbar.autocomplete.enabled"
+                 prefattribute="checked"/>
+       <spring flex="1"/>
+     </box>
+     
+   </titledbox>
 		
 </window>
diff --git a/mozilla/xpfe/components/prefwindow/resources/locale/en-US/pref-smart_browsing.dtd b/mozilla/xpfe/components/prefwindow/resources/locale/en-US/pref-smart_browsing.dtd
index 419a0491a88..d378fa52d86 100644
--- a/mozilla/xpfe/components/prefwindow/resources/locale/en-US/pref-smart_browsing.dtd
+++ b/mozilla/xpfe/components/prefwindow/resources/locale/en-US/pref-smart_browsing.dtd
@@ -29,3 +29,9 @@
 <!--LOCALIZATION NOTE (enableKeyCheck.label): Do not translate 'Internet Keywords' -->
 <!ENTITY  keywordsEnabled.label                 "Enable Internet Keywords">
 <!ENTITY  keywordsEnabled.accesskey             "k">
+
+
+<!ENTITY  autoCompleteHeader.label          "Urlbar AutoComplete">
+<!ENTITY  autoCompleteDescription.label     "Automatically completes text typed into Location field">
+<!ENTITY  autoCompleteEnabled.label                 "Enable Urlbar AutoComplete">
+<!ENTITY  autoCompleteEnabled.accesskey             "c">
