0.9.5claws4

[claws.git] / src / compose.c

diff --git a/src/compose.c b/src/compose.c
index b8d99c5d1b5f7a2c7928d9d8308ee71a34bc9646..6e8793991d1a0cd6e43489013386443e591388e2 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -4287,7 +4287,7 @@ static gint compose_write_headers(Compose *compose, FILE *fp,
        /* MIME */
        fprintf(fp, "Mime-Version: 1.0\n");
        if (compose_use_attach(compose)) {
-               compose->boundary = generate_mime_boundary();
+               compose->boundary = generate_mime_boundary(NULL);
                fprintf(fp,
                        "Content-Type: multipart/mixed;\n"
                        " boundary=\"%s\"\n", compose->boundary);
@@ -4396,9 +4396,9 @@ static void compose_convert_header(gchar *dest, gint len, gchar *src,
 
        if (len < 1) return;
 
-       g_strchomp(src);
        subst_char(src, '\n', ' ');
        subst_char(src, '\r', ' ');
+       g_strchomp(src);
 
        conv_encode_header(dest, len, src, header_len, addr_field);
 }