diff --git a/mozilla/camino/CHFind.h b/mozilla/camino/CHFind.h
index 33510bb5c15..588a815c0c5 100644
--- a/mozilla/camino/CHFind.h
+++ b/mozilla/camino/CHFind.h
@@ -32,6 +32,7 @@
 
 @protocol CHFind
 
-- (BOOL)findInPage:(NSString*)text;
+- (BOOL)findInPageWithPattern:(NSString*)text caseSensitive:(BOOL)inCaseSensitive
+        wrap:(BOOL)inWrap backwards:(BOOL)inBackwards;
 
 @end
diff --git a/mozilla/camino/English.lproj/FindDialog.nib/classes.nib b/mozilla/camino/English.lproj/FindDialog.nib/classes.nib
index caa25506026..b0d20da5dca 100644
--- a/mozilla/camino/English.lproj/FindDialog.nib/classes.nib
+++ b/mozilla/camino/English.lproj/FindDialog.nib/classes.nib
@@ -5,11 +5,11 @@
             CLASS = FindDlgController; 
             LANGUAGE = ObjC; 
             OUTLETS = {
-                mFindButton = id; 
-                mIgnoreCaseBox = id; 
-                mSearchBackwardsBox = id; 
-                mSearchField = id; 
-                mWrapAroundBox = id; 
+                mFindButton = NSButton; 
+                mIgnoreCaseBox = NSButton; 
+                mSearchBackwardsBox = NSButton; 
+                mSearchField = NSTextField; 
+                mWrapAroundBox = NSButton; 
             }; 
             SUPERCLASS = NSWindowController; 
         }, 
diff --git a/mozilla/camino/English.lproj/FindDialog.nib/objects.nib b/mozilla/camino/English.lproj/FindDialog.nib/objects.nib
index 39a36f5e571..5eda225871b 100644
Binary files a/mozilla/camino/English.lproj/FindDialog.nib/objects.nib and b/mozilla/camino/English.lproj/FindDialog.nib/objects.nib differ
diff --git a/mozilla/camino/FindDialog.nib/classes.nib b/mozilla/camino/FindDialog.nib/classes.nib
index caa25506026..b0d20da5dca 100644
--- a/mozilla/camino/FindDialog.nib/classes.nib
+++ b/mozilla/camino/FindDialog.nib/classes.nib
@@ -5,11 +5,11 @@
             CLASS = FindDlgController; 
             LANGUAGE = ObjC; 
             OUTLETS = {
-                mFindButton = id; 
-                mIgnoreCaseBox = id; 
-                mSearchBackwardsBox = id; 
-                mSearchField = id; 
-                mWrapAroundBox = id; 
+                mFindButton = NSButton; 
+                mIgnoreCaseBox = NSButton; 
+                mSearchBackwardsBox = NSButton; 
+                mSearchField = NSTextField; 
+                mWrapAroundBox = NSButton; 
             }; 
             SUPERCLASS = NSWindowController; 
         }, 
diff --git a/mozilla/camino/FindDialog.nib/objects.nib b/mozilla/camino/FindDialog.nib/objects.nib
index 39a36f5e571..5eda225871b 100644
Binary files a/mozilla/camino/FindDialog.nib/objects.nib and b/mozilla/camino/FindDialog.nib/objects.nib differ
diff --git a/mozilla/camino/FindDlgController.h b/mozilla/camino/FindDlgController.h
index 1cb7166db81..6521f6f34b2 100644
--- a/mozilla/camino/FindDlgController.h
+++ b/mozilla/camino/FindDlgController.h
@@ -39,11 +39,11 @@
 #include "nsIWebBrowserFind.h"
 
 @interface FindDlgController : NSWindowController {
-    IBOutlet id mSearchField;
-    IBOutlet id mIgnoreCaseBox;
-    IBOutlet id mWrapAroundBox;
-    IBOutlet id mSearchBackwardsBox;
-    IBOutlet id mFindButton;
+    IBOutlet NSTextField* mSearchField;
+    IBOutlet NSButton* mIgnoreCaseBox;
+    IBOutlet NSButton* mWrapAroundBox;
+    IBOutlet NSButton* mSearchBackwardsBox;
+    IBOutlet NSButton* mFindButton;
     
     NSString* mSearchText;
 }
