--- includes/simplenews.admin.inc
+++ includes/simplenews.admin.inc
@@ -263,14 +263,76 @@
     ),
     '#default_value' => variable_get('simplenews_hyperlinks_'. $term->tid, 1),
   );
+  $form['subscription_mail'] = array(
+  		'#type' => 'fieldset',
+  		'#title' => t('Confirmation emails'),
+  		'#collapsible' => FALSE,
+  );  
+  $form['subscription_mail']['token_help'] = array(
+  		'#title' => t('Replacement patterns'),
+  		'#type' => 'fieldset',
+  		'#collapsible' => TRUE,
+  		'#collapsed' => TRUE,
+  );
+  $form['subscription_mail']['token_help']['help'] = array(
+  		'#value' => theme('token_help', 'simplenews'),
+  );  
+  $form['subscription_mail']['simplenews_confirm_subscribe_subject_'. $term->tid] = array(
+  		'#type' => 'textfield',
+  		'#title' => t('Subject'),
+  		'#default_value' => _simplenews_subscription_confirmation_text('subscribe_subject', NULL, TRUE, $term->tid),
+  		'#maxlength' => 180,
+  );
+  $form['subscription_mail']['simplenews_confirm_subscribe_unsubscribed_'. $term->tid] = array(
+  		'#type' => 'textarea',
+  		'#title' => t('Body text of subscribe email'),
+  		'#default_value' => _simplenews_subscription_confirmation_text('subscribe_unsubscribed', NULL, TRUE, $term->tid),
+  		'#rows' => 5,
+  );
+  $form['subscription_mail']['simplenews_confirm_subscribe_subscribed_'. $term->tid] = array(
+  		'#type' => 'textarea',
+  		'#title' => t('Body text for already subscribed visitor'),
+  		'#default_value' => _simplenews_subscription_confirmation_text('subscribe_subscribed', NULL, TRUE, $term->tid),
+  		'#rows' => 5,
+  );
+  $form['subscription_mail']['simplenews_confirm_unsubscribe_subscribed_'. $term->tid] = array(
+  		'#type' => 'textarea',
+  		'#title' => t('Body text of unsubscribe email'),
+  		'#default_value' => _simplenews_subscription_confirmation_text('unsubscribe_subscribed', NULL, TRUE, $term->tid),
+  		'#rows' => 5,
+  );
+  $form['subscription_mail']['simplenews_confirm_unsubscribe_unsubscribed_'. $term->tid] = array(
+  		'#type' => 'textarea',
+  		'#title' => t('Body text for not yet subscribed visitor'),
+  		'#default_value' => _simplenews_subscription_confirmation_text('unsubscribe_unsubscribed', NULL, TRUE, $term->tid),
+  		'#rows' => 5,
+  );  
+  $form['confirm_pages'] = array(
+  		'#type' => 'fieldset',
+  		'#title' => t('Confirmation pages'),
+  		'#description' => t('If defined, these pages show after subscription / removal instead of the regular message box.'),
+  		'#collapsible' => FALSE,
+  );
+  $form['confirm_pages']['simplenews_confirm_subscribe_page_'. $term->tid] = array(
+  		'#type' => 'textfield',
+  		'#title' => t('Subscribe confirmation'),
+  		'#description' => t('Drupal path or URL of the destination page where after the subscription is confirmed (e.g. node/123). Leave empty to go to the front page.'),
+  		'#default_value' => variable_get('simplenews_confirm_subscribe_page_'. $term->tid, ''),
+  );
+  $form['confirm_pages']['simplenews_confirm_unsubscribe_page_'. $term->tid] = array(
+  		'#type' => 'textfield',
+  		'#title' => t('Unsubscribe confirmation'),
+  		'#description' => t('Drupal path or URL of the destination page when the subscription removal is confirmed (e.g. node/123). Leave empty to go to the front page.'),
+  		'#default_value' => variable_get('simplenews_confirm_unsubscribe_page_'. $term->tid, ''),
+  );
   $form['submit'] = array(
-    '#type' => 'submit',
-    '#value' => t('Save'),
-    '#weight' => 25,
+  		'#type' => 'submit',
+  		'#value' => t('Save'),
+  		'#weight' => 25,
   );
   $form['vid'] = array(
-    '#type' => 'hidden',
-    '#value' => isset($term->vid) ? $term->vid : variable_get('simplenews_vid', ''),
+  		'#type' => 'hidden',
+  		'#value' => isset($term->vid) ? $term->vid : variable_get('simplenews_vid', ''),
   );
 
   // If we are editing a newsletter term, show delete option and store tid.
@@ -360,6 +422,13 @@
   variable_set('simplenews_hyperlinks_'. $tid, $form_state['values']['simplenews_hyperlinks_'. $suffix]);
   variable_set('simplenews_new_account_'. $tid, $form_state['values']['simplenews_new_account_'. $suffix]);
   variable_set('simplenews_opt_inout_'. $tid, $form_state['values']['simplenews_opt_inout_'. $suffix]);
