diff --git a/mozilla/camino/BrowserWindow.nib/classes.nib b/mozilla/camino/BrowserWindow.nib/classes.nib
index 31becfebb79..669269f11fb 100644
--- a/mozilla/camino/BrowserWindow.nib/classes.nib
+++ b/mozilla/camino/BrowserWindow.nib/classes.nib
@@ -34,6 +34,7 @@
                 stop = id; 
                 toggleSidebar = id; 
                 viewOnlyThisImage = id; 
+                viewSource = id; 
             }; 
             CLASS = BrowserWindowController; 
             LANGUAGE = ObjC; 
diff --git a/mozilla/camino/BrowserWindow.nib/info.nib b/mozilla/camino/BrowserWindow.nib/info.nib
index 8214bc64e6c..2c3eba022a1 100644
--- a/mozilla/camino/BrowserWindow.nib/info.nib
+++ b/mozilla/camino/BrowserWindow.nib/info.nib
@@ -13,13 +13,11 @@
 		<key>28</key>
 		<string>478 279 195 457 0 0 1152 746 </string>
 		<key>297</key>
-		<string>70 110 187 210 0 0 1152 746 </string>
+		<string>70 110 198 210 0 0 1152 746 </string>
 		<key>314</key>
-		<string>271 139 168 180 0 0 1152 746 </string>
+		<string>271 139 198 180 0 0 1152 746 </string>
 		<key>336</key>
 		<string>458 90 200 162 0 0 1152 746 </string>
-		<key>343</key>
-		<string>499 330 200 252 0 0 1152 746 </string>
 		<key>365</key>
 		<string>22 500 93 162 0 0 1152 746 </string>
 		<key>463</key>
@@ -48,6 +46,7 @@
 	<key>IBOpenObjects</key>
 	<array>
 		<integer>475</integer>
+		<integer>297</integer>
 		<integer>160</integer>
 		<integer>56</integer>
 	</array>
diff --git a/mozilla/camino/BrowserWindow.nib/objects.nib b/mozilla/camino/BrowserWindow.nib/objects.nib
index d1a7d6061d1..a59a8c9f98f 100644
Binary files a/mozilla/camino/BrowserWindow.nib/objects.nib and b/mozilla/camino/BrowserWindow.nib/objects.nib differ
diff --git a/mozilla/camino/BrowserWindowController.h b/mozilla/camino/BrowserWindowController.h
index 9d9e415f1ae..d34f0f5dac9 100644
--- a/mozilla/camino/BrowserWindowController.h
+++ b/mozilla/camino/BrowserWindowController.h
@@ -123,6 +123,8 @@ class nsIDOMNode;
 - (IBAction)endAddBookmarkSheet:(id)sender;
 - (void)cacheBookmarkDS: (id)aDS;
 
+- (IBAction)viewSource:(id)aSender;
+
 - (void)saveDocument: (NSView*)aFilterView filterList: (NSPopUpButton*)aFilterList;
 - (void)saveURL: (NSView*)aFilterView filterList: (NSPopUpButton*)aFilterList
             url: (NSURL*)aURL suggestedFilename: (NSString*)aFilename;
diff --git a/mozilla/camino/BrowserWindowController.mm b/mozilla/camino/BrowserWindowController.mm
index 1af3fd07af5..d9f47b0bca7 100644
--- a/mozilla/camino/BrowserWindowController.mm
+++ b/mozilla/camino/BrowserWindowController.mm
@@ -492,19 +492,23 @@ static NSString *PrintToolbarItemIdentifier	= @"Print Toolbar Item";
                                      url: aURL suggestedFilename: aFilename];
 }
 
+- (IBAction)viewSource:(id)aSender
+{
+}
+
 - (void)printDocument
 {
-    [[mBrowserView getBrowserView] printDocument];
+  [[mBrowserView getBrowserView] printDocument];
 }
 
 - (void)printPreview
 {
-    [[mBrowserView getBrowserView] printPreview];
+  [[mBrowserView getBrowserView] printPreview];
 }
 
 - (BOOL)findInPage:(NSString*)text
 {
-    return [[mBrowserView getBrowserView] findInPage:text];
+  return [[mBrowserView getBrowserView] findInPage:text];
 }
 
 - (void)addBookmarkExtended: (BOOL)aIsFromMenu isFolder:(BOOL)aIsFolder