diff --git a/mozilla/camino/FindDlgController.mm b/mozilla/camino/FindDlgController.mm
index b0a4ca51356..e3bea8ac6c5 100644
--- a/mozilla/camino/FindDlgController.mm
+++ b/mozilla/camino/FindDlgController.mm
@@ -70,8 +70,15 @@
   NSWindowController* controller = [[NSApp mainWindow] windowController];
   if ( [controller conformsToProtocol:@protocol(CHFind)] ) {
     id<CHFind> browserController = controller;
+    BOOL ignoreCase = [mIgnoreCaseBox state];
+    BOOL wrapSearch = [mWrapAroundBox state];
+    BOOL searchBack = [mSearchBackwardsBox state];
+
     [self storeSearchText:[mSearchField stringValue]];
-    BOOL found = [browserController findInPage:mSearchText];
+
+    BOOL found = [browserController findInPageWithPattern:mSearchText caseSensitive:!ignoreCase
+        wrap:wrapSearch backwards:searchBack];
+
     if ( found ) 
       [self close];
     else
@@ -93,7 +100,12 @@
   NSWindowController* controller = [[NSApp mainWindow] windowController];
   if ( [controller conformsToProtocol:@protocol(CHFind)] ) {
     id<CHFind> browserController = controller;
-    BOOL found = [browserController findInPage:mSearchText];
+    BOOL ignoreCase = [mIgnoreCaseBox state];
+    BOOL wrapSearch = [mWrapAroundBox state];
+    BOOL searchBack = [mSearchBackwardsBox state];
+    
+    BOOL found = [browserController findInPageWithPattern:mSearchText caseSensitive:!ignoreCase
+        wrap:wrapSearch backwards:searchBack];
     if ( !found )
       NSBeep();
   }
@@ -101,7 +113,6 @@
     NSBeep();
 }
 
-
 //
 // controlTextDidChange
 //
@@ -115,7 +126,6 @@
     [mFindButton setEnabled:PR_FALSE];    
 }
 
-
 - (void)storeSearchText:(NSString*)inText
 {
   [mSearchText autorelease];
diff --git a/mozilla/camino/resources/localized/English.lproj/FindDialog.nib/classes.nib b/mozilla/camino/resources/localized/English.lproj/FindDialog.nib/classes.nib
index caa25506026..b0d20da5dca 100644
--- a/mozilla/camino/resources/localized/English.lproj/FindDialog.nib/classes.nib
+++ b/mozilla/camino/resources/localized/English.lproj/FindDialog.nib/classes.nib
@@ -5,11 +5,11 @@
             CLASS = FindDlgController; 
             LANGUAGE = ObjC; 
             OUTLETS = {
-                mFindButton = id; 
-                mIgnoreCaseBox = id; 
-                mSearchBackwardsBox = id; 
-                mSearchField = id; 
-                mWrapAroundBox = id; 
+                mFindButton = NSButton; 
+                mIgnoreCaseBox = NSButton; 
+                mSearchBackwardsBox = NSButton; 
+                mSearchField = NSTextField; 
+                mWrapAroundBox = NSButton; 
             }; 
             SUPERCLASS = NSWindowController; 
         }, 
