simplify mime creation; set payload charset

diff --git a/edward b/edward
index 673e4dc74f8ac18414b5a61d1cdebe24458d5653..2f659da7eb51e117e5c8fa322ccebe2c9fa339f8 100755 (executable)
--- a/edward
+++ b/edward
@@ -1146,15 +1146,8 @@ def generate_encrypted_mime (plaintext, email_to, email_subject, encrypt_to_key,
 
     if (encrypt_to_key != None):
 
-        # quoted printable encoding lets most ascii characters look normal
-        # before the mime message is decoded.
-        char_set = email.charset.Charset("utf-8")
-        char_set.body_encoding = email.charset.QP
-
-        # MIMEText doesn't allow setting the text encoding
-        # so we use MIMENonMultipart.
-        plaintext_mime = MIMENonMultipart('text', 'plain')
-        plaintext_mime.set_payload(plaintext, charset=char_set)
+        plaintext_mime = MIMEText(plaintext)
+        plaintext_mime.set_charset('utf-8')
 
         encrypted_text = encrypt_sign_message(plaintext_mime.as_string(),
                                               encrypt_to_key,
@@ -1180,6 +1173,7 @@ def generate_encrypted_mime (plaintext, email_to, email_subject, encrypt_to_key,
 
     else:
         message_mime = MIMEText(plaintext)
+        message_mime.set_charset('utf-8')
 
     message_mime['To'] = email_to
     message_mime['Subject'] = email_subject