diff --git a/mozilla/camino/English.lproj/BrowserWindow.nib/classes.nib b/mozilla/camino/English.lproj/BrowserWindow.nib/classes.nib
index 31becfebb79..669269f11fb 100644
--- a/mozilla/camino/English.lproj/BrowserWindow.nib/classes.nib
+++ b/mozilla/camino/English.lproj/BrowserWindow.nib/classes.nib
@@ -34,6 +34,7 @@
                 stop = id; 
                 toggleSidebar = id; 
                 viewOnlyThisImage = id; 
+                viewSource = id; 
             }; 
             CLASS = BrowserWindowController; 
             LANGUAGE = ObjC; 
diff --git a/mozilla/camino/English.lproj/BrowserWindow.nib/info.nib b/mozilla/camino/English.lproj/BrowserWindow.nib/info.nib
index 8214bc64e6c..2c3eba022a1 100644
--- a/mozilla/camino/English.lproj/BrowserWindow.nib/info.nib
+++ b/mozilla/camino/English.lproj/BrowserWindow.nib/info.nib
@@ -13,13 +13,11 @@
 		<key>28</key>
 		<string>478 279 195 457 0 0 1152 746 </string>
 		<key>297</key>
-		<string>70 110 187 210 0 0 1152 746 </string>
+		<string>70 110 198 210 0 0 1152 746 </string>
 		<key>314</key>
-		<string>271 139 168 180 0 0 1152 746 </string>
+		<string>271 139 198 180 0 0 1152 746 </string>
 		<key>336</key>
 		<string>458 90 200 162 0 0 1152 746 </string>
-		<key>343</key>
-		<string>499 330 200 252 0 0 1152 746 </string>
 		<key>365</key>
 		<string>22 500 93 162 0 0 1152 746 </string>
 		<key>463</key>
@@ -48,6 +46,7 @@
 	<key>IBOpenObjects</key>
 	<array>
 		<integer>475</integer>
+		<integer>297</integer>
 		<integer>160</integer>
 		<integer>56</integer>
 	</array>
diff --git a/mozilla/camino/English.lproj/BrowserWindow.nib/objects.nib b/mozilla/camino/English.lproj/BrowserWindow.nib/objects.nib
index d1a7d6061d1..a59a8c9f98f 100644
Binary files a/mozilla/camino/English.lproj/BrowserWindow.nib/objects.nib and b/mozilla/camino/English.lproj/BrowserWindow.nib/objects.nib differ
diff --git a/mozilla/camino/English.lproj/MainMenu.nib/classes.nib b/mozilla/camino/English.lproj/MainMenu.nib/classes.nib
index d3f1ca53460..98965c3f17d 100644
--- a/mozilla/camino/English.lproj/MainMenu.nib/classes.nib
+++ b/mozilla/camino/English.lproj/MainMenu.nib/classes.nib
@@ -38,6 +38,7 @@
                 toggleBookmarksToolbar = id; 
                 toggleOfflineMode = id; 
                 toggleSmoothText = id; 
+                viewSource = id; 
             }; 
             CLASS = MainController; 
             LANGUAGE = ObjC; 
diff --git a/mozilla/camino/English.lproj/MainMenu.nib/objects.nib b/mozilla/camino/English.lproj/MainMenu.nib/objects.nib
index 8813d564eb4..f6bc6127373 100644
Binary files a/mozilla/camino/English.lproj/MainMenu.nib/objects.nib and b/mozilla/camino/English.lproj/MainMenu.nib/objects.nib differ
diff --git a/mozilla/camino/MainController.h b/mozilla/camino/MainController.h
index 6200328b026..015d5cc440a 100644
--- a/mozilla/camino/MainController.h
+++ b/mozilla/camino/MainController.h
@@ -96,6 +96,7 @@ class BookmarksService;
 -(IBAction) biggerTextSize:(id)aSender;
 -(IBAction) smallerTextSize:(id)aSender;
 -(IBAction) toggleSmoothText:(id)aSender;
+-(IBAction) viewSource:(id)aSender;
 
 // Bookmarks menu actions.
 -(IBAction) importBookmarks:(id)aSender;
diff --git a/mozilla/camino/MainController.mm b/mozilla/camino/MainController.mm
index e3bf6333373..8a6948dbb93 100644
--- a/mozilla/camino/MainController.mm
+++ b/mozilla/camino/MainController.mm
@@ -409,6 +409,13 @@ static const char* ioServiceContractID = "@mozilla.org/network/io-service;1";
   }
 }
 
