--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -306,17 +306,16 @@ pref("browser.search.updateinterval", 6)
 
 // Whether or not microsummary and generator updates are enabled
 pref("browser.microsummary.enabled", true);
 pref("browser.microsummary.updateGenerators", true);
 
 // enable search suggestions by default
 pref("browser.search.suggest.enabled", true);
 
-pref("browser.history.showSessions", false);
 pref("browser.sessionhistory.max_entries", 50);
 pref("browser.history_expire_days", 180);
 pref("browser.history_expire_days_min", 90);
 pref("browser.history_expire_sites", 40000);
 
 // handle links targeting new windows
 // 0=default window, 1=current window/tab, 2=new window, 3=new tab in most recent window
 pref("browser.link.open_newwindow", 3);
@@ -358,30 +357,26 @@ pref("browser.tabs.closeButtons", 1);
 // true   return to the tab that opened this tab (its owner)
 // false  return to the adjacent tab (old default)
 pref("browser.tabs.selectOwnerOnClose", true);
 
 pref("browser.allTabs.previews", false);
 pref("browser.ctrlTab.previews", false);
 pref("browser.ctrlTab.recentlyUsedLimit", 7);
 
-// Default bookmark sorting
-pref("browser.bookmarks.sort.direction", "descending");
-pref("browser.bookmarks.sort.resource", "rdf:http://home.netscape.com/NC-rdf#Name");
-
 // By default, do not export HTML at shutdown.
 // If true, at shutdown the bookmarks in your menu and toolbar will
 // be exported as HTML to the bookmarks.html file.
 pref("browser.bookmarks.autoExportHTML",          false);
 
 // The maximum number of daily bookmark backups to 
 // keep in {PROFILEDIR}/bookmarkbackups. Special values:
 // -1: unlimited
 //  0: no backups created (and deletes all existing backups)
-pref("browser.bookmarks.max_backups",             5);
+pref("browser.bookmarks.max_backups",             10);
 
 // Scripts & Windows prefs
 pref("dom.disable_open_during_load",              true);
 #ifdef DEBUG
 pref("javascript.options.showInConsole",          true);
 pref("general.warnOnAboutConfig",                 false);
 #else
 pref("javascript.options.showInConsole",          false);

--- a/toolkit/components/places/src/nsNavHistoryQuery.h
+++ b/toolkit/components/places/src/nsNavHistoryQuery.h
@@ -124,17 +124,16 @@ class nsNavHistoryQueryOptions : public 
 public:
   nsNavHistoryQueryOptions() : mSort(0), mResultType(0),
                                mExcludeItems(PR_FALSE),
                                mExcludeQueries(PR_FALSE),
                                mExcludeReadOnlyFolders(PR_FALSE),
                                mExpandQueries(PR_TRUE),
                                mIncludeHidden(PR_FALSE),
                                mRedirectsMode(nsINavHistoryQueryOptions::REDIRECTS_MODE_ALL),
-                               mShowSessions(PR_FALSE),
                                mMaxResults(0),
                                mQueryType(nsINavHistoryQueryOptions::QUERY_TYPE_HISTORY)
   { }
 
   NS_DECLARE_STATIC_IID_ACCESSOR(NS_NAVHISTORYQUERYOPTIONS_IID)
 
   NS_DECL_ISUPPORTS
   NS_DECL_NSINAVHISTORYQUERYOPTIONS
@@ -142,17 +141,16 @@ public:
   PRUint16 SortingMode() const { return mSort; }
   PRUint16 ResultType() const { return mResultType; }
   PRBool ExcludeItems() const { return mExcludeItems; }
   PRBool ExcludeQueries() const { return mExcludeQueries; }
   PRBool ExcludeReadOnlyFolders() const { return mExcludeReadOnlyFolders; }
   PRBool ExpandQueries() const { return mExpandQueries; }
   PRBool IncludeHidden() const { return mIncludeHidden; }
   PRUint16 RedirectsMode() const { return mRedirectsMode; }
-  PRBool ShowSessions() const { return mShowSessions; }
   PRUint32 MaxResults() const { return mMaxResults; }
   PRUint16 QueryType() const { return mQueryType; }
 
   nsresult Clone(nsNavHistoryQueryOptions **aResult);
 
 private:
   nsNavHistoryQueryOptions(const nsNavHistoryQueryOptions& other) {} // no copy
 
@@ -167,17 +165,16 @@ private:
   nsCString mParentAnnotationToExclude;
   PRUint16 mResultType;
   PRPackedBool mExcludeItems;
   PRPackedBool mExcludeQueries;
   PRPackedBool mExcludeReadOnlyFolders;
   PRPackedBool mExpandQueries;
   PRPackedBool mIncludeHidden;
   PRUint16 mRedirectsMode;
-  PRPackedBool mShowSessions;
   PRUint32 mMaxResults;
   PRUint16 mQueryType;
 };
 
 NS_DEFINE_STATIC_IID_ACCESSOR(nsNavHistoryQueryOptions, NS_NAVHISTORYQUERYOPTIONS_IID)
 
 #endif // nsNavHistoryQuery_h_
 

--- a/toolkit/components/places/tests/queries/test_abstime-annotation-domain.js
+++ b/toolkit/components/places/tests/queries/test_abstime-annotation-domain.js
@@ -145,17 +145,17 @@ var testData = [
   {isInQuery: false, isVisit:true, isDetails: true, title: "moz",
    uri: "http://foo.com/changeme3.htm", lastVisit: dec27_800}];
 
 /**
  * This test will test a Query using several terms and do a bit of negative
  * testing for items that should be ignored while querying over history.
  * The Query:WHERE absoluteTime(matches) AND searchTerms AND URI
  *                 AND annotationIsNot(match) GROUP BY Domain, Day SORT BY uri,ascending
- *                 excludeITems(should be ignored) ShowSessions(should be ignored)
+ *                 excludeITems(should be ignored)
  */
 function run_test() {
 
   //Initialize database
   populateDB(testData);
 
   // Query
   var query = histsvc.getNewQuery();

--- a/toolkit/components/places/tests/queries/test_abstime-annotation-uri.js
+++ b/toolkit/components/places/tests/queries/test_abstime-annotation-uri.js
@@ -143,17 +143,17 @@ var testData = [
   {isInQuery: false, isVisit:true, isDetails: true, title: "moz",
    uri: "http://foo.com/changeme3.htm", lastVisit: dec27_800}];
 
 /**
  * This test will test a Query using several terms and do a bit of negative
  * testing for items that should be ignored while querying over history.
  * The Query:WHERE absoluteTime(matches) AND searchTerms AND URI
  *                 AND annotationIsNot(match) GROUP BY Domain, Day SORT BY uri,ascending
- *                 excludeITems(should be ignored) ShowSessions(should be ignored)
+ *                 excludeITems(should be ignored)
  */
 function run_test() {
 
   //Initialize database
   populateDB(testData);
 
   // Query
   var query = histsvc.getNewQuery();