X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fmessages.c;h=a98d702572aa500b1d83ccdd64776d52d31db557;hb=86787cded3b4f37488ebfa03efb50bb958a1fbb2;hp=a5447a378952ca84674ecaaf01f368fc277653e6;hpb=7c339ad1ffcbbd5b5d0d3610b734405e571d286e;p=citadel.git

diff --git a/webcit/messages.c b/webcit/messages.c
index a5447a378..a98d70257 100644
--- a/webcit/messages.c
+++ b/webcit/messages.c
@@ -1,10 +1,12 @@
 /*
  * Functions which deal with the fetching and displaying of messages.
  *
- * Copyright (c) 1996-2012 by the citadel.org team
+ * Copyright (c) 1996-2020 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 open source software.  We call it open source, not
+ * free software, because Richard Stallman is a communist and an asshole.
+ *
+ * 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
@@ -17,7 +19,6 @@
 #include "dav.h"
 #include "calendar.h"
 
-HashList *MsgHeaderHandler = NULL;
 HashList *MimeRenderHandler = NULL;
 HashList *ReadLoopHandler = NULL;
 int dbg_analyze_msg = 0;
@@ -26,12 +27,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();
@@ -39,18 +35,16 @@ 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;
-	headereval *Hdr;
-	void *vHdr;
 	char buf[SIZ];
 	int Done = 0;
 	int state=0;
-	
+	int rc;
+
 	Buf = NewStrBuf();
 	if (Msg->PartNum != NULL) {
 		serv_printf("MSG4 %ld|%s", Msg->msgnum, ChrPtr(Msg->PartNum));
@@ -97,14 +91,11 @@ int load_message(message_summary *Msg,
 			StrBufCutLeft(Buf, StrLength(HdrToken) + 1);
 			
 			/* look up one of the examine_* functions to parse the content */
-			if (GetHash(MsgHeaderHandler, SKEY(HdrToken), &vHdr) &&
-			    (vHdr != NULL)) {
-				Hdr = (headereval*)vHdr;
-				Hdr->evaluator(Msg, Buf, FoundCharset);
-				if (Hdr->Type == 1) {
-					state++;
-				}
-			}/* TODO: 
+			rc =  EvaluateMsgHdr(SKEY(HdrToken), Msg, Buf, FoundCharset);
+			if (rc == 1) {
+				state++;
+			}
+			/* TODO: 
 			else LogError(Target, 
 				      __FUNCTION__,  
 				      "don't know how to handle message header[%s]\n", 
@@ -125,11 +116,8 @@ int load_message(message_summary *Msg,
 				if (StrLength(HdrToken) > 0) {
 					StrBufCutLeft(Buf, StrLength(HdrToken) + 1);
 					/* the examine*'s know how to do with mime headers too... */
-					if (GetHash(MsgHeaderHandler, SKEY(HdrToken), &vHdr) &&
-					    (vHdr != NULL)) {
-						Hdr = (headereval*)vHdr;
-						Hdr->evaluator(Msg, Buf, FoundCharset);
-					}
+					EvaluateMsgHdr(SKEY(HdrToken), Msg, Buf, FoundCharset);
+					
 					break;
 				}
 			}
@@ -163,16 +151,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;
@@ -256,9 +242,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))
@@ -324,12 +308,12 @@ 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;
@@ -341,7 +325,6 @@ void handle_one_message(void)
 	StrBuf *CmdBuf = NULL;
 	const char *pMsg;
 