diff --git a/mozilla/camino/resources/localized/English.lproj/FindDialog.nib/objects.nib b/mozilla/camino/resources/localized/English.lproj/FindDialog.nib/objects.nib
index 39a36f5e571..5eda225871b 100644
Binary files a/mozilla/camino/resources/localized/English.lproj/FindDialog.nib/objects.nib and b/mozilla/camino/resources/localized/English.lproj/FindDialog.nib/objects.nib differ
diff --git a/mozilla/camino/src/find/Find.h b/mozilla/camino/src/find/Find.h
index 33510bb5c15..588a815c0c5 100644
--- a/mozilla/camino/src/find/Find.h
+++ b/mozilla/camino/src/find/Find.h
@@ -32,6 +32,7 @@
 
 @protocol CHFind
 
-- (BOOL)findInPage:(NSString*)text;
+- (BOOL)findInPageWithPattern:(NSString*)text caseSensitive:(BOOL)inCaseSensitive
+        wrap:(BOOL)inWrap backwards:(BOOL)inBackwards;
 
 @end
diff --git a/mozilla/camino/src/find/FindDlgController.h b/mozilla/camino/src/find/FindDlgController.h
index 1cb7166db81..6521f6f34b2 100644
--- a/mozilla/camino/src/find/FindDlgController.h
+++ b/mozilla/camino/src/find/FindDlgController.h
@@ -39,11 +39,11 @@
 #include "nsIWebBrowserFind.h"
 
 @interface FindDlgController : NSWindowController {
-    IBOutlet id mSearchField;
-    IBOutlet id mIgnoreCaseBox;
-    IBOutlet id mWrapAroundBox;
-    IBOutlet id mSearchBackwardsBox;
-    IBOutlet id mFindButton;
+    IBOutlet NSTextField* mSearchField;
+    IBOutlet NSButton* mIgnoreCaseBox;
+    IBOutlet NSButton* mWrapAroundBox;
+    IBOutlet NSButton* mSearchBackwardsBox;
+    IBOutlet NSButton* mFindButton;
     
     NSString* mSearchText;
 }
diff --git a/mozilla/camino/src/find/FindDlgController.mm b/mozilla/camino/src/find/FindDlgController.mm
index b0a4ca51356..e3bea8ac6c5 100644
--- a/mozilla/camino/src/find/FindDlgController.mm
+++ b/mozilla/camino/src/find/FindDlgController.mm
@@ -70,8 +70,15 @@
   NSWindowController* controller = [[NSApp mainWindow] windowController];
   if ( [controller conformsToProtocol:@protocol(CHFind)] ) {
     id<CHFind> browserController = controller;
+    BOOL ignoreCase = [mIgnoreCaseBox state];
+    BOOL wrapSearch = [mWrapAroundBox state];
+    BOOL searchBack = [mSearchBackwardsBox state];
+
     [self storeSearchText:[mSearchField stringValue]];
-    BOOL found = [browserController findInPage:mSearchText];
+
+    BOOL found = [browserController findInPageWithPattern:mSearchText caseSensitive:!ignoreCase
+        wrap:wrapSearch backwards:searchBack];
+
     if ( found ) 
       [self close];
     else
@@ -93,7 +100,12 @@
   NSWindowController* controller = [[NSApp mainWindow] windowController];
   if ( [controller conformsToProtocol:@protocol(CHFind)] ) {
     id<CHFind> browserController = controller;
-    BOOL found = [browserController findInPage:mSearchText];
+    BOOL ignoreCase = [mIgnoreCaseBox state];
+    BOOL wrapSearch = [mWrapAroundBox state];
+    BOOL searchBack = [mSearchBackwardsBox state];
+    
+    BOOL found = [browserController findInPageWithPattern:mSearchText caseSensitive:!ignoreCase
+        wrap:wrapSearch backwards:searchBack];
     if ( !found )
       NSBeep();
   }
@@ -101,7 +113,6 @@
     NSBeep();
 }
 
-
 //
 // controlTextDidChange
 //
@@ -115,7 +126,6 @@
     [mFindButton setEnabled:PR_FALSE];    
 }
 
