23a24
> import java.io.UnsupportedEncodingException;
32a34
> import javax.mail.internet.MimeUtility;
857c859,872
< 
---
> 						else if (header.toLowerCase().startsWith("from: ")) 
> 						{
> 							addEncodedHeader(header, "From: ");
> 						}
> 						else if (header.toLowerCase().startsWith("to: "))
> 						{
> 							addEncodedHeader(header, "To: ");
> 						}
> 						else if (header.toLowerCase().startsWith("cc: ")) 
> 						{
> 							addEncodedHeader(header, "Cc: ");
> 						}
> 					
> 							
971a987,1019
> 		
> 
>         private void addEncodedHeader(String header, String name) throws MessagingException {
>             try {
>                 final String value = header.substring(name.length());
>                 
>                 int index = value.lastIndexOf("<");
>                 if (index == -1) {
>                     addHeaderLine(header);
>                 } else {
>                     if ((index != 0) && (' ' == value.charAt(index - 1))) {
>                         index--;
>                     }
>                     
>                     final String title = value.substring(0, index);
>                     final String email = value.substring(index);
>                     
>                     final String[] lines = (name + MimeUtility.encodeText(
>                             title, "UTF-8", null).replace(" ", "\n ") + 
>                             email).split("\r\n|\r|\n");
>                     for (String temp: lines) {
>                         addHeaderLine(temp);
>                     }
>                 }
>             } catch (MessagingException e) {
>                 M_log.warn("Email.MyMessage: exception: " + e, e);
>                 addHeaderLine(header);
>             } catch (UnsupportedEncodingException e){
>                 M_log.warn("Email.MyMessage: exception: " + e, e);
>                 addHeaderLine(header);
>             }
>         }
>