From: Art Cancro <ajc@citadel.org>
Date: Thu, 14 Jan 1999 21:46:33 +0000 (+0000)
Subject: Changes to support MIME
X-Git-Tag: v7.86~7943
X-Git-Url: https://code.citadel.org/?a=commitdiff_plain;h=35dbe83dcc3a9d188ddee9a2c79483dd690239fb;p=citadel.git

Changes to support MIME
---

diff --git a/citadel/citmail.c b/citadel/citmail.c
index f533f8453..aefd43b16 100644
--- 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 257e03cee..69d1a3151 100644
--- 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