-
 - (void)storeSearchText:(NSString*)inText
 {
   [mSearchText autorelease];
diff --git a/mozilla/chimera/CHFind.h b/mozilla/chimera/CHFind.h
index 33510bb5c15..588a815c0c5 100644
--- a/mozilla/chimera/CHFind.h
+++ b/mozilla/chimera/CHFind.h
@@ -32,6 +32,7 @@
 
 @protocol CHFind
 
-- (BOOL)findInPage:(NSString*)text;
+- (BOOL)findInPageWithPattern:(NSString*)text caseSensitive:(BOOL)inCaseSensitive
+        wrap:(BOOL)inWrap backwards:(BOOL)inBackwards;
 
 @end
diff --git a/mozilla/chimera/English.lproj/FindDialog.nib/classes.nib b/mozilla/chimera/English.lproj/FindDialog.nib/classes.nib
index caa25506026..b0d20da5dca 100644
--- a/mozilla/chimera/English.lproj/FindDialog.nib/classes.nib
+++ b/mozilla/chimera/English.lproj/FindDialog.nib/classes.nib
@@ -5,11 +5,11 @@
             CLASS = FindDlgController; 
             LANGUAGE = ObjC; 
             OUTLETS = {
-                mFindButton = id; 
-                mIgnoreCaseBox = id; 
-                mSearchBackwardsBox = id; 
-                mSearchField = id; 
-                mWrapAroundBox = id; 
+                mFindButton = NSButton; 
+                mIgnoreCaseBox = NSButton; 
+                mSearchBackwardsBox = NSButton; 
+                mSearchField = NSTextField; 
+                mWrapAroundBox = NSButton; 
             }; 
             SUPERCLASS = NSWindowController; 
         }, 
diff --git a/mozilla/chimera/English.lproj/FindDialog.nib/objects.nib b/mozilla/chimera/English.lproj/FindDialog.nib/objects.nib
index 39a36f5e571..5eda225871b 100644
Binary files a/mozilla/chimera/English.lproj/FindDialog.nib/objects.nib and b/mozilla/chimera/English.lproj/FindDialog.nib/objects.nib differ
diff --git a/mozilla/chimera/FindDialog.nib/classes.nib b/mozilla/chimera/FindDialog.nib/classes.nib
index caa25506026..b0d20da5dca 100644
--- a/mozilla/chimera/FindDialog.nib/classes.nib
+++ b/mozilla/chimera/FindDialog.nib/classes.nib
@@ -5,11 +5,11 @@
             CLASS = FindDlgController; 
             LANGUAGE = ObjC; 
             OUTLETS = {
-                mFindButton = id; 
-                mIgnoreCaseBox = id; 
-                mSearchBackwardsBox = id; 
-                mSearchField = id; 
-                mWrapAroundBox = id; 
+                mFindButton = NSButton; 
+                mIgnoreCaseBox = NSButton; 
+                mSearchBackwardsBox = NSButton; 
+                mSearchField = NSTextField; 
+                mWrapAroundBox = NSButton; 
             }; 
             SUPERCLASS = NSWindowController; 
         }, 
diff --git a/mozilla/chimera/FindDialog.nib/objects.nib b/mozilla/chimera/FindDialog.nib/objects.nib
index 39a36f5e571..5eda225871b 100644
Binary files a/mozilla/chimera/FindDialog.nib/objects.nib and b/mozilla/chimera/FindDialog.nib/objects.nib differ
diff --git a/mozilla/chimera/FindDlgController.h b/mozilla/chimera/FindDlgController.h
index 1cb7166db81..6521f6f34b2 100644
--- a/mozilla/chimera/FindDlgController.h
+++ b/mozilla/chimera/FindDlgController.h
@@ -39,11 +39,11 @@
 #include "nsIWebBrowserFind.h"
 
 @interface FindDlgController : NSWindowController {
-    IBOutlet id mSearchField;
-    IBOutlet id mIgnoreCaseBox;
-    IBOutlet id mWrapAroundBox;
-    IBOutlet id mSearchBackwardsBox;
-    IBOutlet id mFindButton;
+    IBOutlet NSTextField* mSearchField;
+    IBOutlet NSButton* mIgnoreCaseBox;
+    IBOutlet NSButton* mWrapAroundBox;
+    IBOutlet NSButton* mSearchBackwardsBox;
+    IBOutlet NSButton* mFindButton;
     
     NSString* mSearchText;
 }