+-(IBAction) viewSource:(id)aSender
+{
+  NSWindow* mainWindow = [mApplication mainWindow];
+  if (mainWindow && [[mainWindow windowController] respondsToSelector:@selector(viewSource)] )
+    [[mainWindow windowController] viewSource: self];
+}
+
 static PRBool gSetupSmoothTextMenu = PR_FALSE;
 
 -(BOOL)validateMenuItem: (id <NSMenuItem> )aMenuItem
diff --git a/mozilla/camino/MainMenu.nib/classes.nib b/mozilla/camino/MainMenu.nib/classes.nib
index d3f1ca53460..98965c3f17d 100644
--- a/mozilla/camino/MainMenu.nib/classes.nib
+++ b/mozilla/camino/MainMenu.nib/classes.nib
@@ -38,6 +38,7 @@
                 toggleBookmarksToolbar = id; 
                 toggleOfflineMode = id; 
                 toggleSmoothText = id; 
+                viewSource = id; 
             }; 
             CLASS = MainController; 
             LANGUAGE = ObjC; 
diff --git a/mozilla/camino/MainMenu.nib/objects.nib b/mozilla/camino/MainMenu.nib/objects.nib
index 8813d564eb4..f6bc6127373 100644
Binary files a/mozilla/camino/MainMenu.nib/objects.nib and b/mozilla/camino/MainMenu.nib/objects.nib differ
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 31becfebb79..669269f11fb 100644
--- a/mozilla/camino/resources/localized/English.lproj/BrowserWindow.nib/classes.nib
+++ b/mozilla/camino/resources/localized/English.lproj/BrowserWindow.nib/classes.nib
@@ -34,6 +34,7 @@
                 stop = id; 
                 toggleSidebar = id; 
                 viewOnlyThisImage = id; 
+                viewSource = id; 
             }; 
             CLASS = BrowserWindowController; 
             LANGUAGE = ObjC; 
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 8214bc64e6c..2c3eba022a1 100644
--- a/mozilla/camino/resources/localized/English.lproj/BrowserWindow.nib/info.nib
+++ b/mozilla/camino/resources/localized/English.lproj/BrowserWindow.nib/info.nib
@@ -13,13 +13,11 @@
 		<key>28</key>
 		<string>478 279 195 457 0 0 1152 746 </string>
 		<key>297</key>
-		<string>70 110 187 210 0 0 1152 746 </string>
+		<string>70 110 198 210 0 0 1152 746 </string>
 		<key>314</key>
-		<string>271 139 168 180 0 0 1152 746 </string>
+		<string>271 139 198 180 0 0 1152 746 </string>
 		<key>336</key>
 		<string>458 90 200 162 0 0 1152 746 </string>
-		<key>343</key>
-		<string>499 330 200 252 0 0 1152 746 </string>
 		<key>365</key>
 		<string>22 500 93 162 0 0 1152 746 </string>
 		<key>463</key>
@@ -48,6 +46,7 @@
 	<key>IBOpenObjects</key>
 	<array>
 		<integer>475</integer>
+		<integer>297</integer>
 		<integer>160</integer>
 		<integer>56</integer>
 	</array>
diff --git a/mozilla/camino/resources/localized/English.lproj/BrowserWindow.nib/objects.nib b/mozilla/camino/resources/localized/English.lproj/BrowserWindow.nib/objects.nib
index d1a7d6061d1..a59a8c9f98f 100644
Binary files a/mozilla/camino/resources/localized/English.lproj/BrowserWindow.nib/objects.nib and b/mozilla/camino/resources/localized/English.lproj/BrowserWindow.nib/objects.nib differ
diff --git a/mozilla/camino/resources/localized/English.lproj/MainMenu.nib/classes.nib b/mozilla/camino/resources/localized/English.lproj/MainMenu.nib/classes.nib
index d3f1ca53460..98965c3f17d 100644
--- a/mozilla/camino/resources/localized/English.lproj/MainMenu.nib/classes.nib
+++ b/mozilla/camino/resources/localized/English.lproj/MainMenu.nib/classes.nib
@@ -38,6 +38,7 @@
                 toggleBookmarksToolbar = id; 
                 toggleOfflineMode = id; 
                 toggleSmoothText = id; 
+                viewSource = id; 
             }; 
             CLASS = MainController; 
             LANGUAGE = ObjC; 
