Index: mailhandler.admin.inc
===================================================================
diff -u -r1.1.2.13 mailhandler.admin.inc
--- mailhandler.admin.inc	25 Jan 2011 13:52:55 -0000	1.1.2.13
+++ mailhandler.admin.inc	25 Jan 2011 14:48:09 -0000
@@ -355,23 +355,23 @@
   $form['mailhandler_default_type'] = array(
     '#type' => 'radios',
     '#title' => t('Default content type'),
+    '#description' => t('If an incoming message does not specify a particular content type, then use this type as a default.'),
     '#options' => node_get_types('names'),
     '#default_value' => mailhandler_default_type(),
-    '#description' => t('If an incoming message does not specify a particular content type, then use this type as a default.'),
   );
 
   $form['mailhandler_max_retrieval'] = array(
     '#type' => 'textfield',
     '#title' => t('Cron maximum message retrieval'),
-    '#default_value' => variable_get('mailhandler_max_retrieval', 0),
     '#description' => t('To prevent timeout errors from large mailboxes you can limit the maximum number of messages that will be processed during each cron run. This is a global setting and applies to all mailboxes. A value of zero means that no limit will be applied. Some trial and error may be needed to find the optimum setting.'),
+    '#default_value' => variable_get('mailhandler_max_retrieval', 0),
   );
 
   $form['mailhandler_default_encoding'] = array(
     '#type' => 'textfield',
     '#title' => t('Default character encoding'),
-    '#default_value' => 'UTF-8',
-    '#description' => t('The default character encoding to use when an incoming message does not define an encoding.')
+    '#description' => t('The default character encoding to use when an incoming message does not define an encoding.'),
+    '#default_value' => variable_get('mailhandler_default_encoding', 'UTF-8'),
   );
 
   $form['#validate'][] = 'mailhandler_admin_settings_validate';