diff --git a/mozilla/camino/resources/localized/English.lproj/BrowserWindow.nib/classes.nib b/mozilla/camino/resources/localized/English.lproj/BrowserWindow.nib/classes.nib
index bdcf4befb02..6be7e8254ab 100644
--- a/mozilla/camino/resources/localized/English.lproj/BrowserWindow.nib/classes.nib
+++ b/mozilla/camino/resources/localized/English.lproj/BrowserWindow.nib/classes.nib
@@ -1,164 +1,217 @@
 {
-    IBClasses = (
-        {
-            CLASS = AutoCompleteTextField; 
-            LANGUAGE = ObjC; 
-            OUTLETS = {mLockIconContextMenu = NSMenu; mProxyIcon = PageProxyIcon; }; 
-            SUPERCLASS = NSTextField; 
-        }, 
-        {
-            ACTIONS = {addFolder = id; }; 
-            CLASS = BookmarkToolbar; 
-            LANGUAGE = ObjC; 
-            SUPERCLASS = NSView; 
-        }, 
-        {
-            CLASS = BrowserContainerView; 
-            LANGUAGE = ObjC; 
-            OUTLETS = {mTabBarView = BrowserTabBarView; mTabView = BrowserTabView; }; 
-            SUPERCLASS = NSView; 
-        }, 
-        {
-            ACTIONS = {toggleBookmarkManager = id; }; 
-            CLASS = BrowserContentView; 
-            LANGUAGE = ObjC; 
-            OUTLETS = {
-                mBookmarkManagerView = NSView; 
-                mBookmarksToolbar = BookmarkToolbar; 
-                mBrowserContainerView = NSView; 
-                mStatusBar = NSView; 
-            }; 
-            SUPERCLASS = NSView; 
-        }, 
-        {
-            CLASS = BrowserTabBarView; 
-            LANGUAGE = ObjC; 
-            OUTLETS = {mTabView = BrowserTabView; }; 
-            SUPERCLASS = NSView; 
-        }, 
-        {
-            CLASS = BrowserTabView; 
-            LANGUAGE = ObjC; 
-            OUTLETS = {mTabBar = BrowserTabBarView; }; 
-            SUPERCLASS = NSTabView; 
-        }, 
-        {CLASS = BrowserTabViewItem; LANGUAGE = ObjC; SUPERCLASS = IconTabViewItem; }, 
-        {CLASS = BrowserWindow; LANGUAGE = ObjC; SUPERCLASS = NSWindow; }, 
-        {
-            ACTIONS = {
-                addBookmark = id; 
-                addBookmarkFolder = id; 
-                addBookmarkForLink = id; 
-                addBookmarkSeparator = id; 
-                addBookmarkWithoutPrompt = id; 
-                addTabGroup = id; 
-                addTabGroupWithoutPrompt = id; 
-                addToAddressBook = id; 
-                back = id; 
-                cancelLocationSheet = id; 
-                cancelSearchSheet = id; 
-                closeCurrentTab = id; 
-                closeOtherTabs = id; 
-                closeSendersTab = id; 
-                copyAddressToClipboard = id; 
-                copyImage = id; 
-                copyImageLocation = id; 
-                copyLinkLocation = id; 
-                endLocationSheet = id; 
-                endSearchSheet = id; 
-                findSearchEngines = id; 
-                forward = id; 
-                frameToNewTab = id; 
-                frameToNewWindow = id; 
-                frameToThisWindow = id; 
-                getInfo = id; 
-                goToLocationFromToolbarURLField = id; 
-                home = id; 
-                makePageBigger = id; 
-                makePageDefaultSize = id; 
-                makePageSmaller = id; 
-                makeTextBigger = id; 
-                makeTextDefaultSize = id; 
-                makeTextSmaller = id; 
-                manageBookmarks = id; 
-                manageHistory = id; 
-                manageSearchEngines = id; 
-                moveTabToNewWindow = id; 
-                newTab = id; 
-                nextTab = id; 
-                openFeedPrefPane = id; 
-                openLinkInNewTab = id; 
-                openLinkInNewWindow = id; 
-                pageSetup = id; 
-                previousTab = id; 
-                printDocument = id; 
-                reload = id; 
-                reloadAllTabs = id; 
-                reloadSendersTab = id; 
-                reloadWithNewCharset = id; 
-                saveFrameAs = id; 
-                saveImageAs = id; 
-                saveLinkAs = id; 
-                savePageAs = id; 
-                searchFieldTriggered = id; 
-                searchForSelection = id; 
-                sendURL = id; 
-                sendURLFromLink = id; 
-                showBookmarksInfo = id; 
-                showPageInfo = id; 
-                showSiteCertificate = id; 
-                stop = id; 
-                toggleStatusBar = id; 
-                toggleTabThumbnailView = id; 
-                unblockFlashFromCurrentDomain = id; 
-                viewOnlyThisImage = id; 
-                viewPageSource = id; 
-                viewSource = id; 
-            }; 
-            CLASS = BrowserWindowController; 
-            LANGUAGE = ObjC; 
-            OUTLETS = {
-                mBackItem = NSMenuItem; 
-                mContentView = BrowserContentView; 
-                mCopyItem = NSMenuItem; 
-                mForwardItem = NSMenuItem; 
-                mImageLinkMenu = NSMenu; 
-                mImageMailToLinkMenu = NSMenu; 
-                mImageMenu = NSMenu; 
-                mInputMenu = NSMenu; 
-                mLinkMenu = NSMenu; 
-                mLocationSheetURLField = NSTextField; 
-                mLocationSheetWindow = NSWindow; 
-                mLocationToolbarView = ExtendedSplitView; 
-                mMailToLinkMenu = NSMenu; 
-                mPageMenu = NSMenu; 
-                mPersonalToolbar = BookmarkToolbar; 
-                mProgress = NSProgressIndicator; 
-                mSearchBar = WebSearchField; 
-                mSearchSheetTextField = WebSearchField; 
-                mSearchSheetWindow = NSWindow; 
-                mStatus = NSTextField; 
-                mStatusBar = NSView; 
-                mTabBarMenu = NSMenu; 
-                mTabBrowser = BrowserTabView; 
-                mTabMenu = NSMenu; 
-                mURLBar = AutoCompleteTextField; 
-            }; 
-            SUPERCLASS = NSWindowController; 
-        }, 
-        {CLASS = ExtendedSplitView; LANGUAGE = ObjC; SUPERCLASS = NSSplitView; }, 
-        {
-            ACTIONS = {addBookmark = id; addBookmarkFolder = id; addBookmarkSeparator = id; }; 
-            CLASS = FirstResponder; 
-            LANGUAGE = ObjC; 
-            SUPERCLASS = NSObject; 
-        }, 
-        {CLASS = IconTabViewItem; LANGUAGE = ObjC; SUPERCLASS = NSTabViewItem; }, 
-        {CLASS = NSObject; LANGUAGE = ObjC; }, 
-        {CLASS = PageProxyIcon; LANGUAGE = ObjC; SUPERCLASS = NSImageView; }, 
-        {CLASS = StatusBarView; LANGUAGE = ObjC; SUPERCLASS = NSView; }, 
-        {CLASS = ThrobberHandler; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, 
-        {CLASS = WebSearchField; LANGUAGE = ObjC; SUPERCLASS = NSSearchField; }
-    ); 
-    IBVersion = 1; 
+    IBClasses =     (
+                {
+            CLASS = AutoCompleteTextField;
+            LANGUAGE = ObjC;
+            OUTLETS =             {
+                mLockIconContextMenu = NSMenu;
+                mProxyIcon = PageProxyIcon;
+            };
+            SUPERCLASS = NSTextField;
+        },
+                {
+            ACTIONS =             {
+                addFolder = id;
+            };
+            CLASS = BookmarkToolbar;
+            LANGUAGE = ObjC;
+            SUPERCLASS = NSView;
+        },
+                {
+            CLASS = BrowserContainerView;
+            LANGUAGE = ObjC;
+            OUTLETS =             {
+                mTabBarView = BrowserTabBarView;
+                mTabView = BrowserTabView;
+            };
+            SUPERCLASS = NSView;
+        },
+                {
+            ACTIONS =             {
+                toggleBookmarkManager = id;
+            };
+            CLASS = BrowserContentView;
+            LANGUAGE = ObjC;
+            OUTLETS =             {
+                mBookmarkManagerView = NSView;
+                mBookmarksToolbar = BookmarkToolbar;
+                mBrowserContainerView = NSView;
+                mStatusBar = NSView;
+            };
+            SUPERCLASS = NSView;
+        },
+                {
+            CLASS = BrowserTabBarView;
+            LANGUAGE = ObjC;
+            OUTLETS =             {
+                mTabView = BrowserTabView;
+            };
+            SUPERCLASS = NSView;
+        },
+                {
+            CLASS = BrowserTabView;
+            LANGUAGE = ObjC;
+            OUTLETS =             {
+                mTabBar = BrowserTabBarView;
+            };
+            SUPERCLASS = NSTabView;
+        },
+                {
+            CLASS = BrowserTabViewItem;
+            LANGUAGE = ObjC;
+            SUPERCLASS = IconTabViewItem;
+        },
+                {
+            CLASS = BrowserWindow;
+            LANGUAGE = ObjC;
+            SUPERCLASS = NSWindow;
+        },
+                {
+            ACTIONS =             {
+                addBookmark = id;
+                addBookmarkFolder = id;
+                addBookmarkForLink = id;
+                addBookmarkSeparator = id;
+                addBookmarkWithoutPrompt = id;
+                addTabGroup = id;
+                addTabGroupWithoutPrompt = id;
+                addToAddressBook = id;
+                back = id;
+                cancelLocationSheet = id;
+                cancelSearchSheet = id;
+                closeCurrentTab = id;
+                closeOtherTabs = id;
+                closeSendersTab = id;
+                copyAddressToClipboard = id;
+                copyImage = id;
+                copyImageLocation = id;
+                copyLinkLocation = id;
+                endLocationSheet = id;
+                endSearchSheet = id;
+                findSearchEngines = id;
+                forward = id;
+                frameToNewTab = id;
+                frameToNewWindow = id;
+                frameToThisWindow = id;
+                getInfo = id;
+                goToLocationFromToolbarURLField = id;
+                home = id;
+                makePageBigger = id;
+                makePageDefaultSize = id;
+                makePageSmaller = id;
+                makeTextBigger = id;
+                makeTextDefaultSize = id;
+                makeTextSmaller = id;
+                manageBookmarks = id;
+                manageHistory = id;
+                manageSearchEngines = id;
+                moveTabToNewWindow = id;
+                newTab = id;
+                nextTab = id;
+                openFeedPrefPane = id;
+                openLinkInNewTab = id;
+                openLinkInNewWindow = id;
+                pageSetup = id;
+                previousTab = id;
+                printDocument = id;
+                reload = id;
+                reloadAllTabs = id;
+                reloadSendersTab = id;
+                reloadWithNewCharset = id;
+                saveFrameAs = id;
+                saveImageAs = id;
+                saveLinkAs = id;
+                savePageAs = id;
+                searchFieldTriggered = id;
+                searchForSelection = id;
+                sendURL = id;
+                sendURLFromLink = id;
+                showBookmarksInfo = id;
+                showPageInfo = id;
+                showSiteCertificate = id;
+                stop = id;
+                toggleStatusBar = id;
+                toggleTabThumbnailView = id;
+                unblockFlashFromCurrentDomain = id;
+                viewOnlyThisImage = id;
+                viewPageSource = id;
+                viewSource = id;
+            };
+            CLASS = BrowserWindowController;
+            LANGUAGE = ObjC;
+            OUTLETS =             {
+                mBackItem = NSMenuItem;
+                mContentView = BrowserContentView;
+                mCopyItem = NSMenuItem;
+                mForwardItem = NSMenuItem;
+                mImageLinkMenu = NSMenu;
+                mImageMailToLinkMenu = NSMenu;
+                mImageMenu = NSMenu;
+                mInputMenu = NSMenu;
+                mLinkMenu = NSMenu;
+                mLocationSheetURLField = NSTextField;
+                mLocationSheetWindow = NSWindow;
+                mLocationToolbarView = ExtendedSplitView;
+                mMailToLinkMenu = NSMenu;
+                mPageMenu = NSMenu;
+                mPersonalToolbar = BookmarkToolbar;
+                mProgress = NSProgressIndicator;
+                mSearchBar = WebSearchField;
+                mSearchSheetTextField = WebSearchField;
+                mSearchSheetWindow = NSWindow;
+                mStatus = NSTextField;
+                mStatusBar = NSView;
+                mTabBarMenu = NSMenu;
+                mTabBrowser = BrowserTabView;
+                mTabMenu = NSMenu;
+                mURLBar = AutoCompleteTextField;
+            };
+            SUPERCLASS = NSWindowController;
+        },
+                {
+            CLASS = ExtendedSplitView;
+            LANGUAGE = ObjC;
+            SUPERCLASS = NSSplitView;
+        },
+                {
+            ACTIONS =             {
+                addBookmark = id;
+                addBookmarkFolder = id;
+                addBookmarkSeparator = id;
+            };
+            CLASS = FirstResponder;
+            LANGUAGE = ObjC;
+            SUPERCLASS = NSObject;
+        },
+                {
+            CLASS = IconTabViewItem;
+            LANGUAGE = ObjC;
+            SUPERCLASS = NSTabViewItem;
+        },
+                {
+            CLASS = NSObject;
+            LANGUAGE = ObjC;
+        },
+                {
+            CLASS = PageProxyIcon;
+            LANGUAGE = ObjC;
+            SUPERCLASS = NSImageView;
+        },
+                {
+            CLASS = StatusBarView;
+            LANGUAGE = ObjC;
+            SUPERCLASS = NSView;
+        },
+                {
+            CLASS = ThrobberHandler;
+            LANGUAGE = ObjC;
+            SUPERCLASS = NSObject;
+        },
+                {
+            CLASS = WebSearchField;
+            LANGUAGE = ObjC;
+            SUPERCLASS = NSSearchField;
+        }
+    );
+    IBVersion = 1;
 }
\ No newline at end of file
diff --git a/mozilla/camino/resources/localized/English.lproj/BrowserWindow.nib/info.nib b/mozilla/camino/resources/localized/English.lproj/BrowserWindow.nib/info.nib
index a33814b232b..b1c44238509 100644
--- a/mozilla/camino/resources/localized/English.lproj/BrowserWindow.nib/info.nib
+++ b/mozilla/camino/resources/localized/English.lproj/BrowserWindow.nib/info.nib
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
 	<key>IBDocumentLocation</key>
 	<string>111 74 356 240 0 0 1440 878 </string>
 	<key>IBEditorPositions</key>
 	<dict>
+		<key>1066</key>
+		<string>535 611 370 64 0 0 1440 878 </string>
 		<key>297</key>
 		<string>526 315 226 424 0 0 1280 778 </string>
 	</dict>
@@ -18,7 +20,7 @@
 		<integer>10</integer>
 	</array>
 	<key>IBSystem Version</key>
-	<string>8S2167</string>
+	<string>9L31a</string>
 	<key>targetFramework</key>
 	<string>IBCocoaFramework</string>
 </dict>
diff --git a/mozilla/camino/resources/localized/English.lproj/BrowserWindow.nib/keyedobjects.nib b/mozilla/camino/resources/localized/English.lproj/BrowserWindow.nib/keyedobjects.nib
index 0e892158143..5115cff9c09 100644
Binary files a/mozilla/camino/resources/localized/English.lproj/BrowserWindow.nib/keyedobjects.nib and b/mozilla/camino/resources/localized/English.lproj/BrowserWindow.nib/keyedobjects.nib differ