+  variable_set('simplenews_confirm_subscribe_subject_'. $tid, $form_state['values']['simplenews_confirm_subscribe_subject_'. $suffix]);
+  variable_set('simplenews_confirm_subscribe_unsubscribed_'. $tid, $form_state['values']['simplenews_confirm_subscribe_unsubscribed_'. $suffix]);
+  variable_set('simplenews_confirm_subscribe_subscribed_'. $tid, $form_state['values']['simplenews_confirm_subscribe_subscribed_'. $suffix]);
+  variable_set('simplenews_confirm_unsubscribe_subscribed_'. $tid, $form_state['values']['simplenews_confirm_unsubscribe_subscribed_'. $suffix]);
+  variable_set('simplenews_confirm_unsubscribe_unsubscribed_'. $tid, $form_state['values']['simplenews_confirm_unsubscribe_unsubscribed_'. $suffix]);
+  variable_set('simplenews_confirm_subscribe_page_'. $tid, $form_state['values']['simplenews_confirm_subscribe_page_'. $suffix]);
+  variable_set('simplenews_confirm_unsubscribe_page_'. $tid, $form_state['values']['simplenews_confirm_unsubscribe_page_'. $suffix]);
 }
 
 /**
@@ -1066,75 +1135,6 @@
     '#title' => t('Synchronize with account'),
     '#default_value' => variable_get('simplenews_sync_account', TRUE),
     '#description' => t('When checked subscriptions will be synchronized with site accounts. When accounts are deleted, subscriptions with the same email address will be removed. When site accounts are blocked/unblocked, subscriptions will be deactivated/activated. When not checked subscriptions will be unchanged when associated accounts are deleted or blocked.'),
-  );
-
-  // These email tokens are shared for all settings, so just define
-  // the list once to help ensure they stay in sync.
-
-  $form['simplenews_subscription']['subscription_mail'] = array(
-    '#type' => 'fieldset',
-    '#title' => t('Confirmation emails'),
-    '#collapsible' => FALSE,
-  );
-
-  $form['simplenews_subscription']['subscription_mail']['token_help'] = array(
-    '#title' => t('Replacement patterns'),
-    '#type' => 'fieldset',
-    '#collapsible' => TRUE,
-    '#collapsed' => TRUE,
-  );
-  $form['simplenews_subscription']['subscription_mail']['token_help']['help'] = array(
-    '#value' => theme('token_help', 'simplenews'),
-  );
-
-  $form['simplenews_subscription']['subscription_mail']['simplenews_confirm_subscribe_subject'] = array(
-    '#type' => 'textfield',
-    '#title' => t('Subject'),
-    '#default_value' => _simplenews_subscription_confirmation_text('subscribe_subject'),
-    '#maxlength' => 180,
-  );
-  $form['simplenews_subscription']['subscription_mail']['simplenews_confirm_subscribe_unsubscribed'] = array(
-    '#type' => 'textarea',
-    '#title' => t('Body text of subscribe email'),
-    '#default_value' => _simplenews_subscription_confirmation_text('subscribe_unsubscribed'),
-    '#rows' => 5,
-  );
-  $form['simplenews_subscription']['subscription_mail']['simplenews_confirm_subscribe_subscribed'] = array(
-    '#type' => 'textarea',
-    '#title' => t('Body text for already subscribed visitor'),
-    '#default_value' => _simplenews_subscription_confirmation_text('subscribe_subscribed'),
-    '#rows' => 5,
-  );
-  $form['simplenews_subscription']['subscription_mail']['simplenews_confirm_unsubscribe_subscribed'] = array(
-    '#type' => 'textarea',
-    '#title' => t('Body text of unsubscribe email'),
-    '#default_value' => _simplenews_subscription_confirmation_text('unsubscribe_subscribed'),
-    '#rows' => 5,
-  );
-  $form['simplenews_subscription']['subscription_mail']['simplenews_confirm_unsubscribe_unsubscribed'] = array(
-    '#type' => 'textarea',
-    '#title' => t('Body text for not yet subscribed visitor'),
-    '#default_value' => _simplenews_subscription_confirmation_text('unsubscribe_unsubscribed'),
-    '#rows' => 5,
-  );
-
-  $form['simplenews_subscription']['confirm_pages'] = array(
-    '#type' => 'fieldset',
-    '#title' => t('Confirmation pages'),
-    '#description' => t('If defined, these pages show after subscription / removal instead of the regular message box.'),
-    '#collapsible' => FALSE,
-  );
-  $form['simplenews_subscription']['confirm_pages']['simplenews_confirm_subscribe_page'] = array(
-    '#type' => 'textfield',
-    '#title' => t('Subscribe confirmation'),
-    '#description' => t('Drupal path or URL of the destination page where after the subscription is confirmed (e.g. node/123). Leave empty to go to the front page.'),
-    '#default_value' => variable_get('simplenews_confirm_subscribe_page', ''),
-  );
-  $form['simplenews_subscription']['confirm_pages']['simplenews_confirm_unsubscribe_page'] = array(
-    '#type' => 'textfield',
-    '#title' => t('Unsubscribe confirmation'),
-    '#description' => t('Drupal path or URL of the destination page when the subscription removal is confirmed (e.g. node/123). Leave empty to go to the front page.'),
-    '#default_value' => variable_get('simplenews_confirm_unsubscribe_page', ''),
   );
 
   return system_settings_form($form);