diff -urN mozilla.orig/browser/app/profile/firefox.js mozilla.new/browser/app/profile/firefox.js
--- mozilla.orig/browser/app/profile/firefox.js	2007-03-22 01:51:01.000000000 +0100
+++ mozilla.new/browser/app/profile/firefox.js	2007-08-29 01:38:24.000000000 +0200
@@ -531,6 +531,7 @@
 pref("browser.sessionstore.enabled", true);
 pref("browser.sessionstore.resume_from_crash", true);
 pref("browser.sessionstore.resume_session_once", false);
+pref("browser.sessionstore.resume_session_always", false);
  
 // minimal interval between two save operations in milliseconds
 pref("browser.sessionstore.interval", 10000);
diff -urN mozilla.orig/browser/components/sessionstore/src/nsSessionStartup.js mozilla.new/browser/components/sessionstore/src/nsSessionStartup.js
--- mozilla.orig/browser/components/sessionstore/src/nsSessionStartup.js	2007-04-03 19:14:04.000000000 +0200
+++ mozilla.new/browser/components/sessionstore/src/nsSessionStartup.js	2007-08-29 01:36:54.000000000 +0200
@@ -79,6 +79,9 @@
 // whether the service is enabled
 const DEFAULT_ENABLED = true;
 
+// resume the current session always at startup
+const DEFAULT_RESUME_SESSION_ALWAYS = false;
+
 // resume the current session at startup just this once
 const DEFAULT_RESUME_SESSION_ONCE = false;
 
@@ -258,6 +261,10 @@
     if (!this._getPref("sessionstore.resume_from_crash", DEFAULT_RESUME_FROM_CRASH))
       return false;
 
+    // always resume if the user wants to 
+    if (this._getPref("sessionstore.resume_session_always", DEFAULT_RESUME_SESSION_ALWAYS))
+      return true;
+
     // if the prompt fails, recover anyway
     var recover = true;
     // allow extensions to hook in a more elaborate restore prompt