2005-02-23 [colin] 1.0.1cvs15.7

[claws.git] / src / compose.c

diff --git a/src/compose.c b/src/compose.c
index 6702e3d0855b07c5c1d0f6e1d0a55c8ad2dba190..fda61e25d6a9d70b07732ad68427c4ef52461f84 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -3390,6 +3390,8 @@ static gint compose_write_to_file(Compose *compose, FILE *fp, gint action)
                        return -1;
 
        procmime_write_mimeinfo(mimemsg, fp);
+       
+       procmime_mimeinfo_free_all(mimemsg);
 
        return 0;
 }
@@ -3741,6 +3743,13 @@ static void compose_add_attachments(Compose *compose, MimeInfo *parent)
                        mimepart->disposition = DISPOSITIONTYPE_ATTACHMENT;
                }
 
+               if (compose->use_signing) {
+                       if (ainfo->encoding == ENC_7BIT)
+                               ainfo->encoding = ENC_QUOTED_PRINTABLE;
+                       else if (ainfo->encoding == ENC_8BIT)
+                               ainfo->encoding = ENC_BASE64;
+               }
+               
                procmime_encode_content(mimepart, ainfo->encoding);
 
                g_node_append(parent->node, mimepart->node);