diff --git a/mozilla/camino/resources/localized/English.lproj/MainMenu.nib/objects.nib b/mozilla/camino/resources/localized/English.lproj/MainMenu.nib/objects.nib
index 8813d564eb4..f6bc6127373 100644
Binary files a/mozilla/camino/resources/localized/English.lproj/MainMenu.nib/objects.nib and b/mozilla/camino/resources/localized/English.lproj/MainMenu.nib/objects.nib differ
diff --git a/mozilla/camino/src/application/MainController.h b/mozilla/camino/src/application/MainController.h
index 6200328b026..015d5cc440a 100644
--- a/mozilla/camino/src/application/MainController.h
+++ b/mozilla/camino/src/application/MainController.h
@@ -96,6 +96,7 @@ class BookmarksService;
 -(IBAction) biggerTextSize:(id)aSender;
 -(IBAction) smallerTextSize:(id)aSender;
 -(IBAction) toggleSmoothText:(id)aSender;
+-(IBAction) viewSource:(id)aSender;
 
 // Bookmarks menu actions.
 -(IBAction) importBookmarks:(id)aSender;
diff --git a/mozilla/camino/src/application/MainController.mm b/mozilla/camino/src/application/MainController.mm
index e3bf6333373..8a6948dbb93 100644
--- a/mozilla/camino/src/application/MainController.mm
+++ b/mozilla/camino/src/application/MainController.mm
@@ -409,6 +409,13 @@ static const char* ioServiceContractID = "@mozilla.org/network/io-service;1";
   }
 }
 
+-(IBAction) viewSource:(id)aSender
+{
+  NSWindow* mainWindow = [mApplication mainWindow];
+  if (mainWindow && [[mainWindow windowController] respondsToSelector:@selector(viewSource)] )
+    [[mainWindow windowController] viewSource: self];
+}
+
 static PRBool gSetupSmoothTextMenu = PR_FALSE;
 
 -(BOOL)validateMenuItem: (id <NSMenuItem> )aMenuItem
diff --git a/mozilla/camino/src/browser/BrowserWindowController.h b/mozilla/camino/src/browser/BrowserWindowController.h
index 9d9e415f1ae..d34f0f5dac9 100644
--- a/mozilla/camino/src/browser/BrowserWindowController.h
+++ b/mozilla/camino/src/browser/BrowserWindowController.h
@@ -123,6 +123,8 @@ class nsIDOMNode;
 - (IBAction)endAddBookmarkSheet:(id)sender;
 - (void)cacheBookmarkDS: (id)aDS;
 
+- (IBAction)viewSource:(id)aSender;
+
 - (void)saveDocument: (NSView*)aFilterView filterList: (NSPopUpButton*)aFilterList;
 - (void)saveURL: (NSView*)aFilterView filterList: (NSPopUpButton*)aFilterList
             url: (NSURL*)aURL suggestedFilename: (NSString*)aFilename;
diff --git a/mozilla/camino/src/browser/BrowserWindowController.mm b/mozilla/camino/src/browser/BrowserWindowController.mm
index 1af3fd07af5..d9f47b0bca7 100644
--- a/mozilla/camino/src/browser/BrowserWindowController.mm
+++ b/mozilla/camino/src/browser/BrowserWindowController.mm
@@ -492,19 +492,23 @@ static NSString *PrintToolbarItemIdentifier	= @"Print Toolbar Item";
                                      url: aURL suggestedFilename: aFilename];
 }
 
+- (IBAction)viewSource:(id)aSender
+{
+}
+
 - (void)printDocument
 {
-    [[mBrowserView getBrowserView] printDocument];
+  [[mBrowserView getBrowserView] printDocument];
 }
 
 - (void)printPreview
 {
-    [[mBrowserView getBrowserView] printPreview];
+  [[mBrowserView getBrowserView] printPreview];
 }
 
 - (BOOL)findInPage:(NSString*)text
 {
-    return [[mBrowserView getBrowserView] findInPage:text];
+  return [[mBrowserView getBrowserView] findInPage:text];
 }
 
 - (void)addBookmarkExtended: (BOOL)aIsFromMenu isFolder:(BOOL)aIsFolder
diff --git a/mozilla/chimera/BrowserWindow.nib/classes.nib b/mozilla/chimera/BrowserWindow.nib/classes.nib
index 31becfebb79..669269f11fb 100644
--- a/mozilla/chimera/BrowserWindow.nib/classes.nib
+++ b/mozilla/chimera/BrowserWindow.nib/classes.nib
@@ -34,6 +34,7 @@
                 stop = id; 
                 toggleSidebar = id; 
                 viewOnlyThisImage = id; 
