X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fmessages.c;h=d1b0f20817cc3b2bbe6f5584573b2d5ae6380516;hb=HEAD;hp=732ef03b8093686eecdac97baf7a9d3a21b60a9e;hpb=9e1d8fc790dc70419e1dbe1363e51d1377afdd66;p=citadel.git

diff --git a/webcit/messages.c b/webcit/messages.c
index 732ef03b8..ec6306ecc 100644
--- a/webcit/messages.c
+++ b/webcit/messages.c
@@ -1,19 +1,23 @@
-/*
- * Functions which deal with the fetching and displaying of messages.
- *
- * Copyright (c) 1996-2012 by the citadel.org team
- *
- * This program is open source software.  You can redistribute it and/or
- * modify it under the terms of the GNU General Public License, version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
+// Functions which deal with the fetching and displaying of messages.
+//
+// Copyright (c) 1996-2022 by the citadel.org team
+//
+// This program is open source software.  We call it open source, not
+// free software, because Richard Stallman is a communist and an asshole.
+// No one has done more damage to open source software than Stallman (ok,
+// maybe Nat and Miguel have done more damage, but they were paid by
+// Microsoft to do so).  Richard Stallman is a far-left ultra-communist
+// who hates America, hates freedom, and deserves to be canceled.
+//
+// The program is licensed under the General Public License, version 3.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
 
 #include "webcit.h"
-#include "webserver.h"
+
 #include "dav.h"
 #include "calendar.h"
 
@@ -25,12 +29,7 @@ int dbg_analyze_msg = 0;
 #define SENDER_COL_WIDTH_PCT		30	/* Mailbox view column width */
 #define DATE_PLUS_BUTTONS_WIDTH_PCT	20	/* Mailbox view column width */
 
