diff --git a/mozilla/extensions/sroaming/resources/content/prefs/all.js b/mozilla/extensions/sroaming/resources/content/prefs/all.js
index c70748e3117..fb1789cdcbd 100644
--- a/mozilla/extensions/sroaming/resources/content/prefs/all.js
+++ b/mozilla/extensions/sroaming/resources/content/prefs/all.js
@@ -155,8 +155,8 @@ RoamingPrefs.prototype =
       /* to understand the structure of the registry,
          see comment at the const defs above */
       // get the Roaming reg branch
-      registry = Components.classes["@mozilla.org/registry;1"]
-                           .createInstance(Components.interfaces.nsIRegistry);
+      var registry = Components.classes["@mozilla.org/registry;1"]
+                     .createInstance(Components.interfaces.nsIRegistry);
       registry.openWellKnownRegistry(registry.ApplicationRegistry);
       this.registry = registry;
       var profMan = Components.classes["@mozilla.org/profile/manager;1"]
@@ -309,7 +309,7 @@ RoamingPrefs.prototype =
   verifyData : function()
   {
     if (!this.Enabled)
-      return;
+      return true;
 
     var errorProp; // see showError();
     var errorVal;  // dito
@@ -419,15 +419,6 @@ function SwitchDeck(page, deckElement)
   deckElement.setAttribute("selectedIndex", page);
 }
 
