diff --git a/mozilla/docshell/base/nsDocShell.cpp b/mozilla/docshell/base/nsDocShell.cpp
index c67f952c8a9..091042ab2bd 100644
--- a/mozilla/docshell/base/nsDocShell.cpp
+++ b/mozilla/docshell/base/nsDocShell.cpp
@@ -229,7 +229,7 @@ nsDocShell::LoadURI(nsIURI* aURI, nsIDocShellLoadInfo* aLoadInfo)
     aLoadInfo->GetSHEntry(getter_AddRefs(shEntry));
   }
 
-  if (!shEntry) {
+  if (!shEntry && loadType != nsIDocShellLoadInfo::loadNormalReplace) {
     /* Check if we are in the middle of loading a subframe whose parent
      * was originally loaded thro' Session History. ie., you were in a frameset
      * page, went somewhere else and clicked 'back'. The loading of the root page
@@ -1094,6 +1094,15 @@ NS_IMETHODIMP nsDocShell::GetCanGoBack(PRBool* aCanGoBack)
       return webNav->GetCanGoBack(aCanGoBack);
     }
   }
+    else {
+    nsCOMPtr<nsIDocShellTreeItem> root;
+	GetSameTypeRootTreeItem(getter_AddRefs(root));
+	NS_ENSURE_TRUE(root, NS_ERROR_FAILURE);
+    nsCOMPtr<nsIWebNavigation> rootAsWebnav(do_QueryInterface(root));  
+    if (rootAsWebnav) {
+       rootAsWebnav->GetCanGoBack(aCanGoBack);
+ 	}
+  }
 #endif 
    return NS_OK;
 }
@@ -1125,6 +1134,15 @@ NS_IMETHODIMP nsDocShell::GetCanGoForward(PRBool* aCanGoForward)
       return webNav->GetCanGoForward(aCanGoForward);
     }
   }
+  else {
+	nsCOMPtr<nsIDocShellTreeItem> root;
+	GetSameTypeRootTreeItem(getter_AddRefs(root));
+	NS_ENSURE_TRUE(root, NS_ERROR_FAILURE);
+    nsCOMPtr<nsIWebNavigation> rootAsWebnav(do_QueryInterface(root));  
+    if (rootAsWebnav) {
+       rootAsWebnav->GetCanGoForward(aCanGoForward);
+ 	}
+  }
 #endif 
    return NS_OK;
 }
@@ -1164,6 +1182,15 @@ NS_IMETHODIMP nsDocShell::GoBack()
       return webNav->GoBack();
     }
   }
+  else {
+	  	nsCOMPtr<nsIDocShellTreeItem> root;
+	GetSameTypeRootTreeItem(getter_AddRefs(root));
+	NS_ENSURE_TRUE(root, NS_ERROR_FAILURE);
+    nsCOMPtr<nsIWebNavigation> rootAsWebnav(do_QueryInterface(root));  
+    if (rootAsWebnav) {
+       rootAsWebnav->GoBack();
+ 	}
+  }
 #endif 
    return NS_OK;
 }
@@ -1202,6 +1229,15 @@ NS_IMETHODIMP nsDocShell::GoForward()
       return webNav->GoForward();
     }
   }
+  else {
+	  	nsCOMPtr<nsIDocShellTreeItem> root;
+	GetSameTypeRootTreeItem(getter_AddRefs(root));
+	NS_ENSURE_TRUE(root, NS_ERROR_FAILURE);
+    nsCOMPtr<nsIWebNavigation> rootAsWebnav(do_QueryInterface(root));  
+    if (rootAsWebnav) {
+       rootAsWebnav->GoForward();
+ 	}
+  }
 #endif 
    return NS_OK;
 }
@@ -1209,7 +1245,21 @@ NS_IMETHODIMP nsDocShell::GoForward()
 NS_IMETHODIMP
 nsDocShell::GotoIndex(PRInt32 aIndex)
 {
-   
+  if (mSessionHistory) {
+      nsCOMPtr<nsIWebNavigation>webNav(do_QueryInterface(mSessionHistory));
+      if (webNav) {
+          return webNav->GotoIndex(aIndex);
+	  }
+  }
+  else {
+ 	nsCOMPtr<nsIDocShellTreeItem> root;
+	GetSameTypeRootTreeItem(getter_AddRefs(root));
+	NS_ENSURE_TRUE(root, NS_ERROR_FAILURE);
+    nsCOMPtr<nsIWebNavigation> rootAsWebnav(do_QueryInterface(root));  
+    if (rootAsWebnav) {
+       rootAsWebnav->GotoIndex(aIndex);
+ 	}
+  } 
 	return NS_OK;
 }
 
@@ -1402,8 +1452,19 @@ NS_IMETHODIMP nsDocShell::GetSessionHistory(nsISHistory** aSessionHistory)
 {
    NS_ENSURE_ARG_POINTER(aSessionHistory);
 
-   *aSessionHistory = mSessionHistory;
-   NS_IF_ADDREF(*aSessionHistory);
+   if (mSessionHistory) {
+     *aSessionHistory = mSessionHistory;
+     NS_IF_ADDREF(*aSessionHistory);
+   }
+   else {
+	nsCOMPtr<nsIDocShellTreeItem> root;
+	GetSameTypeRootTreeItem(getter_AddRefs(root));
+	NS_ENSURE_TRUE(root, NS_ERROR_FAILURE);
+    nsCOMPtr<nsIWebNavigation> rootAsWebnav(do_QueryInterface(root));  
+    if (rootAsWebnav) {
+       rootAsWebnav->GetSessionHistory(aSessionHistory);
+ 	}
+   }
    return NS_OK;
 }
 //*****************************************************************************
@@ -3372,12 +3433,11 @@ nsresult nsDocShell::AddToSessionHistory(nsIURI *aURI,
   // heirarchy, then AddChildSHEntry(...) will fail and the new entry
   // will be deleted when it loses scope...
   //
-  if (mSessionHistory) {
-	  if (mLoadType != nsIDocShellLoadInfo::loadNormalReplace)
+  if (mLoadType != nsIDocShellLoadInfo::loadNormalReplace) {
+     if (mSessionHistory)	  
          rv = mSessionHistory->AddEntry(entry, shouldPersist);
-
-  } else {
-    rv = AddChildSHEntry(nsnull, entry, mChildOffset);
+     else 
+         rv = AddChildSHEntry(nsnull, entry, mChildOffset);
   }
 
   // Return the new SH entry...