? mailhandler-580810-5.patch
Index: mailhandler.admin.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/mailhandler/Attic/mailhandler.admin.inc,v
retrieving revision 1.1.2.6
diff -u -p -r1.1.2.6 mailhandler.admin.inc
--- mailhandler.admin.inc	22 Nov 2009 13:33:05 -0000	1.1.2.6
+++ mailhandler.admin.inc	22 Nov 2009 14:20:56 -0000
@@ -345,6 +345,13 @@ function mailhandler_admin_settings() {
     '#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.'),
   );
+  
+  $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.')
+  );
 
   $form['#validate'][] = 'mailhandler_admin_settings_validate';
 
Index: mailhandler.retrieve.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/mailhandler/Attic/mailhandler.retrieve.inc,v
retrieving revision 1.1.2.24
diff -u -p -r1.1.2.24 mailhandler.retrieve.inc
--- mailhandler.retrieve.inc	12 Oct 2009 20:29:01 -0000	1.1.2.24
+++ mailhandler.retrieve.inc	22 Nov 2009 14:20:57 -0000
@@ -60,10 +60,10 @@ function mailhandler_get_part($stream, $
     $structure = imap_fetchstructure($stream, $msg_number, FT_UID);
   }
   if ($structure) {
+    $encoding = variable_get('mailhandler_default_encoding', 'UTF-8');
     foreach ($structure->parameters as $parameter) {
       if (strtoupper($parameter->attribute) == 'CHARSET') {
         $encoding = $parameter->value;
-        //watchdog('mailhandler', 'Encoding is ' . $encoding);
       }
     }
     if ($mime_type == mailhandler_get_mime_type($structure)) {