? smtp.module_465750_utf4everyone.patch
Index: smtp.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/smtp/smtp.module,v
retrieving revision 1.17.2.8
diff -u -p -r1.17.2.8 smtp.module
--- smtp.module	23 Sep 2008 22:03:01 -0000	1.17.2.8
+++ smtp.module	19 Oct 2009 13:58:02 -0000
@@ -357,12 +357,6 @@ function drupal_mail_wrapper($message) {
           // The message includes only a plain text part.
           $mail->IsHTML(FALSE);
 
-          // Set the charset based on the provided value, if there is one.
-          $charset = _smtp_get_substring($value, 'charset', '=', ';');
-          if ($charset) {
-            $mail->CharSet = $charset;
-          }
-
           $content_type = 'text/plain';
         }
         elseif (strpos(drupal_strtolower($value), 'text/html') !== FALSE) {
@@ -397,6 +391,15 @@ function drupal_mail_wrapper($message) {
           $mail->IsHTML(FALSE);
           $content_type = 'text/plain';
         }
+        // Set the charset based on the provided value, if there is one.
+        $charset = _smtp_get_substring($value, 'charset', '=', ';');
+        if ($charset) {
+          $mail->CharSet = $charset;
+        }
+	else {
+          $mail->CharSet = 'utf-8';
+	}
+
         break;
 
       case 'reply-to':