X-Git-Url: https://code.citadel.org/?p=citadel.git;a=blobdiff_plain;f=webcit%2Fmsg_renderers.c;h=4be851de3c68e5d7b385ba2877450bd4cb80dbf0;hp=d2de1f4bdf89313408ce64e2eff38ed9169b9876;hb=0008163783f3a3b6605813f2db138903450f9ea7;hpb=dca4414169da8ea7161d5b95fc9ccbefe5d39651

diff --git a/webcit/msg_renderers.c b/webcit/msg_renderers.c
index d2de1f4bd..4be851de3 100644
--- a/webcit/msg_renderers.c
+++ b/webcit/msg_renderers.c
@@ -2,9 +2,15 @@
 #include "webserver.h"
 #include "dav.h"
 
+CtxType CTX_MAILSUM = CTX_NONE;
+CtxType CTX_MIME_ATACH = CTX_NONE;
 
+HashList *MsgHeaderHandler = NULL;
+HashList *DflMsgHeaderHandler = NULL;
+HashList *DflEnumMsgHeaderHandler = NULL;
 
-inline void CheckConvertBufs(struct wcsession *WCC)
+
+static inline void CheckConvertBufs(struct wcsession *WCC)
 {
 	if (WCC->ConvertBuf1 == NULL)
 		WCC->ConvertBuf1 = NewStrBuf();
@@ -45,12 +51,11 @@ void DestroyMessageSummary(void *vMsg)
 	FreeStrBuf(&Msg->reply_inreplyto);
 	FreeStrBuf(&Msg->reply_references);
 	FreeStrBuf(&Msg->cccc);
-	FreeStrBuf(&Msg->hnod);
+	FreeStrBuf(&Msg->ReplyTo);
 	FreeStrBuf(&Msg->AllRcpt);
 	FreeStrBuf(&Msg->Room);
 	FreeStrBuf(&Msg->Rfca);
-	FreeStrBuf(&Msg->OtherNode);
-
+	FreeStrBuf(&Msg->EnvTo);
 	DeleteHash(&Msg->Attachments);	/* list of Attachments */
 	DeleteHash(&Msg->Submessages);
 	DeleteHash(&Msg->AttachLinks);
@@ -58,7 +63,39 @@ void DestroyMessageSummary(void *vMsg)
 	free(Msg);
 }
 
