Allowed to send non-latin symbols. JM-1378

git-svn-id: http://svn.igniterealtime.org/svn/repos/openfire/branches@10458 b35dd754-fafc-0310-a699-88a17e54d16e

openfire_3_5_2/src/java/org/jivesoftware/util/EmailService.java

@@ -3,7 +3,7 @@
  * $Revision$
  * $Date$
  *
- * Copyright (C) 2003-2005 Jive Software. All rights reserved.
+ * Copyright (C) 2003-2008 Jive Software. All rights reserved.
  *
  * This software is published under the terms of the GNU Public License (GPL),
  * a copy of which is included in this distribution, or a commercial license
@@ -171,7 +171,7 @@ public class EmailService {
         }
         else {
             try {
-                String encoding = MimeUtility.mimeCharset("iso-8859-1");
+                String encoding = MimeUtility.mimeCharset("UTF-8");
                 MimeMessage message = createMimeMessage();
                 Address to;
                 Address from;
@@ -209,8 +209,9 @@ public class EmailService {
                     content.addBodyPart(text);
                     // HTML
                     MimeBodyPart html = new MimeBodyPart();
-                    html.setContent(htmlBody, "text/html");
+                    html.setContent(htmlBody, "text/html; charset=UTF-8");
                     html.setDisposition(Part.INLINE);
+                   html.setHeader("Content-Transfer-Encoding", "8bit");
                     content.addBodyPart(html);
                     // Add multipart to message.
                     message.setContent(content);
@@ -221,6 +222,7 @@ public class EmailService {
                     MimeBodyPart bPart = new MimeBodyPart();
                     bPart.setText(textBody, encoding);
                     bPart.setDisposition(Part.INLINE);
+                   bPart.setHeader("Content-Transfer-Encoding", "8bit");
                     MimeMultipart mPart = new MimeMultipart();
                     mPart.addBodyPart(bPart);
                     message.setContent(mPart);
@@ -230,8 +232,9 @@ public class EmailService {
                 }
                 else if (htmlBody != null) {
                     MimeBodyPart bPart = new MimeBodyPart();
-                    bPart.setContent(htmlBody, "text/html");
+                    bPart.setContent(htmlBody, "text/html; charset=UTF-8");
                     bPart.setDisposition(Part.INLINE);
+                   bPart.setHeader("Content-Transfer-Encoding", "8bit");
                     MimeMultipart mPart = new MimeMultipart();
                     mPart.addBodyPart(bPart);
                     message.setContent(mPart);