+                viewSource = id; 
             }; 
             CLASS = BrowserWindowController; 
             LANGUAGE = ObjC; 
diff --git a/mozilla/chimera/BrowserWindow.nib/info.nib b/mozilla/chimera/BrowserWindow.nib/info.nib
index 8214bc64e6c..2c3eba022a1 100644
--- a/mozilla/chimera/BrowserWindow.nib/info.nib
+++ b/mozilla/chimera/BrowserWindow.nib/info.nib
@@ -13,13 +13,11 @@
 		<key>28</key>
 		<string>478 279 195 457 0 0 1152 746 </string>
 		<key>297</key>
-		<string>70 110 187 210 0 0 1152 746 </string>
+		<string>70 110 198 210 0 0 1152 746 </string>
 		<key>314</key>
-		<string>271 139 168 180 0 0 1152 746 </string>
+		<string>271 139 198 180 0 0 1152 746 </string>
 		<key>336</key>
 		<string>458 90 200 162 0 0 1152 746 </string>
-		<key>343</key>
-		<string>499 330 200 252 0 0 1152 746 </string>
 		<key>365</key>
 		<string>22 500 93 162 0 0 1152 746 </string>
 		<key>463</key>
@@ -48,6 +46,7 @@
 	<key>IBOpenObjects</key>
 	<array>
 		<integer>475</integer>
+		<integer>297</integer>
 		<integer>160</integer>
 		<integer>56</integer>
 	</array>
diff --git a/mozilla/chimera/BrowserWindow.nib/objects.nib b/mozilla/chimera/BrowserWindow.nib/objects.nib
index d1a7d6061d1..a59a8c9f98f 100644
Binary files a/mozilla/chimera/BrowserWindow.nib/objects.nib and b/mozilla/chimera/BrowserWindow.nib/objects.nib differ
diff --git a/mozilla/chimera/BrowserWindowController.h b/mozilla/chimera/BrowserWindowController.h
index 9d9e415f1ae..d34f0f5dac9 100644
--- a/mozilla/chimera/BrowserWindowController.h
+++ b/mozilla/chimera/BrowserWindowController.h
@@ -123,6 +123,8 @@ class nsIDOMNode;
 - (IBAction)endAddBookmarkSheet:(id)sender;
 - (void)cacheBookmarkDS: (id)aDS;
 
+- (IBAction)viewSource:(id)aSender;
+
 - (void)saveDocument: (NSView*)aFilterView filterList: (NSPopUpButton*)aFilterList;
 - (void)saveURL: (NSView*)aFilterView filterList: (NSPopUpButton*)aFilterList
             url: (NSURL*)aURL suggestedFilename: (NSString*)aFilename;
diff --git a/mozilla/chimera/BrowserWindowController.mm b/mozilla/chimera/BrowserWindowController.mm
index 1af3fd07af5..d9f47b0bca7 100644
--- a/mozilla/chimera/BrowserWindowController.mm
+++ b/mozilla/chimera/BrowserWindowController.mm
@@ -492,19 +492,23 @@ static NSString *PrintToolbarItemIdentifier	= @"Print Toolbar Item";
                                      url: aURL suggestedFilename: aFilename];
 }
 
+- (IBAction)viewSource:(id)aSender
+{
+}
+
 - (void)printDocument
 {
-    [[mBrowserView getBrowserView] printDocument];
+  [[mBrowserView getBrowserView] printDocument];
 }
 
 - (void)printPreview
 {
-    [[mBrowserView getBrowserView] printPreview];
+  [[mBrowserView getBrowserView] printPreview];
 }
 
 - (BOOL)findInPage:(NSString*)text
 {
-    return [[mBrowserView getBrowserView] findInPage:text];
+  return [[mBrowserView getBrowserView] findInPage:text];
 }
 
 - (void)addBookmarkExtended: (BOOL)aIsFromMenu isFolder:(BOOL)aIsFolder
diff --git a/mozilla/chimera/English.lproj/BrowserWindow.nib/classes.nib b/mozilla/chimera/English.lproj/BrowserWindow.nib/classes.nib
index 31becfebb79..669269f11fb 100644
--- a/mozilla/chimera/English.lproj/BrowserWindow.nib/classes.nib
+++ b/mozilla/chimera/English.lproj/BrowserWindow.nib/classes.nib
@@ -34,6 +34,7 @@
                 stop = id; 
                 toggleSidebar = id; 
                 viewOnlyThisImage = id; 
