Index: mailchimp.admin.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/mailchimp/Attic/mailchimp.admin.inc,v
retrieving revision 1.1.2.5
diff -u -r1.1.2.5 mailchimp.admin.inc
--- mailchimp.admin.inc	8 Dec 2010 00:20:34 -0000	1.1.2.5
+++ mailchimp.admin.inc	21 Dec 2010 05:31:12 -0000
@@ -74,6 +74,13 @@
             );
           }
 
+          $form['mailchimp_lists']['mailchimp_list_'. $list['id']]['label'] = array(
+              '#type'           => 'textfield',
+              '#title'          => t('List Label'),
+              '#default_value'  => ($saved_list->label) ? t($saved_list->label) : t('Subscribe to the @newsletter newsletter',  array('@newsletter' => $list['name'])),
+              '#description'    => t('Enter the text to display next to the checkbox for this list on the registration and user account settings pages.  If you have only one list enabled, this text will also act as the default title for the Mailchimp block (which can be further overridden in the block settings).')
+          );
+
           $form['mailchimp_lists']['mailchimp_list_'. $list['id']]['description'] = array(
               '#type'           => 'textarea',
               '#title'          => t('List Description'),
@@ -135,6 +142,26 @@
             '#title'          => t('Subscription Failure Message'),
             '#default_value'  => variable_get('mailchimp_subscription_failure_message', t('We were unable to subscribe you at this time. Please try again later.'))
         );
+        $form['mailchimp_subscribe_page_title'] = array(
+            '#type'           => 'textfield',
+            '#title'          => t('Subscribe page title'),
+            '#description'    => t('The page title to display on the !subscribe_page.', array('!subscribe_page' => l(t('Subscribe page'), 'mailchimp/subscribe'))),
+            '#default_value'  => t(variable_get('mailchimp_subscribe_page_title', 'Newsletter Subscription'))
+        );
+        
+        $form['mailchimp_unsubscribe_page_title'] = array(
+            '#type'           => 'textfield',
+            '#title'          => t('Unsubscribe page title'),
+            '#description'    => t('The page title to display on the !unsubscribe_page.', array('!unsubscribe_page' => l(t('Unsubscribe page'), 'mailchimp/unsubscribe'))),
+            '#default_value'  => t(variable_get('mailchimp_unsubscribe_page_title', 'Newsletter Unsubscribe'))
+        );
+        
+        $form['mailchimp_unsubscribe_page_description'] = array(
+            '#type'           => 'textarea',
+            '#title'          => t('Unsubscribe page description'),
+            '#description'    => t('The text to display above the form on the !unsubscribe_page.', array('!unsubscribe_page' => l(t('Unsubscribe page'), 'mailchimp/unsubscribe'))),
+            '#default_value'  => variable_get('mailchimp_unsubscribe_page_description', t('Use this form to unsubscribe from all of our newsletters.'))
+        );
         $form['mailchimp_user_register'] = array(
             '#type'           => 'checkbox',
             '#title'          => t('Show subscription options on the user registration form.'),
@@ -147,6 +174,12 @@
             '#description'    => t('If set, a tab will be presented for managing newsletter subscriptions when editing an account.'),
             '#default_value'  => variable_get('mailchimp_user_edit', TRUE)
         );
+        $form['mailchimp_user_settings_title'] = array(
+            '#type'           => 'textfield',
+            '#title'          => t('User settings title'),
+            '#description'    => t('If you\'ve enabled subscription options on the user registration form or the user edit screen, this text will be used as the fieldset and page title respectively.'),
+            '#default_value'  => t(variable_get('mailchimp_user_settings_title', 'Newsletter Subscriptions'))
+        );
         $form['mailchimp_interest_groups_user_forms'] = array(
             '#type'           => 'checkbox',
             '#title'          => t('Show Interest Groups on Registration and Account Forms'),
@@ -232,6 +265,7 @@
     $list->name = $form_list['name'];
     $list->roles = array_filter($form_list['roles']);
     $list->description = $form_list['description'];
+    $list->label = $form_list['label'];
     $list->listtype = $form_list['listtype'];
     $list->doublein = $form_list['doublein'];
     $list->mergevars  = $form_list['mergevars'];
@@ -249,4 +283,4 @@
     drupal_set_message(t('At least one list is marked as required and updates are handled via cron. You may need to !rebuild.', 
       array('!rebuild' => l('rebuid the MailChimp users table', 'admin/settings/mailchimp/rebuild'))));
   }  
-}
+}
\ No newline at end of file
Index: mailchimp.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/mailchimp/mailchimp.module,v
retrieving revision 1.2.2.1.2.3.2.8.2.84
diff -u -r1.2.2.1.2.3.2.8.2.84 mailchimp.module
--- mailchimp.module	8 Dec 2010 00:20:34 -0000	1.2.2.1.2.3.2.8.2.84
+++ mailchimp.module	21 Dec 2010 05:30:56 -0000
@@ -28,7 +28,7 @@
       // wrap in a fieldset
       $form['mailchimp_list_forms'] = array(
         '#type' => 'fieldset',
-        '#title' => t('Newsletters')
+        '#title' => t(variable_get('mailchimp_user_settings_title', 'Newsletter Subscriptions')),
       );
 
       // add all individual available newsletter checkboxes