diff --git a/mozilla/chimera/FindDlgController.mm b/mozilla/chimera/FindDlgController.mm
index b0a4ca51356..e3bea8ac6c5 100644
--- a/mozilla/chimera/FindDlgController.mm
+++ b/mozilla/chimera/FindDlgController.mm
@@ -70,8 +70,15 @@
   NSWindowController* controller = [[NSApp mainWindow] windowController];
   if ( [controller conformsToProtocol:@protocol(CHFind)] ) {
     id<CHFind> browserController = controller;
+    BOOL ignoreCase = [mIgnoreCaseBox state];
+    BOOL wrapSearch = [mWrapAroundBox state];
+    BOOL searchBack = [mSearchBackwardsBox state];
+
     [self storeSearchText:[mSearchField stringValue]];
-    BOOL found = [browserController findInPage:mSearchText];
+
+    BOOL found = [browserController findInPageWithPattern:mSearchText caseSensitive:!ignoreCase
+        wrap:wrapSearch backwards:searchBack];
+
     if ( found ) 
       [self close];
     else
@@ -93,7 +100,12 @@
   NSWindowController* controller = [[NSApp mainWindow] windowController];
   if ( [controller conformsToProtocol:@protocol(CHFind)] ) {
     id<CHFind> browserController = controller;
-    BOOL found = [browserController findInPage:mSearchText];
+    BOOL ignoreCase = [mIgnoreCaseBox state];
+    BOOL wrapSearch = [mWrapAroundBox state];
+    BOOL searchBack = [mSearchBackwardsBox state];
+    
+    BOOL found = [browserController findInPageWithPattern:mSearchText caseSensitive:!ignoreCase
+        wrap:wrapSearch backwards:searchBack];
     if ( !found )
       NSBeep();
   }
@@ -101,7 +113,6 @@
     NSBeep();
 }
 
-
 //
 // controlTextDidChange
 //
@@ -115,7 +126,6 @@
     [mFindButton setEnabled:PR_FALSE];    
 }
 
-
 - (void)storeSearchText:(NSString*)inText
 {
   [mSearchText autorelease];
diff --git a/mozilla/chimera/resources/localized/English.lproj/FindDialog.nib/classes.nib b/mozilla/chimera/resources/localized/English.lproj/FindDialog.nib/classes.nib
index caa25506026..b0d20da5dca 100644
--- a/mozilla/chimera/resources/localized/English.lproj/FindDialog.nib/classes.nib
+++ b/mozilla/chimera/resources/localized/English.lproj/FindDialog.nib/classes.nib
@@ -5,11 +5,11 @@
             CLASS = FindDlgController; 
             LANGUAGE = ObjC; 
             OUTLETS = {
-                mFindButton = id; 
-                mIgnoreCaseBox = id; 
-                mSearchBackwardsBox = id; 
-                mSearchField = id; 
-                mWrapAroundBox = id; 
+                mFindButton = NSButton; 
+                mIgnoreCaseBox = NSButton; 
+                mSearchBackwardsBox = NSButton; 
+                mSearchField = NSTextField; 
+                mWrapAroundBox = NSButton; 
             }; 
             SUPERCLASS = NSWindowController; 
         }, 
