X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fmsg_renderers.c;h=97b454abdbdf3cfa4f1ee2c4361f3ca6503c2eff;hb=b73b5cda73bc2a5f5fa77a9caee5a542ad1c1475;hp=15c8b953de6d07ca0a91963de6b9ec19b0ebfd7c;hpb=e5dbdd7196774114456ef1cf7e77933b8430bc41;p=citadel.git

diff --git a/webcit/msg_renderers.c b/webcit/msg_renderers.c
index 15c8b953d..97b454abd 100644
--- a/webcit/msg_renderers.c
+++ b/webcit/msg_renderers.c
@@ -1,8 +1,7 @@
-/*----------------------------------------------------------------------------*/
 #include "webcit.h"
 #include "webserver.h"
 
-/**
+/*
  * message index functions
  */
 
@@ -63,14 +62,18 @@ void RegisterMsgHdr(const char *HeaderName, long HdrNLen, ExamineMsgHeaderFunc e
 
 void RegisterMimeRenderer(const char *HeaderName, long HdrNLen, RenderMimeFunc MimeRenderer)
 {
-	Put(MimeRenderHandler, HeaderName, HdrNLen, MimeRenderer, reference_free_handler);
+	RenderMimeFuncStruct *f;
+
+	f = (RenderMimeFuncStruct*) malloc(sizeof(RenderMimeFuncStruct));
+	f->f = MimeRenderer;
+	Put(MimeRenderHandler, HeaderName, HdrNLen, f, NULL);
 	
 }
 
 /*----------------------------------------------------------------------------*/
 
 /*
- * qsort() compatible function to compare two longs in descending order.
+ *  comparator for two longs in descending order.
  */
 int longcmp_r(const void *s1, const void *s2) {
 	long l1;
@@ -85,7 +88,7 @@ int longcmp_r(const void *s1, const void *s2) {
 }
 
 /*
- * qsort() compatible function to compare two longs in descending order.
+ *  comparator for longs; descending order.
  */
 int qlongcmp_r(const void *s1, const void *s2) {
 	long l1 = (long) s1;
@@ -98,7 +101,7 @@ int qlongcmp_r(const void *s1, const void *s2) {
 
  
 /*
- * qsort() compatible function to compare two message summary structs by ascending subject.
+ * comparator for message summary structs by ascending subject.
  */
 int summcmp_subj(const void *s1, const void *s2) {
 	message_summary *summ1;
@@ -110,7 +113,7 @@ int summcmp_subj(const void *s1, const void *s2) {
 }
 
 /*
- * qsort() compatible function to compare two message summary structs by descending subject.
+ * comparator for message summary structs by descending subject.
  */
 int summcmp_rsubj(const void *s1, const void *s2) {
 	message_summary *summ1;
@@ -120,9 +123,20 @@ int summcmp_rsubj(const void *s1, const void *s2) {
 	summ2 = (message_summary *)GetSearchPayload(s2);
 	return strcasecmp(ChrPtr(summ2->subj), ChrPtr(summ1->subj));
 }
+/*
+ * comparator for message summary structs by descending subject.
+ */
+int groupchange_subj(const void *s1, const void *s2) {
+	message_summary *summ1;
+	message_summary *summ2;
+	
+	summ1 = (message_summary *)s1;
+	summ2 = (message_summary *)s2;
+	return ChrPtr(summ2->subj)[0] != ChrPtr(summ1->subj)[0];
+}
 
 /*
- * qsort() compatible function to compare two message summary structs by ascending sender.
+ * comparator for message summary structs by ascending sender.
  */
 int summcmp_sender(const void *s1, const void *s2) {
 	message_summary *summ1;
@@ -134,7 +148,7 @@ int summcmp_sender(const void *s1, const void *s2) {
 }
 
 /*
- * qsort() compatible function to compare two message summary structs by descending sender.
+ * comparator for message summary structs by descending sender.
  */
 int summcmp_rsender(const void *s1, const void *s2) {
 	message_summary *summ1;
@@ -144,9 +158,21 @@ int summcmp_rsender(const void *s1, const void *s2) {
 	summ2 = (message_summary *)GetSearchPayload(s2);
 	return strcasecmp(ChrPtr(summ2->from), ChrPtr(summ1->from));
 }
+/*
+ * comparator for message summary structs by descending sender.
+ */
+int groupchange_sender(const void *s1, const void *s2) {
+	message_summary *summ1;
+	message_summary *summ2;
+	
+	summ1 = (message_summary *)s1;
+	summ2 = (message_summary *)s2;
+	return strcasecmp(ChrPtr(summ2->from), ChrPtr(summ1->from)) != 0;
+
+}
 
 /*
- * qsort() compatible function to compare two message summary structs by ascending date.
+ * comparator for message summary structs by ascending date.
  */
 int summcmp_date(const void *s1, const void *s2) {
 	message_summary *summ1;
@@ -161,7 +187,7 @@ int summcmp_date(const void *s1, const void *s2) {
 }
 
 /*
- * qsort() compatible function to compare two message summary structs by descending date.
+ * comparator for message summary structs by descending date.
  */
 int summcmp_rdate(const void *s1, const void *s2) {
 	message_summary *summ1;
@@ -175,11 +201,30 @@ int summcmp_rdate(const void *s1, const void *s2) {
 	else return 0;
 }
 
+/*
+ * comparator for message summary structs by descending date.
+ */
+const long DAYSECONDS = 24 * 60 * 60;
+int groupchange_date(const void *s1, const void *s2) {
+	message_summary *summ1;
+	message_summary *summ2;
+	
+	summ1 = (message_summary *)s1;
+	summ2 = (message_summary *)s2;
+
+	return (summ1->date % DAYSECONDS) != (summ2->date %DAYSECONDS);
+}
+
+
 /*----------------------------------------------------------------------------*/
 /* Don't wanna know... or? */
 void examine_pref(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset) {return;}
 void examine_suff(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset) {return;}
 void examine_path(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset) {return;}
+void examine_content_encoding(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
+{
+/* TODO: do we care? */
+}
 
 void examine_nhdr(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
 {
@@ -187,13 +232,12 @@ void examine_nhdr(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
 	if (!strncasecmp(ChrPtr(HdrLine), "yes", 8))
 		Msg->nhdr = 1;
 }
-int Conditional_ANONYMOUS_MESSAGE(WCTemplateToken *Tokens, void *Context, int ContextType)
+int Conditional_ANONYMOUS_MESSAGE(StrBuf *Target, WCTemplputParams *TP)
 {
-	message_summary *Msg = (message_summary*) Context;
+	message_summary *Msg = (message_summary*) CTX;
 	return Msg->nhdr != 0;
 }
 
-
 void examine_type(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
 {
 	Msg->format_type = StrToi(HdrLine);
@@ -206,10 +250,10 @@ void examine_from(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
 	Msg->from = NewStrBufPlain(NULL, StrLength(HdrLine));
 	StrBuf_RFC822_to_Utf8(Msg->from, HdrLine, WC->DefaultCharset, FoundCharset);
 }
-void tmplput_MAIL_SUMM_FROM(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType)
+void tmplput_MAIL_SUMM_FROM(StrBuf *Target, WCTemplputParams *TP)
 {
-	message_summary *Msg = (message_summary*) Context;
-	StrBufAppendTemplate(Target, nArgs, Tokens, Context, ContextType, Msg->from, 0);
+	message_summary *Msg = (message_summary*) CTX;
+	StrBufAppendTemplate(Target, TP, Msg->from, 0);
 }
 
 
@@ -220,10 +264,16 @@ void examine_subj(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
 	Msg->subj = NewStrBufPlain(NULL, StrLength(HdrLine));
 	StrBuf_RFC822_to_Utf8(Msg->subj, HdrLine, WC->DefaultCharset, FoundCharset);
 }
-void tmplput_MAIL_SUMM_SUBJECT(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType)
-{/////TODO: Fwd: and RE: filter!!
-	message_summary *Msg = (message_summary*) Context;
-	StrBufAppendTemplate(Target, nArgs, Tokens, Context, ContextType, Msg->subj, 0);
+void tmplput_MAIL_SUMM_SUBJECT(StrBuf *Target, WCTemplputParams *TP)
+{/*////TODO: Fwd: and RE: filter!!*/
+
+	message_summary *Msg = (message_summary*) CTX;
+	StrBufAppendTemplate(Target, TP, Msg->subj, 0);
+}
+int Conditional_MAIL_SUMM_SUBJECT(StrBuf *Target, WCTemplputParams *TP)
+{
+	message_summary *Msg = (message_summary*) CTX;
+	return StrLength(Msg->subj) > 0;
 }
 
 
@@ -233,15 +283,15 @@ void examine_msgn(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
 	Msg->reply_inreplyto = NewStrBufPlain(NULL, StrLength(HdrLine));
 	StrBuf_RFC822_to_Utf8(Msg->reply_inreplyto, HdrLine, WC->DefaultCharset, FoundCharset);
 }
-void tmplput_MAIL_SUMM_INREPLYTO(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType)
+void tmplput_MAIL_SUMM_INREPLYTO(StrBuf *Target, WCTemplputParams *TP)
 {
-	message_summary *Msg = (message_summary*) Context;
-	StrBufAppendTemplate(Target, nArgs, Tokens, Context, ContextType, Msg->reply_inreplyto, 0);
+	message_summary *Msg = (message_summary*) CTX;
+	StrBufAppendTemplate(Target, TP, Msg->reply_inreplyto, 0);
 }
 
-int Conditional_MAIL_SUMM_UNREAD(WCTemplateToken *Tokens, void *Context, int ContextType)
+int Conditional_MAIL_SUMM_UNREAD(StrBuf *Target, WCTemplputParams *TP)
 {
-	message_summary *Msg = (message_summary*) Context;
+	message_summary *Msg = (message_summary*) CTX;
 	return Msg->is_new != 0;
 }
 
@@ -251,10 +301,10 @@ void examine_wefw(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
 	Msg->reply_references = NewStrBufPlain(NULL, StrLength(HdrLine));
 	StrBuf_RFC822_to_Utf8(Msg->reply_references, HdrLine, WC->DefaultCharset, FoundCharset);
 }
-void tmplput_MAIL_SUMM_REFIDS(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType)
+void tmplput_MAIL_SUMM_REFIDS(StrBuf *Target, WCTemplputParams *TP)
 {
-	message_summary *Msg = (message_summary*) Context;
-	StrBufAppendTemplate(Target, nArgs, Tokens, Context, ContextType, Msg->reply_references, 0);
+	message_summary *Msg = (message_summary*) CTX;
+	StrBufAppendTemplate(Target, TP, Msg->reply_references, 0);
 }
 
 
@@ -270,27 +320,25 @@ void examine_cccc(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
 	}
 	StrBufAppendBuf(Msg->AllRcpt, Msg->cccc, 0);
 }
-void tmplput_MAIL_SUMM_CCCC(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType)
+void tmplput_MAIL_SUMM_CCCC(StrBuf *Target, WCTemplputParams *TP)
 {
-	message_summary *Msg = (message_summary*) Context;
-	StrBufAppendTemplate(Target, nArgs, Tokens, Context, ContextType, Msg->cccc, 0);
+	message_summary *Msg = (message_summary*) CTX;
+	StrBufAppendTemplate(Target, TP, Msg->cccc, 0);
 }
 
 
-
-
 void examine_room(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
 {
 	if ((StrLength(HdrLine) > 0) &&
-	    (strcasecmp(ChrPtr(HdrLine), WC->wc_roomname))) {
+	    (strcasecmp(ChrPtr(HdrLine), ChrPtr(WC->wc_roomname)))) {
 		FreeStrBuf(&Msg->Room);
 		Msg->Room = NewStrBufDup(HdrLine);		
 	}
 }
-void tmplput_MAIL_SUMM_ORGROOM(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType)
+void tmplput_MAIL_SUMM_ORGROOM(StrBuf *Target, WCTemplputParams *TP)
 {
-	message_summary *Msg = (message_summary*) Context;
-	StrBufAppendTemplate(Target, nArgs, Tokens, Context, ContextType, Msg->Room, 0);
+	message_summary *Msg = (message_summary*) CTX;
+	StrBufAppendTemplate(Target, TP, Msg->Room, 0);
 }
 
 
@@ -299,35 +347,42 @@ void examine_rfca(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
 	FreeStrBuf(&Msg->Rfca);
 	Msg->Rfca = NewStrBufDup(HdrLine);
 }
-void tmplput_MAIL_SUMM_RFCA(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType)
+void tmplput_MAIL_SUMM_RFCA(StrBuf *Target, WCTemplputParams *TP)
 {
-	message_summary *Msg = (message_summary*) Context;
-	StrBufAppendTemplate(Target, nArgs, Tokens, Context, ContextType, Msg->Rfca, 0);
+	message_summary *Msg = (message_summary*) CTX;
+	StrBufAppendTemplate(Target, TP, Msg->Rfca, 0);
 }
-int Conditional_MAIL_SUMM_RFCA(WCTemplateToken *Tokens, void *Context, int ContextType)
+int Conditional_MAIL_SUMM_RFCA(StrBuf *Target, WCTemplputParams *TP)
 {
-	message_summary *Msg = (message_summary*) Context;
+	message_summary *Msg = (message_summary*) CTX;
 	return StrLength(Msg->Rfca) > 0;
 }
+int Conditional_MAIL_SUMM_CCCC(StrBuf *Target, WCTemplputParams *TP)
+{
+	message_summary *Msg = (message_summary*) CTX;
+	return StrLength(Msg->cccc) > 0;
+}
 
 void examine_node(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
 {
+	wcsession *WCC = WC;
+
 	if ( (StrLength(HdrLine) > 0) &&
 	     ((WC->room_flags & QR_NETWORK)
-	      || ((strcasecmp(ChrPtr(HdrLine), serv_info.serv_nodename)
-		   && (strcasecmp(ChrPtr(HdrLine), serv_info.serv_fqdn)))))) {
+	      || ((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, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType)
+void tmplput_MAIL_SUMM_OTHERNODE(StrBuf *Target, WCTemplputParams *TP)
 {
-	message_summary *Msg = (message_summary*) Context;
-	StrBufAppendTemplate(Target, nArgs, Tokens, Context, ContextType, Msg->OtherNode, 0);
+	message_summary *Msg = (message_summary*) CTX;
+	StrBufAppendTemplate(Target, TP, Msg->OtherNode, 0);
 }
-int Conditional_MAIL_SUMM_OTHERNODE(WCTemplateToken *Tokens, void *Context, int ContextType)
+int Conditional_MAIL_SUMM_OTHERNODE(StrBuf *Target, WCTemplputParams *TP)
 {
-	message_summary *Msg = (message_summary*) Context;
+	message_summary *Msg = (message_summary*) CTX;
 	return StrLength(Msg->OtherNode) > 0;
 }
 
@@ -344,33 +399,61 @@ void examine_rcpt(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
 	}
 	StrBufAppendBuf(Msg->AllRcpt, Msg->to, 0);
 }
-void tmplput_MAIL_SUMM_TO(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType)
+void tmplput_MAIL_SUMM_TO(StrBuf *Target, WCTemplputParams *TP)
 {
-	message_summary *Msg = (message_summary*) Context;
-	StrBufAppendTemplate(Target, nArgs, Tokens, Context, ContextType, Msg->to, 0);
+	message_summary *Msg = (message_summary*) CTX;
+	StrBufAppendTemplate(Target, TP, Msg->to, 0);
 }
-void tmplput_MAIL_SUMM_ALLRCPT(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType)
+int Conditional_MAIL_SUMM_TO(StrBuf *Target, WCTemplputParams *TP) 
 {
-	message_summary *Msg = (message_summary*) Context;
-	StrBufAppendTemplate(Target, nArgs, Tokens, Context, ContextType, Msg->AllRcpt, 0);
+	message_summary *Msg = (message_summary*) CTX;
+	return StrLength(Msg->to) != 0;
+}
+int Conditional_MAIL_SUMM_SUBJ(StrBuf *Target, WCTemplputParams *TP) 
+{
+	message_summary *Msg = (message_summary*) CTX;
+	return StrLength(Msg->subj) != 0;
+}
+void tmplput_MAIL_SUMM_ALLRCPT(StrBuf *Target, WCTemplputParams *TP)
+{
+	message_summary *Msg = (message_summary*) CTX;
+	StrBufAppendTemplate(Target, TP, Msg->AllRcpt, 0);
 }
 
 
 
+void tmplput_SUMM_COUNT(StrBuf *Target, WCTemplputParams *TP)
+{
+	StrBufAppendPrintf(Target, "%d", GetCount( WC->summ));
+}
+
+HashList *iterate_get_mailsumm_All(StrBuf *Target, WCTemplputParams *TP)
+{
+	return WC->summ;
+}
 void examine_time(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
 {
 	Msg->date = StrTol(HdrLine);
 }
-void tmplput_MAIL_SUMM_DATE_STR(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType)
+
+void tmplput_MAIL_SUMM_DATE_BRIEF(StrBuf *Target, WCTemplputParams *TP)
+{
+	char datebuf[64];
+	message_summary *Msg = (message_summary*) CTX;
+	webcit_fmt_date(datebuf, 64, Msg->date, DATEFMT_BRIEF);
+	StrBufAppendBufPlain(Target, datebuf, -1, 0);
+}
+
+void tmplput_MAIL_SUMM_DATE_FULL(StrBuf *Target, WCTemplputParams *TP)
 {
 	char datebuf[64];
-	message_summary *Msg = (message_summary*) Context;
-	webcit_fmt_date(datebuf, Msg->date, 1);
+	message_summary *Msg = (message_summary*) CTX;
+	webcit_fmt_date(datebuf, 64, Msg->date, DATEFMT_FULL);
 	StrBufAppendBufPlain(Target, datebuf, -1, 0);
 }
-void tmplput_MAIL_SUMM_DATE_NO(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType)
+void tmplput_MAIL_SUMM_DATE_NO(StrBuf *Target, WCTemplputParams *TP)
 {
-	message_summary *Msg = (message_summary*) Context;
+	message_summary *Msg = (message_summary*) CTX;
 	StrBufAppendPrintf(Target, "%ld", Msg->date, 0);
 }
 
@@ -378,8 +461,10 @@ void tmplput_MAIL_SUMM_DATE_NO(StrBuf *Target, int nArgs, WCTemplateToken *Token
 
 void render_MAIL(wc_mime_attachment *Mime, StrBuf *RawData, StrBuf *FoundCharset)
 {
+	const StrBuf *TemplateMime;
+
 	Mime->Data = NewStrBufPlain(NULL, Mime->length);
-	read_message(Mime->Data, HKEY("view_submessage"), Mime->msgnum, 0, Mime->PartNum);
+	read_message(Mime->Data, HKEY("view_submessage"), Mime->msgnum, Mime->PartNum, &TemplateMime);
 /*
 	if ( (!IsEmptyStr(mime_submessages)) && (!section[0]) ) {
 		for (i=0; i<num_tokens(mime_submessages, '|'); ++i) {
@@ -395,13 +480,14 @@ 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;
 	MimeLoadData(Mime);
 	if (StrLength(Mime->Data) > 0) {
 		StrBuf *Buf;
 		Buf = NewStrBuf();
 		/** If it's my vCard I can edit it */
-		if (	(!strcasecmp(WC->wc_roomname, USERCONFIGROOM))
-			|| (!strcasecmp(&WC->wc_roomname[11], USERCONFIGROOM))
+		if (	(!strcasecmp(ChrPtr(WCC->wc_roomname), USERCONFIGROOM))
+			|| (!strcasecmp(&(ChrPtr(WCC->wc_roomname)[11]), USERCONFIGROOM))
 			|| (WC->wc_view == VIEW_ADDRESSBOOK)
 			) {
 			StrBufAppendPrintf(Buf, "<a href=\"edit_vcard?msgnum=%ld&partnum=%s\">",
@@ -410,15 +496,48 @@ void render_MIME_VCard(wc_mime_attachment *Mime, StrBuf *RawData, StrBuf *FoundC
 		}
 
 		/* In all cases, display the full card */
-		display_vcard(Buf, ChrPtr(Mime->Data), 0, 1, NULL, Mime->msgnum);
+		display_vcard(Buf, Mime->Data, 0, 1, NULL, Mime->msgnum);
 		FreeStrBuf(&Mime->Data);
 		Mime->Data = Buf;
 	}
 
 }
-void render_MIME_ICS(wc_mime_attachment *Mime, StrBuf *RawData, StrBuf *FoundCharset)
+
+void render_MIME_VNote(wc_mime_attachment *Mime, StrBuf *RawData, StrBuf *FoundCharset)
 {
 	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
+			Mime->Data = NewStrBuf();
+	}
+
+}
+
+void render_MIME_ICS(wc_mime_attachment *Mime, StrBuf *RawData, StrBuf *FoundCharset)
+{
+	if (StrLength(Mime->Data) == 0) {
+		MimeLoadData(Mime);
+	}
 	if (StrLength(Mime->Data) > 0) {
 		cal_process_attachment(Mime);
 	}
@@ -449,7 +568,7 @@ void examine_mime_part(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundChars
 	Mime->PartNum = NewStrBuf();
 	StrBufExtract_token(Mime->PartNum, HdrLine, 2, '|');
 	StrBufTrim(Mime->PartNum);
-	if (strchr(ChrPtr(Mime->PartNum), '.') != NULL)
+	if (strchr(ChrPtr(Mime->PartNum), '.') != NULL) 
 		Mime->level = 2;
 	else
 		Mime->level = 1;
@@ -462,6 +581,10 @@ void examine_mime_part(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundChars
 	StrBufTrim(Mime->ContentType);
 	StrBufLowerCase(Mime->ContentType);
 
+	if (!strcmp(ChrPtr(Mime->ContentType), "application/octet-stream")) {
+		StrBufPlain(Mime->ContentType, 
+			    GuessMimeByFilename(SKEY(Mime->FileName)), -1);
+	}
 	Mime->length = StrBufExtract_int(HdrLine, 5, '|');
 
 	if ( (StrLength(Mime->FileName) == 0) && (StrLength(Mime->Name) > 0) ) {
@@ -492,7 +615,7 @@ void evaluate_mime_part(message_summary *Msg, wc_mime_attachment *Mime)
 	    GetHash(MimeRenderHandler, SKEY(Mime->ContentType), &vMimeRenderer) &&
 	    vMimeRenderer != NULL)
 	{
-		Mime->Renderer = (RenderMimeFunc) vMimeRenderer;
+		Mime->Renderer = (RenderMimeFuncStruct*) vMimeRenderer;
 		if (Msg->Submessages == NULL)
 			Msg->Submessages = NewHash(1,NULL);
 		Put(Msg->Submessages, SKEY(Mime->PartNum), Mime, reference_free_handler);
@@ -523,32 +646,27 @@ void evaluate_mime_part(message_summary *Msg, wc_mime_attachment *Mime)
 	}
 }
 
-void tmplput_MAIL_SUMM_NATTACH(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType)
+void tmplput_MAIL_SUMM_NATTACH(StrBuf *Target, WCTemplputParams *TP)
 {
-	message_summary *Msg = (message_summary*) Context;
+	message_summary *Msg = (message_summary*) CTX;
 	StrBufAppendPrintf(Target, "%ld", GetCount(Msg->Attachments));
 }
 
 
-
-
-
-
-
 void examine_hnod(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
 {
 	FreeStrBuf(&Msg->hnod);
 	Msg->hnod = NewStrBufPlain(NULL, StrLength(HdrLine));
 	StrBuf_RFC822_to_Utf8(Msg->hnod, HdrLine, WC->DefaultCharset, FoundCharset);
 }
-void tmplput_MAIL_SUMM_H_NODE(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType)
+void tmplput_MAIL_SUMM_H_NODE(StrBuf *Target, WCTemplputParams *TP)
 {
-	message_summary *Msg = (message_summary*) Context;
-	StrBufAppendTemplate(Target, nArgs, Tokens, Context, ContextType, Msg->hnod, 0);
+	message_summary *Msg = (message_summary*) CTX;
+	StrBufAppendTemplate(Target, TP, Msg->hnod, 0);
 }
-int Conditional_MAIL_SUMM_H_NODE(WCTemplateToken *Tokens, void *Context, int ContextType)
+int Conditional_MAIL_SUMM_H_NODE(StrBuf *Target, WCTemplputParams *TP)
 {
-	message_summary *Msg = (message_summary*) Context;
+	message_summary *Msg = (message_summary*) CTX;
 	return StrLength(Msg->hnod) > 0;
 }
 
@@ -556,18 +674,13 @@ int Conditional_MAIL_SUMM_H_NODE(WCTemplateToken *Tokens, void *Context, int Con
 
 void examine_text(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
 {
-	Msg->MsgBody->Data = NewStrBuf();
+	Msg->MsgBody->Data = NewStrBufPlain(NULL, SIZ);
 }
 
 void examine_msg4_partnum(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
 {
 	Msg->MsgBody->PartNum = NewStrBufDup(HdrLine);
-	StrBufTrim(Msg->MsgBody->PartNum);/////TODO: striplt == trim?
-}
-
-void examine_content_encoding(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
-{
-////TODO: do we care?
+	StrBufTrim(Msg->MsgBody->PartNum);
 }
 
 void examine_content_lengh(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
@@ -627,57 +740,68 @@ void examine_content_type(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCh
 	}
 }
 
-void tmplput_MAIL_SUMM_N(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType)
+void tmplput_MAIL_SUMM_N(StrBuf *Target, WCTemplputParams *TP)
 {
-	message_summary *Msg = (message_summary*) Context;
+	message_summary *Msg = (message_summary*) CTX;
 	StrBufAppendPrintf(Target, "%ld", Msg->msgnum);
 }
 
 
 
-int Conditional_MAIL_MIME_ALL(WCTemplateToken *Tokens, void *Context, int ContextType)
+int Conditional_MAIL_MIME_ALL(StrBuf *Target, WCTemplputParams *TP)
 {
-	message_summary *Msg = (message_summary*) Context;
+	message_summary *Msg = (message_summary*) CTX;
 	return GetCount(Msg->Attachments) > 0;
 }
 
-int Conditional_MAIL_MIME_SUBMESSAGES(WCTemplateToken *Tokens, void *Context, int ContextType)
+int Conditional_MAIL_MIME_SUBMESSAGES(StrBuf *Target, WCTemplputParams *TP)
 {
-	message_summary *Msg = (message_summary*) Context;
+	message_summary *Msg = (message_summary*) CTX;
 	return GetCount(Msg->Submessages) > 0;
 }
 
-int Conditional_MAIL_MIME_ATTACHLINKS(WCTemplateToken *Tokens, void *Context, int ContextType)
+int Conditional_MAIL_MIME_ATTACHLINKS(StrBuf *Target, WCTemplputParams *TP)
 {
-	message_summary *Msg = (message_summary*) Context;
+	message_summary *Msg = (message_summary*) CTX;
 	return GetCount(Msg->AttachLinks) > 0;
 }
 
-int Conditional_MAIL_MIME_ATTACH(WCTemplateToken *Tokens, void *Context, int ContextType)
+int Conditional_MAIL_MIME_ATTACH(StrBuf *Target, WCTemplputParams *TP)
 {
-	message_summary *Msg = (message_summary*) Context;
+	message_summary *Msg = (message_summary*) CTX;
 	return GetCount(Msg->AllAttach) > 0;
 }
 
+void tmplput_QUOTED_MAIL_BODY(StrBuf *Target, WCTemplputParams *TP)
+{
+	const StrBuf *Mime;
+        long MsgNum;
+	StrBuf *Buf;
 
+	MsgNum = LBstr(TKEY(0));
+	Buf = NewStrBuf();
+	read_message(Buf, HKEY("view_message_replyquote"), MsgNum, NULL, &Mime);
+	StrBufAppendTemplate(Target, TP, Buf, 1);
+	FreeStrBuf(&Buf);
+}
 
-/*----------------------------------------------------------------------------*/
-void tmplput_QUOTED_MAIL_BODY(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType)
+void tmplput_EDIT_MAIL_BODY(StrBuf *Target, WCTemplputParams *TP)
 {
-	long MsgNum;
+	const StrBuf *Mime;
+        long MsgNum;
 	StrBuf *Buf;
 
-	MsgNum = LBstr(Tokens->Params[0]->Start, Tokens->Params[0]->len);
+	MsgNum = LBstr(TKEY(0));
 	Buf = NewStrBuf();
-	read_message(Buf, HKEY("view_message_replyquote"), MsgNum, 0, NULL);
-	StrBufAppendTemplate(Target, nArgs, Tokens, Context, ContextType, Buf, 1);
+	read_message(Buf, HKEY("view_message_edit"), MsgNum, NULL, &Mime);
+	StrBufAppendTemplate(Target, TP, Buf, 1);
 	FreeStrBuf(&Buf);
 }
 
-void tmplput_MAIL_BODY(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType)
+void tmplput_MAIL_BODY(StrBuf *Target, WCTemplputParams *TP)
 {
-	message_summary *Msg = (message_summary*) Context;
-	StrBufAppendTemplate(Target, nArgs, Tokens, Context, ContextType, Msg->MsgBody->Data, 0);
+	message_summary *Msg = (message_summary*) CTX;
+	StrBufAppendTemplate(Target, TP, Msg->MsgBody->Data, 0);
 }
 
 
@@ -703,7 +827,7 @@ void render_MAIL_text_plain(wc_mime_attachment *Mime, StrBuf *RawData, StrBuf *F
 	int ConvertIt = 1;
 	int bn = 0;
 	int bq = 0;
-	int i, n, done = 0;
+	int i;
 	long len;
 #ifdef HAVE_ICONV
 	iconv_t ic = (iconv_t)(-1) ;
@@ -711,16 +835,9 @@ void render_MAIL_text_plain(wc_mime_attachment *Mime, StrBuf *RawData, StrBuf *F
 
 	if ((StrLength(Mime->Data) == 0) && (Mime->length > 0)) {
 		FreeStrBuf(&Mime->Data);
-		Mime->Data = NewStrBufPlain(NULL, Mime->length);
-		if (!read_message(Mime->Data, HKEY("view_submessage"), Mime->msgnum, 0, Mime->PartNum))
-			return;
+		MimeLoadData(Mime);
 	}
 
-	/* Boring old 80-column fixed format text gets handled this way... */
-	if ((strcasecmp(ChrPtr(Mime->Charset), "us-ascii") == 0) &&
-	    (strcasecmp(ChrPtr(Mime->Charset), "UTF-8") == 0))
-		ConvertIt = 0;
-
 #ifdef HAVE_ICONV
 	if (ConvertIt) {
 		if (StrLength(Mime->Charset) != 0)
@@ -732,6 +849,12 @@ void render_MAIL_text_plain(wc_mime_attachment *Mime, StrBuf *RawData, StrBuf *F
 		if (cs == NULL) {
 			ConvertIt = 0;
 		}
+		else if (!strcasecmp(ChrPtr(cs), "utf-8")) {
+			ConvertIt = 0;
+		}
+		else if (!strcasecmp(ChrPtr(cs), "us-ascii")) {
+			ConvertIt = 0;
+		}
 		else {
 			ctdl_iconv_open("UTF-8", ChrPtr(cs), &ic);
 			if (ic == (iconv_t)(-1) ) {
@@ -741,50 +864,55 @@ void render_MAIL_text_plain(wc_mime_attachment *Mime, StrBuf *RawData, StrBuf *F
 		}
 	}
 #endif
-	Line = NewStrBuf();
-	Line1 = NewStrBuf();
-	Line2 = NewStrBuf();
+	Line = NewStrBufPlain(NULL, SIZ);
+	Line1 = NewStrBufPlain(NULL, SIZ);
+	Line2 = NewStrBufPlain(NULL, SIZ);
 	Target = NewStrBufPlain(NULL, StrLength(Mime->Data));
 
-	while ((n = StrBufSipLine(Line, Mime->Data, &BufPtr), n >= 0) && !done)
-	{
-		done = n == 0;
-		bq = 0;
-		i = 0;
-		ptr = ChrPtr(Line);
-		len = StrLength(Line);
-		pte = ptr + len;
-		
-		while ((ptr < pte) &&
-		       ((*ptr == '>') ||
-			isspace(*ptr)))
+	if (StrLength(Mime->Data) > 0) 
+		do 
 		{
-			if (*ptr == '>')
-				bq++;
-			ptr ++;
-			i++;
-		}
-		if (i > 0) StrBufCutLeft(Line, i);
+			StrBufSipLine(Line, Mime->Data, &BufPtr);
+			bq = 0;
+			i = 0;
+			ptr = ChrPtr(Line);
+			len = StrLength(Line);
+			pte = ptr + len;
+		
+			while ((ptr < pte) &&
+			       ((*ptr == '>') ||
+				isspace(*ptr)))
+			{
+				if (*ptr == '>')
+					bq++;
+				ptr ++;
+				i++;
+			}
+			if (i > 0) StrBufCutLeft(Line, i);
 		
-		if (StrLength(Line) == 0)
-			continue;
+			if (StrLength(Line) == 0) {
+				StrBufAppendBufPlain(Target, HKEY("<tt></tt><br />\n"), 0);
+				continue;
+			}
 
-		for (i = bn; i < bq; i++)				
-			StrBufAppendBufPlain(Target, HKEY("<blockquote>"), 0);
-		for (i = bq; i < bn; i++)				
-			StrBufAppendBufPlain(Target, HKEY("</blockquote>"), 0);
+			for (i = bn; i < bq; i++)				
+				StrBufAppendBufPlain(Target, HKEY("<blockquote>"), 0);
+			for (i = bq; i < bn; i++)				
+				StrBufAppendBufPlain(Target, HKEY("</blockquote>"), 0);
 
-		if (ConvertIt == 1) {
-			StrBufConvert(Line, Line1, &ic);
-		}
+			if (ConvertIt) {
+				StrBufConvert(Line, Line1, &ic);
+			}
 
-		StrBufAppendBufPlain(Target, HKEY("<tt>"), 0);
-		UrlizeText(Line1, Line, Line2);
+			StrBufAppendBufPlain(Target, HKEY("<tt>"), 0);
+			UrlizeText(Line1, Line, Line2);
 
-		StrEscAppend(Target, Line1, NULL, 0, 0);
-		StrBufAppendBufPlain(Target, HKEY("</tt><br />\n"), 0);
-		bn = bq;
-	}
+			StrEscAppend(Target, Line1, NULL, 0, 0);
+			StrBufAppendBufPlain(Target, HKEY("</tt><br />\n"), 0);
+			bn = bq;
+		}
+	while ((BufPtr != StrBufNOTNULL) &&
+	       (BufPtr != NULL));
 
 	for (i = 0; i < bn; i++)				
 		StrBufAppendBufPlain(Target, HKEY("</blockquote>"), 0);
@@ -795,8 +923,13 @@ void render_MAIL_text_plain(wc_mime_attachment *Mime, StrBuf *RawData, StrBuf *F
 		iconv_close(ic);
 	}
 #endif
+
 	FreeStrBuf(&Mime->Data);
 	Mime->Data = Target;
+	FlushStrBuf(Mime->ContentType);
+	StrBufAppendBufPlain(Mime->ContentType, HKEY("text/html"), 0);
+	FlushStrBuf(Mime->Charset);
+	StrBufAppendBufPlain(Mime->Charset, HKEY("UTF-8"), 0);
 	FreeStrBuf(&Line);
 	FreeStrBuf(&Line1);
 	FreeStrBuf(&Line2);
@@ -805,15 +938,16 @@ void render_MAIL_text_plain(wc_mime_attachment *Mime, StrBuf *RawData, StrBuf *F
 void render_MAIL_html(wc_mime_attachment *Mime, StrBuf *RawData, StrBuf *FoundCharset)
 {
 	StrBuf *Buf;
-	/* HTML is fun, but we've got to strip it first */
+
 	if (StrLength(Mime->Data) == 0)
 		return;
 
 	Buf = NewStrBufPlain(NULL, StrLength(Mime->Data));
 
+	/* HTML is fun, but we've got to strip it first */
 	output_html(ChrPtr(Mime->Charset), 
 		    (WC->wc_view == VIEW_WIKI ? 1 : 0), 
-		    StrToi(Mime->PartNum), 
+		    Mime->msgnum,
 		    Mime->Data, Buf);
 	FreeStrBuf(&Mime->Data);
 	Mime->Data = Buf;
@@ -829,65 +963,61 @@ void render_MAIL_UNKNOWN(wc_mime_attachment *Mime, StrBuf *RawData, StrBuf *Foun
 }
 
 
-
-
-
-
-HashList *iterate_get_mime_All(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType)
+HashList *iterate_get_mime_All(StrBuf *Target, WCTemplputParams *TP)
 {
-	message_summary *Msg = (message_summary*) Context;
+	message_summary *Msg = (message_summary*) CTX;
 	return Msg->Attachments;
 }
-HashList *iterate_get_mime_Submessages(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType)
+HashList *iterate_get_mime_Submessages(StrBuf *Target, WCTemplputParams *TP)
 {
-	message_summary *Msg = (message_summary*) Context;
+	message_summary *Msg = (message_summary*) CTX;
 	return Msg->Submessages;
 }
-HashList *iterate_get_mime_AttachLinks(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType)
+HashList *iterate_get_mime_AttachLinks(StrBuf *Target, WCTemplputParams *TP)
 {
-	message_summary *Msg = (message_summary*) Context;
+	message_summary *Msg = (message_summary*) CTX;
 	return Msg->AttachLinks;
 }
-HashList *iterate_get_mime_Attachments(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType)
+HashList *iterate_get_mime_Attachments(StrBuf *Target, WCTemplputParams *TP)
 {
-	message_summary *Msg = (message_summary*) Context;
+	message_summary *Msg = (message_summary*) CTX;
 	return Msg->AllAttach;
 }
 
-void tmplput_MIME_Name(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType)
+void tmplput_MIME_Name(StrBuf *Target, WCTemplputParams *TP)
 {
-	wc_mime_attachment *mime = (wc_mime_attachment*) Context;
-	StrBufAppendTemplate(Target, nArgs, Tokens, Context, ContextType, mime->Name, 0);
+	wc_mime_attachment *mime = (wc_mime_attachment*) CTX;
+	StrBufAppendTemplate(Target, TP, mime->Name, 0);
 }
 
-void tmplput_MIME_FileName(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType)
+void tmplput_MIME_FileName(StrBuf *Target, WCTemplputParams *TP)
 {
-	wc_mime_attachment *mime = (wc_mime_attachment*) Context;
-	StrBufAppendTemplate(Target, nArgs, Tokens, Context, ContextType, mime->FileName, 0);
+	wc_mime_attachment *mime = (wc_mime_attachment*) CTX;
+	StrBufAppendTemplate(Target, TP, mime->FileName, 0);
 }
 
-void tmplput_MIME_PartNum(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType)
+void tmplput_MIME_PartNum(StrBuf *Target, WCTemplputParams *TP)
 {
-	wc_mime_attachment *mime = (wc_mime_attachment*) Context;
-	StrBufAppendTemplate(Target, nArgs, Tokens, Context, ContextType, mime->PartNum, 0);
+	wc_mime_attachment *mime = (wc_mime_attachment*) CTX;
+	StrBufAppendTemplate(Target, TP, mime->PartNum, 0);
 }
 
-void tmplput_MIME_MsgNum(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType)
+void tmplput_MIME_MsgNum(StrBuf *Target, WCTemplputParams *TP)
 {
-	wc_mime_attachment *mime = (wc_mime_attachment*) Context;
+	wc_mime_attachment *mime = (wc_mime_attachment*) CTX;
 	StrBufAppendPrintf(Target, "%ld", mime->msgnum);
 }
 
-void tmplput_MIME_Disposition(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType)
+void tmplput_MIME_Disposition(StrBuf *Target, WCTemplputParams *TP)
 {
-	wc_mime_attachment *mime = (wc_mime_attachment*) Context;
-	StrBufAppendTemplate(Target, nArgs, Tokens, Context, ContextType, mime->Disposition, 0);
+	wc_mime_attachment *mime = (wc_mime_attachment*) CTX;
+	StrBufAppendTemplate(Target, TP, mime->Disposition, 0);
 }
 
-void tmplput_MIME_ContentType(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType)
+void tmplput_MIME_ContentType(StrBuf *Target, WCTemplputParams *TP)
 {
-	wc_mime_attachment *mime = (wc_mime_attachment*) Context;
-	StrBufAppendTemplate(Target, nArgs, Tokens, Context, ContextType, mime->ContentType, 0);
+	wc_mime_attachment *mime = (wc_mime_attachment*) CTX;
+	StrBufAppendTemplate(Target, TP, mime->ContentType, 0);
 }
 
 void examine_charset(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
@@ -895,25 +1025,25 @@ void examine_charset(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset
 	Msg->MsgBody->Charset = NewStrBufDup(HdrLine);
 }
 
-void tmplput_MIME_Charset(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType)
+void tmplput_MIME_Charset(StrBuf *Target, WCTemplputParams *TP)
 {
-	wc_mime_attachment *mime = (wc_mime_attachment*) Context;
-	StrBufAppendTemplate(Target, nArgs, Tokens, Context, ContextType, mime->Charset, 0);
+	wc_mime_attachment *mime = (wc_mime_attachment*) CTX;
+	StrBufAppendTemplate(Target, TP, mime->Charset, 0);
 }
 
-void tmplput_MIME_Data(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType)
+void tmplput_MIME_Data(StrBuf *Target, WCTemplputParams *TP)
 {
-	wc_mime_attachment *mime = (wc_mime_attachment*) Context;
+	wc_mime_attachment *mime = (wc_mime_attachment*) CTX;
 	if (mime->Renderer != NULL)
-		mime->Renderer(mime, NULL, NULL);
-	StrBufAppendTemplate(Target, nArgs, Tokens, Context, ContextType, mime->Data, 0);
- /// TODO: check whether we need to load it now?
+		mime->Renderer->f(mime, NULL, NULL);
+	StrBufAppendTemplate(Target, TP, mime->Data, 0);
+	/* TODO: check whether we need to load it now? */
 }
 
-void tmplput_MIME_LoadData(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType)
+void tmplput_MIME_LoadData(StrBuf *Target, WCTemplputParams *TP)
 {
-	struct wcsession *WCC = WC;	
-	wc_mime_attachment *mime = (wc_mime_attachment*) Context;
+	wcsession *WCC = WC;	
+	wc_mime_attachment *mime = (wc_mime_attachment*) CTX;
 	wc_mime_attachment *att;
 	
 	if ( (!strcasecmp(ChrPtr(mime->Disposition), "inline"))||
@@ -938,36 +1068,109 @@ void tmplput_MIME_LoadData(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, v
  	}
 }
 
-void tmplput_MIME_Length(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType)
+void tmplput_MIME_Length(StrBuf *Target, WCTemplputParams *TP)
 {
-	wc_mime_attachment *mime = (wc_mime_attachment*) Context;
+	wc_mime_attachment *mime = (wc_mime_attachment*) CTX;
 	StrBufAppendPrintf(Target, "%ld", mime->length);
 }
 
-HashList *iterate_get_registered_Attachments(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType)
-{
-	return WC->attachments;
-}
-
-void tmplput_ATT_Length(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType)
-{
-	wc_mime_attachment *att = (wc_mime_attachment*) Context;
-	StrBufAppendPrintf(Target, "%ld", att->length);
-}
-
-void tmplput_ATT_Contenttype(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType)
-{
-	wc_mime_attachment *att = (wc_mime_attachment*) Context;
-	StrBufAppendTemplate(Target, nArgs, Tokens, Context, ContextType, att->ContentType, 0);
+/* startmsg is an index within the message list.
+ * starting_from is the Citadel message number to be supplied to a "MSGS GT" operation
+ */
+long DrawMessageDropdown(StrBuf *Selector, long maxmsgs, long startmsg, int nMessages, long starting_from)
+{
+	StrBuf *TmpBuf;
+	wcsession *WCC = WC;
+	void *vMsg;
+	int lo, hi;
+	long ret;
+	long hklen;
+	const char *key;
+	int done = 0;
+	int nItems;
+	HashPos *At;
+	long vector[16];
+	WCTemplputParams SubTP;
+
+	memset(&SubTP, 0, sizeof(WCTemplputParams));
+	SubTP.Filter.ContextType = CTX_LONGVECTOR;
+	SubTP.Context = &vector;
+	TmpBuf = NewStrBufPlain(NULL, SIZ);
+	At = GetNewHashPos(WCC->summ, nMessages);
+	nItems = GetCount(WCC->summ);
+	ret = nMessages;
+	vector[0] = 7;
+	vector[2] = 1;
+	vector[1] = startmsg;
+	vector[3] = 0;
+	vector[7] = starting_from;
+
+	while (!done) {
+		vector[3] = abs(nMessages);
+		lo = GetHashPosCounter(At);
+		if (nMessages > 0) {
+			if (lo + nMessages >= nItems) {
+				hi = nItems - 1;
+				vector[3] = nItems - lo;
+				if (startmsg == lo) 
+					ret = vector[3];
+			}
+			else {
+				hi = lo + nMessages - 1;
+			}
+		} else {
+			if (lo + nMessages < -1) {
+				hi = 0;
+			}
+			else {
+				if ((lo % abs(nMessages)) != 0) {
+					int offset = (lo % abs(nMessages) *
+						      (nMessages / abs(nMessages)));
+					hi = lo + offset;
+					vector[3] = abs(offset);
+					if (startmsg == lo)
+						 ret = offset;
+				}
+				else
+					hi = lo + nMessages;
+			}
+		}
+		done = !GetNextHashPos(WCC->summ, At, &hklen, &key, &vMsg);
+		
+		/*
+		 * Bump these because although we're thinking in zero base, the user
+		 * is a drooling idiot and is thinking in one base.
+		 */
+		vector[4] = lo + 1;
+		vector[5] = hi + 1;
+		vector[6] = lo;
+		FlushStrBuf(TmpBuf);
+		dbg_print_longvector(vector);
+		DoTemplate(HKEY("select_messageindex"), TmpBuf, &SubTP);
+		StrBufAppendBuf(Selector, TmpBuf, 0);
+	}
+	vector[6] = 0;
+	FlushStrBuf(TmpBuf);
+	if (maxmsgs == 9999999) {
+		vector[1] = 1;
+		ret = maxmsgs;
+	}
+	else
+		vector[1] = 0;		
+	vector[2] = 0;
+	dbg_print_longvector(vector);
+	DoTemplate(HKEY("select_messageindex_all"), TmpBuf, &SubTP);
+	StrBufAppendBuf(Selector, TmpBuf, 0);
+	FreeStrBuf(&TmpBuf);
+	DeleteHashPos(&At);
+	return ret;
 }
 
-void tmplput_ATT_FileName(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType)
+HashList *iterate_get_registered_Attachments(StrBuf *Target, WCTemplputParams *TP)
 {
-	wc_mime_attachment *att = (wc_mime_attachment*) Context;
-	StrBufAppendTemplate(Target, nArgs, Tokens, Context, ContextType, att->FileName, 0);
+	return WC->attachments;
 }
 
-
 void servcmd_do_search(char *buf, long bufsize)
 {
 	snprintf(buf, bufsize, "MSGS SEARCH|%s", bstr("query"));
@@ -983,6 +1186,11 @@ void servcmd_readfwd(char *buf, long bufsize)
 	snprintf(buf, bufsize, "MSGS ALL");
 }
 
+void servcmd_readgt(char *buf, long bufsize)
+{
+	snprintf(buf, bufsize, "MSGS GT|%s", bstr("gt"));
+}
+
 void servcmd_readnew(char *buf, long bufsize)
 {
 	snprintf(buf, bufsize, "MSGS NEW");
@@ -999,38 +1207,274 @@ readloop_struct rlid[] = {
 	{ {HKEY("headers")},   servcmd_headers},
 	{ {HKEY("readfwd")},   servcmd_readfwd},
 	{ {HKEY("readnew")},   servcmd_readnew},
-	{ {HKEY("readold")},   servcmd_readold}
+	{ {HKEY("readold")},   servcmd_readold},
+	{ {HKEY("readgt")},    servcmd_readgt}
 };
 
+/* Spit out the new summary view. This is basically a static page, so clients can cache the layout, all the dirty work is javascript :) */
+void new_summary_view(void) {
+	DoTemplate(HKEY("msg_listview"),NULL,&NoCtx);
+	DoTemplate(HKEY("trailing"),NULL,&NoCtx);
+}
+
+
+int mailview_GetParamsGetServerCall(SharedMessageStatus *Stat, 
+				    void **ViewSpecific, 
+				    long oper, 
+				    char *cmd, 
+				    long len)
+{
+	if (!WC->is_ajax) {
+		new_summary_view();
+		return 200;
+	} else {
+		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 mailview_RenderView_or_Tail(SharedMessageStatus *Stat, 
+				void **ViewSpecific, 
+				long oper)
+{
+	WCTemplputParams SubTP;
 
+	DoTemplate(HKEY("mailsummary_json"),NULL, &SubTP);
+	return 0;
+}
 
-		
+int mailview_Cleanup(void **ViewSpecific)
+{
+	/* Note: wDumpContent() will output one additional </div> tag. */
+	/* We ought to move this out into template */
+	if (WC->is_ajax) 
+		end_burst();
+	else
+		wDumpContent(1);
+	return 0;
+}
+
+
+
+typedef struct _bbsview_stuct {
+	StrBuf *BBViewToolBar;
+	StrBuf *MessageDropdown;
+	long *displayed_msgs;
+	int a;
+}bbsview_struct;
+
+int bbsview_GetParamsGetServerCall(SharedMessageStatus *Stat, 
+				   void **ViewSpecific, 
+				   long oper, 
+				   char *cmd, 
+				   long len)
+{
+	bbsview_struct *VS;
+
+	VS = (bbsview_struct*) malloc(sizeof(bbsview_struct));
+	memset(VS, 0, sizeof(bbsview_struct));
+	*ViewSpecific = (void*)VS;
+	Stat->defaultsortorder = 1;
+	Stat->startmsg = -1;
+	Stat->sortit = 1;
+	
+	rlid[oper].cmd(cmd, len);
+	
+	if (havebstr("maxmsgs"))
+		Stat->maxmsgs = ibstr("maxmsgs");
+	if (Stat->maxmsgs == 0) Stat->maxmsgs = DEFAULT_MAXMSGS;
+	
+	if (havebstr("startmsg")) {
+		Stat->startmsg = lbstr("startmsg");
+	}
+	if (lbstr("SortOrder") == 2) {
+		Stat->reverse = 1;
+		Stat->num_displayed = -DEFAULT_MAXMSGS;
+	}
+	else {
+		Stat->reverse = 0;
+		Stat->num_displayed = DEFAULT_MAXMSGS;
+	}
+
+	return 200;
+}
+
+int bbsview_PrintViewHeader(SharedMessageStatus *Stat, void **ViewSpecific)
+{
+	bbsview_struct *VS;
+	WCTemplputParams SubTP;
+
+	VS = (bbsview_struct*)*ViewSpecific;
+
+	VS->BBViewToolBar = NewStrBufPlain(NULL, SIZ);
+	VS->MessageDropdown = NewStrBufPlain(NULL, SIZ);
+
+	/*** startmsg->maxmsgs = **/DrawMessageDropdown(VS->MessageDropdown, 
+							Stat->maxmsgs, 
+							Stat->startmsg,
+							Stat->num_displayed, 
+							Stat->lowest_found-1);
+	if (Stat->num_displayed < 0) {
+		Stat->startmsg += Stat->maxmsgs;
+		if (Stat->num_displayed != Stat->maxmsgs)				
+			Stat->maxmsgs = abs(Stat->maxmsgs) + 1;
+		else
+			Stat->maxmsgs = abs(Stat->maxmsgs);
+
+	}
+	if (Stat->nummsgs > 0) {
+		memset(&SubTP, 0, sizeof(WCTemplputParams));
+		SubTP.Filter.ContextType = CTX_STRBUF;
+		SubTP.Context = VS->MessageDropdown;
+		DoTemplate(HKEY("msg_listselector_top"), VS->BBViewToolBar, &SubTP);
+		StrBufAppendBuf(WC->WBuf, VS->BBViewToolBar, 0);
+		FlushStrBuf(VS->BBViewToolBar);
+	}
+	return 200;
+}
+
+int bbsview_LoadMsgFromServer(SharedMessageStatus *Stat, 
+			      void **ViewSpecific, 
+			      message_summary* Msg, 
+			      int is_new, 
+			      int i)
+{
+	bbsview_struct *VS;
+
+	VS = (bbsview_struct*)*ViewSpecific;
+	if (VS->displayed_msgs == NULL) {
+		VS->displayed_msgs = malloc(sizeof(long) *
+					    ((Stat->maxmsgs < Stat->nummsgs) ? 
+					     Stat->maxmsgs + 1 : 
+					     Stat->nummsgs + 1));
+	}
+	if ((i >= Stat->startmsg) && (i < Stat->startmsg + Stat->maxmsgs)) {
+		VS->displayed_msgs[Stat->num_displayed] = Msg->msgnum;
+		Stat->num_displayed++;
+	}
+	return 200;
+}
+
+
+int bbsview_RenderView_or_Tail(SharedMessageStatus *Stat, 
+			       void **ViewSpecific, 
+			       long oper)
+{
+	wcsession *WCC = WC;
+	bbsview_struct *VS;
+	WCTemplputParams SubTP;
+	const StrBuf *Mime;
+
+	VS = (bbsview_struct*)*ViewSpecific;
+	if (Stat->nummsgs == 0) {
+		wprintf("<div class=\"nomsgs\"><br><em>");
+		switch (oper) {
+		case readnew:
+			wprintf(_("No new messages."));
+			break;
+		case readold:
+			wprintf(_("No old messages."));
+			break;
+		default:
+			wprintf(_("No messages here."));
+		}
+		wprintf("</em><br></div>\n");
+	}
+	else 
+	{
+		if (VS->displayed_msgs != NULL) {
+			/* if we do a split bbview in the future, begin messages div here */
+			int a;/// todo	
+			for (a=0; a < Stat->num_displayed; ++a) {
+				read_message(WCC->WBuf, HKEY("view_message"), VS->displayed_msgs[a], NULL, &Mime);
+			}
+			
+			/* if we do a split bbview in the future, end messages div here */
+			
+			free(VS->displayed_msgs);
+			VS->displayed_msgs = NULL;
+		}
+		memset(&SubTP, 0, sizeof(WCTemplputParams));
+		SubTP.Filter.ContextType = CTX_STRBUF;
+		SubTP.Context = VS->MessageDropdown;
+		DoTemplate(HKEY("msg_listselector_bottom"), VS->BBViewToolBar, &SubTP);
+		StrBufAppendBuf(WCC->WBuf, VS->BBViewToolBar, 0);
+	}
+	return 0;
+
+}
 
 
+int bbsview_Cleanup(void **ViewSpecific)
+{
+	bbsview_struct *VS;
 
+	VS = (bbsview_struct*)*ViewSpecific;
+	end_burst();
+	FreeStrBuf(&VS->BBViewToolBar);
+	FreeStrBuf(&VS->MessageDropdown);
+	free(VS);
+	return 0;
+}
 
 void 
 InitModule_MSGRENDERERS
 (void)
 {
+	RegisterReadLoopHandlerset(
+		VIEW_MAILBOX,
+		mailview_GetParamsGetServerCall,
+		NULL, /// TODO: is this right?
+		NULL, //// ""
+		mailview_RenderView_or_Tail,
+		mailview_Cleanup);
+
+	RegisterReadLoopHandlerset(
+		VIEW_BBS,
+		bbsview_GetParamsGetServerCall,
+		bbsview_PrintViewHeader,
+		bbsview_LoadMsgFromServer,
+		bbsview_RenderView_or_Tail,
+		bbsview_Cleanup);
+
 	RegisterSortFunc(HKEY("date"), 
 			 NULL, 0,
 			 summcmp_date,
 			 summcmp_rdate,
+			 groupchange_date,
 			 CTX_MAILSUM);
 	RegisterSortFunc(HKEY("subject"), 
 			 NULL, 0,
 			 summcmp_subj,
 			 summcmp_rsubj,
+			 groupchange_subj,
 			 CTX_MAILSUM);
 	RegisterSortFunc(HKEY("sender"),
 			 NULL, 0,
 			 summcmp_sender,
 			 summcmp_rsender,
+			 groupchange_sender,
 			 CTX_MAILSUM);
 
-	RegisterNamespace("MAIL:SUMM:DATESTR", 0, 0, tmplput_MAIL_SUMM_DATE_STR, CTX_MAILSUM);
+	RegisterNamespace("SUMM:COUNT", 0, 0, tmplput_SUMM_COUNT, CTX_NONE);
+	/* iterate over all known mails in WC->summ */
+	RegisterIterator("MAIL:SUMM:MSGS", 0, NULL, iterate_get_mailsumm_All,
+			 NULL,NULL, CTX_MAILSUM, CTX_NONE, IT_NOFLAG);
+
+	RegisterNamespace("MAIL:SUMM:DATEBRIEF", 0, 0, tmplput_MAIL_SUMM_DATE_BRIEF, CTX_MAILSUM);
+	RegisterNamespace("MAIL:SUMM:DATEFULL", 0, 0, tmplput_MAIL_SUMM_DATE_FULL, CTX_MAILSUM);
 	RegisterNamespace("MAIL:SUMM:DATENO",  0, 0, tmplput_MAIL_SUMM_DATE_NO,  CTX_MAILSUM);
 	RegisterNamespace("MAIL:SUMM:N",       0, 0, tmplput_MAIL_SUMM_N,        CTX_MAILSUM);
 	RegisterNamespace("MAIL:SUMM:FROM",    0, 2, tmplput_MAIL_SUMM_FROM,     CTX_MAILSUM);
@@ -1043,34 +1487,36 @@ InitModule_MSGRENDERERS
 	RegisterNamespace("MAIL:SUMM:ORGROOM", 0, 2, tmplput_MAIL_SUMM_ORGROOM,  CTX_MAILSUM);
 	RegisterNamespace("MAIL:SUMM:RFCA", 0, 2, tmplput_MAIL_SUMM_RFCA,  CTX_MAILSUM);
 	RegisterNamespace("MAIL:SUMM:OTHERNODE", 2, 0, tmplput_MAIL_SUMM_OTHERNODE,  CTX_MAILSUM);
-	RegisterNamespace("MAIL:SUMM:REFIDS", 0, 0, tmplput_MAIL_SUMM_REFIDS,  CTX_MAILSUM);
+	RegisterNamespace("MAIL:SUMM:REFIDS", 0, 1, tmplput_MAIL_SUMM_REFIDS,  CTX_MAILSUM);
 	RegisterNamespace("MAIL:SUMM:INREPLYTO", 0, 2, tmplput_MAIL_SUMM_INREPLYTO,  CTX_MAILSUM);
 	RegisterNamespace("MAIL:BODY", 0, 2, tmplput_MAIL_BODY,  CTX_MAILSUM);
 	RegisterNamespace("MAIL:QUOTETEXT", 1, 2, tmplput_QUOTED_MAIL_BODY,  CTX_NONE);
-	RegisterNamespace("ATT:SIZE", 0, 1, tmplput_ATT_Length, CTX_ATT);
-	RegisterNamespace("ATT:TYPE", 0, 1, tmplput_ATT_Contenttype, CTX_ATT);
-	RegisterNamespace("ATT:FILENAME", 0, 1, tmplput_ATT_FileName, CTX_ATT);
-
-	RegisterConditional(HKEY("MAIL:SUMM:RFCA"), 0, Conditional_MAIL_SUMM_RFCA,  CTX_MAILSUM);
+	RegisterNamespace("MAIL:EDITTEXT", 1, 2, tmplput_EDIT_MAIL_BODY,  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);	
 
+	/* 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);
-
 	RegisterIterator("MAIL:MIME:ATTACH", 0, NULL, iterate_get_mime_All, 
-			 NULL, NULL, CTX_MIME_ATACH, CTX_MAILSUM);
+			 NULL, NULL, CTX_MIME_ATACH, CTX_MAILSUM, IT_NOFLAG);
 	RegisterIterator("MAIL:MIME:ATTACH:SUBMESSAGES", 0, NULL, iterate_get_mime_Submessages, 
-			 NULL, NULL, CTX_MIME_ATACH, CTX_MAILSUM);
+			 NULL, NULL, CTX_MIME_ATACH, CTX_MAILSUM, IT_NOFLAG);
 	RegisterIterator("MAIL:MIME:ATTACH:LINKS", 0, NULL, iterate_get_mime_AttachLinks, 
-			 NULL, NULL, CTX_MIME_ATACH, CTX_MAILSUM);
+			 NULL, NULL, CTX_MIME_ATACH, CTX_MAILSUM, IT_NOFLAG);
 	RegisterIterator("MAIL:MIME:ATTACH:ATT", 0, NULL, iterate_get_mime_Attachments, 
-			 NULL, NULL, CTX_MIME_ATACH, CTX_MAILSUM);
+			 NULL, NULL, CTX_MIME_ATACH, CTX_MAILSUM, IT_NOFLAG);
 
+	/* Parts of a mime attachent */
 	RegisterNamespace("MAIL:MIME:NAME", 0, 2, tmplput_MIME_Name, CTX_MIME_ATACH);
 	RegisterNamespace("MAIL:MIME:FILENAME", 0, 2, tmplput_MIME_FileName, CTX_MIME_ATACH);
 	RegisterNamespace("MAIL:MIME:PARTNUM", 0, 2, tmplput_MIME_PartNum, CTX_MIME_ATACH);
@@ -1080,23 +1526,27 @@ InitModule_MSGRENDERERS
 	RegisterNamespace("MAIL:MIME:CHARSET", 0, 2, tmplput_MIME_Charset, CTX_MIME_ATACH);
 	RegisterNamespace("MAIL:MIME:LENGTH", 0, 2, tmplput_MIME_Length, CTX_MIME_ATACH);
 	RegisterNamespace("MAIL:MIME:DATA", 0, 2, tmplput_MIME_Data, CTX_MIME_ATACH);
+	/* load the actual attachment into WC->attachments; no output!!! */
 	RegisterNamespace("MAIL:MIME:LOADDATA", 0, 0, tmplput_MIME_LoadData, CTX_MIME_ATACH);
 
+	/* iterate the WC->attachments; use the above tokens for their contents */
 	RegisterIterator("MSG:ATTACHNAMES", 0, NULL, iterate_get_registered_Attachments, 
-			 NULL, NULL, CTX_ATT, CTX_NONE);
+			 NULL, NULL, CTX_MIME_ATACH, CTX_NONE, IT_NOFLAG);
 
+	/* mime renderers translate an attachment into webcit viewable html text */
 	RegisterMimeRenderer(HKEY("message/rfc822"), render_MAIL);
+	RegisterMimeRenderer(HKEY("text/vnote"), render_MIME_VNote);
 	RegisterMimeRenderer(HKEY("text/x-vcard"), render_MIME_VCard);
 	RegisterMimeRenderer(HKEY("text/vcard"), render_MIME_VCard);
 	RegisterMimeRenderer(HKEY("text/calendar"), render_MIME_ICS);
 	RegisterMimeRenderer(HKEY("application/ics"), render_MIME_ICS);
-
 	RegisterMimeRenderer(HKEY("text/x-citadel-variformat"), render_MAIL_variformat);
 	RegisterMimeRenderer(HKEY("text/plain"), render_MAIL_text_plain);
 	RegisterMimeRenderer(HKEY("text"), render_MAIL_text_plain);
 	RegisterMimeRenderer(HKEY("text/html"), render_MAIL_html);
 	RegisterMimeRenderer(HKEY(""), render_MAIL_UNKNOWN);
 
+	/* these headers are citserver replies to MSG4 and friends. one evaluator for each */
 	RegisterMsgHdr(HKEY("nhdr"), examine_nhdr, 0);
 	RegisterMsgHdr(HKEY("type"), examine_type, 0);
 	RegisterMsgHdr(HKEY("from"), examine_from, 0);
@@ -1112,14 +1562,42 @@ InitModule_MSGRENDERERS
 	RegisterMsgHdr(HKEY("time"), examine_time, 0);
 	RegisterMsgHdr(HKEY("part"), examine_mime_part, 0);
 	RegisterMsgHdr(HKEY("text"), examine_text, 1);
+	/* these are the content-type headers we get infront of a message; put it into the same hash since it doesn't clash. */
 	RegisterMsgHdr(HKEY("X-Citadel-MSG4-Partnum"), examine_msg4_partnum, 0);
 	RegisterMsgHdr(HKEY("Content-type"), examine_content_type, 0);
 	RegisterMsgHdr(HKEY("Content-length"), examine_content_lengh, 0);
-	RegisterMsgHdr(HKEY("Content-transfer-encoding"), examine_content_encoding, 0);
+	RegisterMsgHdr(HKEY("Content-transfer-encoding"), examine_content_encoding, 0); /* do we care? */
 	RegisterMsgHdr(HKEY("charset"), examine_charset, 0);
 
-	/* Don't care... */
+	/* Don't care about these... */
 	RegisterMsgHdr(HKEY("pref"), examine_pref, 0);
 	RegisterMsgHdr(HKEY("suff"), examine_suff, 0);
 	RegisterMsgHdr(HKEY("path"), examine_path, 0);
 }
+
+void 
+ServerStartModule_MSGRENDERERS
+(void)
+{
+	MsgHeaderHandler = NewHash(1, NULL);
+	MimeRenderHandler = NewHash(1, NULL);
+	ReadLoopHandler = NewHash(1, NULL);
+}
+
+void 
+ServerShutdownModule_MSGRENDERERS
+(void)
+{
+	DeleteHash(&MsgHeaderHandler);
+	DeleteHash(&MimeRenderHandler);
+	DeleteHash(&ReadLoopHandler);
+}
+
+
+
+void 
+SessionDestroyModule_MSGRENDERERS
+(wcsession *sess)
+{
+	DeleteHash(&sess->attachments);
+}