+                viewSource = id; 
             }; 
             CLASS = BrowserWindowController; 
             LANGUAGE = ObjC; 
diff --git a/mozilla/chimera/English.lproj/BrowserWindow.nib/info.nib b/mozilla/chimera/English.lproj/BrowserWindow.nib/info.nib
index 8214bc64e6c..2c3eba022a1 100644
--- a/mozilla/chimera/English.lproj/BrowserWindow.nib/info.nib
+++ b/mozilla/chimera/English.lproj/BrowserWindow.nib/info.nib
@@ -13,13 +13,11 @@
 		<key>28</key>
 		<string>478 279 195 457 0 0 1152 746 </string>
 		<key>297</key>
-		<string>70 110 187 210 0 0 1152 746 </string>
+		<string>70 110 198 210 0 0 1152 746 </string>
 		<key>314</key>
-		<string>271 139 168 180 0 0 1152 746 </string>
+		<string>271 139 198 180 0 0 1152 746 </string>
 		<key>336</key>
 		<string>458 90 200 162 0 0 1152 746 </string>
-		<key>343</key>
-		<string>499 330 200 252 0 0 1152 746 </string>
 		<key>365</key>
 		<string>22 500 93 162 0 0 1152 746 </string>
 		<key>463</key>
@@ -48,6 +46,7 @@
 	<key>IBOpenObjects</key>
 	<array>
 		<integer>475</integer>
+		<integer>297</integer>
 		<integer>160</integer>
 		<integer>56</integer>
 	</array>
diff --git a/mozilla/chimera/English.lproj/BrowserWindow.nib/objects.nib b/mozilla/chimera/English.lproj/BrowserWindow.nib/objects.nib
index d1a7d6061d1..a59a8c9f98f 100644
Binary files a/mozilla/chimera/English.lproj/BrowserWindow.nib/objects.nib and b/mozilla/chimera/English.lproj/BrowserWindow.nib/objects.nib differ
diff --git a/mozilla/chimera/English.lproj/MainMenu.nib/classes.nib b/mozilla/chimera/English.lproj/MainMenu.nib/classes.nib
index d3f1ca53460..98965c3f17d 100644
--- a/mozilla/chimera/English.lproj/MainMenu.nib/classes.nib
+++ b/mozilla/chimera/English.lproj/MainMenu.nib/classes.nib
@@ -38,6 +38,7 @@
                 toggleBookmarksToolbar = id; 
                 toggleOfflineMode = id; 
                 toggleSmoothText = id; 
+                viewSource = id; 
             }; 
             CLASS = MainController; 
             LANGUAGE = ObjC; 
diff --git a/mozilla/chimera/English.lproj/MainMenu.nib/objects.nib b/mozilla/chimera/English.lproj/MainMenu.nib/objects.nib
index 8813d564eb4..f6bc6127373 100644
Binary files a/mozilla/chimera/English.lproj/MainMenu.nib/objects.nib and b/mozilla/chimera/English.lproj/MainMenu.nib/objects.nib differ
diff --git a/mozilla/chimera/MainController.h b/mozilla/chimera/MainController.h
index 6200328b026..015d5cc440a 100644
--- a/mozilla/chimera/MainController.h
+++ b/mozilla/chimera/MainController.h
@@ -96,6 +96,7 @@ class BookmarksService;
 -(IBAction) biggerTextSize:(id)aSender;
 -(IBAction) smallerTextSize:(id)aSender;
 -(IBAction) toggleSmoothText:(id)aSender;
+-(IBAction) viewSource:(id)aSender;
 
 // Bookmarks menu actions.
 -(IBAction) importBookmarks:(id)aSender;
diff --git a/mozilla/chimera/MainController.mm b/mozilla/chimera/MainController.mm
index e3bf6333373..8a6948dbb93 100644
--- a/mozilla/chimera/MainController.mm
+++ b/mozilla/chimera/MainController.mm
@@ -409,6 +409,13 @@ static const char* ioServiceContractID = "@mozilla.org/network/io-service;1";
   }
 }
 