diff --git a/mozilla/chimera/resources/localized/English.lproj/FindDialog.nib/objects.nib b/mozilla/chimera/resources/localized/English.lproj/FindDialog.nib/objects.nib
index 39a36f5e571..5eda225871b 100644
Binary files a/mozilla/chimera/resources/localized/English.lproj/FindDialog.nib/objects.nib and b/mozilla/chimera/resources/localized/English.lproj/FindDialog.nib/objects.nib differ
diff --git a/mozilla/chimera/src/find/Find.h b/mozilla/chimera/src/find/Find.h
index 33510bb5c15..588a815c0c5 100644
--- a/mozilla/chimera/src/find/Find.h
+++ b/mozilla/chimera/src/find/Find.h
@@ -32,6 +32,7 @@
 
 @protocol CHFind
 
-- (BOOL)findInPage:(NSString*)text;
+- (BOOL)findInPageWithPattern:(NSString*)text caseSensitive:(BOOL)inCaseSensitive
+        wrap:(BOOL)inWrap backwards:(BOOL)inBackwards;
 
 @end
diff --git a/mozilla/chimera/src/find/FindDlgController.h b/mozilla/chimera/src/find/FindDlgController.h
index 1cb7166db81..6521f6f34b2 100644
--- a/mozilla/chimera/src/find/FindDlgController.h
+++ b/mozilla/chimera/src/find/FindDlgController.h
@@ -39,11 +39,11 @@
 #include "nsIWebBrowserFind.h"
 
 @interface FindDlgController : NSWindowController {
-    IBOutlet id mSearchField;
-    IBOutlet id mIgnoreCaseBox;
-    IBOutlet id mWrapAroundBox;
-    IBOutlet id mSearchBackwardsBox;
-    IBOutlet id mFindButton;
+    IBOutlet NSTextField* mSearchField;
+    IBOutlet NSButton* mIgnoreCaseBox;
+    IBOutlet NSButton* mWrapAroundBox;
+    IBOutlet NSButton* mSearchBackwardsBox;
+    IBOutlet NSButton* mFindButton;
     
     NSString* mSearchText;
 }
diff --git a/mozilla/chimera/src/find/FindDlgController.mm b/mozilla/chimera/src/find/FindDlgController.mm
index b0a4ca51356..e3bea8ac6c5 100644
--- a/mozilla/chimera/src/find/FindDlgController.mm
+++ b/mozilla/chimera/src/find/FindDlgController.mm
@@ -70,8 +70,15 @@
   NSWindowController* controller = [[NSApp mainWindow] windowController];
   if ( [controller conformsToProtocol:@protocol(CHFind)] ) {
     id<CHFind> browserController = controller;
+    BOOL ignoreCase = [mIgnoreCaseBox state];
+    BOOL wrapSearch = [mWrapAroundBox state];
+    BOOL searchBack = [mSearchBackwardsBox state];
+
     [self storeSearchText:[mSearchField stringValue]];
-    BOOL found = [browserController findInPage:mSearchText];
+
+    BOOL found = [browserController findInPageWithPattern:mSearchText caseSensitive:!ignoreCase
+        wrap:wrapSearch backwards:searchBack];
+
     if ( found ) 
       [self close];
     else
@@ -93,7 +100,12 @@
   NSWindowController* controller = [[NSApp mainWindow] windowController];
   if ( [controller conformsToProtocol:@protocol(CHFind)] ) {
     id<CHFind> browserController = controller;
-    BOOL found = [browserController findInPage:mSearchText];
+    BOOL ignoreCase = [mIgnoreCaseBox state];
+    BOOL wrapSearch = [mWrapAroundBox state];
+    BOOL searchBack = [mSearchBackwardsBox state];
+    
+    BOOL found = [browserController findInPageWithPattern:mSearchText caseSensitive:!ignoreCase
+        wrap:wrapSearch backwards:searchBack];
     if ( !found )
       NSBeep();
   }
@@ -101,7 +113,6 @@
     NSBeep();
 }
 
-
 //
 // controlTextDidChange
 //
@@ -115,7 +126,6 @@
     [mFindButton setEnabled:PR_FALSE];    
 }
 
-
 - (void)storeSearchText:(NSString*)inText
 {
   [mSearchText autorelease];