-void jsonMessageListHdr(void);
-
-void display_enter(void);
-
-void fixview()
-{
+void fixview() {
 	/* workaround for json listview; its not useable directly */
 	if (WC->CurRoom.view == VIEW_JSON_LIST) {
 		StrBuf *View = NewStrBuf();
@@ -38,10 +37,9 @@ void fixview()
 		putbstr("view", View);;
 	}
 }
-int load_message(message_summary *Msg, 
-		 StrBuf *FoundCharset,
-		 StrBuf **Error)
-{
+
+
+int load_message(message_summary *Msg, StrBuf *FoundCharset, StrBuf **Error) {
 	StrBuf *Buf;
 	StrBuf *HdrToken;
 	char buf[SIZ];
@@ -155,16 +153,14 @@ int load_message(message_summary *Msg,
 }
 
 
-
 /*
- * I wanna SEE that message!
+ * Display a message to the user
  *
  * msgnum		Message number to display
  * printable_view	Nonzero to display a printable view
  * section		Optional for encapsulated message/rfc822 submessage
  */
-int read_message(StrBuf *Target, const char *tmpl, long tmpllen, long msgnum, const StrBuf *PartNum, const StrBuf **OutMime, WCTemplputParams *TP) 
-{
+int read_message(StrBuf *Target, const char *tmpl, long tmpllen, long msgnum, const StrBuf *PartNum, const StrBuf **OutMime, WCTemplputParams *TP) {
 	StrBuf *Buf;
 	StrBuf *FoundCharset;
 	HashPos  *it;
@@ -183,10 +179,16 @@ int read_message(StrBuf *Target, const char *tmpl, long tmpllen, long msgnum, co
 	Buf = NewStrBuf();
 	FoundCharset = NewStrBuf();
 	Msg = (message_summary *)malloc(sizeof(message_summary));
+	if (!Msg) {
+		syslog(LOG_DEBUG, "malloc() error");
+	}
 	memset(Msg, 0, sizeof(message_summary));
 	Msg->msgnum = msgnum;
 	Msg->PartNum = PartNum;
 	Msg->MsgBody =  (wc_mime_attachment*) malloc(sizeof(wc_mime_attachment));
+	if (!Msg->MsgBody) {
+		syslog(LOG_DEBUG, "malloc() error");
+	}
 	memset(Msg->MsgBody, 0, sizeof(wc_mime_attachment));
 	Msg->MsgBody->msgnum = msgnum;
 
@@ -248,9 +250,7 @@ int read_message(StrBuf *Target, const char *tmpl, long tmpllen, long msgnum, co
 }
 
 
-long
-HttpStatus(long CitadelStatus)
-{
+long HttpStatus(long CitadelStatus) {
 	long httpstatus = 502;
 	
 	switch (MAJORCODE(CitadelStatus))
@@ -305,7 +305,7 @@ HttpStatus(long CitadelStatus)
 	default:
 	case BINARY_FOLLOWS:
 	case SEND_BINARY:
-	case START_CHAT_MODE:
+	case SEND_THEN_RECV:
 	case ASYNC_MSG:
 	case MORE_DATA:
 	case SEND_LISTING:
@@ -316,47 +316,45 @@ HttpStatus(long CitadelStatus)
 	return httpstatus;
 }
 
+
 /*
  * Unadorned HTML output of an individual message, suitable
  * for placing in a hidden iframe, for printing, or whatever
  */
-void handle_one_message(void) 
-{
+void handle_one_message(void) {
 	long CitStatus = ERROR + NOT_HERE;
 	int CopyMessage = 0;
 	const StrBuf *Destination;
 	void *vLine;
 	const StrBuf *Mime;
 	long msgnum = 0L;
-	wcsession *WCC = WC;
 	const StrBuf *Tmpl;
 	StrBuf *CmdBuf = NULL;
 	const char *pMsg;
 
-
-	pMsg = strchr(ChrPtr(WCC->Hdr->HR.ReqLine), '/');
+	pMsg = strchr(ChrPtr(WC->Hdr->HR.ReqLine), '/');
 	if (pMsg == NULL) {
 		HttpStatus(CitStatus);
 		return;
 	}
 
 	msgnum = atol(pMsg + 1);
-	StrBufCutAt(WCC->Hdr->HR.ReqLine, 0, pMsg);
-	gotoroom(WCC->Hdr->HR.ReqLine);
-	switch (WCC->Hdr->HR.eReqType)
+	StrBufCutAt(WC->Hdr->HR.ReqLine, 0, pMsg);
+	gotoroom(WC->Hdr->HR.ReqLine);
+	switch (WC->Hdr->HR.eReqType)
 	{
 	case eGET:
 	case ePOST:
 		Tmpl = sbstr("template");
 		if (StrLength(Tmpl) > 0) 
-			read_message(WCC->WBuf, SKEY(Tmpl), msgnum, NULL, &Mime, NULL);
+			read_message(WC->WBuf, SKEY(Tmpl), msgnum, NULL, &Mime, NULL);
 		else 
-			read_message(WCC->WBuf, HKEY("view_message"), msgnum, NULL, &Mime, NULL);
+			read_message(WC->WBuf, HKEY("view_message"), msgnum, NULL, &Mime, NULL);
 		http_transmit_thing(ChrPtr(Mime), 0);
 		break;
 	case eDELETE:
 		CmdBuf = NewStrBuf ();
-		if ((WCC->CurRoom.RAFlags & UA_ISTRASH) != 0) {	/* Delete from Trash is a real delete */
+		if ((WC->CurRoom.RAFlags & UA_ISTRASH) != 0) {	/* Delete from Trash is a real delete */
 			serv_printf("DELE %ld", msgnum);	
 		}
 		else {			/* Otherwise move it to Trash */
@@ -369,7 +367,7 @@ void handle_one_message(void)
 	case eCOPY:
 		CopyMessage = 1;
 	case eMOVE:
-		if (GetHash(WCC->Hdr->HTTPHeaders, HKEY("DESTINATION"), &vLine) &&
+		if (GetHash(WC->Hdr->HTTPHeaders, HKEY("DESTINATION"), &vLine) &&
 		    (vLine!=NULL)) {
 			Destination = (StrBuf*) vLine;
 			serv_printf("MOVE %ld|%s|%d", msgnum, ChrPtr(Destination), CopyMessage);
@@ -395,27 +393,26 @@ void handle_one_message(void)
 void embed_message(void) {
 	const StrBuf *Mime;
 	long msgnum = 0L;
-	wcsession *WCC = WC;
 	const StrBuf *Tmpl;
 	StrBuf *CmdBuf = NULL;
 
-	msgnum = StrBufExtract_long(WCC->Hdr->HR.ReqLine, 0, '/');
+	msgnum = StrBufExtract_long(WC->Hdr->HR.ReqLine, 0, '/');
 	if (msgnum <= 0) return;
 
-	switch (WCC->Hdr->HR.eReqType)
+	switch (WC->Hdr->HR.eReqType)
 	{
 	case eGET:
 	case ePOST:
 		Tmpl = sbstr("template");
 		if (StrLength(Tmpl) > 0) 
-			read_message(WCC->WBuf, SKEY(Tmpl), msgnum, NULL, &Mime, NULL);
+			read_message(WC->WBuf, SKEY(Tmpl), msgnum, NULL, &Mime, NULL);
 		else 
-			read_message(WCC->WBuf, HKEY("view_message"), msgnum, NULL, &Mime, NULL);
+			read_message(WC->WBuf, HKEY("view_message"), msgnum, NULL, &Mime, NULL);
 		http_transmit_thing(ChrPtr(Mime), 0);
 		break;
 	case eDELETE:
 		CmdBuf = NewStrBuf ();
-		if ((WCC->CurRoom.RAFlags & UA_ISTRASH) != 0) {	/* Delete from Trash is a real delete */
+		if ((WC->CurRoom.RAFlags & UA_ISTRASH) != 0) {	/* Delete from Trash is a real delete */
 			serv_printf("DELE %ld", msgnum);	
 		}
 		else {			/* Otherwise move it to Trash */
@@ -452,6 +449,7 @@ void print_message(void) {
 	wDumpContent(0);
 }
 
+
 /*
  * Display a message's headers
  */
@@ -480,7 +478,6 @@ void display_headers(void) {
 }
 
 
-
 /*
  * load message pointers from the server for a "read messages" operation
  *
@@ -488,10 +485,14 @@ void display_headers(void) {
  */
 int load_msg_ptrs(const char *servcmd,
 		  const char *filter,
+		  StrBuf *FoundCharset,
 		  SharedMessageStatus *Stat, 
-		  load_msg_ptrs_detailheaders LH)
+		  void **ViewSpecific,
+		  load_msg_ptrs_detailheaders LH,
+		  StrBuf *FetchMessageList,
+		  eMessageField *MessageFieldList,
+		  long HeaderCount)
 {
-        wcsession *WCC = WC;
 	message_summary *Msg;
 	StrBuf *Buf, *Buf2;
 	long len;
@@ -503,10 +504,10 @@ int load_msg_ptrs(const char *servcmd,
 	Stat->lowest_found = LONG_MAX;
 	Stat->highest_found = LONG_MIN;
 
-	if (WCC->summ != NULL) {
-		DeleteHash(&WCC->summ);
+	if (WC->summ != NULL) {
+		DeleteHash(&WC->summ);
 	}
-	WCC->summ = NewHash(1, Flathash);
+	WC->summ = NewHash(1, Flathash);
 	
 	Buf = NewStrBuf();
 	serv_puts(servcmd);
@@ -521,6 +522,10 @@ int load_msg_ptrs(const char *servcmd,
                         serv_puts("000");
 			break;
 		}
+		else if (FetchMessageList != NULL) {
+			serv_putbuf(FetchMessageList);
+			break;
+		}
 		/* fall back to empty filter in case of we were fooled... */
 		serv_puts("");
 		serv_puts("000");
@@ -530,34 +535,42 @@ int load_msg_ptrs(const char *servcmd,
 		return (Stat->nummsgs);
 	}
 	Buf2 = NewStrBuf();
-	while (len = StrBuf_ServGetln(Buf), 
-	       ((len >= 0) &&
-		((len != 3) || 
-		 strcmp(ChrPtr(Buf), "000")!= 0)))
-	{
+	while (len = StrBuf_ServGetln(Buf), ((len >= 0) && ((len != 3) || strcmp(ChrPtr(Buf), "000")!= 0))) {
 		if (Stat->nummsgs < Stat->maxload) {
 			skipit = 0;
 			Ptr = NULL;
 			Msg = (message_summary*)malloc(sizeof(message_summary));
+			if (!Msg) {
+				syslog(LOG_DEBUG, "malloc() error");
+			}
 			memset(Msg, 0, sizeof(message_summary));
 
 			Msg->msgnum = StrBufExtractNext_long(Buf, &Ptr, '|');
 			Msg->date = StrBufExtractNext_long(Buf, &Ptr, '|');
-
-			if (Stat->nummsgs == 0) {
-				if (Msg->msgnum < Stat->lowest_found) {
-					Stat->lowest_found = Msg->msgnum;
-				}
-				if (Msg->msgnum > Stat->highest_found) {
-					Stat->highest_found = Msg->msgnum;
+			if (MessageFieldList != NULL) {
+				long i;
+				for (i = 0; i < HeaderCount; i++) {
+					StrBufExtract_NextToken(Buf2, Buf, &Ptr, '|');
+					if (StrLength(Buf2) > 0) {
+						EvaluateMsgHdrEnum(MessageFieldList[i], Msg, Buf2, FoundCharset);
+					}
 				}
 			}
+			else {
+				if (Stat->nummsgs == 0) {
+					if (Msg->msgnum < Stat->lowest_found) {
+						Stat->lowest_found = Msg->msgnum;
+					}
+					if (Msg->msgnum > Stat->highest_found) {
+						Stat->highest_found = Msg->msgnum;
+					}
+				}
 
-			if ((Msg->msgnum == 0) && (StrLength(Buf) < 32)) {
-				free(Msg);
-				continue;
+				if ((Msg->msgnum == 0) && (StrLength(Buf) < 32)) {
+					free(Msg);
+					continue;
+				}
 			}
-
 			/* 
 			 * as citserver probably gives us messages in forward date sorting
 			 * nummsgs should be the same order as the message date.
@@ -568,13 +581,13 @@ int load_msg_ptrs(const char *servcmd,
 					skipit = 1;
 			}
 			if ((!skipit) && (LH != NULL)) {
-				if (!LH(Buf, &Ptr, Msg, Buf2)){
+				if (!LH(Buf, &Ptr, Msg, Buf2, ViewSpecific)){
 					free(Msg);
 					continue;
 				}					
 			}
 			n = Msg->msgnum;
-			Put(WCC->summ, (const char *)&n, sizeof(n), Msg, DestroyMessageSummary);
+			Put(WC->summ, (const char *)&n, sizeof(n), Msg, DestroyMessageSummary);
 		}
 		Stat->nummsgs++;
 	}
@@ -584,15 +597,13 @@ int load_msg_ptrs(const char *servcmd,
 }
 
 
-
-/**
- * \brief sets FlagToSet for each of ScanMe that appears in MatchMSet
- * \param ScanMe List of BasicMsgStruct to be searched it MatchSet
- * \param MatchMSet MSet we want to flag
- * \param FlagToSet Flag to set on each BasicMsgStruct->Flags if in MSet
+/*
+ * sets FlagToSet for each of ScanMe that appears in MatchMSet
+ * ScanMe:	 List of BasicMsgStruct to be searched it MatchSet
+ * MatchMSet:	 MSet we want to flag
+ * FlagToSet:	 Flag to set on each BasicMsgStruct->Flags if in MSet
  */
-long SetFlagsFromMSet(HashList *ScanMe, MSet *MatchMSet, int FlagToSet, int Reverse)
-{
+long SetFlagsFromMSet(HashList *ScanMe, MSet *MatchMSet, int FlagToSet, int Reverse) {
 	const char *HashKey;
 	long HKLen;
 	long count = 0;
@@ -618,11 +629,9 @@ long SetFlagsFromMSet(HashList *ScanMe, MSet *MatchMSet, int FlagToSet, int Reve
 }
 
 
-long load_seen_flags(void)
-{
+long load_seen_flags(void) {
 	long count = 0;
 	StrBuf *OldMsg;
-	wcsession *WCC = WC;
 	MSet *MatchMSet;
 
 	OldMsg = NewStrBuf();
@@ -638,7 +647,7 @@ long load_seen_flags(void)
 
 	if (ParseMSet(&MatchMSet, OldMsg))
 	{
-		count = SetFlagsFromMSet(WCC->summ, MatchMSet, MSGFLAG_READ, 0);
+		count = SetFlagsFromMSet(WC->summ, MatchMSet, MSGFLAG_READ, 0);
 	}
 	DeleteMSet(&MatchMSet);
 	FreeStrBuf(&OldMsg);
@@ -658,6 +667,9 @@ typedef struct _RoomRenderer{
 	RenderView_or_Tail_func RenderView_or_Tail;
 	View_Cleanup_func ViewCleanup;
 	load_msg_ptrs_detailheaders LHParse;
+	long HeaderCount;
+	StrBuf *FetchMessageList;
+	eMessageField *MessageFieldList;
 } RoomRenderer;
 
 
@@ -666,8 +678,7 @@ typedef struct _RoomRenderer{
  *
  * Set oper to "readnew" or "readold" or "readfwd" or "headers" or "readgt" or "readlt" or "do_search"
  */
-void readloop(long oper, eCustomRoomRenderer ForceRenderer)
-{
+void readloop(long oper, eCustomRoomRenderer ForceRenderer) {
 	RoomRenderer *ViewMsg;
 	void *vViewMsg;
 	void *vMsg;
@@ -675,7 +686,6 @@ void readloop(long oper, eCustomRoomRenderer ForceRenderer)
 	char cmd[256] = "";
 	char filter[256] = "";
 	int i, r;
-	wcsession *WCC = WC;
 	HashPos *at;
 	const char *HashKey;
 	long HKLen;
@@ -684,11 +694,11 @@ void readloop(long oper, eCustomRoomRenderer ForceRenderer)
 	void *ViewSpecific = NULL;
 
 	if (havebstr("is_summary") && (1 == (ibstr("is_summary")))) {
-		WCC->CurRoom.view = VIEW_MAILBOX;
+		WC->CurRoom.view = VIEW_MAILBOX;
 	}
 
 	if (havebstr("view")) {
-		WCC->CurRoom.view = ibstr("view");
+		WC->CurRoom.view = ibstr("view");
 	}
 
 	memset(&Stat, 0, sizeof(SharedMessageStatus));
@@ -696,12 +706,12 @@ void readloop(long oper, eCustomRoomRenderer ForceRenderer)
 	Stat.lowest_found = (-1);
 	Stat.highest_found = (-1);
 	if (ForceRenderer == eUseDefault)
-		GetHash(ReadLoopHandler, IKEY(WCC->CurRoom.view), &vViewMsg);
+		GetHash(ReadLoopHandler, IKEY(WC->CurRoom.view), &vViewMsg);
 	else 
 		GetHash(ReadLoopHandler, IKEY(ForceRenderer), &vViewMsg);
 	if (vViewMsg == NULL) {
-		WCC->CurRoom.view = VIEW_BBS;
-		GetHash(ReadLoopHandler, IKEY(WCC->CurRoom.view), &vViewMsg);
+		WC->CurRoom.view = VIEW_BBS;
+		GetHash(ReadLoopHandler, IKEY(WC->CurRoom.view), &vViewMsg);
 	}
 	if (vViewMsg == NULL) {
 		return;			/* TODO: print message */
@@ -739,9 +749,21 @@ void readloop(long oper, eCustomRoomRenderer ForceRenderer)
 	}
 	if (!IsEmptyStr(cmd)) {
 		const char *p = NULL;
+		StrBuf *FoundCharset = NULL;
 		if (!IsEmptyStr(filter))
 			p = filter;
-		Stat.nummsgs = load_msg_ptrs(cmd, p, &Stat, ViewMsg->LHParse);
+		if (ViewMsg->HeaderCount > 0) {
+			FoundCharset = NewStrBuf();
+		}
+		Stat.nummsgs = load_msg_ptrs(cmd, p,
+					     FoundCharset,
+					     &Stat,
+					     &ViewSpecific,
+					     ViewMsg->LHParse,
+					     ViewMsg->FetchMessageList,
+					     ViewMsg->MessageFieldList,
+					     ViewMsg->HeaderCount);
+		FreeStrBuf(&FoundCharset);
 	}
 
 	if (Stat.sortit) {
@@ -755,7 +777,7 @@ void readloop(long oper, eCustomRoomRenderer ForceRenderer)
 		}
 		UnStackContext(&SubTP);
 		if (SortIt != NULL)
-			SortByPayload(WCC->summ, SortIt);
+			SortByPayload(WC->summ, SortIt);
 	}
 	if (Stat.startmsg < 0) {
 		Stat.startmsg =  0;
@@ -769,9 +791,9 @@ void readloop(long oper, eCustomRoomRenderer ForceRenderer)
 	if (ViewMsg->PrintViewHeader != NULL)
 		ViewMsg->PrintViewHeader(&Stat, &ViewSpecific);
 
-	WCC->startmsg =  Stat.startmsg;
-	WCC->maxmsgs = Stat.maxmsgs;
-	WCC->num_displayed = 0;
+	WC->startmsg =  Stat.startmsg;
+	WC->maxmsgs = Stat.maxmsgs;
+	WC->num_displayed = 0;
 
 	/* Put some helpful data in vars for mailsummary_json */
 	{
@@ -792,12 +814,10 @@ void readloop(long oper, eCustomRoomRenderer ForceRenderer)
 	 * iterate over each message. if we need to load an attachment, do it here. 
 	 */
 
-	if ((ViewMsg->LoadMsgFromServer != NULL) && 
-	    (!IsEmptyStr(cmd)))
-	{
-		at = GetNewHashPos(WCC->summ, 0);
+	if ((ViewMsg->LoadMsgFromServer != NULL) && (!IsEmptyStr(cmd))) {
+		at = GetNewHashPos(WC->summ, 0);
 		Stat.num_displayed = i = 0;
-		while (	GetNextHashPos(WCC->summ, at, &HKLen, &HashKey, &vMsg)) {
+		while (	GetNextHashPos(WC->summ, at, &HKLen, &HashKey, &vMsg)) {
 			Msg = (message_summary*) vMsg;		
 			if ((Msg->msgnum >= Stat.startmsg) && (Stat.num_displayed <= Stat.maxmsgs)) {
 				ViewMsg->LoadMsgFromServer(&Stat, 
@@ -820,20 +840,17 @@ void readloop(long oper, eCustomRoomRenderer ForceRenderer)
 	if (ViewMsg->ViewCleanup != NULL)
 		ViewMsg->ViewCleanup(&ViewSpecific);
 
-	WCC->startmsg = 0;
-	WCC->maxmsgs = 0;
-	if (WCC->summ != NULL) {
-		DeleteHash(&WCC->summ);
+	WC->startmsg = 0;
+	WC->maxmsgs = 0;
+	if (WC->summ != NULL) {
+		DeleteHash(&WC->summ);
 	}
 }
 
 
-/*
- * Back end for post_message()
- * ... this is where the actual message gets transmitted to the server.
- */
+// Back end for post_message()
+// This is where the actual message gets transmitted to the server.
 void post_mime_to_server(void) {
-	wcsession *WCC = WC;
 	char top_boundary[SIZ];
 	char alt_boundary[SIZ];
 	int is_multipart = 0;
@@ -846,12 +863,12 @@ void post_mime_to_server(void) {
 	int include_text_alt = 0;	/* Set to nonzero to include multipart/alternative text/plain */
 
 	sprintf(top_boundary, "Citadel--Multipart--%s--%04x--%04x",
-		ChrPtr(WCC->serv_info->serv_fqdn),
+		ChrPtr(WC->serv_info->serv_fqdn),
 		getpid(),
 		++seq
 	);
 	sprintf(alt_boundary, "Citadel--Multipart--%s--%04x--%04x",
-		ChrPtr(WCC->serv_info->serv_fqdn),
+		ChrPtr(WC->serv_info->serv_fqdn),
 		getpid(),
 		++seq
 	);
@@ -861,14 +878,13 @@ void post_mime_to_server(void) {
 	serv_puts("X-Mailer: " PACKAGE_STRING);
 
 	/* If there are attachments, we have to do multipart/mixed */
-	if (GetCount(WCC->attachments) > 0) {
+	syslog(LOG_DEBUG, "This message will have %d attachments", GetCount(WC->attachments));
+	if (GetCount(WC->attachments) > 0) {
 		is_multipart = 1;
 	}
 
 	/* Only do multipart/alternative for mailboxes.  BBS and Wiki rooms don't need it. */
-	if ((WCC->CurRoom.view == VIEW_MAILBOX) ||
-	    (WCC->CurRoom.view == VIEW_JSON_LIST))
-	{
+	if ((WC->CurRoom.view == VIEW_MAILBOX) || (WC->CurRoom.view == VIEW_JSON_LIST)) {
 		include_text_alt = 1;
 	}
 
@@ -882,8 +898,7 @@ void post_mime_to_server(void) {
 	/* Remember, serv_printf() appends an extra newline */
 	if (include_text_alt) {
 		StrBuf *Buf;
-		serv_printf("Content-type: multipart/alternative; "
-			"boundary=\"%s\"\n", alt_boundary);
+		serv_printf("Content-type: multipart/alternative; boundary=\"%s\"\n", alt_boundary);
 		serv_printf("This is a multipart message in MIME format.\n");
 		serv_printf("--%s", alt_boundary);
 
@@ -899,22 +914,14 @@ void post_mime_to_server(void) {
 		serv_printf("\n--%s", alt_boundary);
 	}
 
-	if (havebstr("markdown"))
-	{
-		serv_puts("Content-type: text/x-markdown; charset=utf-8");
-		serv_puts("Content-Transfer-Encoding: quoted-printable");
-		serv_puts("");
+	serv_puts("Content-type: text/html; charset=utf-8");
+	serv_puts("Content-Transfer-Encoding: quoted-printable");
+	serv_puts("");
+	serv_puts("<html><body>\r\n");
+	if (havebstr("msgtext")) {
 		text_to_server_qp(sbstr("msgtext"));	/* Transmit message in quoted-printable encoding */
 	}
-	else
-	{
-		serv_puts("Content-type: text/html; charset=utf-8");
-		serv_puts("Content-Transfer-Encoding: quoted-printable");
-		serv_puts("");
-		serv_puts("<html><body>\r\n");
-		text_to_server_qp(sbstr("msgtext"));	/* Transmit message in quoted-printable encoding */
-		serv_puts("</body></html>\r\n");
-	}
+	serv_puts("</body></html>\r\n");
 
 	if (include_text_alt) {
 		serv_printf("--%s--", alt_boundary);
@@ -927,15 +934,21 @@ void post_mime_to_server(void) {
 		HashPos  *it;
 
 		/* Add in the attachments */
-		it = GetNewHashPos(WCC->attachments, 0);
-		while (GetNextHashPos(WCC->attachments, it, &len, &Key, &vAtt)) {
+		it = GetNewHashPos(WC->attachments, 0);
+		while (GetNextHashPos(WC->attachments, it, &len, &Key, &vAtt)) {
 			att = (wc_mime_attachment *)vAtt;
 			if (att->length == 0)
 				continue;
-			encoded_length = ((att->length * 150) / 100);
+
+			encoded_length = att->length + (att->length / 2);	// make it 150% of the original size for encoding
 			encoded = malloc(encoded_length);
-			if (encoded == NULL) break;
-			encoded_strlen = CtdlEncodeBase64(encoded, ChrPtr(att->Data), StrLength(att->Data), 1);
+			if (!encoded) {
+				syslog(LOG_ERR, "malloc() error");
+				break;
+			}
+			syslog(LOG_DEBUG, "Attachment: raw len %d", StrLength(att->Data));
+			encoded_strlen = CtdlEncodeBase64(encoded, ChrPtr(att->Data), StrLength(att->Data), BASE64_YES_LINEBREAKS);
+			syslog(LOG_DEBUG, "Attachment: encoded len %d", encoded_strlen);
 
 			serv_printf("--%s", top_boundary);
 			serv_printf("Content-type: %s", ChrPtr(att->ContentType));
@@ -966,8 +979,7 @@ void post_mime_to_server(void) {
  * discarded.  This prevents the accidental double-saving of the same message
  * if the user happens to click the browser "back" button.
  */
-void post_message(void)
-{
+void post_message(void) {
 	StrBuf *UserName;
 	StrBuf *EmailAddress;
 	StrBuf *EncBuf;
@@ -976,7 +988,6 @@ void post_message(void)
 	static long dont_post = (-1L);
 	int is_anonymous = 0;
 	const StrBuf *display_name = NULL;
-	wcsession *WCC = WC;
 	StrBuf *Buf;
 	
 	if (havebstr("force_room")) {
@@ -1002,7 +1013,7 @@ void post_message(void)
 		StrBuf *Recp = NULL; 
 		StrBuf *Cc = NULL;
 		StrBuf *Bcc = NULL;
-		char *wikipage = NULL;
+		StrBuf *wikipage = NULL;
 		const StrBuf *my_email_addr = NULL;
 		StrBuf *CmdBuf = NULL;
 		StrBuf *references = NULL;
@@ -1057,7 +1068,7 @@ void post_message(void)
 		FreeStrBuf(&EmailAddress);
 		FreeStrBuf(&EncBuf);
 
-		wikipage = strdup(bstr("page"));
+		wikipage = NewStrBufDup(sbstr("page"));
 		str_wiki_index(wikipage);
 		my_email_addr = sbstr("my_email_addr");
 		
@@ -1065,7 +1076,7 @@ void post_message(void)
 			StrLength(encoded_subject) +
 			StrLength(Cc) +
 			StrLength(Bcc) + 
-			strlen(wikipage) +
+			StrLength(wikipage) +
 			StrLength(my_email_addr) + 
 			StrLength(references);
 		CmdBuf = NewStrBufPlain(NULL, sizeof (CMD) + HeaderLen);
@@ -1077,7 +1088,7 @@ void post_message(void)
 			     ChrPtr(display_name),
 			     saving_to_drafts?"":ChrPtr(Cc),
 			     saving_to_drafts?"":ChrPtr(Bcc),
-			     wikipage,
+			     ChrPtr(wikipage),
 			     ChrPtr(my_email_addr),
 			     ChrPtr(references));
 		FreeStrBuf(&references);
@@ -1085,7 +1096,7 @@ void post_message(void)
 		free(wikipage);
 
 		if ((HeaderLen + StrLength(sbstr("msgtext")) < 10) && 
-		    (GetCount(WCC->attachments) == 0)){
+		    (GetCount(WC->attachments) == 0)){
 			AppendImportantMessage(_("Refusing to post empty message.\n"), -1);
 			FreeStrBuf(&CmdBuf);
 				
@@ -1107,13 +1118,13 @@ void post_message(void)
 						serv_printf("Cc: %s", ChrPtr(Cc));
 						serv_printf("Bcc: %s", ChrPtr(Bcc));
 					} else {
-						serv_printf("X-Citadel-Room: %s", ChrPtr(WCC->CurRoom.name));
+						serv_printf("X-Citadel-Room: %s", ChrPtr(WC->CurRoom.name));
 					}
 				}
 				post_mime_to_server();
 				if (saving_to_drafts) {
 					AppendImportantMessage(_("Message has been saved to Drafts.\n"), -1);
-					gotoroom(WCC->CurRoom.name);
+					gotoroom(WC->CurRoom.name);
 					fixview();
 					readloop(readnew, eUseDefault);
 					FreeStrBuf(&Buf);
@@ -1132,7 +1143,7 @@ void post_message(void)
 				syslog(LOG_DEBUG, "%s:%d: server post error: %s", __FILE__, __LINE__, ChrPtr(Buf) + 4);
 				AppendImportantMessage(ChrPtr(Buf) + 4, StrLength(Buf) - 4);
 				display_enter();
-				if (saving_to_drafts) gotoroom(WCC->CurRoom.name);
+				if (saving_to_drafts) gotoroom(WC->CurRoom.name);
 				FreeStrBuf(&Recp);
 				FreeStrBuf(&Buf);
 				FreeStrBuf(&Cc);
@@ -1146,7 +1157,7 @@ void post_message(void)
 		FreeStrBuf(&Bcc);
 	}
 
-	DeleteHash(&WCC->attachments);
+	DeleteHash(&WC->attachments);
 
 	/*
 	 *  We may have been supplied with instructions regarding the location
@@ -1176,7 +1187,6 @@ void post_message(void)
  * Client is uploading an attachment
  */
 void upload_attachment(void) {
-	wcsession *WCC = WC;
 	const char *pch;
 	int n;
 	const char *newn;
@@ -1188,47 +1198,61 @@ void upload_attachment(void) {
 	const StrBuf *UID;
 
 	begin_burst();
-	syslog(LOG_DEBUG, "upload_attachment()\n");
-	if (!Tmpl) wc_printf("upload_attachment()<br>\n");
+	syslog(LOG_DEBUG, "upload_attachment()");
+	if (!Tmpl) {
+		wc_printf("upload_attachment()<br>\n");
+	}
 
-	if (WCC->upload_length <= 0) {
+	if (WC->upload_length <= 0) {
 		syslog(LOG_DEBUG, "ERROR no attachment was uploaded\n");
-		if (Tmpl)
-		{
+		if (Tmpl) {
 			putlbstr("UPLOAD_ERROR", 1);
 			MimeType = DoTemplate(SKEY(Tmpl), NULL, &NoCtx);
 		}
-		else      wc_printf("ERROR no attachment was uploaded<br>\n");
+		else {
+			wc_printf("ERROR no attachment was uploaded<br>\n");
+		}
 		http_transmit_thing(ChrPtr(MimeType), 0);
 
 		return;
 	}
 
-	syslog(LOG_DEBUG, "Client is uploading %d bytes\n", WCC->upload_length);
-	if (Tmpl) putlbstr("UPLOAD_LENGTH", WCC->upload_length);
-	else wc_printf("Client is uploading %d bytes<br>\n", WCC->upload_length);
+	syslog(LOG_DEBUG, "Client has uploaded %d bytes", WC->upload_length);
+	if (Tmpl) {
+		putlbstr("UPLOAD_LENGTH", WC->upload_length);
+	}
+	else {
+		wc_printf("Client is uploading %d bytes<br>\n", WC->upload_length);
+	}
 
 	att = (wc_mime_attachment*)malloc(sizeof(wc_mime_attachment));
+	if (!att) {
+		syslog(LOG_DEBUG, "malloc() error");
+	}
 	memset(att, 0, sizeof(wc_mime_attachment ));
-	att->length = WCC->upload_length;
-	att->ContentType = NewStrBufPlain(WCC->upload_content_type, -1);
-	att->FileName = NewStrBufDup(WCC->upload_filename);
+	att->length = WC->upload_length;
+	att->ContentType = NewStrBufPlain(WC->upload_content_type, -1);
+	att->FileName = NewStrBufDup(WC->upload_filename);
 	UID = sbstr("qquuid");
-	if (UID)
+	if (UID) {
 		att->PartNum = NewStrBufDup(UID);
+	}
+
+	syslog(LOG_DEBUG, "attachment length: %d", att->length);
+	syslog(LOG_DEBUG, "att. content type: %s", ChrPtr(att->ContentType));
+	syslog(LOG_DEBUG, "att upload buffer: %s", ((WC->upload == NULL) ? "null" : "not null"));
+
 
-	if (WCC->attachments == NULL) {
-		WCC->attachments = NewHash(1, Flathash);
+	if (WC->attachments == NULL) {
+		WC->attachments = NewHash(1, Flathash);
 	}
 
 	/* And add it to the list. */
 	n = 0;
-	if ((GetCount(WCC->attachments) > 0) && 
-	    GetHashAt(WCC->attachments, 
-		      GetCount(WCC->attachments) -1, 
-		      &newnlen, &newn, &v))
-	    n = *((int*) newn) + 1;
-	Put(WCC->attachments, IKEY(n), att, DestroyMime);
+	if ((GetCount(WC->attachments) > 0) && GetHashAt(WC->attachments, GetCount(WC->attachments) -1, &newnlen, &newn, &v)) {
+		n = *((int*) newn) + 1;
+	}
+	Put(WC->attachments, IKEY(n), att, DestroyMime);
 
 	/*
 	 * Mozilla sends a simple filename, which is what we want,
@@ -1248,9 +1272,9 @@ void upload_attachment(void) {
 	 * Transfer control of this memory from the upload struct
 	 * to the attachment struct.
 	 */
-	att->Data = WCC->upload;
-	WCC->upload = NULL;
-	WCC->upload_length = 0;
+	att->Data = WC->upload;
+	WC->upload = NULL;
+	WC->upload_length = 0;
 	
 	if (Tmpl) MimeType = DoTemplate(SKEY(Tmpl), NULL, &NoCtx);
 	http_transmit_thing(ChrPtr(MimeType), 0);
@@ -1264,7 +1288,6 @@ void upload_attachment(void) {
  * There is probably a better way to do this.
  */
 void remove_attachment(void) {
-	wcsession *WCC = WC;
 	wc_mime_attachment *att;
 	void *vAtt;
 	StrBuf *WhichAttachment;
@@ -1277,10 +1300,10 @@ void remove_attachment(void) {
 	if (ChrPtr(WhichAttachment)[0] == '/')
 		StrBufCutLeft(WhichAttachment, 1);
 	StrBufUnescape(WhichAttachment, 0);
-	at = GetNewHashPos(WCC->attachments, 0);
+	at = GetNewHashPos(WC->attachments, 0);
 	do {
 		vAtt = NULL;
-		GetHashPos(WCC->attachments, at, &len, &key, &vAtt);
+		GetHashPos(WC->attachments, at, &len, &key, &vAtt);
 
 		att = (wc_mime_attachment*) vAtt;
 		if ((att != NULL) &&
@@ -1290,12 +1313,12 @@ void remove_attachment(void) {
 		     !strcmp(ChrPtr(WhichAttachment), ChrPtr(att->PartNum)))
 			    ))
 		{
-			DeleteEntryFromHash(WCC->attachments, at);
+			DeleteEntryFromHash(WC->attachments, at);
 			found=1;
 			break;
 		}
 	}
-	while (NextHashPos(WCC->attachments, at));
+	while (NextHashPos(WC->attachments, at));
 
 	FreeStrBuf(&WhichAttachment);
 	wc_printf("remove_attachment(%d) completed\n", found);
@@ -1312,12 +1335,12 @@ typedef enum _eReplyToNodes {
 	eReplyAll,
 	eForward
 }eReplyToNodes;
-	
+
+
 /*
  * display the message entry screen
  */
-void display_enter(void)
-{
+void display_enter(void) {
 	const char *ReplyingModeStr;
 	eReplyToNodes ReplyMode = eReply;
 	StrBuf *Line;
@@ -1327,14 +1350,9 @@ void display_enter(void)
 	int recipient_required = 0;
 	int subject_required = 0;
 	int is_anonymous = 0;
-      	wcsession *WCC = WC;
 	int i = 0;
 	long replying_to;
 
-	int prefer_md;
-
-	get_pref_yesno("markdown", &prefer_md, 0);
-
 	if (havebstr("force_room")) {
 		gotoroom(sbstr("force_room"));
 	}
@@ -1373,17 +1391,16 @@ void display_enter(void)
 	 * Are we perhaps in an address book view?  If so, then an "enter
 	 * message" command really means "add new entry."
 	 */
-	if (WCC->CurRoom.defview == VIEW_ADDRESSBOOK) {
-		do_edit_vcard(-1, "", NULL, NULL, "",  ChrPtr(WCC->CurRoom.name));
+	if (WC->CurRoom.defview == VIEW_ADDRESSBOOK) {
+		do_edit_vcard(-1, "", NULL, NULL, "",  ChrPtr(WC->CurRoom.name));
 		FreeStrBuf(&Line);
 		return;
 	}
 
 	/*
-	 * Are we perhaps in a calendar room?  If so, then an "enter
-	 * message" command really means "add new calendar item."
+	 * Are we perhaps in a calendar room?  If so, then an "enter message" command really means "add new calendar item."
 	 */
-	if (WCC->CurRoom.defview == VIEW_CALENDAR) {
+	if (WC->CurRoom.defview == VIEW_CALENDAR) {
 		display_edit_event();
 		FreeStrBuf(&Line);
 		return;
@@ -1393,21 +1410,21 @@ void display_enter(void)
 	 * Are we perhaps in a tasks view?  If so, then an "enter
 	 * message" command really means "add new task."
 	 */
-	if (WCC->CurRoom.defview == VIEW_TASKS) {
+	if (WC->CurRoom.defview == VIEW_TASKS) {
 		display_edit_task();
 		FreeStrBuf(&Line);
 		return;
 	}
 
-
 	ReplyingModeStr = bstr("replying_mode");
-	if (ReplyingModeStr != NULL) for (i = 0; i < 3; i++) {
+	if (ReplyingModeStr != NULL) {
+		for (i = 0; i < 3; i++) {
 			if (strcmp(ReplyingModeStr, ReplyToModeStrings[i]) == 0) {
 				ReplyMode = (eReplyToNodes) i;
 				break;
 			}
 		}
-		
+	}
 
 	/*
 	 * If the "replying_to" variable is set, it refers to a message
@@ -1419,26 +1436,19 @@ void display_enter(void)
 		StrBuf *wefw = NULL;
 		StrBuf *msgn = NULL;
 		StrBuf *from = NULL;
-		StrBuf *node = NULL;
 		StrBuf *rfca = NULL;
 		StrBuf *rcpt = NULL;
 		StrBuf *cccc = NULL;
 		StrBuf *replyto = NULL;
 		StrBuf *nvto = NULL;
+		int message_originated_locally = 0;
 		serv_printf("MSG0 %ld|1", replying_to);	
 
 		StrBuf_ServGetln(Line);
 		if (GetServerStatusMsg(Line, NULL, 0, 0) == 1)
-			while (len = StrBuf_ServGetln(Line),
-			       (len >= 0) && 
-			       ((len != 3)  ||
-				strcmp(ChrPtr(Line), "000")))
-			{
+			while (len = StrBuf_ServGetln(Line), (len >= 0) && ((len != 3) || strcmp(ChrPtr(Line), "000"))) {
 				eMessageField which;
-				if ((StrLength(Line) > 4) && 
-				    (ChrPtr(Line)[4] == '=') &&
-				    GetFieldFromMnemonic(&which, ChrPtr(Line)))
-					switch (which) {
+				if ((StrLength(Line) > 4) && (ChrPtr(Line)[4] == '=') && GetFieldFromMnemonic(&which, ChrPtr(Line))) switch (which) {
 					case eMsgSubject: {
 						StrBuf *subj = NewStrBuf();
 						StrBuf *FlatSubject;
@@ -1463,6 +1473,11 @@ void display_enter(void)
 					}
 						break;
 
+					case eIsLocal: {
+						message_originated_locally = 1;
+						break;
+					}
+
 					case eWeferences:
 					{
 						int rrtok;
@@ -1498,20 +1513,12 @@ void display_enter(void)
 						}
 						break;
 					}
-				
 					case eRecipient:
 						rcpt = NewStrBufPlain(ChrPtr(Line) + 5, StrLength(Line) - 5);
 						break;
-			
-				
 					case eCarbonCopY:
 						cccc = NewStrBufPlain(ChrPtr(Line) + 5, StrLength(Line) - 5);
 						break;
-
-				
-					case eNodeName:
-						node = NewStrBufPlain(ChrPtr(Line) + 5, StrLength(Line) - 5);
-						break;
 					case eReplyTo:
 						replyto = NewStrBufPlain(ChrPtr(Line) + 5, StrLength(Line) - 5);
 						break;
@@ -1529,14 +1536,17 @@ void display_enter(void)
 						putbstr("nvto", nvto);
 						break;
 					case eXclusivID:
-					case eHumanNode:
 					case eJournal:
 					case eListID:
-					case eMesageText:
-					case eOriginalRoom:
+					case eMessageText:
 					case eMessagePath:
 					case eSpecialField:
 					case eTimestamp:
+					case eHeaderOnly:
+					case eFormatType:
+					case eMessagePart:
+					case eSubFolder:
+					case eLastHeader:
 						break;
 
 					}
@@ -1562,29 +1572,25 @@ void display_enter(void)
 		/*
 		 * If this is a Reply or a ReplyAll, copy the sender's email into the To: field
 		 */
-		if ((ReplyMode == eReply) || (ReplyMode == eReplyAll))
-		{
+		if ((ReplyMode == eReply) || (ReplyMode == eReplyAll)) {
 			StrBuf *to_rcpt;
+
 			if ((StrLength(replyto) > 0) && (ReplyMode == eReplyAll)) {
 				to_rcpt = NewStrBuf();
 				StrBufAppendBuf(to_rcpt, replyto, 0);
 			}
-			else if (StrLength(rfca) > 0) {
+
+			else if ( (StrLength(rfca) > 0) && (message_originated_locally == 0) ) {
 				to_rcpt = NewStrBuf();
 				StrBufAppendBuf(to_rcpt, from, 0);
 				StrBufAppendBufPlain(to_rcpt, HKEY(" <"), 0);
 				StrBufAppendBuf(to_rcpt, rfca, 0);
 				StrBufAppendBufPlain(to_rcpt, HKEY(">"), 0);
 			}
+
 			else {
 				to_rcpt =  from;
 				from = NULL;
-				if (	(StrLength(node) > 0)
-					&& (strcasecmp(ChrPtr(node), ChrPtr(WCC->serv_info->serv_nodename)))
-				) {
-					StrBufAppendBufPlain(to_rcpt, HKEY(" @ "), 0);
-					StrBufAppendBuf(to_rcpt, node, 0);
-				}
 			}
 			PutBstr(HKEY("recp"), to_rcpt);
 		}
@@ -1592,49 +1598,60 @@ void display_enter(void)
 		/*
 		 * Only if this is a ReplyAll, copy all recipients into the Cc: field
 		 */
-		if (ReplyMode == eReplyAll)
-		{
+		if (ReplyMode == eReplyAll) {
 			StrBuf *cc_rcpt = rcpt;
 			rcpt = NULL;
-			if ((StrLength(cccc) > 0) && (StrLength(replyto) == 0))
-			{
+			if ((StrLength(cccc) > 0) && (StrLength(replyto) == 0)) {
 				if (cc_rcpt != NULL)  {
 					StrBufAppendPrintf(cc_rcpt, ", ");
 					StrBufAppendBuf(cc_rcpt, cccc, 0);
-				} else {
+				}
+				else {
 					cc_rcpt = cccc;
 					cccc = NULL;
 				}
 			}
-			if (cc_rcpt != NULL)
+			if (cc_rcpt != NULL) {
 				PutBstr(HKEY("cc"), cc_rcpt);
+			}
 		}
+
+		// We might not need these logs anymore.
+		syslog(LOG_DEBUG, "wefw = %s", ChrPtr(wefw));
+		syslog(LOG_DEBUG, "msgn = %s", ChrPtr(msgn));
+		syslog(LOG_DEBUG, "from = %s", ChrPtr(from));
+		syslog(LOG_DEBUG, "rfca = %s", ChrPtr(rfca));
+		syslog(LOG_DEBUG, "rcpt = %s", ChrPtr(rcpt));
+		syslog(LOG_DEBUG, "cccc = %s", ChrPtr(cccc));
+		syslog(LOG_DEBUG, "replyto = %s", ChrPtr(replyto));
+		syslog(LOG_DEBUG, "nvto = %s", ChrPtr(nvto));
+		syslog(LOG_DEBUG, "local = %d" , message_originated_locally);
+
 		FreeStrBuf(&wefw);
 		FreeStrBuf(&msgn);
 		FreeStrBuf(&from);
-		FreeStrBuf(&node);
 		FreeStrBuf(&rfca);
 		FreeStrBuf(&rcpt);
 		FreeStrBuf(&cccc);
 	}
 	FreeStrBuf(&Line);
+
 	/*
 	 * Otherwise proceed normally.
 	 * Do a custom room banner with no navbar...
 	 */
-
 	if (recipient_required) {
 		const StrBuf *Recp = NULL; 
 		const StrBuf *Cc = NULL;
 		const StrBuf *Bcc = NULL;
-		char *wikipage = NULL;
+		StrBuf *wikipage = NULL;
 		StrBuf *CmdBuf = NULL;
 		const char CMD[] = "ENT0 0|%s|%d|0||%s||%s|%s|%s";
 		
 		Recp = sbstr("recp");
 		Cc = sbstr("cc");
 		Bcc = sbstr("bcc");
-		wikipage = strdup(bstr("page"));
+		wikipage = NewStrBufDup(sbstr("page"));
 		str_wiki_index(wikipage);
 		
 		CmdBuf = NewStrBufPlain(NULL, 
@@ -1643,7 +1660,7 @@ void display_enter(void)
 					StrLength(display_name) +
 					StrLength(Cc) +
 					StrLength(Bcc) + 
-					strlen(wikipage));
+					StrLength(wikipage));
 
 		StrBufPrintf(CmdBuf, 
 			     CMD,
@@ -1652,7 +1669,7 @@ void display_enter(void)
 			     ChrPtr(display_name),
 			     ChrPtr(Cc), 
 			     ChrPtr(Bcc), 
-			     wikipage
+			     ChrPtr(wikipage)
 		);
 		serv_puts(ChrPtr(CmdBuf));
 		StrBuf_ServGetln(CmdBuf);
@@ -1681,20 +1698,17 @@ void display_enter(void)
 
 	begin_burst();
 	output_headers(1, 0, 0, 0, 1, 0);
-	if ((WCC->CurRoom.defview == VIEW_WIKIMD) || prefer_md)
-		DoTemplate(HKEY("edit_markdown_epic"), NULL, &NoCtx);
-	else
-		DoTemplate(HKEY("edit_message"), NULL, &NoCtx);
+	DoTemplate(HKEY("edit_message"), NULL, &NoCtx);
 	end_burst();
 
 	return;
 }
 
+
 /*
  * delete a message
  */
-void delete_msg(void)
-{
+void delete_msg(void) {
 	long msgid;
 	StrBuf *Line;
 	
@@ -1719,8 +1733,7 @@ void delete_msg(void)
 /*
  * move a message to another room
  */
-void move_msg(void)
-{
+void move_msg(void) {
 	long msgid;
 
 	msgid = lbstr("msgid");
@@ -1741,7 +1754,6 @@ void move_msg(void)
 }
 
 
-
 /*
  * Generic function to output an arbitrary MIME attachment from
  * message being composed
@@ -1750,8 +1762,7 @@ void move_msg(void)
  * filename		Fake filename to give
  * force_download	Nonzero to force set the Content-Type: header to "application/octet-stream"
  */
-void postpart(StrBuf *partnum, StrBuf *filename, int force_download)
-{
+void postpart(StrBuf *partnum, StrBuf *filename, int force_download) {
 	void *vPart;
 	StrBuf *content_type;
 	wc_mime_attachment *part;
@@ -1782,102 +1793,69 @@ void postpart(StrBuf *partnum, StrBuf *filename, int force_download)
 }
 
 
-/*
- * Generic function to output an arbitrary MIME part from an arbitrary
- * message number on the server.
- *
- * msgnum		Number of the item on the citadel server
- * partnum		The MIME part to be output
- * force_download	Nonzero to force set the Content-Type: header to "application/octet-stream"
- */
-void mimepart(int force_download)
-{
-	int detect_mime = 0;
+// Generic function to output an arbitrary MIME part from an arbitrary
+// message number on the server.
+//
+// msgnum		message number on the citadel server
+// partnum		MIME part number to be output
+// force_download	Nonzero to force set the Content-Type: header to "application/octet-stream"
+
+void view_or_download_mimepart(int force_download) {
 	long msgnum;
-	long ErrorDetail;
-	StrBuf *att;
-	wcsession *WCC = WC;
-	StrBuf *Buf;
 	off_t bytes;
-	StrBuf *ContentType = NewStrBufPlain(HKEY("application/octet-stream"));
-	const char *CT;
+	StrBuf *Buf;
+	StrBuf *ContentType;
+	StrBuf *PartNum;
 
-	att = Buf = NewStrBuf();
-	msgnum = StrBufExtract_long(WCC->Hdr->HR.ReqLine, 0, '/');
-	StrBufExtract_token(att, WCC->Hdr->HR.ReqLine, 1, '/');
+	PartNum = NewStrBuf();
 
-	serv_printf("OPNA %ld|%s", msgnum, ChrPtr(att));
-	StrBuf_ServGetln(Buf);
-	if (GetServerStatus(Buf, &ErrorDetail) == 2) {
-		StrBufCutLeft(Buf, 4);
-		bytes = StrBufExtract_long(Buf, 0, '|');
-		StrBufExtract_token(ContentType, Buf, 3, '|');
-		CheckGZipCompressionAllowed (SKEY(ContentType));
-		if (force_download)
-		{
-			FlushStrBuf(ContentType);
-			detect_mime = 0;
-		}
-		else
-		{
-			if (!strcasecmp(ChrPtr(ContentType), "application/octet-stream"))
-			{
-				StrBufExtract_token(Buf, WCC->Hdr->HR.ReqLine, 2, '/');
-				CT = GuessMimeByFilename(SKEY(Buf));
-				StrBufPlain(ContentType, CT, -1);
-			}
-			if (!strcasecmp(ChrPtr(ContentType), "application/octet-stream"))
-			{
-				detect_mime = 1;
-			}
-		}
-		serv_read_binary_to_http(ContentType, bytes, 0, detect_mime);
-
-		serv_read_binary(WCC->WBuf, bytes, Buf);
-		serv_puts("CLOS");
-		StrBuf_ServGetln(Buf);
-		CT = ChrPtr(ContentType);
-	} else {
-		StrBufCutLeft(Buf, 4);
-		switch (ErrorDetail) {
-		default:
-		case ERROR + MESSAGE_NOT_FOUND:
-			hprintf("HTTP/1.1 404 %s\n", ChrPtr(Buf));
-			break;
-		case ERROR + NOT_LOGGED_IN:
-			hprintf("HTTP/1.1 401 %s\n", ChrPtr(Buf));
-			break;
+	msgnum = StrBufExtract_long(WC->Hdr->HR.ReqLine, 0, '/');
+	StrBufExtract_token(PartNum, WC->Hdr->HR.ReqLine, 1, '/');
 
-		case ERROR + HIGHER_ACCESS_REQUIRED:
-			hprintf("HTTP/1.1 403 %s\n", ChrPtr(Buf));
-			break;
-		case ERROR + INTERNAL_ERROR:
-		case ERROR + TOO_BIG:
-			hprintf("HTTP/1.1 500 %s\n", ChrPtr(Buf));
-			break;
-		}
+	Buf = NewStrBuf();
+	serv_printf("DLAT %ld|%s", msgnum, ChrPtr(PartNum));	// DLAT will return: 6XX length|-1|filename|cbtype|cbcharset
+	StrBuf_ServGetln(Buf);
+	FreeStrBuf(&PartNum);
 
-		hprintf("Pragma: no-cache\r\n"
+	if (GetServerStatus(Buf, NULL) != 6) {
+		FreeStrBuf(&Buf);
+		hprintf("HTTP/1.1 500 error\r\n"
+			"Pragma: no-cache\r\n"
 			"Cache-Control: no-store\r\n"
 			"Expires: -1\r\n"
+			"Content-Type: text/plain\r\n"
 		);
-
-		hprintf("Content-Type: text/plain\r\n");
 		begin_burst();
-		wc_printf(_("An error occurred while retrieving this part: %s\n"), 
-			ChrPtr(Buf));
-		end_burst();
+		wc_printf(_("An error occurred while retrieving this part: %s\n"), "--");
+		return;
 	}
-	FreeStrBuf(&ContentType);
+
+	StrBufCutLeft(Buf, 4);
+	bytes = StrBufExtract_long(Buf, 0, '|');
+
+	if (force_download) {
+		ContentType = NewStrBufPlain(HKEY("application/octet-stream"));
+	}
+	else {
+		ContentType = NewStrBuf();
+		StrBufExtract_token(ContentType, Buf, 3, '|');
+	}
+
 	FreeStrBuf(&Buf);
+	Buf = NewStrBuf();
+	StrBuf_ServGetBLOBBuffered(Buf, bytes);
+
+	WC->WBuf = Buf;
+	Buf = NULL;
+	http_transmit_thing(ChrPtr(ContentType), 0);
+	FreeStrBuf(&ContentType);
 }
 
 
 /*
  * Read any MIME part of a message, from the server, into memory.
  */
-StrBuf *load_mimepart(long msgnum, char *partnum)
-{
+StrBuf *load_mimepart(long msgnum, char *partnum) {
 	off_t bytes;
 	StrBuf *Buf;
 	
@@ -1898,15 +1876,14 @@ StrBuf *load_mimepart(long msgnum, char *partnum)
 	}
 }
 
+
 /*
  * Read any MIME part of a message, from the server, into memory.
  */
-void MimeLoadData(wc_mime_attachment *Mime)
-{
+void MimeLoadData(wc_mime_attachment *Mime) {
 	StrBuf *Buf;
 	const char *Ptr;
 	off_t bytes;
-	/* TODO: is there a chance the content type is different from the one we know? */
 
 	serv_printf("DLAT %ld|%s", Mime->msgnum, ChrPtr(Mime->PartNum));
 	Buf = NewStrBuf();
@@ -1918,26 +1895,28 @@ void MimeLoadData(wc_mime_attachment *Mime)
 		if (Mime->Charset == NULL) Mime->Charset = NewStrBuf();
 		StrBufExtract_NextToken(Mime->Charset, Buf, &Ptr, '|');
 		
-		if (Mime->Data == NULL)
+		if (Mime->Data == NULL) {
 			Mime->Data = NewStrBufPlain(NULL, bytes);
+		}
 		StrBuf_ServGetBLOBBuffered(Mime->Data, bytes);
 	}
 	else {
 		FlushStrBuf(Mime->Data);
-		/* TODO XImportant message */
 	}
 	FreeStrBuf(&Buf);
 }
 
 
 void view_mimepart(void) {
-	mimepart(0);
+	view_or_download_mimepart(0);
 }
 
+
 void download_mimepart(void) {
-	mimepart(1);
+	view_or_download_mimepart(1);
 }
 
+
 void view_postpart(void) {
 	StrBuf *filename = NewStrBuf();
 	StrBuf *partnum = NewStrBuf();
@@ -1951,6 +1930,7 @@ void view_postpart(void) {
 	FreeStrBuf(&partnum);
 }
 
+
 void download_postpart(void) {
 	StrBuf *filename = NewStrBuf();
 	StrBuf *partnum = NewStrBuf();
@@ -1965,7 +1945,6 @@ void download_postpart(void) {
 }
 
 
-
 void show_num_attachments(void) {
 	wc_printf("%d", GetCount(WC->attachments));
 }
@@ -1980,7 +1959,6 @@ void h_readgt(void) { readloop(readgt, eUseDefault);}
 void h_readlt(void) { readloop(readlt, eUseDefault);}
 
 
-
 /* Output message list in JSON format */
 void jsonMessageList(void) {
 	StrBuf *View = NewStrBuf();
@@ -1992,6 +1970,17 @@ void jsonMessageList(void) {
 	readloop(oper, eUseDefault);
 }
 
+
+void FreeReadLoopHandlerSet(void *v) {
+	RoomRenderer *Handler = (RoomRenderer *) v;
+	FreeStrBuf(&Handler->FetchMessageList);
+	if (Handler->MessageFieldList != NULL) {
+		free(Handler->MessageFieldList);
+	}
+	free(Handler);
+}
+
+
 void RegisterReadLoopHandlerset(
 	int RoomType,
 	GetParamsGetServerCall_func GetParamsGetServerCall,
@@ -2000,9 +1989,12 @@ void RegisterReadLoopHandlerset(
 	load_msg_ptrs_detailheaders LH,
 	LoadMsgFromServer_func LoadMsgFromServer,
 	RenderView_or_Tail_func RenderView_or_Tail,
-	View_Cleanup_func ViewCleanup
+	View_Cleanup_func ViewCleanup,
+	const char **browseListFields
 	)
 {
+	long count = 0;
+	long i = 0;
 	RoomRenderer *Handler;
 
 	Handler = (RoomRenderer*) malloc(sizeof(RoomRenderer));
@@ -2016,7 +2008,30 @@ void RegisterReadLoopHandlerset(
 	Handler->ViewCleanup = ViewCleanup;
 	Handler->LHParse = LH;
 
-	Put(ReadLoopHandler, IKEY(RoomType), Handler, NULL);
+	if (browseListFields != NULL) {
+		while (browseListFields[count] != NULL) {
+			count ++;
+		}
+		Handler->HeaderCount = count;
+		Handler->MessageFieldList = (eMessageField*) malloc(sizeof(eMessageField) * count);
+		Handler->FetchMessageList = NewStrBufPlain(NULL, 5 * count + 4 + 5);
+		StrBufPlain(Handler->FetchMessageList, HKEY("time\n"));
+		for (i = 0; i < count; i++) {
+			if (!GetFieldFromMnemonic(&Handler->MessageFieldList[i], browseListFields[i])) {
+				fprintf(stderr, "Unknown message header: %s\n", browseListFields[i]);
+				exit(1);
+			}
+			StrBufAppendBufPlain(Handler->FetchMessageList, browseListFields[i], 4, 0);
+			StrBufAppendBufPlain(Handler->FetchMessageList, HKEY("\n"), 0);
+		}
+		StrBufAppendBufPlain(Handler->FetchMessageList, HKEY("000"), 0);
+	}
+	else {
+		Handler->FetchMessageList = NULL;
+		Handler->MessageFieldList = NULL;
+	}
+
+	Put(ReadLoopHandler, IKEY(RoomType), Handler, FreeReadLoopHandlerSet);
 }
 
 void 
@@ -2042,8 +2057,6 @@ InitModule_MSG
 			   PRF_STRING, 
 			   NULL);
 	RegisterPreference("mailbox",_("Mailbox view mode"), PRF_STRING, NULL);
-	RegisterPreference("markdown",_("Prefer markdown editing"), PRF_YESNO, NULL);
-
 
 	WebcitAddUrlHandler(HKEY("readnew"), "", 0, h_readnew, ANONYMOUS|NEED_URL);
 	WebcitAddUrlHandler(HKEY("readold"), "", 0, h_readold, ANONYMOUS|NEED_URL);