+-(IBAction) viewSource:(id)aSender
+{
+  NSWindow* mainWindow = [mApplication mainWindow];
+  if (mainWindow && [[mainWindow windowController] respondsToSelector:@selector(viewSource)] )
+    [[mainWindow windowController] viewSource: self];
+}
+
 static PRBool gSetupSmoothTextMenu = PR_FALSE;
 
 -(BOOL)validateMenuItem: (id <NSMenuItem> )aMenuItem
diff --git a/mozilla/chimera/MainMenu.nib/classes.nib b/mozilla/chimera/MainMenu.nib/classes.nib
index d3f1ca53460..98965c3f17d 100644
--- a/mozilla/chimera/MainMenu.nib/classes.nib
+++ b/mozilla/chimera/MainMenu.nib/classes.nib
@@ -38,6 +38,7 @@
                 toggleBookmarksToolbar = id; 
                 toggleOfflineMode = id; 
                 toggleSmoothText = id; 
+                viewSource = id; 
             }; 
             CLASS = MainController; 
             LANGUAGE = ObjC; 
diff --git a/mozilla/chimera/MainMenu.nib/objects.nib b/mozilla/chimera/MainMenu.nib/objects.nib
index 8813d564eb4..f6bc6127373 100644
Binary files a/mozilla/chimera/MainMenu.nib/objects.nib and b/mozilla/chimera/MainMenu.nib/objects.nib differ
diff --git a/mozilla/chimera/resources/localized/English.lproj/BrowserWindow.nib/classes.nib b/mozilla/chimera/resources/localized/English.lproj/BrowserWindow.nib/classes.nib
index 31becfebb79..669269f11fb 100644
--- a/mozilla/chimera/resources/localized/English.lproj/BrowserWindow.nib/classes.nib
+++ b/mozilla/chimera/resources/localized/English.lproj/BrowserWindow.nib/classes.nib
@@ -34,6 +34,7 @@
                 stop = id; 
                 toggleSidebar = id; 
                 viewOnlyThisImage = id; 
+                viewSource = id; 
             }; 
             CLASS = BrowserWindowController; 
             LANGUAGE = ObjC; 
diff --git a/mozilla/chimera/resources/localized/English.lproj/BrowserWindow.nib/info.nib b/mozilla/chimera/resources/localized/English.lproj/BrowserWindow.nib/info.nib
index 8214bc64e6c..2c3eba022a1 100644
--- a/mozilla/chimera/resources/localized/English.lproj/BrowserWindow.nib/info.nib
+++ b/mozilla/chimera/resources/localized/English.lproj/BrowserWindow.nib/info.nib
@@ -13,13 +13,11 @@
 		<key>28</key>
 		<string>478 279 195 457 0 0 1152 746 </string>
 		<key>297</key>
-		<string>70 110 187 210 0 0 1152 746 </string>
+		<string>70 110 198 210 0 0 1152 746 </string>
 		<key>314</key>
-		<string>271 139 168 180 0 0 1152 746 </string>
+		<string>271 139 198 180 0 0 1152 746 </string>
 		<key>336</key>
 		<string>458 90 200 162 0 0 1152 746 </string>
-		<key>343</key>
-		<string>499 330 200 252 0 0 1152 746 </string>
 		<key>365</key>
 		<string>22 500 93 162 0 0 1152 746 </string>
 		<key>463</key>
@@ -48,6 +46,7 @@
 	<key>IBOpenObjects</key>
 	<array>
 		<integer>475</integer>
+		<integer>297</integer>
 		<integer>160</integer>
 		<integer>56</integer>
 	</array>
diff --git a/mozilla/chimera/resources/localized/English.lproj/BrowserWindow.nib/objects.nib b/mozilla/chimera/resources/localized/English.lproj/BrowserWindow.nib/objects.nib
index d1a7d6061d1..a59a8c9f98f 100644
Binary files a/mozilla/chimera/resources/localized/English.lproj/BrowserWindow.nib/objects.nib and b/mozilla/chimera/resources/localized/English.lproj/BrowserWindow.nib/objects.nib differ
diff --git a/mozilla/chimera/resources/localized/English.lproj/MainMenu.nib/classes.nib b/mozilla/chimera/resources/localized/English.lproj/MainMenu.nib/classes.nib
index d3f1ca53460..98965c3f17d 100644
--- a/mozilla/chimera/resources/localized/English.lproj/MainMenu.nib/classes.nib
+++ b/mozilla/chimera/resources/localized/English.lproj/MainMenu.nib/classes.nib
@@ -38,6 +38,7 @@
                 toggleBookmarksToolbar = id; 
                 toggleOfflineMode = id; 
                 toggleSmoothText = id; 