-
 	pMsg = strchr(ChrPtr(WCC->Hdr->HR.ReqLine), '/');
 	if (pMsg == NULL) {
 		HttpStatus(CitStatus);
@@ -460,6 +443,7 @@ void print_message(void) {
 	wDumpContent(0);
 }
 
+
 /*
  * Display a message's headers
  */
@@ -488,7 +472,6 @@ void display_headers(void) {
 }
 
 
-
 /*
  * load message pointers from the server for a "read messages" operation
  *
@@ -496,8 +479,13 @@ 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;
@@ -529,6 +517,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");
@@ -551,21 +543,30 @@ int load_msg_ptrs(const char *servcmd,
 
 			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.
@@ -576,7 +577,7 @@ 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;
 				}					
@@ -592,15 +593,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;
@@ -626,8 +625,7 @@ 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;
@@ -666,6 +664,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;
 
 
@@ -674,8 +675,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;
@@ -747,9 +747,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) {
@@ -898,7 +910,7 @@ void post_mime_to_server(void) {
 		serv_puts("Content-type: text/plain; charset=utf-8");
 		serv_puts("Content-Transfer-Encoding: quoted-printable");
 		serv_puts("");
-		txtmail = html_to_ascii(bstr("msgtext"), 0, 80, 0);
+		txtmail = html_to_ascii(bstr("msgtext"), 0, 80);
 		Buf = NewStrBufPlain(txtmail, -1);
         	free(txtmail);
 
@@ -907,22 +919,12 @@ 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("");
-		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("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");
 
 	if (include_text_alt) {
 		serv_printf("--%s--", alt_boundary);
@@ -974,8 +976,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;
@@ -1010,7 +1011,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;
@@ -1065,7 +1066,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");
 		
@@ -1073,7 +1074,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);
@@ -1085,7 +1086,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);
@@ -1310,77 +1311,6 @@ void remove_attachment(void) {
 }
 
 
-/* Maps to msgkeys[] in msgbase.c: */
-
-typedef enum _eMessageField {
-	eAuthor,
-	eXclusivID,
-	erFc822Addr,
-	eHumanNode,
-	emessageId,
-	eJournal,
-	eReplyTo,
-	eListID,
-	eMesageText,
-	eNodeName,
-	eOriginalRoom,
-	eMessagePath,
-	eRecipient,
-	eSpecialField,
-	eTimestamp,
-	eMsgSubject,
-	eenVelopeTo,
-	eWeferences,
-	eCarbonCopY
-}eMessageField;
-
-const char* fieldMnemonics[] = {
-	"from", /* A -> eAuthor       */
-	"exti", /* E -> eXclusivID    */
-	"rfca", /* F -> erFc822Addr   */
-	"hnod", /* H -> eHumanNode    */
-	"msgn", /* I -> emessageId    */
-	"jrnl", /* J -> eJournal      */
-	"rep2", /* K -> eReplyTo      */
-	"list", /* L -> eListID       */
-	"text", /* M -> eMesageText   */
-	"node", /* N -> eNodeName     */
-	"room", /* O -> eOriginalRoom */
-	"path", /* P -> eMessagePath  */
-	"rcpt", /* R -> eRecipient    */
-	"spec", /* S -> eSpecialField */
-	"time", /* T -> eTimestamp    */
-	"subj", /* U -> eMsgSubject   */
-	"nvto", /* V -> eenVelopeTo   */
-	"wefw", /* W -> eWeferences   */
-	"cccc"  /* Y -> eCarbonCopY   */
-};
-
-HashList *msgKeyLookup = NULL;
-
-int GetFieldFromMnemonic(eMessageField *f, const char* c)
-{
-	void *v = NULL;
-	if (GetHash(msgKeyLookup, c, 4, &v)) {
-		*f = (eMessageField) v;
-		return 1;
-	}
-	return 0;
-}
-
-void FillMsgKeyLookupTable(void)
-{
-	long i;
-
-	msgKeyLookup = NewHash (1, FourHash);
-
-	for (i=0; i < 20; i++) {
-		if (fieldMnemonics[i] != NULL) {
-			Put(msgKeyLookup, fieldMnemonics[i], 4, (void*)i, reference_free_handler);
-		}
-	}
-}
-
 const char *ReplyToModeStrings [3] = {
 	"reply",
 	"replyall",
@@ -1391,12 +1321,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;
@@ -1410,10 +1340,6 @@ void display_enter(void)
 	int i = 0;
 	long replying_to;
 
-	int prefer_md;
-
-	get_pref_yesno("markdown", &prefer_md, 0);
-
 	if (havebstr("force_room")) {
 		gotoroom(sbstr("force_room"));
 	}
@@ -1478,15 +1404,15 @@ void display_enter(void)
 		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
@@ -1498,26 +1424,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;
@@ -1542,6 +1461,11 @@ void display_enter(void)
 					}
 						break;
 
+					case eIsLocal: {
+						message_originated_locally = 1;
+						break;
+					}
+
 					case eWeferences:
 					{
 						int rrtok;
@@ -1577,20 +1501,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;
@@ -1608,14 +1524,17 @@ void display_enter(void)
 						putbstr("nvto", nvto);
 						break;
 					case eXclusivID:
-					case eHumanNode:
 					case eJournal:
 					case eListID:
 					case eMesageText:
-					case eOriginalRoom:
 					case eMessagePath:
 					case eSpecialField:
 					case eTimestamp:
+					case eHeaderOnly:
+					case eFormatType:
+					case eMessagePart:
+					case eSubFolder:
+					case eLastHeader:
 						break;
 
 					}
@@ -1641,13 +1560,14 @@ 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) {
 				to_rcpt = NewStrBuf();
 				StrBufAppendBuf(to_rcpt, from, 0);
@@ -1655,15 +1575,10 @@ void display_enter(void)
 				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);
 		}
