Default to 7bit instead of 8bit content-encoding-type.

--HG--
branch : HEAD

diff --git a/src/lib-imap/imap-bodystructure.c b/src/lib-imap/imap-bodystructure.c
index cd3c375507e3561b075f242046a6734d878c0b86..683f2c7ff53460e8a31a5c69ee47b8f0abccf4c2 100644 (file)
--- a/src/lib-imap/imap-bodystructure.c
+++ b/src/lib-imap/imap-bodystructure.c
@@ -338,7 +338,16 @@ static void part_write_body(struct message_part *part,
        /* "content type" "subtype" */
        str_append(str, NVL(data->content_type, "\"text\""));
        str_append_c(str, ' ');
-       str_append(str, NVL(data->content_subtype, "\"plain\""));
+       if (data->content_subtype != NULL)
+               str_append(str, data->content_subtype);
+       else {
+               if (data->content_type == NULL ||
+                   strcasecmp(data->content_type, "text") == 0)
+                       str_append(str, "\"plain\"");
+               else
+                       str_append(str, "\"unknown\"");
+
+       }
 
        /* ("content type param key" "value" ...) */
        str_append_c(str, ' ');
@@ -353,7 +362,7 @@ static void part_write_body(struct message_part *part,
        str_printfa(str, " %s %s %s %"PRIuUOFF_T,
                    NVL(data->content_id, "NIL"),
                    NVL(data->content_description, "NIL"),
-                   NVL(data->content_transfer_encoding, "\"8bit\""),
+                   NVL(data->content_transfer_encoding, "\"7bit\""),
                    part->body_size.virtual_size);
 
        if (part->flags & MESSAGE_PART_FLAG_TEXT) {