-function EnableElement(enabled, triggerElement, elementID)
-{
-  var element = document.getElementById(elementID);
-  if(!enabled)
-    element.setAttribute("disabled", "true");
-  else
-    element.removeAttribute("disabled");
-}
-
 function EnableTree(enabled, element)
 {
   if (!element || !element.setAttribute)
@@ -454,3 +445,29 @@ function E(elementID)
 {
   return document.getElementById(elementID);
 }
+
+function Browse()
+{
+  const nsIFilePicker = Components.interfaces.nsIFilePicker;
+
+  var fp = Components.classes["@mozilla.org/filepicker;1"]
+           .createInstance(nsIFilePicker);
+  var currentFolder = Components.classes["@mozilla.org/file/local;1"]
+                      .createInstance(Components.interfaces.nsILocalFile);
+  var currentFolderTextbox = document.getElementById("copyDir");
+  
+  try {
+    currentFolder.initWithPath(currentFolderTextbox.value);
+    fp.displayDirectory = currentFolder;
+  }
+  catch (ex) {
+    dump("initWithPath failed. Reason: " + ex);
+  }
+
+  fp.init(window, E("browseButton").getAttribute("filepickertitle"),
+          nsIFilePicker.modeGetFolder);
+  
+  if (fp.show() == nsIFilePicker.returnOK)
+    // convert the nsILocalFile into a nsIFileSpec 
+    currentFolderTextbox.value = fp.file.path;
+}
diff --git a/mozilla/extensions/sroaming/resources/content/prefs/files.js b/mozilla/extensions/sroaming/resources/content/prefs/files.js
index 57f17264ab7..c58c1144afa 100644
--- a/mozilla/extensions/sroaming/resources/content/prefs/files.js
+++ b/mozilla/extensions/sroaming/resources/content/prefs/files.js
@@ -135,7 +135,7 @@ function DataToUI()
     var found = false;
     for (var i2 = 0, l2 = children.length; i2 < l2; i2++)
     {
-      var checkbox = children[i2];
+      checkbox = children[i2];
       if ("getAttribute" in checkbox
           && checkbox.getAttribute("type") == "checkbox"
           // Somebody adds unwanted nodes as children to listbox :-(
diff --git a/mozilla/extensions/sroaming/resources/content/prefs/files.xul b/mozilla/extensions/sroaming/resources/content/prefs/files.xul
index ca0ace39ac1..e44ddc8ea85 100644
--- a/mozilla/extensions/sroaming/resources/content/prefs/files.xul
+++ b/mozilla/extensions/sroaming/resources/content/prefs/files.xul
@@ -59,10 +59,6 @@
   <stringbundle id="bundle_roaming_filedescr" src="chrome://sroaming/locale/filedescr.properties"/>
   <vbox id="roamingSettings" flex="1">
 
-  <groupbox id="files" flex="1">
-    <caption label="&files.label;" />
-    <vbox flex="1">
-
 <!--
   Defaults are set in the default pref "roaming.default.files", displayed
   names in filedescr.properties.
@@ -153,9 +149,6 @@
                   filename="secmod.db"
                   label="" />
       </listbox>
-    </vbox>
-  </groupbox>
-
   </vbox>
 
 </page>
diff --git a/mozilla/extensions/sroaming/resources/content/prefs/top.js b/mozilla/extensions/sroaming/resources/content/prefs/top.js
index ea39efd8005..54d3d5787db 100644
--- a/mozilla/extensions/sroaming/resources/content/prefs/top.js
+++ b/mozilla/extensions/sroaming/resources/content/prefs/top.js
@@ -135,7 +135,7 @@ function ActivationWarning()
 		       .getService(Components.interfaces.nsIPrefBranch);
     try
     {
-      showWarning = prefBranch.getBoolPref("roaming.showInitialWarning");
+      var showWarning = prefBranch.getBoolPref("roaming.showInitialWarning");
       if (!showWarning)
         return;
     } catch(e) {}
diff --git a/mozilla/extensions/sroaming/resources/content/prefs/top.xul b/mozilla/extensions/sroaming/resources/content/prefs/top.xul
index 3bb5d1b281b..3e2582fe0b5 100644
--- a/mozilla/extensions/sroaming/resources/content/prefs/top.xul
+++ b/mozilla/extensions/sroaming/resources/content/prefs/top.xul
@@ -59,14 +59,16 @@
   <stringbundle id="bundle_roaming_prefs" src="chrome://sroaming/locale/prefs.properties"/>
   <stringbundle id="bundle_roaming_filedescr" src="chrome://sroaming/locale/filedescr.properties"/>
 
-  <checkbox id="enabled"
-            aoncommand="EnableTree(this.checked, E('roamingSettings'));
-                        parent.roaming.enabled = this.checked;"
-            oncommand="ActivationWarning(); SwitchChanged();"
-            class="indent"
-            label="&enabled.label;"
-            accesskey="&enabled.accesskey;"
-            />
+  <vbox align="start">
+    <checkbox id="enabled"
+              aoncommand="EnableTree(this.checked, E('roamingSettings'));
+                          parent.roaming.enabled = this.checked;"
+              oncommand="ActivationWarning(); SwitchChanged();"
+              class="indent"
+              label="&enabled.label;"
+              accesskey="&enabled.accesskey;"
+              />
+  </vbox>
 
   <groupbox id="method">
     <caption label="&method.label;" />
@@ -115,11 +117,13 @@
                </row>
                <row>
                   <hbox />
-                  <checkbox id="streamSavePW"
-                            oncommand="SwitchChanged();"
-                            label="&streamSavePW.label;"
-                            accesskey="&streamSavePW.accesskey;"
-                            />
+                  <vbox align="start">
+                    <checkbox id="streamSavePW"
+                              oncommand="SwitchChanged();"
+                              label="&streamSavePW.label;"
+                              accesskey="&streamSavePW.accesskey;"
+                              />
+                  </vbox>
                </row>
                <row>
                   <hbox align="center">
@@ -134,11 +138,20 @@
          </grid>
       </vbox>
       <vbox id="copySettings">
-        <label control="copyDir"
-               value="&copyDir.label;"
-               accesskey="&copyDir.accesskey;"
-               />
-        <textbox id="copyDir" />
+        <separator class="thin" />
+        <label value="&copyDir.label;" />
+        <hbox>
+          <textbox id="copyDir"
+                   readonly="true"
+                   flex="1"
+                   />
+          <button id="browseButton"
+                  label="&browse.label;" 
+                  accesskey="&browse.accesskey;"
+                  filepickertitle="&filepicker.title;"
+                  onclick="Browse();"
+                  /> 
+        </hbox>
       </vbox>
     </deck>
   </groupbox>
diff --git a/mozilla/extensions/sroaming/resources/locale/en-US/prefs.dtd b/mozilla/extensions/sroaming/resources/locale/en-US/prefs.dtd
index a7b1fcdd8db..ee04f47ceb3 100644
--- a/mozilla/extensions/sroaming/resources/locale/en-US/prefs.dtd
+++ b/mozilla/extensions/sroaming/resources/locale/en-US/prefs.dtd
@@ -42,26 +42,22 @@
 <!ENTITY descr.label              "Roaming Access allows you to retrieve and store your user profile information from/on a Roaming Access server. Your profile information will then be retrieved from the server on startup and transferred to it on shutdown.">
 <!ENTITY descrFiles.label         "If Roaming Access is enabled (in the Roaming User pane), the following parts of your profile will be transferred to and from the Roaming Access server.">
 <!ENTITY enabled.label            "Enable remote profile storage">
-<!ENTITY enabled.accesskey        "e">
+<!ENTITY enabled.accesskey        "E">
 <!ENTITY method.label             "Server Information">
-<!ENTITY methodSelect.label       "Transfer Method">
-<!ENTITY methodSelect.accesskey   "m">
-<!ENTITY files.label              "Item Selection">
-<!ENTITY filesDescr.label         "User profile items selected below will be transferred to/from the server.">
-<!ENTITY filesList.accesskey      "i">
 
-
-<!ENTITY methodCopy.label         "File copy">
+<!ENTITY methodCopy.label         "File Copy">
 <!ENTITY methodStream.label       "HTTP / FTP">
 
-<!ENTITY streamURL.label          "Base URL">
-<!ENTITY streamURL.accesskey      "u">
-<!ENTITY streamUsername.label     "Username">
-<!ENTITY streamUsername.accesskey "Username">
+<!ENTITY streamURL.label          "Base URL:">
+<!ENTITY streamURL.accesskey      "a">
+<!ENTITY streamUsername.label     "Username:">
+<!ENTITY streamUsername.accesskey "U">
 <!ENTITY streamSavePW.label       "Save password">
-<!ENTITY streamSavePW.accesskey   "s">
-<!ENTITY streamPassword.label     "Password">
-<!ENTITY streamPassword.accesskey "p">
+<!ENTITY streamSavePW.accesskey   "S">
+<!ENTITY streamPassword.label     "Password:">
+<!ENTITY streamPassword.accesskey "P">
 
-<!ENTITY copyDir.label            "Copy to/from directory">
-<!ENTITY copyDir.accesskey        "d">
+<!ENTITY copyDir.label            "Copy to/from directory:">
+<!ENTITY browse.label             "Browse...">
+<!ENTITY browse.accesskey         "B">
+<!ENTITY filepicker.title         "Select Directory">