@@ -131,7 +131,7 @@
 /**
  * Maichimp authenticated user subscription form.
  */
-function mailchimp_subscribe_auth_form($form_state, $account, $standalone = TRUE, $list = NULL) {
+function mailchimp_subscribe_auth_form($form_state, $account, $standalone = TRUE, $list = NULL, $page = TRUE) {
   $form = array();
 
   if ($q = _mailchimp_get_api_object()) {
@@ -168,7 +168,13 @@
         '#value' => t('save settings'),
         '#weight' => 100
       );
-      
+      // if page display
+      if ($page) {
+        // for some reason drupal core hammers the page title callback by the time
+        // the H1 is rendered?
+        drupal_set_title(t(variable_get('mailchimp_user_settings_title', 'Newsletter Subscriptions')));
+      }
+
       $form['#submit'][] = 'mailchimp_subscribe_auth_form_submit';
     }
   }
@@ -221,7 +227,7 @@
 
     $form['wrapper'. $list->id]['mailchimp_list_'. $list->id] = array(
         '#type'           => 'checkbox',
-        '#title'          => t('Subscribe to the @newsletter newsletter', array('@newsletter' => $list->name)),
+        '#title'          => ($list->label) ? t($list->label) : t('Subscribe to the @newsletter newsletter', array('@newsletter' => $list->name)),
         '#default_value'  => $default_value,
         '#description'    => $list->description,
         '#attributes'     => array('class' => 'mailchimp-newsletter-checkbox-' . $list->id)
@@ -386,21 +392,23 @@
   $items['user/%user/mailchimp'] = array(
     'page callback' => 'drupal_get_form',
     'page arguments' => array('mailchimp_subscribe_auth_form', 1),
-    'title' => 'Newsletter Subscriptions',
+    'title callback' => 'mailchimp_user_settings_page_title',
     'type' => MENU_LOCAL_TASK,
     'access callback' => 'mailchimp_user_edit_access',
     'access arguments' => array(1),
+    'tab parent' => 'user/%/edit',
+    'weight' => 10,
   );
   $items['mailchimp/subscribe'] = array(
       'page callback' => 'mailchimp_subscribe_page',
-      'title' => 'Newsletter Subscriptions' ,
+      'title callback' => 'mailchimp_subscribe_page_title',
       'type' => MENU_NORMAL_ITEM,
       'access arguments' => array('access content'),
   );
   $items['mailchimp/unsubscribe'] = array(
       'page callback' => 'drupal_get_form',
       'page arguments' => array('mailchimp_unsubscribe_form'),
-      'title' => 'Newsletter Unsubscribe' ,
+      'title callback' => 'mailchimp_unsubscribe_page_title',
       'type' => MENU_CALLBACK,
       'access callback' => TRUE,
   );
@@ -449,7 +457,8 @@
   global $user;
   $ret = '';
   if($user->uid){
-    $ret = drupal_get_form('mailchimp_subscribe_auth_form', $user);
+    $ret = drupal_get_form('mailchimp_subscribe_auth_form', $user, TRUE, NULL, FALSE);
+
   }
   elseif ($q = _mailchimp_get_api_object()) {
     $ret = drupal_get_form('mailchimp_subscribe_anon_form_all', $q);
@@ -532,6 +541,33 @@
 }
 
 /**
+ * Title callback for subscribe page
+ *
+ * @return <type> page title
+ */
+function mailchimp_subscribe_page_title() {
+  return t(variable_get('mailchimp_subscribe_page_title', 'Newsletter Subscription'));
+}
+
+/**
+ * Title callback for unsubscribe page
+ *
+ * @return <type> page title
+ */
+function mailchimp_unsubscribe_page_title() {
+  return t(variable_get('mailchimp_unsubscribe_page_title', 'Newsletter Unsubscribe'));
+}  
+
+/**
+ * Title callback for user settings page
+ *
+ * @return <type> page title
+ */
+function mailchimp_user_settings_page_title() {
+  return t(variable_get('mailchimp_user_settings_title', 'Newsletter Subscriptions'));
+}
+
+/**
  * Return a form for a given MC list
  *
  * @param <type> $form_state
@@ -723,7 +759,7 @@
   $form = array();
   $form['intro'] = array(
     '#type'           => 'markup',
-    '#value'          => t('Use this form to unsubscribe from all of our newsletters.'),
+    '#value'          => t(variable_get('mailchimp_unsubscribe_page_description', 'Use this form to unsubscribe from all of our newsletters.')),
   );
   $form['EMAIL'] = array(
     '#type'           => 'textfield',