@@ -1671,49 +1586,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);
+			}
 		}
+
+		// FOOFOO
+		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, 
@@ -1722,7 +1648,7 @@ void display_enter(void)
 					StrLength(display_name) +
 					StrLength(Cc) +
 					StrLength(Bcc) + 
-					strlen(wikipage));
+					StrLength(wikipage));
 
 		StrBufPrintf(CmdBuf, 
 			     CMD,
@@ -1731,7 +1657,7 @@ void display_enter(void)
 			     ChrPtr(display_name),
 			     ChrPtr(Cc), 
 			     ChrPtr(Bcc), 
-			     wikipage
+			     ChrPtr(wikipage)
 		);
 		serv_puts(ChrPtr(CmdBuf));
 		StrBuf_ServGetln(CmdBuf);
@@ -1760,20 +1686,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;
 	
@@ -1798,8 +1721,7 @@ void delete_msg(void)
 /*
  * move a message to another room
  */
-void move_msg(void)
-{
+void move_msg(void) {
 	long msgid;
 
 	msgid = lbstr("msgid");
@@ -1820,7 +1742,6 @@ void move_msg(void)
 }
 
 
-
 /*
  * Generic function to output an arbitrary MIME attachment from
  * message being composed
@@ -1829,8 +1750,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;
@@ -1865,98 +1785,66 @@ 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
+ * 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 mimepart(int force_download)
-{
-	int detect_mime = 0;
+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;
 	
@@ -1977,15 +1865,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();
@@ -1997,26 +1884,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();
@@ -2030,6 +1919,7 @@ void view_postpart(void) {
 	FreeStrBuf(&partnum);
 }
 
+
 void download_postpart(void) {
 	StrBuf *filename = NewStrBuf();
 	StrBuf *partnum = NewStrBuf();
@@ -2044,7 +1934,6 @@ void download_postpart(void) {
 }
 
 
-
 void show_num_attachments(void) {
 	wc_printf("%d", GetCount(WC->attachments));
 }
@@ -2059,7 +1948,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();
@@ -2071,6 +1959,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,
@@ -2079,9 +1978,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));
@@ -2095,28 +1997,42 @@ 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;
+	}
 
-void 
-ServerShutdownModule_MSG
-(void)
-{
-	DeleteHash(&msgKeyLookup);
+	Put(ReadLoopHandler, IKEY(RoomType), Handler, FreeReadLoopHandlerSet);
 }
 
 void 
 InitModule_MSG
 (void)
 {
-	FillMsgKeyLookupTable();
-
 	RegisterPreference("use_sig",
 			   _("Attach signature to email messages?"), 
 			   PRF_YESNO, 
 			   NULL);
 	RegisterPreference("signature", _("Use this signature:"), PRF_QP_STRING, NULL);
-	RegisterPreference("default_header_charset", 
+	RegisterPreference("default_header_charset",
 			   _("Default character set for email headers:"), 
 			   PRF_STRING, 
 			   NULL);
@@ -2130,8 +2046,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);