+int EvaluateMsgHdrEnum(eMessageField f, message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
+{
+	void *vHdr;
+	headereval* Hdr = NULL;
+	if (GetHash(DflEnumMsgHeaderHandler, IKEY(f), &vHdr) &&
+	    (vHdr != NULL)) {
+		Hdr = (headereval*)vHdr;
+	}
+	if (Hdr == NULL)
+		return -1;
+	Hdr->evaluator(Msg, HdrLine, FoundCharset);
+	return Hdr->Type;
+}
 
+int EvaluateMsgHdr(const char *HeaderName, long HdrNLen, message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
+{
+	void *vHdr;
+	headereval* Hdr = NULL;
+	if (HdrNLen == 4) {
+		if (GetHash(DflMsgHeaderHandler, HeaderName, HdrNLen, &vHdr) &&
+		    (vHdr != NULL)) {
+			Hdr = (headereval*)vHdr;
+		}
+	}
+	if (Hdr == NULL && GetHash(MsgHeaderHandler, HeaderName, HdrNLen, &vHdr) &&
+	    (vHdr != NULL)) {
+		Hdr = (headereval*)vHdr;
+	}
+	if (Hdr == NULL)
+		return -1;
+	Hdr->evaluator(Msg, HdrLine, FoundCharset);
+	return Hdr->Type;
+}
 
 void RegisterMsgHdr(const char *HeaderName, long HdrNLen, ExamineMsgHeaderFunc evaluator, int type)
 {
@@ -66,6 +103,15 @@ void RegisterMsgHdr(const char *HeaderName, long HdrNLen, ExamineMsgHeaderFunc e
 	ev = (headereval*) malloc(sizeof(headereval));
 	ev->evaluator = evaluator;
 	ev->Type = type;
+
+	if (HdrNLen == 4) {
+		eMessageField f;
+		if (GetFieldFromMnemonic(&f, HeaderName)) {
+			Put(DflMsgHeaderHandler, HeaderName, HdrNLen, ev, NULL);
+			Put(DflEnumMsgHeaderHandler, IKEY(f), ev, reference_free_handler);
+			return;
+		}
+	}
 	Put(MsgHeaderHandler, HeaderName, HdrNLen, ev, NULL);
 }
 
@@ -239,6 +285,12 @@ void examine_content_encoding(message_summary *Msg, StrBuf *HdrLine, StrBuf *Fou
 /* TODO: do we care? */
 }
 
+
+void examine_exti(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
+{
+	/* we don't care */
+}
+
 void examine_nhdr(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
 {
 	Msg->nhdr = 0;
@@ -247,7 +299,7 @@ void examine_nhdr(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
 }
 int Conditional_ANONYMOUS_MESSAGE(StrBuf *Target, WCTemplputParams *TP)
 {
-	message_summary *Msg = (message_summary*) CTX;
+	message_summary *Msg = (message_summary*) CTX(CTX_MAILSUM);
 	return Msg->nhdr != 0;
 }
 
@@ -273,7 +325,7 @@ void examine_from(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
 }
 void tmplput_MAIL_SUMM_FROM(StrBuf *Target, WCTemplputParams *TP)
 {
-	message_summary *Msg = (message_summary*) CTX;
+	message_summary *Msg = (message_summary*) CTX(CTX_MAILSUM);
 	StrBufAppendTemplate(Target, TP, Msg->from, 0);
 }
 
@@ -293,7 +345,7 @@ void examine_subj(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
 }
 void tmplput_MAIL_SUMM_SUBJECT(StrBuf *Target, WCTemplputParams *TP)
 {
-	message_summary *Msg = (message_summary*) CTX;
+	message_summary *Msg = (message_summary*) CTX(CTX_MAILSUM);
 
 	if (TP->Tokens->nParameters == 4)
 	{
@@ -312,7 +364,7 @@ void tmplput_MAIL_SUMM_SUBJECT(StrBuf *Target, WCTemplputParams *TP)
 }
 int Conditional_MAIL_SUMM_SUBJECT(StrBuf *Target, WCTemplputParams *TP)
 {
-	message_summary *Msg = (message_summary*) CTX;
+	message_summary *Msg = (message_summary*) CTX(CTX_MAILSUM);
 
 
 	return StrLength(Msg->subj) > 0;
@@ -322,10 +374,17 @@ int Conditional_MAIL_SUMM_SUBJECT(StrBuf *Target, WCTemplputParams *TP)
 void examine_msgn(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
 {
 	wcsession *WCC = WC;
+	long Offset = 0;
+	const char *pOffset;
 
 	CheckConvertBufs(WCC);
 	FreeStrBuf(&Msg->reply_inreplyto);
 	Msg->reply_inreplyto = NewStrBufPlain(NULL, StrLength(HdrLine));
+	pOffset = strchr(ChrPtr(HdrLine), '/');
+	if (pOffset != NULL) {
+		Offset = pOffset - ChrPtr(HdrLine);
+	}
+	Msg->reply_inreplyto_hash = ThreadIdHashOffset(HdrLine, Offset);
 	StrBuf_RFC822_2_Utf8(Msg->reply_inreplyto, 
 			     HdrLine, 
 			     WCC->DefaultCharset,
@@ -335,23 +394,30 @@ void examine_msgn(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
 }
 void tmplput_MAIL_SUMM_INREPLYTO(StrBuf *Target, WCTemplputParams *TP)
 {
-	message_summary *Msg = (message_summary*) CTX;
+	message_summary *Msg = (message_summary*) CTX(CTX_MAILSUM);
 	StrBufAppendTemplate(Target, TP, Msg->reply_inreplyto, 0);
 }
 
 int Conditional_MAIL_SUMM_UNREAD(StrBuf *Target, WCTemplputParams *TP)
 {
-	message_summary *Msg = (message_summary*) CTX;
+	message_summary *Msg = (message_summary*) CTX(CTX_MAILSUM);
 	return (Msg->Flags & MSGFLAG_READ) != 0;
 }
 
 void examine_wefw(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
 {
 	wcsession *WCC = WC;
+	long Offset = 0;
+	const char *pOffset;
 
 	CheckConvertBufs(WCC);
 	FreeStrBuf(&Msg->reply_references);
 	Msg->reply_references = NewStrBufPlain(NULL, StrLength(HdrLine));
+	pOffset = strchr(ChrPtr(HdrLine), '/');
+	if (pOffset != NULL) {
+		Offset = pOffset - ChrPtr(HdrLine);
+	}
+	Msg->reply_references_hash = ThreadIdHashOffset(HdrLine, Offset);
 	StrBuf_RFC822_2_Utf8(Msg->reply_references, 
 			     HdrLine, 
 			     WCC->DefaultCharset, 
@@ -361,10 +427,35 @@ void examine_wefw(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
 }
 void tmplput_MAIL_SUMM_REFIDS(StrBuf *Target, WCTemplputParams *TP)
 {
-	message_summary *Msg = (message_summary*) CTX;
+	message_summary *Msg = (message_summary*) CTX(CTX_MAILSUM);
 	StrBufAppendTemplate(Target, TP, Msg->reply_references, 0);
 }
 
+void examine_replyto(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
+{
+	wcsession *WCC = WC;
+
+	CheckConvertBufs(WCC);
+	FreeStrBuf(&Msg->ReplyTo);
+	Msg->ReplyTo = NewStrBufPlain(NULL, StrLength(HdrLine));
+	StrBuf_RFC822_2_Utf8(Msg->ReplyTo, 
+			     HdrLine, 
+			     WCC->DefaultCharset, 
+			     FoundCharset,
+			     WCC->ConvertBuf1,
+			     WCC->ConvertBuf2);
+	if (Msg->AllRcpt == NULL)
+		Msg->AllRcpt = NewStrBufPlain(NULL, StrLength(HdrLine));
+	if (StrLength(Msg->AllRcpt) > 0) {
+		StrBufAppendBufPlain(Msg->AllRcpt, HKEY(", "), 0);
+	}
+	StrBufAppendBuf(Msg->AllRcpt, Msg->ReplyTo, 0);
+}
+void tmplput_MAIL_SUMM_REPLYTO(StrBuf *Target, WCTemplputParams *TP)
+{
+	message_summary *Msg = (message_summary*) CTX(CTX_MAILSUM);
+	StrBufAppendTemplate(Target, TP, Msg->ReplyTo, 0);
+}
 
 void examine_cccc(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
 {
@@ -388,7 +479,7 @@ void examine_cccc(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
 }
 void tmplput_MAIL_SUMM_CCCC(StrBuf *Target, WCTemplputParams *TP)
 {
-	message_summary *Msg = (message_summary*) CTX;
+	message_summary *Msg = (message_summary*) CTX(CTX_MAILSUM);
 	StrBufAppendTemplate(Target, TP, Msg->cccc, 0);
 }
 
@@ -403,7 +494,7 @@ void examine_room(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
 }
 void tmplput_MAIL_SUMM_ORGROOM(StrBuf *Target, WCTemplputParams *TP)
 {
-	message_summary *Msg = (message_summary*) CTX;
+	message_summary *Msg = (message_summary*) CTX(CTX_MAILSUM);
 	StrBufAppendTemplate(Target, TP, Msg->Room, 0);
 }
 
@@ -415,41 +506,38 @@ void examine_rfca(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
 }
 void tmplput_MAIL_SUMM_RFCA(StrBuf *Target, WCTemplputParams *TP)
 {
-	message_summary *Msg = (message_summary*) CTX;
+	message_summary *Msg = (message_summary*) CTX(CTX_MAILSUM);
 	StrBufAppendTemplate(Target, TP, Msg->Rfca, 0);
 }
 int Conditional_MAIL_SUMM_RFCA(StrBuf *Target, WCTemplputParams *TP)
 {
-	message_summary *Msg = (message_summary*) CTX;
+	message_summary *Msg = (message_summary*) CTX(CTX_MAILSUM);
 	return StrLength(Msg->Rfca) > 0;
 }
 int Conditional_MAIL_SUMM_CCCC(StrBuf *Target, WCTemplputParams *TP)
 {
-	message_summary *Msg = (message_summary*) CTX;
+	message_summary *Msg = (message_summary*) CTX(CTX_MAILSUM);
 	return StrLength(Msg->cccc) > 0;
 }
+int Conditional_MAIL_SUMM_REPLYTO(StrBuf *Target, WCTemplputParams *TP)
+{
+	message_summary *Msg = (message_summary*) CTX(CTX_MAILSUM);
+	return StrLength(Msg->ReplyTo) > 0;
+}
 
-void examine_node(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
+void examine_nvto(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
 {
 	wcsession *WCC = WC;
 
-	if ( (StrLength(HdrLine) > 0) &&
-	     ((WC->CurRoom.QRFlags & QR_NETWORK)
-	      || ((strcasecmp(ChrPtr(HdrLine), ChrPtr(WCC->serv_info->serv_nodename))
-		   && (strcasecmp(ChrPtr(HdrLine), ChrPtr(WCC->serv_info->serv_fqdn))))))) {
-		FreeStrBuf(&Msg->OtherNode);
-		Msg->OtherNode = NewStrBufDup(HdrLine);
-	}
-}
-void tmplput_MAIL_SUMM_OTHERNODE(StrBuf *Target, WCTemplputParams *TP)
-{
-	message_summary *Msg = (message_summary*) CTX;
-	StrBufAppendTemplate(Target, TP, Msg->OtherNode, 0);
-}
-int Conditional_MAIL_SUMM_OTHERNODE(StrBuf *Target, WCTemplputParams *TP)
-{
-	message_summary *Msg = (message_summary*) CTX;
-	return StrLength(Msg->OtherNode) > 0;
+	CheckConvertBufs(WCC);
+	FreeStrBuf(&Msg->EnvTo);
+	Msg->EnvTo = NewStrBufPlain(NULL, StrLength(HdrLine));
+	StrBuf_RFC822_2_Utf8(Msg->EnvTo, 
+			     HdrLine, 
+			     WCC->DefaultCharset, 
+			     FoundCharset,
+			     WCC->ConvertBuf1,
+			     WCC->ConvertBuf2);
 }
 
 
@@ -475,22 +563,22 @@ void examine_rcpt(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
 }
 void tmplput_MAIL_SUMM_TO(StrBuf *Target, WCTemplputParams *TP)
 {
-	message_summary *Msg = (message_summary*) CTX;
+	message_summary *Msg = (message_summary*) CTX(CTX_MAILSUM);
 	StrBufAppendTemplate(Target, TP, Msg->to, 0);
 }
 int Conditional_MAIL_SUMM_TO(StrBuf *Target, WCTemplputParams *TP) 
 {
-	message_summary *Msg = (message_summary*) CTX;
+	message_summary *Msg = (message_summary*) CTX(CTX_MAILSUM);
 	return StrLength(Msg->to) != 0;
 }
 int Conditional_MAIL_SUMM_SUBJ(StrBuf *Target, WCTemplputParams *TP) 
 {
-	message_summary *Msg = (message_summary*) CTX;
+	message_summary *Msg = (message_summary*) CTX(CTX_MAILSUM);
 	return StrLength(Msg->subj) != 0;
 }
 void tmplput_MAIL_SUMM_ALLRCPT(StrBuf *Target, WCTemplputParams *TP)
 {
-	message_summary *Msg = (message_summary*) CTX;
+	message_summary *Msg = (message_summary*) CTX(CTX_MAILSUM);
 	StrBufAppendTemplate(Target, TP, Msg->AllRcpt, 0);
 }
 
@@ -513,41 +601,42 @@ void examine_time(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
 void tmplput_MAIL_SUMM_DATE_BRIEF(StrBuf *Target, WCTemplputParams *TP)
 {
 	char datebuf[64];
-	message_summary *Msg = (message_summary*) CTX;
+	message_summary *Msg = (message_summary*) CTX(CTX_MAILSUM);
 	webcit_fmt_date(datebuf, 64, Msg->date, DATEFMT_BRIEF);
 	StrBufAppendBufPlain(Target, datebuf, -1, 0);
 }
 
 void tmplput_MAIL_SUMM_EUID(StrBuf *Target, WCTemplputParams *TP)
 {
-	message_summary *Msg = (message_summary*) CTX;
+	message_summary *Msg = (message_summary*) CTX(CTX_MAILSUM);
 	StrBufAppendTemplate(Target, TP, Msg->euid, 0);
 }
 
 void tmplput_MAIL_SUMM_DATE_FULL(StrBuf *Target, WCTemplputParams *TP)
 {
 	char datebuf[64];
-	message_summary *Msg = (message_summary*) CTX;
+	message_summary *Msg = (message_summary*) CTX(CTX_MAILSUM);
 	webcit_fmt_date(datebuf, 64, Msg->date, DATEFMT_FULL);
 	StrBufAppendBufPlain(Target, datebuf, -1, 0);
 }
 void tmplput_MAIL_SUMM_DATE_NO(StrBuf *Target, WCTemplputParams *TP)
 {
-	message_summary *Msg = (message_summary*) CTX;
+	message_summary *Msg = (message_summary*) CTX(CTX_MAILSUM);
 	StrBufAppendPrintf(Target, "%ld", Msg->date, 0);
 }
 
 
 
-void render_MAIL(wc_mime_attachment *Mime, StrBuf *RawData, StrBuf *FoundCharset)
+void render_MAIL(StrBuf *Target, WCTemplputParams *TP, StrBuf *FoundCharset)
 {
+	wc_mime_attachment *Mime = (wc_mime_attachment *) CTX(CTX_MIME_ATACH);
 	const StrBuf *TemplateMime;
 
 	if (Mime->Data == NULL) 
 		Mime->Data = NewStrBufPlain(NULL, Mime->length);
 	else 
 		FlushStrBuf(Mime->Data);
-	read_message(Mime->Data, HKEY("view_submessage"), Mime->msgnum, Mime->PartNum, &TemplateMime);
+	read_message(Mime->Data, HKEY("view_submessage"), Mime->msgnum, Mime->PartNum, &TemplateMime, TP);
 /*
 	if ( (!IsEmptyStr(mime_submessages)) && (!section[0]) ) {
 		for (i=0; i<num_tokens(mime_submessages, '|'); ++i) {
@@ -561,68 +650,9 @@ void render_MAIL(wc_mime_attachment *Mime, StrBuf *RawData, StrBuf *FoundCharset
 */
 }
 
-void render_MIME_VCard(wc_mime_attachment *Mime, StrBuf *RawData, StrBuf *FoundCharset)
-{
-	wcsession *WCC = WC;
-	if (StrLength(Mime->Data) == 0)
-		MimeLoadData(Mime);
-	if (StrLength(Mime->Data) > 0) {
-		StrBuf *Buf;
-		Buf = NewStrBuf();
-		/** If it's my vCard I can edit it */
-		if (	(!strcasecmp(ChrPtr(WCC->CurRoom.name), USERCONFIGROOM))
-			|| (!strcasecmp(&(ChrPtr(WCC->CurRoom.name)[11]), USERCONFIGROOM))
-			|| (WC->CurRoom.view == VIEW_ADDRESSBOOK)
-			) {
-			StrBufAppendPrintf(Buf, "<a href=\"edit_vcard?msgnum=%ld?partnum=%s\">",
-				Mime->msgnum, ChrPtr(Mime->PartNum));
-			StrBufAppendPrintf(Buf, "[%s]</a>", _("edit"));
-		}
-
-		/* In all cases, display the full card */
-		display_vcard(Buf, Mime, 0, 1, NULL, -1);
-		FreeStrBuf(&Mime->Data);
-		Mime->Data = Buf;
-	}
-
-}
-
-void render_MIME_VNote(wc_mime_attachment *Mime, StrBuf *RawData, StrBuf *FoundCharset)
-{
-	if (StrLength(Mime->Data) == 0)
-		MimeLoadData(Mime);
-	if (StrLength(Mime->Data) > 0) {
-		struct vnote *v;
-		StrBuf *Buf;
-		char *vcard;
-
-		Buf = NewStrBuf();
-		vcard = SmashStrBuf(&Mime->Data);
-		v = vnote_new_from_str(vcard);
-		free (vcard);
-		if (v) {
-			WCTemplputParams TP;
-			
-			memset(&TP, 0, sizeof(WCTemplputParams));
-			TP.Filter.ContextType = CTX_VNOTE;
-			TP.Context = v;
-			DoTemplate(HKEY("mail_vnoteitem"),
-				   Buf, &TP);
-			
-			vnote_free(v);
-			Mime->Data = Buf;
-		}
-		else {
-			if (Mime->Data == NULL)
-				Mime->Data = NewStrBuf();
-			else
-				FlushStrBuf(Mime->Data);
-		}
-	}
-}
-
-void render_MIME_ICS(wc_mime_attachment *Mime, StrBuf *RawData, StrBuf *FoundCharset)
+void render_MIME_ICS(StrBuf *Target, WCTemplputParams *TP, StrBuf *FoundCharset)
 {
+	wc_mime_attachment *Mime = (wc_mime_attachment *) CTX(CTX_MIME_ATACH);
 	if (StrLength(Mime->Data) == 0) {
 		MimeLoadData(Mime);
 	}
@@ -713,8 +743,10 @@ void examine_mime_part(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundChars
 }
 
 
-void evaluate_mime_part(message_summary *Msg, wc_mime_attachment *Mime)
+void evaluate_mime_part(StrBuf *Target, WCTemplputParams *TP)
 {
+	message_summary *Msg = (message_summary*) CTX(CTX_MAILSUM);
+	wc_mime_attachment *Mime = (wc_mime_attachment *) CTX(CTX_MIME_ATACH);
 	void *vMimeRenderer;
 
 	/* just print the root-node */
@@ -755,38 +787,10 @@ void evaluate_mime_part(message_summary *Msg, wc_mime_attachment *Mime)
 
 void tmplput_MAIL_SUMM_NATTACH(StrBuf *Target, WCTemplputParams *TP)
 {
-	message_summary *Msg = (message_summary*) CTX;
+	message_summary *Msg = (message_summary*) CTX(CTX_MAILSUM);
 	StrBufAppendPrintf(Target, "%ld", GetCount(Msg->Attachments));
 }
 
-
-void examine_hnod(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
-{
-	wcsession *WCC = WC;
-
-	CheckConvertBufs(WCC);
-	FreeStrBuf(&Msg->hnod);
-	Msg->hnod = NewStrBufPlain(NULL, StrLength(HdrLine));
-	StrBuf_RFC822_2_Utf8(Msg->hnod, 
-			     HdrLine, 
-			     WCC->DefaultCharset, 
-			     FoundCharset,
-			     WCC->ConvertBuf1,
-			     WCC->ConvertBuf2);
-}
-void tmplput_MAIL_SUMM_H_NODE(StrBuf *Target, WCTemplputParams *TP)
-{
-	message_summary *Msg = (message_summary*) CTX;
-	StrBufAppendTemplate(Target, TP, Msg->hnod, 0);
-}
-int Conditional_MAIL_SUMM_H_NODE(StrBuf *Target, WCTemplputParams *TP)
-{
-	message_summary *Msg = (message_summary*) CTX;
-	return StrLength(Msg->hnod) > 0;
-}
-
-
-
 void examine_text(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
 {
 	if (Msg->MsgBody->Data == NULL)
@@ -809,8 +813,6 @@ void examine_content_lengh(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundC
 
 void examine_content_type(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
 {
-	void *vHdr;
-	headereval *Hdr;
 	StrBuf *Token;
 	StrBuf *Value;
 	const char* sem;
@@ -846,58 +848,92 @@ void examine_content_type(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCh
 			}
 			StrBufTrim(Token);
 
-			if (GetHash(MsgHeaderHandler, SKEY(Token), &vHdr) &&
-			    (vHdr != NULL)) {
-				Hdr = (headereval*)vHdr;
-				Hdr->evaluator(Msg, Value, FoundCharset);
-			}
-			else syslog(1, "don't know how to handle content type sub-header[%s]\n", ChrPtr(Token));
+			if (EvaluateMsgHdr(SKEY(Token), Msg, Value, FoundCharset) < 0)
+				syslog(LOG_WARNING, "don't know how to handle content type sub-header[%s]\n", ChrPtr(Token));
 		}
 		FreeStrBuf(&Token);
 		FreeStrBuf(&Value);
 	}
 }
 
+
+int ReadOneMessageSummary(message_summary *Msg, StrBuf *FoundCharset, StrBuf *Buf)
+{
+	const char *buf;
+	const char *ebuf;
+	int nBuf;
+	long len;
+	
+	serv_printf("MSG0 %ld|1", Msg->msgnum);	/* ask for headers only */
+	
+	StrBuf_ServGetln(Buf);
+	if (GetServerStatus(Buf, NULL) != 1) {
+		return 0;
+	}
+
+	while (len = StrBuf_ServGetln(Buf),
+	       (len >= 0) && 
+	       ((len != 3)  ||
+		strcmp(ChrPtr(Buf), "000")))
+	{
+		buf = ChrPtr(Buf);
+		ebuf = strchr(ChrPtr(Buf), '=');
+		nBuf = ebuf - buf;
+		
+		if (EvaluateMsgHdr(buf, nBuf, Msg, Buf, FoundCharset) < 0)
+			syslog(LOG_INFO, "Don't know how to handle Message Headerline [%s]", ChrPtr(Buf));
+	}
+	return 1;
+}
+
 void tmplput_MAIL_SUMM_N(StrBuf *Target, WCTemplputParams *TP)
 {
-	message_summary *Msg = (message_summary*) CTX;
+	message_summary *Msg = (message_summary*) CTX(CTX_MAILSUM);
 	StrBufAppendPrintf(Target, "%ld", Msg->msgnum);
 }
 
 
 void tmplput_MAIL_SUMM_PERMALINK(StrBuf *Target, WCTemplputParams *TP)
 {
-	message_summary *Msg = (message_summary*) CTX;
-	char perma_link[1024];
+	message_summary *Msg = (message_summary*) CTX(CTX_MAILSUM);
+	StrBuf *perma_link;
+	const StrBuf *View;
 
-	strcpy(perma_link, "/readfwd?go=");
-	urlesc(&perma_link[12], sizeof(perma_link) - 12, (char *)ChrPtr(WC->CurRoom.name) );
-	sprintf(&perma_link[strlen(perma_link)], "?start_reading_at=%ld#%ld", Msg->msgnum, Msg->msgnum);
-	StrBufAppendPrintf(Target, "%s", perma_link);
+	perma_link = NewStrBufPlain(HKEY("/readfwd?go="));
+	StrBufUrlescAppend(perma_link, WC->CurRoom.name, NULL);
+	View = sbstr("view");
+	if (View != NULL) {
+		StrBufAppendBufPlain(perma_link, HKEY("?view="), 0);
+		StrBufAppendBuf(perma_link, View, 0);
+	}
+	StrBufAppendBufPlain(perma_link, HKEY("?start_reading_at="), 0);
+	StrBufAppendPrintf(perma_link, "%ld#%ld", Msg->msgnum, Msg->msgnum);
+	StrBufAppendBuf(Target, perma_link, 0);
+	FreeStrBuf(&perma_link);
 }
 
 
 int Conditional_MAIL_MIME_ALL(StrBuf *Target, WCTemplputParams *TP)
 {
-	message_summary *Msg = (message_summary*) CTX;
+	message_summary *Msg = (message_summary*) CTX(CTX_MAILSUM);
 	return GetCount(Msg->Attachments) > 0;
 }
 
 int Conditional_MAIL_MIME_SUBMESSAGES(StrBuf *Target, WCTemplputParams *TP)
 {
-	message_summary *Msg = (message_summary*) CTX;
+	message_summary *Msg = (message_summary*) CTX(CTX_MAILSUM);
 	return GetCount(Msg->Submessages) > 0;
 }
 
 int Conditional_MAIL_MIME_ATTACHLINKS(StrBuf *Target, WCTemplputParams *TP)
 {
-	message_summary *Msg = (message_summary*) CTX;
+	message_summary *Msg = (message_summary*) CTX(CTX_MAILSUM);
 	return GetCount(Msg->AttachLinks) > 0;
 }
 
 int Conditional_MAIL_MIME_ATTACH(StrBuf *Target, WCTemplputParams *TP)
 {
-	message_summary *Msg = (message_summary*) CTX;
+	message_summary *Msg = (message_summary*) CTX(CTX_MAILSUM);
 	return GetCount(Msg->AllAttach) > 0;
 }
 
@@ -909,7 +945,7 @@ void tmplput_QUOTED_MAIL_BODY(StrBuf *Target, WCTemplputParams *TP)
 
 	MsgNum = LBstr(TKEY(0));
 	Buf = NewStrBuf();
-	read_message(Buf, HKEY("view_message_replyquote"), MsgNum, NULL, &Mime);
+	read_message(Buf, HKEY("view_message_replyquote"), MsgNum, NULL, &Mime, TP);
 	StrBufAppendTemplate(Target, TP, Buf, 1);
 	FreeStrBuf(&Buf);
 }
@@ -922,7 +958,7 @@ void tmplput_EDIT_MAIL_BODY(StrBuf *Target, WCTemplputParams *TP)
 
 	MsgNum = LBstr(TKEY(0));
 	Buf = NewStrBuf();
-	read_message(Buf, HKEY("view_message_edit"), MsgNum, NULL, &Mime);
+	read_message(Buf, HKEY("view_message_edit"), MsgNum, NULL, &Mime, TP);
 	StrBufAppendTemplate(Target, TP, Buf, 1);
 	FreeStrBuf(&Buf);
 }
@@ -938,13 +974,14 @@ void tmplput_EDIT_WIKI_BODY(StrBuf *Target, WCTemplputParams *TP)
 	 * to do it again.
 	 */
 	if (!havebstr("attach_button")) {
-		char *wikipage = strdup(bstr("page"));
+		StrBuf *wikipage = NewStrBufDup(sbstr("page"));
+		putbstr("format", NewStrBufPlain(HKEY("plain")));
 		str_wiki_index(wikipage);
-		msgnum = locate_message_by_uid(wikipage);
-		free(wikipage);
+		msgnum = locate_message_by_uid(ChrPtr(wikipage));
+		FreeStrBuf(&wikipage);
 		if (msgnum >= 0L) {
 			Buf = NewStrBuf();
-			read_message(Buf, HKEY("view_message_wikiedit"), msgnum, NULL, &Mime);
+			read_message(Buf, HKEY("view_message_wikiedit"), msgnum, NULL, &Mime, TP);
 			StrBufAppendTemplate(Target, TP, Buf, 1);
 			FreeStrBuf(&Buf);
 		}
@@ -953,28 +990,30 @@ void tmplput_EDIT_WIKI_BODY(StrBuf *Target, WCTemplputParams *TP)
 
 void tmplput_MAIL_BODY(StrBuf *Target, WCTemplputParams *TP)
 {
-	message_summary *Msg = (message_summary*) CTX;
+	message_summary *Msg = (message_summary*) CTX(CTX_MAILSUM);
 	StrBufAppendTemplate(Target, TP, Msg->MsgBody->Data, 0);
 }
 
 
-void render_MAIL_variformat(wc_mime_attachment *Mime, StrBuf *RawData, StrBuf *FoundCharset)
+void render_MAIL_variformat(StrBuf *Target, WCTemplputParams *TP, StrBuf *FoundCharset)
 {
 	/* Messages in legacy Citadel variformat get handled thusly... */
-	StrBuf *Target = NewStrBufPlain(NULL, StrLength(Mime->Data));
-	FmOut(Target, "JUSTIFY", Mime->Data);
+	wc_mime_attachment *Mime = (wc_mime_attachment *) CTX(CTX_MIME_ATACH);
+	StrBuf *TTarget = NewStrBufPlain(NULL, StrLength(Mime->Data));
+	FmOut(TTarget, "JUSTIFY", Mime->Data);
 	FreeStrBuf(&Mime->Data);
-	Mime->Data = Target;
+	Mime->Data = TTarget;
 }
 
-void render_MAIL_text_plain(wc_mime_attachment *Mime, StrBuf *RawData, StrBuf *FoundCharset)
+void render_MAIL_text_plain(StrBuf *Target, WCTemplputParams *TP, StrBuf *FoundCharset)
 {
+	wc_mime_attachment *Mime = (wc_mime_attachment *) CTX(CTX_MIME_ATACH);
 	const char *ptr, *pte;
 	const char *BufPtr = NULL;
 	StrBuf *Line;
 	StrBuf *Line1;
 	StrBuf *Line2;
-	StrBuf *Target;
+	StrBuf *TTarget;
 	long Linecount;
 	long nEmptyLines;
 	int bn = 0;
@@ -1012,7 +1051,7 @@ void render_MAIL_text_plain(wc_mime_attachment *Mime, StrBuf *RawData, StrBuf *F
 		else {
 			ctdl_iconv_open("UTF-8", ChrPtr(cs), &ic);
 			if (ic == (iconv_t)(-1) ) {
-				syslog(5, "%s:%d iconv_open(UTF-8, %s) failed: %s\n",
+				syslog(LOG_WARNING, "%s:%d iconv_open(UTF-8, %s) failed: %s\n",
 					__FILE__, __LINE__, ChrPtr(Mime->Charset), strerror(errno));
 			}
 		}
@@ -1021,7 +1060,7 @@ void render_MAIL_text_plain(wc_mime_attachment *Mime, StrBuf *RawData, StrBuf *F
 	Line = NewStrBufPlain(NULL, SIZ);
 	Line1 = NewStrBufPlain(NULL, SIZ);
 	Line2 = NewStrBufPlain(NULL, SIZ);
-	Target = NewStrBufPlain(NULL, StrLength(Mime->Data));
+	TTarget = NewStrBufPlain(NULL, StrLength(Mime->Data));
 	Linecount = 0;
 	nEmptyLines = 0;
 	if (StrLength(Mime->Data) > 0) 
@@ -1048,26 +1087,26 @@ void render_MAIL_text_plain(wc_mime_attachment *Mime, StrBuf *RawData, StrBuf *F
 			if (StrLength(Line) == 0) {
 				if (Linecount == 0)
 					continue;
-				StrBufAppendBufPlain(Target, HKEY("<tt></tt><br>\n"), 0);
+				StrBufAppendBufPlain(TTarget, HKEY("<tt></tt><br>\n"), 0);
 
 				nEmptyLines ++;
 				continue;
 			}
 			nEmptyLines = 0;
 			for (i = bn; i < bq; i++)				
-				StrBufAppendBufPlain(Target, HKEY("<blockquote>"), 0);
+				StrBufAppendBufPlain(TTarget, HKEY("<blockquote>"), 0);
 			for (i = bq; i < bn; i++)				
-				StrBufAppendBufPlain(Target, HKEY("</blockquote>"), 0);
+				StrBufAppendBufPlain(TTarget, HKEY("</blockquote>"), 0);
 #ifdef HAVE_ICONV
 			if (ConvertIt) {
 				StrBufConvert(Line, Line1, &ic);
 			}
 #endif
-			StrBufAppendBufPlain(Target, HKEY("<tt>"), 0);
+			StrBufAppendBufPlain(TTarget, HKEY("<tt>"), 0);
 			UrlizeText(Line1, Line, Line2);
 
-			StrEscAppend(Target, Line1, NULL, 0, 0);
-			StrBufAppendBufPlain(Target, HKEY("</tt><br>\n"), 0);
+			StrEscAppend(TTarget, Line1, NULL, 0, 0);
+			StrBufAppendBufPlain(TTarget, HKEY("</tt><br>\n"), 0);
 			bn = bq;
 			Linecount ++;
 		}
@@ -1075,11 +1114,11 @@ void render_MAIL_text_plain(wc_mime_attachment *Mime, StrBuf *RawData, StrBuf *F
 	       (BufPtr != NULL));
 
 	if (nEmptyLines > 0)
-		StrBufCutRight(Target, nEmptyLines * (sizeof ("<tt></tt><br>\n") - 1));
+		StrBufCutRight(TTarget, nEmptyLines * (sizeof ("<tt></tt><br>\n") - 1));
 	for (i = 0; i < bn; i++)				
-		StrBufAppendBufPlain(Target, HKEY("</blockquote>"), 0);
+		StrBufAppendBufPlain(TTarget, HKEY("</blockquote>"), 0);
 
-	StrBufAppendBufPlain(Target, HKEY("</i><br>"), 0);
+	StrBufAppendBufPlain(TTarget, HKEY("</i><br>"), 0);
 #ifdef HAVE_ICONV
 	if (ic != (iconv_t)(-1) ) {
 		iconv_close(ic);
@@ -1087,7 +1126,7 @@ void render_MAIL_text_plain(wc_mime_attachment *Mime, StrBuf *RawData, StrBuf *F
 #endif
 
 	FreeStrBuf(&Mime->Data);
-	Mime->Data = Target;
+	Mime->Data = TTarget;
 	FlushStrBuf(Mime->ContentType);
 	StrBufAppendBufPlain(Mime->ContentType, HKEY("text/html"), 0);
 	FlushStrBuf(Mime->Charset);
@@ -1097,8 +1136,9 @@ void render_MAIL_text_plain(wc_mime_attachment *Mime, StrBuf *RawData, StrBuf *F
 	FreeStrBuf(&Line2);
 }
 
-void render_MAIL_html(wc_mime_attachment *Mime, StrBuf *RawData, StrBuf *FoundCharset)
+void render_MAIL_html(StrBuf *Target, WCTemplputParams *TP, StrBuf *FoundCharset)
 {
+	wc_mime_attachment *Mime = (wc_mime_attachment *) CTX(CTX_MIME_ATACH);
 	StrBuf *Buf;
 
 	if (StrLength(Mime->Data) == 0)
@@ -1115,8 +1155,10 @@ void render_MAIL_html(wc_mime_attachment *Mime, StrBuf *RawData, StrBuf *FoundCh
 	Mime->Data = Buf;
 }
 
-void render_MAIL_UNKNOWN(wc_mime_attachment *Mime, StrBuf *RawData, StrBuf *FoundCharset)
+
+void render_MAIL_UNKNOWN(StrBuf *Target, WCTemplputParams *TP, StrBuf *FoundCharset)
 {
+	wc_mime_attachment *Mime = (wc_mime_attachment *) CTX(CTX_MIME_ATACH);
 	/* Unknown weirdness */
 	FlushStrBuf(Mime->Data);
 	StrBufAppendBufPlain(Mime->Data, _("I don't know how to display "), -1, 0);
@@ -1127,58 +1169,58 @@ void render_MAIL_UNKNOWN(wc_mime_attachment *Mime, StrBuf *RawData, StrBuf *Foun
 
 HashList *iterate_get_mime_All(StrBuf *Target, WCTemplputParams *TP)
 {
-	message_summary *Msg = (message_summary*) CTX;
+	message_summary *Msg = (message_summary*) CTX(CTX_MAILSUM);
 	return Msg->Attachments;
 }
 HashList *iterate_get_mime_Submessages(StrBuf *Target, WCTemplputParams *TP)
 {
-	message_summary *Msg = (message_summary*) CTX;
+	message_summary *Msg = (message_summary*) CTX(CTX_MAILSUM);
 	return Msg->Submessages;
 }
 HashList *iterate_get_mime_AttachLinks(StrBuf *Target, WCTemplputParams *TP)
 {
-	message_summary *Msg = (message_summary*) CTX;
+	message_summary *Msg = (message_summary*) CTX(CTX_MAILSUM);
 	return Msg->AttachLinks;
 }
 HashList *iterate_get_mime_Attachments(StrBuf *Target, WCTemplputParams *TP)
 {
-	message_summary *Msg = (message_summary*) CTX;
+	message_summary *Msg = (message_summary*) CTX(CTX_MAILSUM);
 	return Msg->AllAttach;
 }
 
 void tmplput_MIME_Name(StrBuf *Target, WCTemplputParams *TP)
 {
-	wc_mime_attachment *mime = (wc_mime_attachment*) CTX;
+	wc_mime_attachment *mime = (wc_mime_attachment*) CTX(CTX_MIME_ATACH);
 	StrBufAppendTemplate(Target, TP, mime->Name, 0);
 }
 
 void tmplput_MIME_FileName(StrBuf *Target, WCTemplputParams *TP)
 {
-	wc_mime_attachment *mime = (wc_mime_attachment*) CTX;
+	wc_mime_attachment *mime = (wc_mime_attachment*) CTX(CTX_MIME_ATACH);
 	StrBufAppendTemplate(Target, TP, mime->FileName, 0);
 }
 
 void tmplput_MIME_PartNum(StrBuf *Target, WCTemplputParams *TP)
 {
-	wc_mime_attachment *mime = (wc_mime_attachment*) CTX;
+	wc_mime_attachment *mime = (wc_mime_attachment*) CTX(CTX_MIME_ATACH);
 	StrBufAppendTemplate(Target, TP, mime->PartNum, 0);
 }
 
 void tmplput_MIME_MsgNum(StrBuf *Target, WCTemplputParams *TP)
 {
-	wc_mime_attachment *mime = (wc_mime_attachment*) CTX;
+	wc_mime_attachment *mime = (wc_mime_attachment*) CTX(CTX_MIME_ATACH);
 	StrBufAppendPrintf(Target, "%ld", mime->msgnum);
 }
 
 void tmplput_MIME_Disposition(StrBuf *Target, WCTemplputParams *TP)
 {
-	wc_mime_attachment *mime = (wc_mime_attachment*) CTX;
+	wc_mime_attachment *mime = (wc_mime_attachment*) CTX(CTX_MIME_ATACH);
 	StrBufAppendTemplate(Target, TP, mime->Disposition, 0);
 }
 
 void tmplput_MIME_ContentType(StrBuf *Target, WCTemplputParams *TP)
 {
-	wc_mime_attachment *mime = (wc_mime_attachment*) CTX;
+	wc_mime_attachment *mime = (wc_mime_attachment*) CTX(CTX_MIME_ATACH);
 	StrBufAppendTemplate(Target, TP, mime->ContentType, 0);
 }
 
@@ -1189,15 +1231,15 @@ void examine_charset(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset
 
 void tmplput_MIME_Charset(StrBuf *Target, WCTemplputParams *TP)
 {
-	wc_mime_attachment *mime = (wc_mime_attachment*) CTX;
+	wc_mime_attachment *mime = (wc_mime_attachment*) CTX(CTX_MIME_ATACH);
 	StrBufAppendTemplate(Target, TP, mime->Charset, 0);
 }
 
 void tmplput_MIME_Data(StrBuf *Target, WCTemplputParams *TP)
 {
-	wc_mime_attachment *mime = (wc_mime_attachment*) CTX;
+	wc_mime_attachment *mime = (wc_mime_attachment*) CTX(CTX_MIME_ATACH);
 	if (mime->Renderer != NULL)
-		mime->Renderer->f(mime, NULL, NULL);
+		mime->Renderer->f(Target, TP, NULL);
 	StrBufAppendTemplate(Target, TP, mime->Data, 0);
 	/* TODO: check whether we need to load it now? */
 }
@@ -1205,7 +1247,7 @@ void tmplput_MIME_Data(StrBuf *Target, WCTemplputParams *TP)
 void tmplput_MIME_LoadData(StrBuf *Target, WCTemplputParams *TP)
 {
 	wcsession *WCC = WC;	
-	wc_mime_attachment *mime = (wc_mime_attachment*) CTX;
+	wc_mime_attachment *mime = (wc_mime_attachment*) CTX(CTX_MIME_ATACH);
 	wc_mime_attachment *att;
 	
 	if (( (!strcasecmp(ChrPtr(mime->Disposition), "inline"))||
@@ -1233,7 +1275,7 @@ void tmplput_MIME_LoadData(StrBuf *Target, WCTemplputParams *TP)
 
 void tmplput_MIME_Length(StrBuf *Target, WCTemplputParams *TP)
 {
-	wc_mime_attachment *mime = (wc_mime_attachment*) CTX;
+	wc_mime_attachment *mime = (wc_mime_attachment*) CTX(CTX_MIME_ATACH);
 	StrBufAppendPrintf(Target, "%ld", mime->length);
 }
 
@@ -1294,157 +1336,54 @@ readloop_struct rlid[] = {
 	{ {HKEY("readlt")},	servcmd_readlt		}
 };
 
+const char* fieldMnemonics[] = {
+	"from", /* A -> eAuthor       */
+	"exti", /* E -> eXclusivID    */
+	"rfca", /* F -> erFc822Addr   */
+	"msgn", /* I -> emessageId    */
+	"jrnl", /* J -> eJournal      */
+	"rep2", /* K -> eReplyTo      */
+	"list", /* L -> eListID       */
+	"text", /* M -> eMesageText   */
+	"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   */
+	"nhdr", /* % -> eHeaderOnly   */
+	"type", /* % -> eFormatType   */
+	"part", /* % -> eMessagePart  */
+	"suff", /* % -> eSubFolder    */
+	"pref"  /* % -> ePevious      */
+};
+HashList *msgKeyLookup = NULL;
 
-int ParseMessageListHeaders_Detail(StrBuf *Line, 
-				   const char **pos, 
-				   message_summary *Msg, 
-				   StrBuf *ConversionBuffer)
+int GetFieldFromMnemonic(eMessageField *f, const char* c)
 {
-	wcsession *WCC = WC;
-	long len;
-	long totallen;
-
-	CheckConvertBufs(WCC);
-
-	totallen = StrLength(Line);
-	Msg->from = NewStrBufPlain(NULL, totallen);
-	len = StrBufExtract_NextToken(ConversionBuffer, Line, pos, '|');
-	if (len > 0) {
-		/* Handle senders with RFC2047 encoding */
-		StrBuf_RFC822_2_Utf8(Msg->from, 
-				     ConversionBuffer, 
-				     WCC->DefaultCharset, 
-				     NULL, 
-				     WCC->ConvertBuf1,
-				     WCC->ConvertBuf2);
-	}
-			
-	/* node name */
-	len = StrBufExtract_NextToken(ConversionBuffer, Line, pos, '|');
-	if ((len > 0 ) &&
-	    ( ((WCC->CurRoom.QRFlags & QR_NETWORK)
-	       || ((strcasecmp(ChrPtr(ConversionBuffer), ChrPtr(WCC->serv_info->serv_nodename))
-		    && (strcasecmp(ChrPtr(ConversionBuffer), ChrPtr(WCC->serv_info->serv_fqdn))))))))
-	{
-		StrBufAppendBufPlain(Msg->from, HKEY(" @ "), 0);
-		StrBufAppendBuf(Msg->from, ConversionBuffer, 0);
+	void *v = NULL;
+	if (GetHash(msgKeyLookup, c, 4, &v)) {
+		*f = (eMessageField) v;
+		return 1;
 	}
-
-	/* Internet address (not used)
-	 *	StrBufExtract_token(Msg->inetaddr, Line, 4, '|');
-	 */
-	StrBufSkip_NTokenS(Line, pos, '|', 1);
-	Msg->subj = NewStrBufPlain(NULL, totallen);
-
-	FlushStrBuf(ConversionBuffer);
-	/* we assume the subject is the last parameter inside of the list; 
-	 * thus we don't use the tokenizer to fetch it, since it will hick up 
-	 * on tokenizer chars inside of the subjects
-	StrBufExtract_NextToken(ConversionBuffer,  Line, pos, '|');
-	*/
-	len = 0;
-	if (*pos != StrBufNOTNULL) {
-		len = totallen - (*pos - ChrPtr(Line));
-		StrBufPlain(ConversionBuffer, *pos, len);
-		*pos = StrBufNOTNULL;
-		if ((len > 0) &&
-		    (*(ChrPtr(ConversionBuffer) + len - 1) == '|'))
-			StrBufCutRight(ConversionBuffer, 1);
-	}
-
-	if (len == 0)
-		StrBufAppendBufPlain(Msg->subj, _("(no subject)"), -1,0);
-	else {
-		StrBuf_RFC822_2_Utf8(Msg->subj, 
-				     ConversionBuffer, 
-				     WCC->DefaultCharset, 
-				     NULL,
-				     WCC->ConvertBuf1,
-				     WCC->ConvertBuf2);
-	}
-
-	return 1;
-}
-
-
-int mailview_GetParamsGetServerCall(SharedMessageStatus *Stat, 
-				    void **ViewSpecific, 
-				    long oper, 
-				    char *cmd, 
-				    long len,
-				    char *filter,
-				    long flen)
-{
-	DoTemplate(HKEY("msg_listview"),NULL,&NoCtx);
-
-	return 200;
-}
-
-int mailview_Cleanup(void **ViewSpecific)
-{
-	/* Note: wDumpContent() will output one additional </div> tag. */
-	/* We ought to move this out into template */
-	wDumpContent(1);
-
-	return 0;
-}
-
-
-int json_GetParamsGetServerCall(SharedMessageStatus *Stat, 
-				void **ViewSpecific, 
-				long oper, 
-				char *cmd, 
-				long len,
-				char *filter,
-				long flen)
-{
-	Stat->defaultsortorder = 2;
-	Stat->sortit = 1;
-	Stat->load_seen = 1;
-	/* Generally using maxmsgs|startmsg is not required
-	   in mailbox view, but we have a 'safemode' for clients
-	   (*cough* Exploder) that simply can't handle too many */
-	if (havebstr("maxmsgs"))  Stat->maxmsgs  = ibstr("maxmsgs");
-	else                      Stat->maxmsgs  = 9999999;
-	if (havebstr("startmsg")) Stat->startmsg = lbstr("startmsg");
-	snprintf(cmd, len, "MSGS %s|%s||1",
-		 (oper == do_search) ? "SEARCH" : "ALL",
-		 (oper == do_search) ? bstr("query") : ""
-		);
-
-	return 200;
-}
-int json_MessageListHdr(SharedMessageStatus *Stat, void **ViewSpecific) 
-{
-	/* TODO: make a generic function */
-	hprintf("HTTP/1.1 200 OK\r\n");
-	hprintf("Content-type: application/json; charset=utf-8\r\n");
-	hprintf("Server: %s / %s\r\n", PACKAGE_STRING, ChrPtr(WC->serv_info->serv_software));
-	hprintf("Connection: close\r\n");
-	hprintf("Pragma: no-cache\r\nCache-Control: no-store\r\nExpires:-1\r\n");
-	begin_burst();
 	return 0;
 }
 
-int json_RenderView_or_Tail(SharedMessageStatus *Stat, 
-			    void **ViewSpecific, 
-			    long oper)
+void FillMsgKeyLookupTable(void)
 {
-	WCTemplputParams SubTP;
+	long i = 0;
 
-	memset(&SubTP, 0, sizeof(WCTemplputParams));
-	DoTemplate(HKEY("mailsummary_json"),NULL, &SubTP);
-	
-	return 0;
-}
+	msgKeyLookup = NewHash (1, FourHash);
 
-int json_Cleanup(void **ViewSpecific)
-{
-	/* Note: wDumpContent() will output one additional </div> tag. */
-	/* We ought to move this out into template */
-	end_burst();
-
-	return 0;
+	while (i != eLastHeader) {
+		if (fieldMnemonics[i] != NULL) {
+			Put(msgKeyLookup, fieldMnemonics[i], 4, (void*)i, reference_free_handler);
+		}
+		i++;
+	}
 }
 
 
@@ -1453,25 +1392,8 @@ void
 InitModule_MSGRENDERERS
 (void)
 {
-	RegisterReadLoopHandlerset(
-		VIEW_MAILBOX,
-		mailview_GetParamsGetServerCall,
-		NULL, /* TODO: is this right? */
-		NULL,
-		ParseMessageListHeaders_Detail,
-		NULL,
-		NULL,
-		mailview_Cleanup);
-
-	RegisterReadLoopHandlerset(
-		VIEW_JSON_LIST,
-		json_GetParamsGetServerCall,
-		json_MessageListHdr,
-		NULL, /* TODO: is this right? */
-		ParseMessageListHeaders_Detail,
-		NULL,
-		json_RenderView_or_Tail,
-		json_Cleanup);
+	RegisterCTX(CTX_MAILSUM);
+	RegisterCTX(CTX_MIME_ATACH);
 
 	RegisterSortFunc(HKEY("date"), 
 			 NULL, 0,
@@ -1508,32 +1430,30 @@ InitModule_MSGRENDERERS
 	RegisterNamespace("MAIL:SUMM:SUBJECT", 0, 4, tmplput_MAIL_SUMM_SUBJECT,  NULL, CTX_MAILSUM);
 	RegisterNamespace("MAIL:SUMM:NTATACH", 0, 0, tmplput_MAIL_SUMM_NATTACH,  NULL, CTX_MAILSUM);
 	RegisterNamespace("MAIL:SUMM:CCCC", 0, 2, tmplput_MAIL_SUMM_CCCC, NULL, CTX_MAILSUM);
-	RegisterNamespace("MAIL:SUMM:H_NODE", 0, 2, tmplput_MAIL_SUMM_H_NODE,  NULL, CTX_MAILSUM);
+	RegisterNamespace("MAIL:SUMM:REPLYTO", 0, 2, tmplput_MAIL_SUMM_REPLYTO, NULL, CTX_MAILSUM);
 	RegisterNamespace("MAIL:SUMM:ALLRCPT", 0, 2, tmplput_MAIL_SUMM_ALLRCPT,  NULL, CTX_MAILSUM);
 	RegisterNamespace("MAIL:SUMM:ORGROOM", 0, 2, tmplput_MAIL_SUMM_ORGROOM,  NULL, CTX_MAILSUM);
 	RegisterNamespace("MAIL:SUMM:RFCA", 0, 2, tmplput_MAIL_SUMM_RFCA, NULL, CTX_MAILSUM);
-	RegisterNamespace("MAIL:SUMM:OTHERNODE", 2, 0, tmplput_MAIL_SUMM_OTHERNODE,  NULL, CTX_MAILSUM);
 	RegisterNamespace("MAIL:SUMM:REFIDS", 0, 1, tmplput_MAIL_SUMM_REFIDS,  NULL, CTX_MAILSUM);
 	RegisterNamespace("MAIL:SUMM:INREPLYTO", 0, 2, tmplput_MAIL_SUMM_INREPLYTO,  NULL, CTX_MAILSUM);
 	RegisterNamespace("MAIL:BODY", 0, 2, tmplput_MAIL_BODY,  NULL, CTX_MAILSUM);
 	RegisterNamespace("MAIL:QUOTETEXT", 1, 2, tmplput_QUOTED_MAIL_BODY,  NULL, CTX_NONE);
 	RegisterNamespace("MAIL:EDITTEXT", 1, 2, tmplput_EDIT_MAIL_BODY,  NULL, CTX_NONE);
 	RegisterNamespace("MAIL:EDITWIKI", 1, 2, tmplput_EDIT_WIKI_BODY,  NULL, CTX_NONE);
-	RegisterConditional(HKEY("COND:MAIL:SUMM:RFCA"), 0, Conditional_MAIL_SUMM_RFCA,  CTX_MAILSUM);
-	RegisterConditional(HKEY("COND:MAIL:SUMM:CCCC"), 0, Conditional_MAIL_SUMM_CCCC,  CTX_MAILSUM);
-	RegisterConditional(HKEY("COND:MAIL:SUMM:UNREAD"), 0, Conditional_MAIL_SUMM_UNREAD, CTX_MAILSUM);
-	RegisterConditional(HKEY("COND:MAIL:SUMM:H_NODE"), 0, Conditional_MAIL_SUMM_H_NODE, CTX_MAILSUM);
-	RegisterConditional(HKEY("COND:MAIL:SUMM:OTHERNODE"), 0, Conditional_MAIL_SUMM_OTHERNODE, CTX_MAILSUM);
-	RegisterConditional(HKEY("COND:MAIL:SUMM:SUBJECT"), 0, Conditional_MAIL_SUMM_SUBJECT, CTX_MAILSUM);
-	RegisterConditional(HKEY("COND:MAIL:ANON"), 0, Conditional_ANONYMOUS_MESSAGE, CTX_MAILSUM);
-	RegisterConditional(HKEY("COND:MAIL:TO"), 0, Conditional_MAIL_SUMM_TO, CTX_MAILSUM);	
-	RegisterConditional(HKEY("COND:MAIL:SUBJ"), 0, Conditional_MAIL_SUMM_SUBJ, CTX_MAILSUM);	
+	RegisterConditional("COND:MAIL:SUMM:RFCA", 0, Conditional_MAIL_SUMM_RFCA,  CTX_MAILSUM);
+	RegisterConditional("COND:MAIL:SUMM:CCCC", 0, Conditional_MAIL_SUMM_CCCC,  CTX_MAILSUM);
+	RegisterConditional("COND:MAIL:SUMM:REPLYTO", 0, Conditional_MAIL_SUMM_REPLYTO,  CTX_MAILSUM);
+	RegisterConditional("COND:MAIL:SUMM:UNREAD", 0, Conditional_MAIL_SUMM_UNREAD, CTX_MAILSUM);
+	RegisterConditional("COND:MAIL:SUMM:SUBJECT", 0, Conditional_MAIL_SUMM_SUBJECT, CTX_MAILSUM);
+	RegisterConditional("COND:MAIL:ANON", 0, Conditional_ANONYMOUS_MESSAGE, CTX_MAILSUM);
+	RegisterConditional("COND:MAIL:TO", 0, Conditional_MAIL_SUMM_TO, CTX_MAILSUM);	
+	RegisterConditional("COND:MAIL:SUBJ", 0, Conditional_MAIL_SUMM_SUBJ, CTX_MAILSUM);	
 
 	/* do we have mimetypes to iterate over? */
-	RegisterConditional(HKEY("COND:MAIL:MIME:ATTACH"), 0, Conditional_MAIL_MIME_ALL, CTX_MAILSUM);
-	RegisterConditional(HKEY("COND:MAIL:MIME:ATTACH:SUBMESSAGES"), 0, Conditional_MAIL_MIME_SUBMESSAGES, CTX_MAILSUM);
-	RegisterConditional(HKEY("COND:MAIL:MIME:ATTACH:LINKS"), 0, Conditional_MAIL_MIME_ATTACHLINKS, CTX_MAILSUM);
-	RegisterConditional(HKEY("COND:MAIL:MIME:ATTACH:ATT"), 0, Conditional_MAIL_MIME_ATTACH, CTX_MAILSUM);
+	RegisterConditional("COND:MAIL:MIME:ATTACH", 0, Conditional_MAIL_MIME_ALL, CTX_MAILSUM);
+	RegisterConditional("COND:MAIL:MIME:ATTACH:SUBMESSAGES", 0, Conditional_MAIL_MIME_SUBMESSAGES, CTX_MAILSUM);
+	RegisterConditional("COND:MAIL:MIME:ATTACH:LINKS", 0, Conditional_MAIL_MIME_ATTACHLINKS, CTX_MAILSUM);
+	RegisterConditional("COND:MAIL:MIME:ATTACH:ATT", 0, Conditional_MAIL_MIME_ATTACH, CTX_MAILSUM);
 	RegisterIterator("MAIL:MIME:ATTACH", 0, NULL, iterate_get_mime_All, 
 			 NULL, NULL, CTX_MIME_ATACH, CTX_MAILSUM, IT_NOFLAG);
 	RegisterIterator("MAIL:MIME:ATTACH:SUBMESSAGES", 0, NULL, iterate_get_mime_Submessages, 
@@ -1564,30 +1484,31 @@ InitModule_MSGRENDERERS
 
 	/* mime renderers translate an attachment into webcit viewable html text */
 	RegisterMimeRenderer(HKEY("message/rfc822"), render_MAIL, 0, 150);
-	RegisterMimeRenderer(HKEY("text/vnote"), render_MIME_VNote, 1, 300);
-	RegisterMimeRenderer(HKEY("text/x-vcard"), render_MIME_VCard, 1, 201);
-	RegisterMimeRenderer(HKEY("text/vcard"), render_MIME_VCard, 1, 200);
+//*
 	RegisterMimeRenderer(HKEY("text/calendar"), render_MIME_ICS, 1, 501);
 	RegisterMimeRenderer(HKEY("application/ics"), render_MIME_ICS, 1, 500);
+//*/
 	RegisterMimeRenderer(HKEY("text/x-citadel-variformat"), render_MAIL_variformat, 1, 2);
 	RegisterMimeRenderer(HKEY("text/plain"), render_MAIL_text_plain, 1, 3);
 	RegisterMimeRenderer(HKEY("text"), render_MAIL_text_plain, 1, 1);
+	RegisterMimeRenderer(HKEY("text/x-markdown"), render_MAIL_text_plain, 1, 1);
 	RegisterMimeRenderer(HKEY("text/html"), render_MAIL_html, 1, 100);
 	RegisterMimeRenderer(HKEY(""), render_MAIL_UNKNOWN, 0, 0);
 
 	/* these headers are citserver replies to MSG4 and friends. one evaluator for each */
 	RegisterMsgHdr(HKEY("nhdr"), examine_nhdr, 0);
+	RegisterMsgHdr(HKEY("exti"), examine_exti, 0);
 	RegisterMsgHdr(HKEY("type"), examine_type, 0);
 	RegisterMsgHdr(HKEY("from"), examine_from, 0);
 	RegisterMsgHdr(HKEY("subj"), examine_subj, 0);
 	RegisterMsgHdr(HKEY("msgn"), examine_msgn, 0);
 	RegisterMsgHdr(HKEY("wefw"), examine_wefw, 0);
 	RegisterMsgHdr(HKEY("cccc"), examine_cccc, 0);
-	RegisterMsgHdr(HKEY("hnod"), examine_hnod, 0);
+	RegisterMsgHdr(HKEY("rep2"), examine_replyto, 0);
 	RegisterMsgHdr(HKEY("room"), examine_room, 0);
 	RegisterMsgHdr(HKEY("rfca"), examine_rfca, 0);
-	RegisterMsgHdr(HKEY("node"), examine_node, 0);
 	RegisterMsgHdr(HKEY("rcpt"), examine_rcpt, 0);
+	RegisterMsgHdr(HKEY("nvto"), examine_nvto, 0);
 	RegisterMsgHdr(HKEY("time"), examine_time, 0);
 	RegisterMsgHdr(HKEY("part"), examine_mime_part, 0);
 	RegisterMsgHdr(HKEY("text"), examine_text, 1);
@@ -1615,22 +1536,28 @@ void
 ServerStartModule_MSGRENDERERS
 (void)
 {
+	DflMsgHeaderHandler = NewHash (1, FourHash);
+	DflEnumMsgHeaderHandler = NewHash (1, Flathash);
 	MsgHeaderHandler = NewHash(1, NULL);
 	MimeRenderHandler = NewHash(1, NULL);
 	ReadLoopHandler = NewHash(1, NULL);
+	FillMsgKeyLookupTable();
 }
 
 void 
 ServerShutdownModule_MSGRENDERERS
 (void)
 {
+	DeleteHash(&DflMsgHeaderHandler);
+	DeleteHash(&DflEnumMsgHeaderHandler);
+
+
 	DeleteHash(&MsgHeaderHandler);
 	DeleteHash(&MimeRenderHandler);
 	DeleteHash(&ReadLoopHandler);
+	DeleteHash(&msgKeyLookup);
 }
 
-
-
 void 
 SessionDestroyModule_MSGRENDERERS
 (wcsession *sess)