Changes to support MIME

diff --git a/citadel/citmail.c b/citadel/citmail.c
index f533f84539632ce1f9fc3ec51f2ff9756101ad87..aefd43b165d859fc1356bebaf9dacf0de133b87c 100644 (file)
--- a/citadel/citmail.c
+++ b/citadel/citmail.c
@@ -399,6 +399,8 @@ void do_citmail(char recp[], int dtype) {
                        strcpy(from, &buf[6]);
                else if (!strncasecmp(buf,"Content-type: ",14))
                        strcpy(content_type, &buf[14]);
+               else if (!strncasecmp(buf,"From ", 5))  /* ignore */
+                       { }
                else {
                        if (extra_headers == NULL) {
                                extra_headers = malloc(strlen(buf)+2);

diff --git a/citadel/msgbase.c b/citadel/msgbase.c
index 257e03ceede7f5676ce1ae11d376713fd2197b8f..69d1a3151f058cd553d5931fbb2cb65d55f8dba8 100644 (file)
--- a/citadel/msgbase.c
+++ b/citadel/msgbase.c
@@ -549,7 +549,7 @@ time_t output_message(char *msgid, int mode,
 
        /* signify start of msg text */
        if (mode == MT_CITADEL) cprintf("text\n");
-       if (mode == MT_RFC822) cprintf("\n");
+       if ( (mode == MT_RFC822) && (format_type != 4) ) cprintf("\n");
 
        /* If the format type on disk is 1 (fixed-format), then we want
         * everything to be output completely literally ... regardless of