indent -kr -i8 -brf -bbb -fnc -l132 -nce on all of webcit-classic
[citadel.git] / webcit / msg_renderers.c
index 97b454abdbdf3cfa4f1ee2c4361f3ca6503c2eff..a4784b39f0fe3cf632fddec1b6eff219ee993496 100644 (file)
@@ -1,13 +1,28 @@
 #include "webcit.h"
 #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;
+
+
+static inline void CheckConvertBufs(struct wcsession *WCC) {
+       if (WCC->ConvertBuf1 == NULL)
+               WCC->ConvertBuf1 = NewStrBuf();
+       if (WCC->ConvertBuf2 == NULL)
+               WCC->ConvertBuf2 = NewStrBuf();
+}
 
 /*
  * message index functions
  */
 
 
-void DestroyMimeParts(wc_mime_attachment *Mime)
-{
+void DestroyMimeParts(wc_mime_attachment * Mime) {
        FreeStrBuf(&Mime->Name);
        FreeStrBuf(&Mime->FileName);
        FreeStrBuf(&Mime->PartNum);
@@ -17,16 +32,14 @@ void DestroyMimeParts(wc_mime_attachment *Mime)
        FreeStrBuf(&Mime->Data);
 }
 
-void DestroyMime(void *vMime)
-{
-       wc_mime_attachment *Mime = (wc_mime_attachment*)vMime;
+void DestroyMime(void *vMime) {
+       wc_mime_attachment *Mime = (wc_mime_attachment *) vMime;
        DestroyMimeParts(Mime);
        free(Mime);
 }
 
-void DestroyMessageSummary(void *vMsg)
-{
-       message_summary *Msg = (message_summary*) vMsg;
+void DestroyMessageSummary(void *vMsg) {
+       message_summary *Msg = (message_summary *) vMsg;
 
        FreeStrBuf(&Msg->from);
        FreeStrBuf(&Msg->to);
@@ -34,40 +47,72 @@ 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->reply_to);
-
-       DeleteHash(&Msg->Attachments);  /**< list of Accachments */
+       FreeStrBuf(&Msg->EnvTo);
+       DeleteHash(&Msg->Attachments);  /* list of Attachments */
        DeleteHash(&Msg->Submessages);
        DeleteHash(&Msg->AttachLinks);
        DeleteHash(&Msg->AllAttach);
        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)
-{
+void RegisterMsgHdr(const char *HeaderName, long HdrNLen, ExamineMsgHeaderFunc evaluator, int type) {
        headereval *ev;
-       ev = (headereval*) malloc(sizeof(headereval));
+       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);
 }
 
-void RegisterMimeRenderer(const char *HeaderName, long HdrNLen, RenderMimeFunc MimeRenderer)
-{
+void RegisterMimeRenderer(const char *HeaderName, long HdrNLen, RenderMimeFunc MimeRenderer, int InlineRenderable, int Priority) {
        RenderMimeFuncStruct *f;
 
-       f = (RenderMimeFuncStruct*) malloc(sizeof(RenderMimeFuncStruct));
+       f = (RenderMimeFuncStruct *) malloc(sizeof(RenderMimeFuncStruct));
        f->f = MimeRenderer;
        Put(MimeRenderHandler, HeaderName, HdrNLen, f, NULL);
-       
+       if (InlineRenderable)
+               RegisterEmbeddableMimeType(HeaderName, HdrNLen, 10000 - Priority);
 }
 
 /*----------------------------------------------------------------------------*/
@@ -79,12 +124,14 @@ int longcmp_r(const void *s1, const void *s2) {
        long l1;
        long l2;
 
-       l1 = *(long *)GetSearchPayload(s1);
-       l2 = *(long *)GetSearchPayload(s2);
+       l1 = *(long *) GetSearchPayload(s1);
+       l2 = *(long *) GetSearchPayload(s2);
 
-       if (l1 > l2) return(-1);
-       if (l1 < l2) return(+1);
-       return(0);
+       if (l1 > l2)
+               return (-1);
+       if (l1 < l2)
+               return (+1);
+       return (0);
 }
 
 /*
@@ -94,21 +141,23 @@ int qlongcmp_r(const void *s1, const void *s2) {
        long l1 = (long) s1;
        long l2 = (long) s2;
 
-       if (l1 > l2) return(-1);
-       if (l1 < l2) return(+1);
-       return(0);
+       if (l1 > l2)
+               return (-1);
+       if (l1 < l2)
+               return (+1);
+       return (0);
 }
 
+
 /*
  * comparator for message summary structs by ascending subject.
  */
 int summcmp_subj(const void *s1, const void *s2) {
        message_summary *summ1;
        message_summary *summ2;
-       
-       summ1 = (message_summary *)GetSearchPayload(s1);
-       summ2 = (message_summary *)GetSearchPayload(s2);
+
+       summ1 = (message_summary *) GetSearchPayload(s1);
+       summ2 = (message_summary *) GetSearchPayload(s2);
        return strcasecmp(ChrPtr(summ1->subj), ChrPtr(summ2->subj));
 }
 
@@ -118,20 +167,21 @@ int summcmp_subj(const void *s1, const void *s2) {
 int summcmp_rsubj(const void *s1, const void *s2) {
        message_summary *summ1;
        message_summary *summ2;
-       
-       summ1 = (message_summary *)GetSearchPayload(s1);
-       summ2 = (message_summary *)GetSearchPayload(s2);
+
+       summ1 = (message_summary *) GetSearchPayload(s1);
+       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;
+
+       summ1 = (message_summary *) s1;
+       summ2 = (message_summary *) s2;
        return ChrPtr(summ2->subj)[0] != ChrPtr(summ1->subj)[0];
 }
 
@@ -141,9 +191,9 @@ int groupchange_subj(const void *s1, const void *s2) {
 int summcmp_sender(const void *s1, const void *s2) {
        message_summary *summ1;
        message_summary *summ2;
-       
-       summ1 = (message_summary *)GetSearchPayload(s1);
-       summ2 = (message_summary *)GetSearchPayload(s2);
+
+       summ1 = (message_summary *) GetSearchPayload(s1);
+       summ2 = (message_summary *) GetSearchPayload(s2);
        return strcasecmp(ChrPtr(summ1->from), ChrPtr(summ2->from));
 }
 
@@ -153,20 +203,21 @@ int summcmp_sender(const void *s1, const void *s2) {
 int summcmp_rsender(const void *s1, const void *s2) {
        message_summary *summ1;
        message_summary *summ2;
-       
-       summ1 = (message_summary *)GetSearchPayload(s1);
-       summ2 = (message_summary *)GetSearchPayload(s2);
+
+       summ1 = (message_summary *) GetSearchPayload(s1);
+       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;
+
+       summ1 = (message_summary *) s1;
+       summ2 = (message_summary *) s2;
        return strcasecmp(ChrPtr(summ2->from), ChrPtr(summ1->from)) != 0;
 
 }
@@ -177,13 +228,16 @@ int groupchange_sender(const void *s1, const void *s2) {
 int summcmp_date(const void *s1, const void *s2) {
        message_summary *summ1;
        message_summary *summ2;
-       
-       summ1 = (message_summary *)GetSearchPayload(s1);
-       summ2 = (message_summary *)GetSearchPayload(s2);
 
-       if (summ1->date < summ2->date) return -1;
-       else if (summ1->date > summ2->date) return +1;
-       else return 0;
+       summ1 = (message_summary *) GetSearchPayload(s1);
+       summ2 = (message_summary *) GetSearchPayload(s2);
+
+       if (summ1->date < summ2->date)
+               return -1;
+       else if (summ1->date > summ2->date)
+               return +1;
+       else
+               return 0;
 }
 
 /*
@@ -192,13 +246,16 @@ int summcmp_date(const void *s1, const void *s2) {
 int summcmp_rdate(const void *s1, const void *s2) {
        message_summary *summ1;
        message_summary *summ2;
-       
-       summ1 = (message_summary *)GetSearchPayload(s1);
-       summ2 = (message_summary *)GetSearchPayload(s2);
 
-       if (summ1->date < summ2->date) return +1;
-       else if (summ1->date > summ2->date) return -1;
-       else return 0;
+       summ1 = (message_summary *) GetSearchPayload(s1);
+       summ2 = (message_summary *) GetSearchPayload(s2);
+
+       if (summ1->date < summ2->date)
+               return +1;
+       else if (summ1->date > summ2->date)
+               return -1;
+       else
+               return 0;
 }
 
 /*
@@ -208,111 +265,182 @@ 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);
+       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? */
+/* Stub handlers for MIME parser */
+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) {
+
+/* nothing to do here */
+}
+
+
+void examine_exti(message_summary * Msg, StrBuf * HdrLine, StrBuf * FoundCharset) {
+
+/* nothing to do here */
 }
 
-void examine_nhdr(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
-{
+void examine_nhdr(message_summary * Msg, StrBuf * HdrLine, StrBuf * FoundCharset) {
        Msg->nhdr = 0;
        if (!strncasecmp(ChrPtr(HdrLine), "yes", 8))
                Msg->nhdr = 1;
 }
-int Conditional_ANONYMOUS_MESSAGE(StrBuf *Target, WCTemplputParams *TP)
-{
-       message_summary *Msg = (message_summary*) CTX;
+int Conditional_ANONYMOUS_MESSAGE(StrBuf * Target, WCTemplputParams * TP) {
+       message_summary *Msg = (message_summary *) CTX(CTX_MAILSUM);
        return Msg->nhdr != 0;
 }
 
-void examine_type(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
-{
+void examine_type(message_summary * Msg, StrBuf * HdrLine, StrBuf * FoundCharset) {
        Msg->format_type = StrToi(HdrLine);
-                       
+
 }
 
-void examine_from(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
-{
+void examine_from(message_summary * Msg, StrBuf * HdrLine, StrBuf * FoundCharset) {
+       CheckConvertBufs(WC);
        FreeStrBuf(&Msg->from);
        Msg->from = NewStrBufPlain(NULL, StrLength(HdrLine));
-       StrBuf_RFC822_to_Utf8(Msg->from, HdrLine, WC->DefaultCharset, FoundCharset);
+       StrBuf_RFC822_2_Utf8(Msg->from, HdrLine, WC->DefaultCharset, FoundCharset, WC->ConvertBuf1, WC->ConvertBuf2);
 }
-void tmplput_MAIL_SUMM_FROM(StrBuf *Target, WCTemplputParams *TP)
-{
-       message_summary *Msg = (message_summary*) CTX;
+void tmplput_MAIL_SUMM_FROM(StrBuf * Target, WCTemplputParams * TP) {
+       message_summary *Msg = (message_summary *) CTX(CTX_MAILSUM);
        StrBufAppendTemplate(Target, TP, Msg->from, 0);
 }
 
-
-
-void examine_subj(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
-{
+void examine_subj(message_summary * Msg, StrBuf * HdrLine, StrBuf * FoundCharset) {
+       CheckConvertBufs(WC);
        FreeStrBuf(&Msg->subj);
        Msg->subj = NewStrBufPlain(NULL, StrLength(HdrLine));
-       StrBuf_RFC822_to_Utf8(Msg->subj, HdrLine, WC->DefaultCharset, FoundCharset);
+       StrBuf_RFC822_2_Utf8(Msg->subj, HdrLine, WC->DefaultCharset, FoundCharset, WC->ConvertBuf1, WC->ConvertBuf2);
 }
-void tmplput_MAIL_SUMM_SUBJECT(StrBuf *Target, WCTemplputParams *TP)
-{/*////TODO: Fwd: and RE: filter!!*/
+void tmplput_MAIL_SUMM_SUBJECT(StrBuf * Target, WCTemplputParams * TP) {
+       message_summary *Msg = (message_summary *) CTX(CTX_MAILSUM);
+
+       if (TP->Tokens->nParameters == 4) {
+               const char *pch;
+               long len;
 
-       message_summary *Msg = (message_summary*) CTX;
+               GetTemplateTokenString(Target, TP, 3, &pch, &len);
+               if ((len > 0) && (strstr(ChrPtr(Msg->subj), pch) == NULL)) {
+                       GetTemplateTokenString(Target, TP, 2, &pch, &len);
+                       StrBufAppendBufPlain(Target, pch, len, 0);
+               }
+       }
        StrBufAppendTemplate(Target, TP, Msg->subj, 0);
 }
-int Conditional_MAIL_SUMM_SUBJECT(StrBuf *Target, WCTemplputParams *TP)
-{
-       message_summary *Msg = (message_summary*) CTX;
+
+/*
+ * Conditional returns true if the message has a Subject and it is nonzero in length
+ */
+int Conditional_MAIL_SUMM_SUBJECT(StrBuf * Target, WCTemplputParams * TP) {
+       message_summary *Msg = (message_summary *) CTX(CTX_MAILSUM);
        return StrLength(Msg->subj) > 0;
 }
 
 
-void examine_msgn(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
-{
+/*
+ * Conditional returns true if the message originated on the local system
+ */
+int Conditional_MAIL_LOCAL(StrBuf * Target, WCTemplputParams * TP) {
+       message_summary *Msg = (message_summary *) CTX(CTX_MAILSUM);
+       return (Msg->is_local ? 1 : 0);
+}
+
+
+void examine_msgn(message_summary * Msg, StrBuf * HdrLine, StrBuf * FoundCharset) {
+       long Offset = 0;
+       const char *pOffset;
+
+       CheckConvertBufs(WC);
        FreeStrBuf(&Msg->reply_inreplyto);
        Msg->reply_inreplyto = NewStrBufPlain(NULL, StrLength(HdrLine));
-       StrBuf_RFC822_to_Utf8(Msg->reply_inreplyto, HdrLine, WC->DefaultCharset, FoundCharset);
+       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, WC->DefaultCharset, FoundCharset, WC->ConvertBuf1, WC->ConvertBuf2);
 }
-void tmplput_MAIL_SUMM_INREPLYTO(StrBuf *Target, WCTemplputParams *TP)
-{
-       message_summary *Msg = (message_summary*) CTX;
+
+
+void tmplput_MAIL_SUMM_INREPLYTO(StrBuf * Target, WCTemplputParams * TP) {
+       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;
-       return Msg->is_new != 0;
+
+int Conditional_MAIL_SUMM_UNREAD(StrBuf * Target, WCTemplputParams * TP) {
+       message_summary *Msg = (message_summary *) CTX(CTX_MAILSUM);
+       return (Msg->Flags & MSGFLAG_READ) != 0;
 }
 
-void examine_wefw(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
-{
+
+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));
-       StrBuf_RFC822_to_Utf8(Msg->reply_references, HdrLine, WC->DefaultCharset, FoundCharset);
+       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, FoundCharset, WCC->ConvertBuf1, WCC->ConvertBuf2);
 }
-void tmplput_MAIL_SUMM_REFIDS(StrBuf *Target, WCTemplputParams *TP)
-{
-       message_summary *Msg = (message_summary*) CTX;
+
+
+void tmplput_MAIL_SUMM_REFIDS(StrBuf * Target, WCTemplputParams * TP) {
+       message_summary *Msg = (message_summary *) CTX(CTX_MAILSUM);
        StrBufAppendTemplate(Target, TP, Msg->reply_references, 0);
 }
 
 
-void examine_cccc(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
-{
+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) {
+       wcsession *WCC = WC;
+
+       CheckConvertBufs(WCC);
        FreeStrBuf(&Msg->cccc);
        Msg->cccc = NewStrBufPlain(NULL, StrLength(HdrLine));
-       StrBuf_RFC822_to_Utf8(Msg->cccc, HdrLine, WC->DefaultCharset, FoundCharset);
+       StrBuf_RFC822_2_Utf8(Msg->cccc, HdrLine, WCC->DefaultCharset, FoundCharset, WCC->ConvertBuf1, WCC->ConvertBuf2);
        if (Msg->AllRcpt == NULL)
                Msg->AllRcpt = NewStrBufPlain(NULL, StrLength(HdrLine));
        if (StrLength(Msg->AllRcpt) > 0) {
@@ -320,78 +448,80 @@ void examine_cccc(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
        }
        StrBufAppendBuf(Msg->AllRcpt, Msg->cccc, 0);
 }
-void tmplput_MAIL_SUMM_CCCC(StrBuf *Target, WCTemplputParams *TP)
-{
-       message_summary *Msg = (message_summary*) CTX;
+
+
+void tmplput_MAIL_SUMM_CCCC(StrBuf * Target, WCTemplputParams * TP) {
+       message_summary *Msg = (message_summary *) CTX(CTX_MAILSUM);
        StrBufAppendTemplate(Target, TP, Msg->cccc, 0);
 }
 
 
-void examine_room(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
-{
-       if ((StrLength(HdrLine) > 0) &&
-           (strcasecmp(ChrPtr(HdrLine), ChrPtr(WC->wc_roomname)))) {
+void examine_room(message_summary * Msg, StrBuf * HdrLine, StrBuf * FoundCharset) {
+       if ((StrLength(HdrLine) > 0) && (strcasecmp(ChrPtr(HdrLine), ChrPtr(WC->CurRoom.name)))) {
                FreeStrBuf(&Msg->Room);
-               Msg->Room = NewStrBufDup(HdrLine);              
+               Msg->Room = NewStrBufDup(HdrLine);
        }
 }
-void tmplput_MAIL_SUMM_ORGROOM(StrBuf *Target, WCTemplputParams *TP)
-{
-       message_summary *Msg = (message_summary*) CTX;
+
+
+void tmplput_MAIL_SUMM_ORGROOM(StrBuf * Target, WCTemplputParams * TP) {
+       message_summary *Msg = (message_summary *) CTX(CTX_MAILSUM);
        StrBufAppendTemplate(Target, TP, Msg->Room, 0);
 }
 
 
-void examine_rfca(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
-{
+void examine_rfca(message_summary * Msg, StrBuf * HdrLine, StrBuf * FoundCharset) {
        FreeStrBuf(&Msg->Rfca);
        Msg->Rfca = NewStrBufDup(HdrLine);
 }
-void tmplput_MAIL_SUMM_RFCA(StrBuf *Target, WCTemplputParams *TP)
-{
-       message_summary *Msg = (message_summary*) CTX;
+
+
+void examine_locl(message_summary * Msg, StrBuf * HdrLine, StrBuf * FoundCharset) {
+       Msg->is_local = 1;
+}
+
+
+void tmplput_MAIL_SUMM_RFCA(StrBuf * Target, WCTemplputParams * TP) {
+       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;
+
+
+int Conditional_MAIL_SUMM_RFCA(StrBuf * Target, WCTemplputParams * TP) {
+       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;
+
+
+int Conditional_MAIL_SUMM_CCCC(StrBuf * Target, WCTemplputParams * TP) {
+       message_summary *Msg = (message_summary *) CTX(CTX_MAILSUM);
        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), ChrPtr(WCC->serv_info->serv_nodename))
-                  && (strcasecmp(ChrPtr(HdrLine), ChrPtr(WCC->serv_info->serv_fqdn))))))) {
-               FreeStrBuf(&Msg->OtherNode);
-               Msg->OtherNode = NewStrBufDup(HdrLine);
-       }
+int Conditional_MAIL_SUMM_REPLYTO(StrBuf * Target, WCTemplputParams * TP) {
+       message_summary *Msg = (message_summary *) CTX(CTX_MAILSUM);
+       return StrLength(Msg->ReplyTo) > 0;
 }
-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;
+
+
+void examine_nvto(message_summary * Msg, StrBuf * HdrLine, StrBuf * FoundCharset) {
+       wcsession *WCC = WC;
+
+       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);
 }
 
 
-void examine_rcpt(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
-{
+void examine_rcpt(message_summary * Msg, StrBuf * HdrLine, StrBuf * FoundCharset) {
+       wcsession *WCC = WC;
+
+       CheckConvertBufs(WCC);
        FreeStrBuf(&Msg->to);
        Msg->to = NewStrBufPlain(NULL, StrLength(HdrLine));
-       StrBuf_RFC822_to_Utf8(Msg->to, HdrLine, WC->DefaultCharset, FoundCharset);
+       StrBuf_RFC822_2_Utf8(Msg->to, HdrLine, WCC->DefaultCharset, FoundCharset, WCC->ConvertBuf1, WCC->ConvertBuf2);
        if (Msg->AllRcpt == NULL)
                Msg->AllRcpt = NewStrBufPlain(NULL, StrLength(HdrLine));
        if (StrLength(Msg->AllRcpt) > 0) {
@@ -399,142 +529,97 @@ void examine_rcpt(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
        }
        StrBufAppendBuf(Msg->AllRcpt, Msg->to, 0);
 }
-void tmplput_MAIL_SUMM_TO(StrBuf *Target, WCTemplputParams *TP)
-{
-       message_summary *Msg = (message_summary*) CTX;
+
+
+void tmplput_MAIL_SUMM_TO(StrBuf * Target, WCTemplputParams * TP) {
+       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;
+
+
+int Conditional_MAIL_SUMM_TO(StrBuf * Target, WCTemplputParams * TP) {
+       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;
+
+
+int Conditional_MAIL_SUMM_SUBJ(StrBuf * Target, WCTemplputParams * TP) {
+       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;
+
+
+void tmplput_MAIL_SUMM_ALLRCPT(StrBuf * Target, WCTemplputParams * TP) {
+       message_summary *Msg = (message_summary *) CTX(CTX_MAILSUM);
        StrBufAppendTemplate(Target, TP, Msg->AllRcpt, 0);
 }
 
 
-
-void tmplput_SUMM_COUNT(StrBuf *Target, WCTemplputParams *TP)
-{
-       StrBufAppendPrintf(Target, "%d", GetCount( WC->summ));
+void tmplput_SUMM_COUNT(StrBuf * Target, WCTemplputParams * TP) {
+       StrBufAppendPrintf(Target, "%d", GetCount(WC->summ));
 }
 
-HashList *iterate_get_mailsumm_All(StrBuf *Target, WCTemplputParams *TP)
-{
+
+HashList *iterate_get_mailsumm_All(StrBuf * Target, WCTemplputParams * TP) {
        return WC->summ;
 }
-void examine_time(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
-{
+
+
+void examine_time(message_summary * Msg, StrBuf * HdrLine, StrBuf * FoundCharset) {
        Msg->date = StrTol(HdrLine);
 }
 
-void tmplput_MAIL_SUMM_DATE_BRIEF(StrBuf *Target, WCTemplputParams *TP)
-{
+
+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_DATE_FULL(StrBuf *Target, WCTemplputParams *TP)
-{
+void tmplput_MAIL_SUMM_EUID(StrBuf * Target, WCTemplputParams * TP) {
+       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;
+void tmplput_MAIL_SUMM_DATE_NO(StrBuf * Target, WCTemplputParams * TP) {
+       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;
 
-       Mime->Data = NewStrBufPlain(NULL, Mime->length);
-       read_message(Mime->Data, HKEY("view_submessage"), Mime->msgnum, Mime->PartNum, &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, TP);
+
 /*
        if ( (!IsEmptyStr(mime_submessages)) && (!section[0]) ) {
                for (i=0; i<num_tokens(mime_submessages, '|'); ++i) {
                        extract_token(buf, mime_submessages, i, '|', sizeof buf);
                        / ** use printable_view to suppress buttons * /
-                       wprintf("<blockquote>");
+                       wc_printf("<blockquote>");
                        read_message(Mime->msgnum, 1, ChrPtr(Mime->Section));
-                       wprintf("</blockquote>");
+                       wc_printf("</blockquote>");
                }
        }
 */
 }
 
-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(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\">",
-                               Mime->msgnum, ChrPtr(Mime->PartNum));
-                       StrBufAppendPrintf(Buf, "[%s]</a>", _("edit"));
-               }
-
-               /* In all cases, display the full card */
-               display_vcard(Buf, Mime->Data, 0, 1, NULL, Mime->msgnum);
-               FreeStrBuf(&Mime->Data);
-               Mime->Data = Buf;
-       }
-
-}
-
-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)
-{
+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);
        }
@@ -545,49 +630,56 @@ void render_MIME_ICS(wc_mime_attachment *Mime, StrBuf *RawData, StrBuf *FoundCha
 
 
 
-void examine_mime_part(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
-{
+void examine_mime_part(message_summary * Msg, StrBuf * HdrLine, StrBuf * FoundCharset) {
+       const char *Ptr = NULL;
        wc_mime_attachment *Mime;
        StrBuf *Buf;
-       
-       Mime = (wc_mime_attachment*) malloc(sizeof(wc_mime_attachment));
+       wcsession *WCC = WC;
+
+       CheckConvertBufs(WCC);
+       Mime = (wc_mime_attachment *) malloc(sizeof(wc_mime_attachment));
        memset(Mime, 0, sizeof(wc_mime_attachment));
        Mime->msgnum = Msg->msgnum;
        Buf = NewStrBuf();
 
        Mime->Name = NewStrBuf();
-       StrBufExtract_token(Buf, HdrLine, 0, '|');
-       StrBuf_RFC822_to_Utf8(Mime->Name, Buf, WC->DefaultCharset, FoundCharset);
+       StrBufExtract_NextToken(Buf, HdrLine, &Ptr, '|');
+       StrBuf_RFC822_2_Utf8(Mime->Name, Buf, WCC->DefaultCharset, FoundCharset, WCC->ConvertBuf1, WCC->ConvertBuf2);
        StrBufTrim(Mime->Name);
 
-       StrBufExtract_token(Buf, HdrLine, 1, '|');
+       StrBufExtract_NextToken(Buf, HdrLine, &Ptr, '|');
        Mime->FileName = NewStrBuf();
-       StrBuf_RFC822_to_Utf8(Mime->FileName, Buf, WC->DefaultCharset, FoundCharset);
+       StrBuf_RFC822_2_Utf8(Mime->FileName, Buf, WCC->DefaultCharset, FoundCharset, WCC->ConvertBuf1, WCC->ConvertBuf2);
        StrBufTrim(Mime->FileName);
 
        Mime->PartNum = NewStrBuf();
-       StrBufExtract_token(Mime->PartNum, HdrLine, 2, '|');
+       StrBufExtract_NextToken(Mime->PartNum, HdrLine, &Ptr, '|');
        StrBufTrim(Mime->PartNum);
-       if (strchr(ChrPtr(Mime->PartNum), '.') != NULL) 
+       if (strchr(ChrPtr(Mime->PartNum), '.') != NULL)
                Mime->level = 2;
        else
                Mime->level = 1;
 
        Mime->Disposition = NewStrBuf();
-       StrBufExtract_token(Mime->Disposition, HdrLine, 3, '|');
+       StrBufExtract_NextToken(Mime->Disposition, HdrLine, &Ptr, '|');
 
        Mime->ContentType = NewStrBuf();
-       StrBufExtract_token(Mime->ContentType, HdrLine, 4, '|');
+       StrBufExtract_NextToken(Mime->ContentType, HdrLine, &Ptr, '|');
        StrBufTrim(Mime->ContentType);
        StrBufLowerCase(Mime->ContentType);
-
        if (!strcmp(ChrPtr(Mime->ContentType), "application/octet-stream")) {
-               StrBufPlain(Mime->ContentType, 
-                           GuessMimeByFilename(SKEY(Mime->FileName)), -1);
+               StrBufPlain(Mime->ContentType, GuessMimeByFilename(SKEY(Mime->FileName)), -1);
        }
-       Mime->length = StrBufExtract_int(HdrLine, 5, '|');
 
-       if ( (StrLength(Mime->FileName) == 0) && (StrLength(Mime->Name) > 0) ) {
+       Mime->length = StrBufExtractNext_int(HdrLine, &Ptr, '|');
+
+       StrBufSkip_NTokenS(HdrLine, &Ptr, '|', 1);      /* cbid?? */
+
+       Mime->Charset = NewStrBuf();
+       StrBufExtract_NextToken(Mime->Charset, HdrLine, &Ptr, '|');
+
+
+       if ((StrLength(Mime->FileName) == 0) && (StrLength(Mime->Name) > 0)) {
                StrBufAppendBuf(Mime->FileName, Mime->Name, 0);
        }
 
@@ -600,102 +692,69 @@ void examine_mime_part(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundChars
        }
 
        if (Msg->AllAttach == NULL)
-               Msg->AllAttach = NewHash(1,NULL);
+               Msg->AllAttach = NewHash(1, NULL);
        Put(Msg->AllAttach, SKEY(Mime->PartNum), Mime, DestroyMime);
        FreeStrBuf(&Buf);
 }
 
 
-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 */
-       if ((Mime->level == 1) &&
-           GetHash(MimeRenderHandler, SKEY(Mime->ContentType), &vMimeRenderer) &&
-           vMimeRenderer != NULL)
-       {
-               Mime->Renderer = (RenderMimeFuncStruct*) vMimeRenderer;
+       if ((Mime->level >= 1) && GetHash(MimeRenderHandler, SKEY(Mime->ContentType), &vMimeRenderer) && vMimeRenderer != NULL) {
+               Mime->Renderer = (RenderMimeFuncStruct *) vMimeRenderer;
                if (Msg->Submessages == NULL)
-                       Msg->Submessages = NewHash(1,NULL);
+                       Msg->Submessages = NewHash(1, NULL);
                Put(Msg->Submessages, SKEY(Mime->PartNum), Mime, reference_free_handler);
        }
-       else if ((Mime->level == 1) &&
-                (!strcasecmp(ChrPtr(Mime->Disposition), "inline"))
-                && (!strncasecmp(ChrPtr(Mime->ContentType), "image/", 6)) ){
+       else if ((Mime->level >= 1) && (!strcasecmp(ChrPtr(Mime->Disposition), "inline"))
+                && (!strncasecmp(ChrPtr(Mime->ContentType), "image/", 6))) {
                if (Msg->AttachLinks == NULL)
-                       Msg->AttachLinks = NewHash(1,NULL);
+                       Msg->AttachLinks = NewHash(1, NULL);
                Put(Msg->AttachLinks, SKEY(Mime->PartNum), Mime, reference_free_handler);
        }
-       else if ((Mime->level == 1) &&
-                (StrLength(Mime->ContentType) > 0) &&
-                 ( (!strcasecmp(ChrPtr(Mime->Disposition), "attachment")) 
-                   || (!strcasecmp(ChrPtr(Mime->Disposition), "inline"))
-                   || (!strcasecmp(ChrPtr(Mime->Disposition), ""))))
-       {               
+       else if ((Mime->level >= 1) && (StrLength(Mime->ContentType) > 0) && ((!strcasecmp(ChrPtr(Mime->Disposition), "attachment"))
+                                                                             || (!strcasecmp(ChrPtr(Mime->Disposition), "inline"))
+                                                                             || (!strcasecmp(ChrPtr(Mime->Disposition), "")))) {
                if (Msg->AttachLinks == NULL)
-                       Msg->AttachLinks = NewHash(1,NULL);
+                       Msg->AttachLinks = NewHash(1, NULL);
                Put(Msg->AttachLinks, SKEY(Mime->PartNum), Mime, reference_free_handler);
-               if ((strcasecmp(ChrPtr(Mime->ContentType), "application/octet-stream") == 0) && 
-                   (StrLength(Mime->FileName) > 0)) {
+               if ((strcasecmp(ChrPtr(Mime->ContentType), "application/octet-stream") == 0) && (StrLength(Mime->FileName) > 0)) {
                        FlushStrBuf(Mime->ContentType);
-                       StrBufAppendBufPlain(Mime->ContentType,
-                                            GuessMimeByFilename(SKEY(Mime->FileName)),
-                                            -1, 0);
+                       StrBufAppendBufPlain(Mime->ContentType, GuessMimeByFilename(SKEY(Mime->FileName)), -1, 0);
                }
        }
 }
 
-void tmplput_MAIL_SUMM_NATTACH(StrBuf *Target, WCTemplputParams *TP)
-{
-       message_summary *Msg = (message_summary*) CTX;
+void tmplput_MAIL_SUMM_NATTACH(StrBuf * Target, WCTemplputParams * TP) {
+       message_summary *Msg = (message_summary *) CTX(CTX_MAILSUM);
        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, 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)
-{
-       Msg->MsgBody->Data = NewStrBufPlain(NULL, SIZ);
+void examine_text(message_summary * Msg, StrBuf * HdrLine, StrBuf * FoundCharset) {
+       if (Msg->MsgBody->Data == NULL)
+               Msg->MsgBody->Data = NewStrBufPlain(NULL, SIZ);
+       else
+               FlushStrBuf(Msg->MsgBody->Data);
 }
 
-void examine_msg4_partnum(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
-{
+void examine_msg4_partnum(message_summary * Msg, StrBuf * HdrLine, StrBuf * FoundCharset) {
        Msg->MsgBody->PartNum = NewStrBufDup(HdrLine);
        StrBufTrim(Msg->MsgBody->PartNum);
 }
 
-void examine_content_lengh(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
-{
+void examine_content_lengh(message_summary * Msg, StrBuf * HdrLine, StrBuf * FoundCharset) {
        Msg->MsgBody->length = StrTol(HdrLine);
        Msg->MsgBody->size_known = 1;
 }
 
-void examine_content_type(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
-{
-       void *vHdr;
-       headereval *Hdr;
+void examine_content_type(message_summary * Msg, StrBuf * HdrLine, StrBuf * FoundCharset) {
        StrBuf *Token;
        StrBuf *Value;
-       const charsem;
+       const char *sem;
        const char *eq;
        int len;
        StrBufTrim(HdrLine);
@@ -709,7 +768,7 @@ void examine_content_type(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCh
                StrBufCutAt(Msg->MsgBody->ContentType, len, NULL);
                while (sem != NULL) {
                        while (isspace(*(sem + 1)))
-                               sem ++;
+                               sem++;
                        StrBufCutLeft(HdrLine, sem - ChrPtr(HdrLine));
                        sem = strchr(ChrPtr(HdrLine), ';');
                        if (sem != NULL)
@@ -722,115 +781,171 @@ void examine_content_type(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCh
                        eq = strchr(ChrPtr(Token), '=');
                        if (eq != NULL) {
                                len = eq - ChrPtr(Token);
-                               StrBufAppendBufPlain(Value, eq + 1, StrLength(Token) - len - 1, 0); 
+                               StrBufAppendBufPlain(Value, eq + 1, StrLength(Token) - len - 1, 0);
                                StrBufCutAt(Token, len, NULL);
                                StrBufTrim(Value);
                        }
                        StrBufTrim(Token);
 
-                       if (GetHash(MsgHeaderHandler, SKEY(Token), &vHdr) &&
-                           (vHdr != NULL)) {
-                               Hdr = (headereval*)vHdr;
-                               Hdr->evaluator(Msg, Value, FoundCharset);
-                       }
-                       else lprintf(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);
        }
 }
 
-void tmplput_MAIL_SUMM_N(StrBuf *Target, WCTemplputParams *TP)
-{
-       message_summary *Msg = (message_summary*) CTX;
+
+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(CTX_MAILSUM);
        StrBufAppendPrintf(Target, "%ld", Msg->msgnum);
 }
 
 
+void tmplput_MAIL_SUMM_PERMALINK(StrBuf * Target, WCTemplputParams * TP) {
+       message_summary *Msg = (message_summary *) CTX(CTX_MAILSUM);
+       StrBuf *perma_link;
+       const StrBuf *View;
+
+       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;
+int Conditional_MAIL_MIME_ALL(StrBuf * Target, WCTemplputParams * TP) {
+       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;
+int Conditional_MAIL_MIME_SUBMESSAGES(StrBuf * Target, WCTemplputParams * TP) {
+       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;
+int Conditional_MAIL_MIME_ATTACHLINKS(StrBuf * Target, WCTemplputParams * TP) {
+       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;
+int Conditional_MAIL_MIME_ATTACH(StrBuf * Target, WCTemplputParams * TP) {
+       message_summary *Msg = (message_summary *) CTX(CTX_MAILSUM);
        return GetCount(Msg->AllAttach) > 0;
 }
 
-void tmplput_QUOTED_MAIL_BODY(StrBuf *Target, WCTemplputParams *TP)
-{
+void tmplput_QUOTED_MAIL_BODY(StrBuf * Target, WCTemplputParams * TP) {
        const StrBuf *Mime;
-        long MsgNum;
+       long MsgNum;
        StrBuf *Buf;
 
        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);
 }
 
-void tmplput_EDIT_MAIL_BODY(StrBuf *Target, WCTemplputParams *TP)
-{
+void tmplput_EDIT_MAIL_BODY(StrBuf * Target, WCTemplputParams * TP) {
        const StrBuf *Mime;
-        long MsgNum;
+       long MsgNum;
        StrBuf *Buf;
 
        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);
 }
 
-void tmplput_MAIL_BODY(StrBuf *Target, WCTemplputParams *TP)
-{
-       message_summary *Msg = (message_summary*) CTX;
+void tmplput_EDIT_WIKI_BODY(StrBuf * Target, WCTemplputParams * TP) {
+       const StrBuf *Mime;
+       long msgnum;
+       StrBuf *Buf;
+
+       /* Insert the existing content of the wiki page into the editor.  But we only want
+        * to do this the first time -- if the user is uploading an attachment we don't want
+        * to do it again.
+        */
+       if (!havebstr("attach_button")) {
+               StrBuf *wikipage = NewStrBufDup(sbstr("page"));
+               putbstr("format", NewStrBufPlain(HKEY("plain")));
+               str_wiki_index(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, TP);
+                       StrBufAppendTemplate(Target, TP, Buf, 1);
+                       FreeStrBuf(&Buf);
+               }
+       }
+}
+
+void tmplput_MAIL_BODY(StrBuf * Target, WCTemplputParams * TP) {
+       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)
-{
-       StrBuf *cs = NULL;
+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;
-
-       int ConvertIt = 1;
+       StrBuf *TTarget;
+       long Linecount;
+       long nEmptyLines;
        int bn = 0;
        int bq = 0;
        int i;
        long len;
 #ifdef HAVE_ICONV
-       iconv_t ic = (iconv_t)(-1) ;
+       StrBuf *cs = NULL;
+       int ConvertIt = 1;
+       iconv_t ic = (iconv_t) (-1);
 #endif
 
        if ((StrLength(Mime->Data) == 0) && (Mime->length > 0)) {
@@ -857,9 +972,9 @@ 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) ) {
-                               lprintf(5, "%s:%d iconv_open(UTF-8, %s) failed: %s\n",
-                                       __FILE__, __LINE__, ChrPtr(Mime->Charset), strerror(errno));
+                       if (ic == (iconv_t) (-1)) {
+                               syslog(LOG_WARNING, "%s:%d iconv_open(UTF-8, %s) failed: %s\n",
+                                      __FILE__, __LINE__, ChrPtr(Mime->Charset), strerror(errno));
                        }
                }
        }
@@ -867,65 +982,69 @@ 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));
-
-       if (StrLength(Mime->Data) > 0) 
-               do 
-               {
+       TTarget = NewStrBufPlain(NULL, StrLength(Mime->Data));
+       Linecount = 0;
+       nEmptyLines = 0;
+       if (StrLength(Mime->Data) > 0)
+               do {
                        StrBufSipLine(Line, Mime->Data, &BufPtr);
                        bq = 0;
                        i = 0;
                        ptr = ChrPtr(Line);
                        len = StrLength(Line);
                        pte = ptr + len;
-               
-                       while ((ptr < pte) &&
-                              ((*ptr == '>') ||
-                               isspace(*ptr)))
-                       {
+
+                       while ((ptr < pte) && ((*ptr == '>') || isspace(*ptr))) {
                                if (*ptr == '>')
                                        bq++;
-                               ptr ++;
+                               ptr++;
                                i++;
                        }
-                       if (i > 0) StrBufCutLeft(Line, i);
-               
+                       if (i > 0)
+                               StrBufCutLeft(Line, i);
+
                        if (StrLength(Line) == 0) {
-                               StrBufAppendBufPlain(Target, HKEY("<tt></tt><br />\n"), 0);
+                               if (Linecount == 0)
+                                       continue;
+                               StrBufAppendBufPlain(TTarget, HKEY("<tt></tt><br>\n"), 0);
+
+                               nEmptyLines++;
                                continue;
                        }
-
-                       for (i = bn; i < bq; i++)                               
-                               StrBufAppendBufPlain(Target, HKEY("<blockquote>"), 0);
-                       for (i = bq; i < bn; i++)                               
-                               StrBufAppendBufPlain(Target, HKEY("</blockquote>"), 0);
-
+                       nEmptyLines = 0;
+                       for (i = bn; i < bq; i++)
+                               StrBufAppendBufPlain(TTarget, HKEY("<blockquote>"), 0);
+                       for (i = bq; i < bn; i++)
+                               StrBufAppendBufPlain(TTarget, HKEY("</blockquote>"), 0);
+#ifdef HAVE_ICONV
                        if (ConvertIt) {
                                StrBufConvert(Line, Line1, &ic);
                        }
-
-                       StrBufAppendBufPlain(Target, HKEY("<tt>"), 0);
+#endif
+                       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++;
                }
-       while ((BufPtr != StrBufNOTNULL) &&
-              (BufPtr != NULL));
+               while ((BufPtr != StrBufNOTNULL) && (BufPtr != NULL));
 
-       for (i = 0; i < bn; i++)                                
-               StrBufAppendBufPlain(Target, HKEY("</blockquote>"), 0);
+       if (nEmptyLines > 0)
+               StrBufCutRight(TTarget, nEmptyLines * (sizeof("<tt></tt><br>\n") - 1));
+       for (i = 0; i < bn; i++)
+               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) ) {
+       if (ic != (iconv_t) (-1)) {
                iconv_close(ic);
        }
 #endif
 
        FreeStrBuf(&Mime->Data);
-       Mime->Data = Target;
+       Mime->Data = TTarget;
        FlushStrBuf(Mime->ContentType);
        StrBufAppendBufPlain(Mime->ContentType, HKEY("text/html"), 0);
        FlushStrBuf(Mime->Charset);
@@ -935,8 +1054,8 @@ 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)
@@ -945,628 +1064,333 @@ void render_MAIL_html(wc_mime_attachment *Mime, StrBuf *RawData, StrBuf *FoundCh
        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), 
-                   Mime->msgnum,
-                   Mime->Data, Buf);
+       output_html(ChrPtr(Mime->Charset), (WC->CurRoom.view == VIEW_WIKI ? 1 : 0), Mime->msgnum, Mime->Data, Buf);
        FreeStrBuf(&Mime->Data);
        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);
        StrBufAppendBuf(Mime->Data, Mime->ContentType, 0);
-       StrBufAppendBufPlain(Mime->Data, HKEY("<br />\n"), 0);
+       StrBufAppendBufPlain(Mime->Data, HKEY("<br>\n"), 0);
 }
 
 
-HashList *iterate_get_mime_All(StrBuf *Target, WCTemplputParams *TP)
-{
-       message_summary *Msg = (message_summary*) CTX;
+HashList *iterate_get_mime_All(StrBuf * Target, WCTemplputParams * TP) {
+       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;
+HashList *iterate_get_mime_Submessages(StrBuf * Target, WCTemplputParams * TP) {
+       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;
+HashList *iterate_get_mime_AttachLinks(StrBuf * Target, WCTemplputParams * TP) {
+       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;
+HashList *iterate_get_mime_Attachments(StrBuf * Target, WCTemplputParams * TP) {
+       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;
+void tmplput_MIME_Name(StrBuf * Target, WCTemplputParams * TP) {
+       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;
+void tmplput_MIME_FileName(StrBuf * Target, WCTemplputParams * TP) {
+       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;
+void tmplput_MIME_PartNum(StrBuf * Target, WCTemplputParams * TP) {
+       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;
+void tmplput_MIME_MsgNum(StrBuf * Target, WCTemplputParams * TP) {
+       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;
+void tmplput_MIME_Disposition(StrBuf * Target, WCTemplputParams * TP) {
+       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;
+void tmplput_MIME_ContentType(StrBuf * Target, WCTemplputParams * TP) {
+       wc_mime_attachment *mime = (wc_mime_attachment *) CTX(CTX_MIME_ATACH);
        StrBufAppendTemplate(Target, TP, mime->ContentType, 0);
 }
 
-void examine_charset(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
-{
+void examine_charset(message_summary * Msg, StrBuf * HdrLine, StrBuf * FoundCharset) {
        Msg->MsgBody->Charset = NewStrBufDup(HdrLine);
 }
 
-void tmplput_MIME_Charset(StrBuf *Target, WCTemplputParams *TP)
-{
-       wc_mime_attachment *mime = (wc_mime_attachment*) CTX;
+void tmplput_MIME_Charset(StrBuf * Target, WCTemplputParams * TP) {
+       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;
+void tmplput_MIME_Data(StrBuf * Target, WCTemplputParams * TP) {
+       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? */
 }
 
-void tmplput_MIME_LoadData(StrBuf *Target, WCTemplputParams *TP)
-{
-       wcsession *WCC = WC;    
-       wc_mime_attachment *mime = (wc_mime_attachment*) CTX;
+void tmplput_MIME_LoadData(StrBuf * Target, WCTemplputParams * TP) {
+       wcsession *WCC = WC;
+       wc_mime_attachment *mime = (wc_mime_attachment *) CTX(CTX_MIME_ATACH);
        wc_mime_attachment *att;
-       
-       if ( (!strcasecmp(ChrPtr(mime->Disposition), "inline"))||
-            (!strcasecmp(ChrPtr(mime->Disposition), "attachment")) ) 
-       {
-               
-               int n;
-               char N[64];
-               /* steal this mime part... */
-               att = malloc(sizeof(wc_mime_attachment));
-               memcpy(att, mime, sizeof(wc_mime_attachment));
-               memset(mime, 0, sizeof(wc_mime_attachment));
-
-               if (att->Data == NULL) 
+
+       if (((!strcasecmp(ChrPtr(mime->Disposition), "inline")) ||
+            (!strcasecmp(ChrPtr(mime->Disposition), "attachment"))) &&
+           (strcasecmp(ChrPtr(mime->ContentType), "application/ms-tnef") != 0)) {
+
+               int n;
+               char N[64];
+               /* steal this mime part... */
+               att = malloc(sizeof(wc_mime_attachment));
+               memcpy(att, mime, sizeof(wc_mime_attachment));
+               memset(mime, 0, sizeof(wc_mime_attachment));
+
+               if (att->Data == NULL)
                        MimeLoadData(att);
 
-               if (WCC->attachments == NULL)
-                       WCC->attachments = NewHash(1, NULL);
-               /* And add it to the list. */
-               n = snprintf(N, sizeof N, "%d", GetCount(WCC->attachments) + 1);
-               Put(WCC->attachments, N, n, att, DestroyMime);
-       }
+               if (WCC->attachments == NULL)
+                       WCC->attachments = NewHash(1, NULL);
+               /* And add it to the list. */
+               n = snprintf(N, sizeof N, "%d", GetCount(WCC->attachments) + 1);
+               Put(WCC->attachments, N, n, att, DestroyMime);
+       }
 }
 
-void tmplput_MIME_Length(StrBuf *Target, WCTemplputParams *TP)
-{
-       wc_mime_attachment *mime = (wc_mime_attachment*) CTX;
+void tmplput_MIME_Length(StrBuf * Target, WCTemplputParams * TP) {
+       wc_mime_attachment *mime = (wc_mime_attachment *) CTX(CTX_MIME_ATACH);
        StrBufAppendPrintf(Target, "%ld", mime->length);
 }
 
-/* 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;
-}
-
-HashList *iterate_get_registered_Attachments(StrBuf *Target, WCTemplputParams *TP)
-{
+HashList *iterate_get_registered_Attachments(StrBuf * Target, WCTemplputParams * TP) {
        return WC->attachments;
 }
 
-void servcmd_do_search(char *buf, long bufsize)
-{
+void get_registered_Attachments_Count(StrBuf * Target, WCTemplputParams * TP) {
+       StrBufAppendPrintf(Target, "%ld", GetCount(WC->attachments));
+}
+
+void servcmd_do_search(char *buf, long bufsize) {
        snprintf(buf, bufsize, "MSGS SEARCH|%s", bstr("query"));
 }
 
-void servcmd_headers(char *buf, long bufsize)
-{
+void servcmd_headers(char *buf, long bufsize) {
        snprintf(buf, bufsize, "MSGS ALL");
 }
 
-void servcmd_readfwd(char *buf, long bufsize)
-{
+void servcmd_readfwd(char *buf, long bufsize) {
        snprintf(buf, bufsize, "MSGS ALL");
 }
 
-void servcmd_readgt(char *buf, long bufsize)
-{
+void servcmd_readgt(char *buf, long bufsize) {
        snprintf(buf, bufsize, "MSGS GT|%s", bstr("gt"));
 }
 
-void servcmd_readnew(char *buf, long bufsize)
-{
+void servcmd_readlt(char *buf, long bufsize) {
+       snprintf(buf, bufsize, "MSGS LT|%s", bstr("lt"));
+}
+
+void servcmd_readnew(char *buf, long bufsize) {
        snprintf(buf, bufsize, "MSGS NEW");
 }
 
-void servcmd_readold(char *buf, long bufsize)
-{
+void servcmd_readold(char *buf, long bufsize) {
        snprintf(buf, bufsize, "MSGS OLD");
 }
 
 
+/* DO NOT REORDER OR REMOVE ANY OF THESE */
 readloop_struct rlid[] = {
-       { {HKEY("do_search")}, servcmd_do_search},
-       { {HKEY("headers")},   servcmd_headers},
-       { {HKEY("readfwd")},   servcmd_readfwd},
-       { {HKEY("readnew")},   servcmd_readnew},
-       { {HKEY("readold")},   servcmd_readold},
-       { {HKEY("readgt")},    servcmd_readgt}
+       { { HKEY("do_search")}, servcmd_do_search },
+       { { HKEY("headers")}, servcmd_headers },
+       { { HKEY("readfwd")}, servcmd_readfwd },
+       { { HKEY("readnew")}, servcmd_readnew },
+       { { HKEY("readold")}, servcmd_readold },
+       { { HKEY("readgt")}, servcmd_readgt },
+       { { HKEY("readlt")}, servcmd_readlt }
 };
 
-/* 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;
+/* I think these are supposed to align with _eMessageField in messages.h
+ * So if you change one you have to change the other.
+ * TODO: figure out who did this and beat them with a wet noodle.
+ */
+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   */
+       "locl",                 /*      eIsLocal      */
+       "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    */
+};
 
-       VS->BBViewToolBar = NewStrBufPlain(NULL, SIZ);
-       VS->MessageDropdown = NewStrBufPlain(NULL, SIZ);
+HashList *msgKeyLookup = NULL;
 
-       /*** 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);
 
+int GetFieldFromMnemonic(eMessageField * f, const char *c) {
+       void *v = NULL;
+       if (GetHash(msgKeyLookup, c, 4, &v)) {
+               *f = (eMessageField) v;
+               return 1;
        }
-       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;
+       return 0;
 }
 
 
-int bbsview_RenderView_or_Tail(SharedMessageStatus *Stat, 
-                              void **ViewSpecific, 
-                              long oper)
-{
-       wcsession *WCC = WC;
-       bbsview_struct *VS;
-       WCTemplputParams SubTP;
-       const StrBuf *Mime;
+void FillMsgKeyLookupTable(void) {
+       long i = 0;
 
-       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."));
+       msgKeyLookup = NewHash(1, FourHash);
+       for (i = 0; i < eLastHeader; ++i) {
+               if (fieldMnemonics[i] != NULL) {
+                       Put(msgKeyLookup, fieldMnemonics[i], 4, (void *) i, reference_free_handler);
                }
-               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;
+void InitModule_MSGRENDERERS(void) {
+       RegisterCTX(CTX_MAILSUM);
+       RegisterCTX(CTX_MIME_ATACH);
 
-       VS = (bbsview_struct*)*ViewSpecific;
-       end_burst();
-       FreeStrBuf(&VS->BBViewToolBar);
-       FreeStrBuf(&VS->MessageDropdown);
-       free(VS);
-       return 0;
-}
+       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("SUMM:COUNT", 0, 0, tmplput_SUMM_COUNT, NULL, CTX_NONE);
 
-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("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);
-       RegisterNamespace("MAIL:SUMM:TO",      0, 2, tmplput_MAIL_SUMM_TO,       CTX_MAILSUM);
-       RegisterNamespace("MAIL:SUMM:SUBJECT", 0, 4, tmplput_MAIL_SUMM_SUBJECT,  CTX_MAILSUM);
-       RegisterNamespace("MAIL:SUMM:NTATACH", 0, 0, tmplput_MAIL_SUMM_NATTACH,  CTX_MAILSUM);
-       RegisterNamespace("MAIL:SUMM:CCCC", 0, 2, tmplput_MAIL_SUMM_CCCC,  CTX_MAILSUM);
-       RegisterNamespace("MAIL:SUMM:H_NODE", 0, 2, tmplput_MAIL_SUMM_H_NODE,  CTX_MAILSUM);
-       RegisterNamespace("MAIL:SUMM:ALLRCPT", 0, 2, tmplput_MAIL_SUMM_ALLRCPT,  CTX_MAILSUM);
-       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, 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("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);        
+       RegisterIterator("MAIL:SUMM:MSGS", 0, NULL, iterate_get_mailsumm_All, NULL, NULL, CTX_MAILSUM, CTX_NONE, IT_NOFLAG);
+
+       RegisterNamespace("MAIL:SUMM:EUID", 0, 1, tmplput_MAIL_SUMM_EUID, NULL, CTX_MAILSUM);
+       RegisterNamespace("MAIL:SUMM:DATEBRIEF", 0, 0, tmplput_MAIL_SUMM_DATE_BRIEF, NULL, CTX_MAILSUM);
+       RegisterNamespace("MAIL:SUMM:DATEFULL", 0, 0, tmplput_MAIL_SUMM_DATE_FULL, NULL, CTX_MAILSUM);
+       RegisterNamespace("MAIL:SUMM:DATENO", 0, 0, tmplput_MAIL_SUMM_DATE_NO, NULL, CTX_MAILSUM);
+       RegisterNamespace("MAIL:SUMM:N", 0, 0, tmplput_MAIL_SUMM_N, NULL, CTX_MAILSUM);
+       RegisterNamespace("MAIL:SUMM:PERMALINK", 0, 0, tmplput_MAIL_SUMM_PERMALINK, NULL, CTX_MAILSUM);
+       RegisterNamespace("MAIL:SUMM:FROM", 0, 2, tmplput_MAIL_SUMM_FROM, NULL, CTX_MAILSUM);
+       RegisterNamespace("MAIL:SUMM:TO", 0, 2, tmplput_MAIL_SUMM_TO, NULL, CTX_MAILSUM);
+       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: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: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("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);
+       RegisterConditional("COND:MAIL:LOCAL", 0, Conditional_MAIL_LOCAL, 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, IT_NOFLAG);
-       RegisterIterator("MAIL:MIME:ATTACH:SUBMESSAGES", 0, NULL, iterate_get_mime_Submessages, 
-                        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, IT_NOFLAG);
-       RegisterIterator("MAIL:MIME:ATTACH:ATT", 0, NULL, iterate_get_mime_Attachments, 
-                        NULL, NULL, CTX_MIME_ATACH, CTX_MAILSUM, IT_NOFLAG);
+       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, 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,
+                        IT_NOFLAG);
+       RegisterIterator("MAIL:MIME:ATTACH:ATT", 0, NULL, iterate_get_mime_Attachments, 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);
-       RegisterNamespace("MAIL:MIME:MSGNUM", 0, 2, tmplput_MIME_MsgNum, CTX_MIME_ATACH);
-       RegisterNamespace("MAIL:MIME:DISPOSITION", 0, 2, tmplput_MIME_Disposition, CTX_MIME_ATACH);
-       RegisterNamespace("MAIL:MIME:CONTENTTYPE", 0, 2, tmplput_MIME_ContentType, CTX_MIME_ATACH);
-       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);
+       RegisterNamespace("MAIL:MIME:NAME", 0, 2, tmplput_MIME_Name, NULL, CTX_MIME_ATACH);
+       RegisterNamespace("MAIL:MIME:FILENAME", 0, 2, tmplput_MIME_FileName, NULL, CTX_MIME_ATACH);
+       RegisterNamespace("MAIL:MIME:PARTNUM", 0, 2, tmplput_MIME_PartNum, NULL, CTX_MIME_ATACH);
+       RegisterNamespace("MAIL:MIME:MSGNUM", 0, 2, tmplput_MIME_MsgNum, NULL, CTX_MIME_ATACH);
+       RegisterNamespace("MAIL:MIME:DISPOSITION", 0, 2, tmplput_MIME_Disposition, NULL, CTX_MIME_ATACH);
+       RegisterNamespace("MAIL:MIME:CONTENTTYPE", 0, 2, tmplput_MIME_ContentType, NULL, CTX_MIME_ATACH);
+       RegisterNamespace("MAIL:MIME:CHARSET", 0, 2, tmplput_MIME_Charset, NULL, CTX_MIME_ATACH);
+       RegisterNamespace("MAIL:MIME:LENGTH", 0, 2, tmplput_MIME_Length, NULL, CTX_MIME_ATACH);
+       RegisterNamespace("MAIL:MIME:DATA", 0, 2, tmplput_MIME_Data, NULL, CTX_MIME_ATACH);
+
        /* load the actual attachment into WC->attachments; no output!!! */
-       RegisterNamespace("MAIL:MIME:LOADDATA", 0, 0, tmplput_MIME_LoadData, CTX_MIME_ATACH);
+       RegisterNamespace("MAIL:MIME:LOADDATA", 0, 0, tmplput_MIME_LoadData, NULL, 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_MIME_ATACH, CTX_NONE, IT_NOFLAG);
+       RegisterIterator("MSG:ATTACHNAMES", 0, NULL, iterate_get_registered_Attachments, NULL, NULL, CTX_MIME_ATACH, CTX_NONE,
+                        IT_NOFLAG);
+       RegisterNamespace("MSG:NATTACH", 0, 0, get_registered_Attachments_Count, NULL, CTX_NONE);
 
        /* 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);
+       RegisterMimeRenderer(HKEY("message/rfc822"), render_MAIL, 0, 150);
+//*
+       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("locl"), examine_locl, 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. */
+
+       /* these are the content-type headers we get in front 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); /* do we care? */
+       RegisterMsgHdr(HKEY("Content-transfer-encoding"), examine_content_encoding, 0); /* do we care? */
        RegisterMsgHdr(HKEY("charset"), examine_charset, 0);
 
        /* Don't care about these... */
@@ -1575,29 +1399,33 @@ InitModule_MSGRENDERERS
        RegisterMsgHdr(HKEY("path"), examine_path, 0);
 }
 
-void 
-ServerStartModule_MSGRENDERERS
-(void)
-{
+void InitModule2_MSGRENDERERS(void) {
+       /* and finalize the anouncement to the server... */
+       CreateMimeStr();
+}
+
+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)
-{
+void ServerShutdownModule_MSGRENDERERS(void) {
+       DeleteHash(&DflMsgHeaderHandler);
+       DeleteHash(&DflEnumMsgHeaderHandler);
+
+
        DeleteHash(&MsgHeaderHandler);
        DeleteHash(&MimeRenderHandler);
        DeleteHash(&ReadLoopHandler);
+       DeleteHash(&msgKeyLookup);
 }
 
-
-
-void 
-SessionDestroyModule_MSGRENDERERS
-(wcsession *sess)
-{
+void SessionDestroyModule_MSGRENDERERS(wcsession * sess) {
        DeleteHash(&sess->attachments);
+       FreeStrBuf(&sess->ConvertBuf1);
+       FreeStrBuf(&sess->ConvertBuf2);
 }