+                viewSource = id; 
             }; 
             CLASS = MainController; 
             LANGUAGE = ObjC; 
diff --git a/mozilla/chimera/resources/localized/English.lproj/MainMenu.nib/objects.nib b/mozilla/chimera/resources/localized/English.lproj/MainMenu.nib/objects.nib
index 8813d564eb4..f6bc6127373 100644
Binary files a/mozilla/chimera/resources/localized/English.lproj/MainMenu.nib/objects.nib and b/mozilla/chimera/resources/localized/English.lproj/MainMenu.nib/objects.nib differ
diff --git a/mozilla/chimera/src/application/MainController.h b/mozilla/chimera/src/application/MainController.h
index 6200328b026..015d5cc440a 100644
--- a/mozilla/chimera/src/application/MainController.h
+++ b/mozilla/chimera/src/application/MainController.h
@@ -96,6 +96,7 @@ class BookmarksService;
 -(IBAction) biggerTextSize:(id)aSender;
 -(IBAction) smallerTextSize:(id)aSender;
 -(IBAction) toggleSmoothText:(id)aSender;
+-(IBAction) viewSource:(id)aSender;
 
 // Bookmarks menu actions.
 -(IBAction) importBookmarks:(id)aSender;
diff --git a/mozilla/chimera/src/application/MainController.mm b/mozilla/chimera/src/application/MainController.mm
index e3bf6333373..8a6948dbb93 100644
--- a/mozilla/chimera/src/application/MainController.mm
+++ b/mozilla/chimera/src/application/MainController.mm
@@ -409,6 +409,13 @@ static const char* ioServiceContractID = "@mozilla.org/network/io-service;1";
   }
 }
 
+-(IBAction) viewSource:(id)aSender
+{
+  NSWindow* mainWindow = [mApplication mainWindow];
+  if (mainWindow && [[mainWindow windowController] respondsToSelector:@selector(viewSource)] )
+    [[mainWindow windowController] viewSource: self];
+}
+
 static PRBool gSetupSmoothTextMenu = PR_FALSE;
 
 -(BOOL)validateMenuItem: (id <NSMenuItem> )aMenuItem
diff --git a/mozilla/chimera/src/browser/BrowserWindowController.h b/mozilla/chimera/src/browser/BrowserWindowController.h
index 9d9e415f1ae..d34f0f5dac9 100644
--- a/mozilla/chimera/src/browser/BrowserWindowController.h
+++ b/mozilla/chimera/src/browser/BrowserWindowController.h
@@ -123,6 +123,8 @@ class nsIDOMNode;
 - (IBAction)endAddBookmarkSheet:(id)sender;
 - (void)cacheBookmarkDS: (id)aDS;
 
+- (IBAction)viewSource:(id)aSender;
+
 - (void)saveDocument: (NSView*)aFilterView filterList: (NSPopUpButton*)aFilterList;
 - (void)saveURL: (NSView*)aFilterView filterList: (NSPopUpButton*)aFilterList
             url: (NSURL*)aURL suggestedFilename: (NSString*)aFilename;
diff --git a/mozilla/chimera/src/browser/BrowserWindowController.mm b/mozilla/chimera/src/browser/BrowserWindowController.mm
index 1af3fd07af5..d9f47b0bca7 100644
--- a/mozilla/chimera/src/browser/BrowserWindowController.mm
+++ b/mozilla/chimera/src/browser/BrowserWindowController.mm
@@ -492,19 +492,23 @@ static NSString *PrintToolbarItemIdentifier	= @"Print Toolbar Item";
                                      url: aURL suggestedFilename: aFilename];
 }
 
+- (IBAction)viewSource:(id)aSender
+{
+}
+
 - (void)printDocument
 {
-    [[mBrowserView getBrowserView] printDocument];
+  [[mBrowserView getBrowserView] printDocument];
 }
 
 - (void)printPreview
 {
-    [[mBrowserView getBrowserView] printPreview];
+  [[mBrowserView getBrowserView] printPreview];
 }
 
 - (BOOL)findInPage:(NSString*)text
 {
-    return [[mBrowserView getBrowserView] findInPage:text];
+  return [[mBrowserView getBrowserView] findInPage:text];
 }
 
 - (void)addBookmarkExtended: (BOOL)aIsFromMenu isFolder:(BOOL)aIsFolder