diff --git a/ChangeLog b/ChangeLog
index 8843a2346..639b91021 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-07-17  Francis Lachapelle  <flachapelle@inverse.ca>
+
+	* UI/Contacts/UIxContactFoldersView.m ([UIxContactFoldersView
+	-mailerContactsAction]): restored method lost with
+	UIxContactsListViewContainer.
+
 2009-07-17  Cyril Robert <crobert@inverse.ca>
 
 	* SoObjects/Appointments/SOGoAppointmentFolder.m
diff --git a/UI/Contacts/UIxContactFoldersView.h b/UI/Contacts/UIxContactFoldersView.h
index 064e71e6a..490ac6de0 100644
--- a/UI/Contacts/UIxContactFoldersView.h
+++ b/UI/Contacts/UIxContactFoldersView.h
@@ -29,6 +29,7 @@
 @interface UIxContactFoldersView : UIxComponent
 {
   NSUserDefaults *ud;
+  NSString *selectorComponentClass;
   NSMutableDictionary *moduleSettings;
   id currentFolder;
 }
diff --git a/UI/Contacts/UIxContactFoldersView.m b/UI/Contacts/UIxContactFoldersView.m
index e43179391..6dd6bf268 100644
--- a/UI/Contacts/UIxContactFoldersView.m
+++ b/UI/Contacts/UIxContactFoldersView.m
@@ -74,9 +74,35 @@
   [ud setObject: moduleSettings forKey: module];
 }
 
+- (id <WOActionResults>) mailerContactsAction
+{
+  selectorComponentClass = @"UIxContactsMailerSelection";
+
+  return self;
+}
+
+- (NSString *) selectorComponentClass
+{
+  return selectorComponentClass;
+}
+
+- (WOElement *) selectorComponent
+{
+  WOElement *newComponent;
+
+  newComponent = [self pageWithName: selectorComponentClass];
+
+  return newComponent;
+}
+
+- (BOOL) hasContactSelectionButtons
+{
+  return (selectorComponentClass != nil);
+}
+
 - (void) _fillResults: (NSMutableDictionary *) results
-inFolder: (id <SOGoContactFolder>) folder
-withSearchOn: (NSString *) contact
+             inFolder: (id <SOGoContactFolder>) folder
+	 withSearchOn: (NSString *) contact
 {
   NSEnumerator *folderResults;
   NSDictionary *currentContact;
diff --git a/UI/Contacts/UIxContactsListView.h b/UI/Contacts/UIxContactsListView.h
index 704306746..2f6e0bf5e 100644
--- a/UI/Contacts/UIxContactsListView.h
+++ b/UI/Contacts/UIxContactsListView.h
@@ -32,7 +32,6 @@
 @interface UIxContactsListView : UIxComponent
 {
   NSDictionary *currentContact;
-  NSString *selectorComponentClass;
   NSArray *contactInfos;
 }
 
diff --git a/UI/Contacts/UIxContactsListView.m b/UI/Contacts/UIxContactsListView.m
index cba1bfef8..d04de0c09 100644
--- a/UI/Contacts/UIxContactsListView.m
+++ b/UI/Contacts/UIxContactsListView.m
@@ -34,11 +34,8 @@
 - (id) init
 {
   if ((self = [super init]))
-    {
-      selectorComponentClass = nil;
-      contactInfos = nil;
-    }
-
+    contactInfos = nil;
+  
   return self;
 }
 
@@ -60,18 +57,6 @@
   return currentContact;
 }
 
-- (id <WOActionResults>) mailerContactsAction
-{
-  selectorComponentClass = @"UIxContactsMailerSelection";
-
-  return self;
-}
-
-- (NSString *) selectorComponentClass
-{
-  return selectorComponentClass;
-}
-
 - (NSString *) defaultSortKey
 {
   return @"c_cn";
diff --git a/UI/Contacts/product.plist b/UI/Contacts/product.plist
index 77079b608..24f3fbf27 100644
--- a/UI/Contacts/product.plist
+++ b/UI/Contacts/product.plist
@@ -21,7 +21,7 @@
            mailer-contacts = {
               protectedBy = "View";
               pageName    = "UIxContactFoldersView";
-              actionName  = "selectForMailer";
+              actionName  = "mailerContacts";
            };
            contactSearch = {
               protectedBy = "<public>";