diff --git a/mozilla/mailnews/base/prefs/resources/content/am-main.xul b/mozilla/mailnews/base/prefs/resources/content/am-main.xul
index db9371f9a09..2c258438dfa 100644
--- a/mozilla/mailnews/base/prefs/resources/content/am-main.xul
+++ b/mozilla/mailnews/base/prefs/resources/content/am-main.xul
@@ -71,7 +71,7 @@
         <html:input name="identity.attachSignature" id="identity.attachSignature" type="checkbox"/>
         <html:label for="identity.attachSignature">&signature.label;</html:label>
         <html:input type="text" id="identity.signature" datatype="nsIFileSpec" flex="100%" name="identity.signature"/>
-        <titledbutton class="dialog push" name="browse" type="button" value="&choose.label;" onclick="prefNavSelectFile('identity.signature', 'choosefile')"/>
+        <titledbutton class="dialog push" name="browse" type="button" value="&choose.label;" onclick="prefNavSelectFile('identity.signature', 'choosefile', true)"/>
       </html:div>
 
 <!--
diff --git a/mozilla/mailnews/base/prefs/resources/content/pref-mailnews.xul b/mozilla/mailnews/base/prefs/resources/content/pref-mailnews.xul
index 756004ef291..dcb73e27455 100644
--- a/mozilla/mailnews/base/prefs/resources/content/pref-mailnews.xul
+++ b/mozilla/mailnews/base/prefs/resources/content/pref-mailnews.xul
@@ -124,7 +124,7 @@
 			value="&useCurrent;" onclick="setHomePageToCurrentPage('mailnews.start_page.url');" />
 
 			<titledbutton class="dialog push" name="browse" type="button" 
-			value="&browseFile;" onclick="prefNavSelectFile('mailnews.start_page.url', 'choosehomepage')"/>
+			value="&browseFile;" onclick="prefNavSelectFile('mailnews.start_page.url', 'choosehomepage', false)"/>
 		</box>
 
 	</titledbox>
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-navigator.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref-navigator.xul
index 473226905c1..c50348687fa 100644
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-navigator.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-navigator.xul
@@ -80,7 +80,7 @@
         <box orient="horizontal">
   				<spring flex="1"/>
   				<titledbutton class="dialog push" name="starts" type="button" value="&useCurrent;" onclick="setHomePageToCurrentPage('browserStartupHomepage');" />
-  				<titledbutton class="dialog push" name="browse" type="button" value="&browseFile;" onclick="prefNavSelectFile('browserStartupHomepage', 'choosehomepage');"/>
+  				<titledbutton class="dialog push" name="browse" type="button" value="&browseFile;" onclick="prefNavSelectFile('browserStartupHomepage', 'choosehomepage', false);"/>
   			</box>		
 			</box>		
 		</titledbox>  
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/prefutilities.js b/mozilla/xpfe/components/prefwindow/resources/content/prefutilities.js
index d7a22573a8c..22d53bd62d0 100644
--- a/mozilla/xpfe/components/prefwindow/resources/content/prefutilities.js
+++ b/mozilla/xpfe/components/prefwindow/resources/content/prefutilities.js
@@ -1,6 +1,29 @@
+/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s):
+ * Alec Flett <alecf@netscape.com>
+ */
+
 var bundle = srGetStrBundle("chrome://pref/locale/prefutilities.properties");
 
-function getFileOrFolderURL( aTitle, aFolder )
+function getFileOrFolderSpec( aTitle, aFolder )
 {
   try {
     var fileSpecWithUI = Components.classes["component://netscape/filespecwithui"].createInstance();
@@ -24,15 +47,19 @@ function getFileOrFolderURL( aTitle, aFolder )
     dump("Error: " + e + "\n");
     return -1;
   }
-  return fileSpecWithUI.URLString;
+  return fileSpecWithUI;
 }
 
-function prefNavSelectFile(folderFieldId, stringId)
+function prefNavSelectFile(folderFieldId, stringId, useNative)
 {
   var folderField = document.getElementById(folderFieldId);
-  var url = getFileOrFolderURL( bundle.GetStringFromName(stringId), false );
-  if( url != -1 )
-    folderField.value = url;
+  var spec = getFileOrFolderSpec( bundle.GetStringFromName(stringId), false );
+  if( spec != -1 ) {
+      if (useNative)
+          folderField.value = spec.nativePath;
+      else
+          folderField.value = spec.URLString;
+  }
 }
 
 function setHomePageToCurrentPage(folderFieldId)