WebCit now handles the 'local message' flag correctly.
[citadel.git] / webcit / msg_renderers.c
index d04959865188d830015890c6bfa9f9c1b66cefed..3ba80c97f628550c90114eb4711e4ff4317597d8 100644 (file)
@@ -5,6 +5,11 @@
 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)
@@ -47,13 +52,10 @@ void DestroyMessageSummary(void *vMsg)
        FreeStrBuf(&Msg->reply_references);
        FreeStrBuf(&Msg->cccc);
        FreeStrBuf(&Msg->ReplyTo);
-       FreeStrBuf(&Msg->hnod);
        FreeStrBuf(&Msg->AllRcpt);
        FreeStrBuf(&Msg->Room);
        FreeStrBuf(&Msg->Rfca);
        FreeStrBuf(&Msg->EnvTo);
-       FreeStrBuf(&Msg->OtherNode);
-
        DeleteHash(&Msg->Attachments);  /* list of Attachments */
        DeleteHash(&Msg->Submessages);
        DeleteHash(&Msg->AttachLinks);
@@ -61,7 +63,39 @@ void DestroyMessageSummary(void *vMsg)
        free(Msg);
 }
 
+int EvaluateMsgHdrEnum(eMessageField f, message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
+{
+       void *vHdr;
+       headereval* Hdr = NULL;
+       if (GetHash(DflEnumMsgHeaderHandler, IKEY(f), &vHdr) &&
+           (vHdr != NULL)) {
+               Hdr = (headereval*)vHdr;
+       }
+       if (Hdr == NULL)
+               return -1;
+       Hdr->evaluator(Msg, HdrLine, FoundCharset);
+       return Hdr->Type;
+}
 
+int EvaluateMsgHdr(const char *HeaderName, long HdrNLen, message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
+{
+       void *vHdr;
+       headereval* Hdr = NULL;
+       if (HdrNLen == 4) {
+               if (GetHash(DflMsgHeaderHandler, HeaderName, HdrNLen, &vHdr) &&
+                   (vHdr != NULL)) {
+                       Hdr = (headereval*)vHdr;
+               }
+       }
+       if (Hdr == NULL && GetHash(MsgHeaderHandler, HeaderName, HdrNLen, &vHdr) &&
+           (vHdr != NULL)) {
+               Hdr = (headereval*)vHdr;
+       }
+       if (Hdr == NULL)
+               return -1;
+       Hdr->evaluator(Msg, HdrLine, FoundCharset);
+       return Hdr->Type;
+}
 
 void RegisterMsgHdr(const char *HeaderName, long HdrNLen, ExamineMsgHeaderFunc evaluator, int type)
 {
@@ -69,6 +103,15 @@ void RegisterMsgHdr(const char *HeaderName, long HdrNLen, ExamineMsgHeaderFunc e
        ev = (headereval*) malloc(sizeof(headereval));
        ev->evaluator = evaluator;
        ev->Type = type;
+
+       if (HdrNLen == 4) {
+               eMessageField f;
+               if (GetFieldFromMnemonic(&f, HeaderName)) {
+                       Put(DflMsgHeaderHandler, HeaderName, HdrNLen, ev, NULL);
+                       Put(DflEnumMsgHeaderHandler, IKEY(f), ev, reference_free_handler);
+                       return;
+               }
+       }
        Put(MsgHeaderHandler, HeaderName, HdrNLen, ev, NULL);
 }
 
@@ -242,6 +285,12 @@ void examine_content_encoding(message_summary *Msg, StrBuf *HdrLine, StrBuf *Fou
 /* TODO: do we care? */
 }
 
+
+void examine_exti(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
+{
+       /* we don't care */
+}
+
 void examine_nhdr(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
 {
        Msg->nhdr = 0;
@@ -313,23 +362,38 @@ void tmplput_MAIL_SUMM_SUBJECT(StrBuf *Target, WCTemplputParams *TP)
        }
        StrBufAppendTemplate(Target, TP, Msg->subj, 0);
 }
-int Conditional_MAIL_SUMM_SUBJECT(StrBuf *Target, WCTemplputParams *TP)
-{
+
+/*
+ * 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;
+}
 
 
-       return StrLength(Msg->subj) > 0;
+/*
+ * 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)
-{
+void examine_msgn(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset) {
        wcsession *WCC = WC;
+       long Offset = 0;
+       const char *pOffset;
 
        CheckConvertBufs(WCC);
        FreeStrBuf(&Msg->reply_inreplyto);
        Msg->reply_inreplyto = NewStrBufPlain(NULL, StrLength(HdrLine));
-       Msg->reply_inreplyto_hash = ThreadIdHash(HdrLine);
+       pOffset = strchr(ChrPtr(HdrLine), '/');
+       if (pOffset != NULL) {
+               Offset = pOffset - ChrPtr(HdrLine);
+       }
+       Msg->reply_inreplyto_hash = ThreadIdHashOffset(HdrLine, Offset);
        StrBuf_RFC822_2_Utf8(Msg->reply_inreplyto, 
                             HdrLine, 
                             WCC->DefaultCharset,
@@ -352,11 +416,17 @@ int Conditional_MAIL_SUMM_UNREAD(StrBuf *Target, WCTemplputParams *TP)
 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));
-       Msg->reply_references_hash = ThreadIdHash(HdrLine);
+       pOffset = strchr(ChrPtr(HdrLine), '/');
+       if (pOffset != NULL) {
+               Offset = pOffset - ChrPtr(HdrLine);
+       }
+       Msg->reply_references_hash = ThreadIdHashOffset(HdrLine, Offset);
        StrBuf_RFC822_2_Utf8(Msg->reply_references, 
                             HdrLine, 
                             WCC->DefaultCharset, 
@@ -431,6 +501,8 @@ void examine_room(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
                Msg->Room = NewStrBufDup(HdrLine);              
        }
 }
+
+
 void tmplput_MAIL_SUMM_ORGROOM(StrBuf *Target, WCTemplputParams *TP)
 {
        message_summary *Msg = (message_summary*) CTX(CTX_MAILSUM);
@@ -443,6 +515,14 @@ void examine_rfca(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
        FreeStrBuf(&Msg->Rfca);
        Msg->Rfca = NewStrBufDup(HdrLine);
 }
+
+
+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);
@@ -464,29 +544,6 @@ int Conditional_MAIL_SUMM_REPLYTO(StrBuf *Target, WCTemplputParams *TP)
        return StrLength(Msg->ReplyTo) > 0;
 }
 
-void examine_node(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
-{
-       wcsession *WCC = WC;
-
-       if ( (StrLength(HdrLine) > 0) &&
-            ((WC->CurRoom.QRFlags & QR_NETWORK)
-             || ((strcasecmp(ChrPtr(HdrLine), ChrPtr(WCC->serv_info->serv_nodename))
-                  && (strcasecmp(ChrPtr(HdrLine), ChrPtr(WCC->serv_info->serv_fqdn))))))) {
-               FreeStrBuf(&Msg->OtherNode);
-               Msg->OtherNode = NewStrBufDup(HdrLine);
-       }
-}
-void tmplput_MAIL_SUMM_OTHERNODE(StrBuf *Target, WCTemplputParams *TP)
-{
-       message_summary *Msg = (message_summary*) CTX(CTX_MAILSUM);
-       StrBufAppendTemplate(Target, TP, Msg->OtherNode, 0);
-}
-int Conditional_MAIL_SUMM_OTHERNODE(StrBuf *Target, WCTemplputParams *TP)
-{
-       message_summary *Msg = (message_summary*) CTX(CTX_MAILSUM);
-       return StrLength(Msg->OtherNode) > 0;
-}
-
 void examine_nvto(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
 {
        wcsession *WCC = WC;
@@ -753,34 +810,6 @@ void tmplput_MAIL_SUMM_NATTACH(StrBuf *Target, WCTemplputParams *TP)
        StrBufAppendPrintf(Target, "%ld", GetCount(Msg->Attachments));
 }
 
-
-void examine_hnod(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
-{
-       wcsession *WCC = WC;
-
-       CheckConvertBufs(WCC);
-       FreeStrBuf(&Msg->hnod);
-       Msg->hnod = NewStrBufPlain(NULL, StrLength(HdrLine));
-       StrBuf_RFC822_2_Utf8(Msg->hnod, 
-                            HdrLine, 
-                            WCC->DefaultCharset, 
-                            FoundCharset,
-                            WCC->ConvertBuf1,
-                            WCC->ConvertBuf2);
-}
-void tmplput_MAIL_SUMM_H_NODE(StrBuf *Target, WCTemplputParams *TP)
-{
-       message_summary *Msg = (message_summary*) CTX(CTX_MAILSUM);
-       StrBufAppendTemplate(Target, TP, Msg->hnod, 0);
-}
-int Conditional_MAIL_SUMM_H_NODE(StrBuf *Target, WCTemplputParams *TP)
-{
-       message_summary *Msg = (message_summary*) CTX(CTX_MAILSUM);
-       return StrLength(Msg->hnod) > 0;
-}
-
-
-
 void examine_text(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
 {
        if (Msg->MsgBody->Data == NULL)
@@ -803,8 +832,6 @@ void examine_content_lengh(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundC
 
 void examine_content_type(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
 {
-       void *vHdr;
-       headereval *Hdr;
        StrBuf *Token;
        StrBuf *Value;
        const char* sem;
@@ -840,12 +867,8 @@ void examine_content_type(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCh
                        }
                        StrBufTrim(Token);
 
-                       if (GetHash(MsgHeaderHandler, SKEY(Token), &vHdr) &&
-                           (vHdr != NULL)) {
-                               Hdr = (headereval*)vHdr;
-                               Hdr->evaluator(Msg, Value, FoundCharset);
-                       }
-                       else syslog(LOG_WARNING, "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);
@@ -855,8 +878,6 @@ void examine_content_type(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCh
 
 int ReadOneMessageSummary(message_summary *Msg, StrBuf *FoundCharset, StrBuf *Buf)
 {
-       void *vHdr;
-       headereval *Hdr;
        const char *buf;
        const char *ebuf;
        int nBuf;
@@ -878,13 +899,8 @@ int ReadOneMessageSummary(message_summary *Msg, StrBuf *FoundCharset, StrBuf *Bu
                ebuf = strchr(ChrPtr(Buf), '=');
                nBuf = ebuf - buf;
                
-               if (GetHash(MsgHeaderHandler, buf, nBuf, &vHdr) &&
-                   (vHdr != NULL)) {
-                       Hdr = (headereval*)vHdr;
-                       StrBufCutLeft(Buf, nBuf + 1);
-                       Hdr->evaluator(Msg, Buf, FoundCharset);
-               }
-               else syslog(LOG_INFO, "Don't know how to handle Message Headerline [%s]", ChrPtr(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;
 }
@@ -977,11 +993,11 @@ void tmplput_EDIT_WIKI_BODY(StrBuf *Target, WCTemplputParams *TP)
         * to do it again.
         */
        if (!havebstr("attach_button")) {
-               char *wikipage = strdup(bstr("page"));
+               StrBuf *wikipage = NewStrBufDup(sbstr("page"));
                putbstr("format", NewStrBufPlain(HKEY("plain")));
                str_wiki_index(wikipage);
-               msgnum = locate_message_by_uid(wikipage);
-               free(wikipage);
+               msgnum = locate_message_by_uid(ChrPtr(wikipage));
+               FreeStrBuf(&wikipage);
                if (msgnum >= 0L) {
                        Buf = NewStrBuf();
                        read_message(Buf, HKEY("view_message_wikiedit"), msgnum, NULL, &Mime, TP);
@@ -1158,40 +1174,6 @@ void render_MAIL_html(StrBuf *Target, WCTemplputParams *TP, StrBuf *FoundCharset
        Mime->Data = Buf;
 }
 
-#ifdef HAVE_MARKDOWN
-/*
-char * MarkdownHandleURL(const char* SourceURL, const int len, void* something)
-{
-
-}
-*/
-void render_MAIL_markdown(StrBuf *Target, WCTemplputParams *TP, StrBuf *FoundCharset)
-{
-#include <mkdio.h>
-       wc_mime_attachment *Mime = (wc_mime_attachment *) CTX(CTX_MIME_ATACH);
-       MMIOT *doc;
-       char *md_as_html = NULL;
-       const char *format;
-
-       if (StrLength(Mime->Data) == 0)
-               return;
-
-       format = bstr("format");
-
-       if ((format == NULL) || 
-           strcmp(format, "plain"))
-       {
-               doc = mkd_string(ChrPtr(Mime->Data), StrLength(Mime->Data), 0);
-               mkd_basename(doc, "/wiki?page=");
-               mkd_compile(doc, 0);
-               if (mkd_document(doc, &md_as_html) != EOF) {
-                       FreeStrBuf(&Mime->Data);
-                       Mime->Data = NewStrBufPlain(md_as_html, -1);
-               }
-               mkd_cleanup(doc);
-       }
-}
-#endif
 
 void render_MAIL_UNKNOWN(StrBuf *Target, WCTemplputParams *TP, StrBuf *FoundCharset)
 {
@@ -1373,6 +1355,57 @@ readloop_struct rlid[] = {
        { {HKEY("readlt")},     servcmd_readlt          }
 };
 
+const char* fieldMnemonics[] = {
+       "from", /* A -> eAuthor       */
+       "exti", /* E -> eXclusivID    */
+       "rfca", /* F -> erFc822Addr   */
+       "msgn", /* I -> emessageId    */
+       "jrnl", /* J -> eJournal      */
+       "rep2", /* K -> eReplyTo      */
+       "list", /* L -> eListID       */
+       "text", /* M -> eMesageText   */
+       "room", /* O -> eOriginalRoom */
+       "path", /* P -> eMessagePath  */
+       "rcpt", /* R -> eRecipient    */
+       "spec", /* S -> eSpecialField */
+       "time", /* T -> eTimestamp    */
+       "subj", /* U -> eMsgSubject   */
+       "nvto", /* V -> eenVelopeTo   */
+       "wefw", /* W -> eWeferences   */
+       "cccc", /* Y -> eCarbonCopY   */
+       "nhdr", /* % -> eHeaderOnly   */
+       "type", /* % -> eFormatType   */
+       "part", /* % -> eMessagePart  */
+       "suff", /*      eSubFolder    */
+       "pref", /*      ePrefix       */
+       "locl"  /*      eIsLocal      */
+};
+HashList *msgKeyLookup = NULL;
+
+
+int GetFieldFromMnemonic(eMessageField *f, const char *c) {
+       void *v = NULL;
+       if (GetHash(msgKeyLookup, c, 4, &v)) {
+               *f = (eMessageField) v;
+               return 1;
+       }
+       return 0;
+}
+
+
+void FillMsgKeyLookupTable(void) {
+       long i = 0;
+
+       msgKeyLookup = NewHash (1, FourHash);
+
+       while (i != eLastHeader) {
+               if (fieldMnemonics[i] != NULL) {
+                       Put(msgKeyLookup, fieldMnemonics[i], 4, (void*)i, reference_free_handler);
+               }
+               i++;
+       }
+}
+
 
 void 
 InitModule_MSGRENDERERS
@@ -1401,9 +1434,9 @@ InitModule_MSGRENDERERS
                         CTX_MAILSUM);
 
        RegisterNamespace("SUMM:COUNT", 0, 0, tmplput_SUMM_COUNT, NULL, 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);
+       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);
@@ -1417,11 +1450,9 @@ InitModule_MSGRENDERERS
        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:H_NODE", 0, 2, tmplput_MAIL_SUMM_H_NODE,  NULL, CTX_MAILSUM);
        RegisterNamespace("MAIL:SUMM:ALLRCPT", 0, 2, tmplput_MAIL_SUMM_ALLRCPT,  NULL, CTX_MAILSUM);
        RegisterNamespace("MAIL:SUMM:ORGROOM", 0, 2, tmplput_MAIL_SUMM_ORGROOM,  NULL, CTX_MAILSUM);
        RegisterNamespace("MAIL:SUMM:RFCA", 0, 2, tmplput_MAIL_SUMM_RFCA, NULL, CTX_MAILSUM);
-       RegisterNamespace("MAIL:SUMM:OTHERNODE", 2, 0, tmplput_MAIL_SUMM_OTHERNODE,  NULL, CTX_MAILSUM);
        RegisterNamespace("MAIL:SUMM:REFIDS", 0, 1, tmplput_MAIL_SUMM_REFIDS,  NULL, CTX_MAILSUM);
        RegisterNamespace("MAIL:SUMM:INREPLYTO", 0, 2, tmplput_MAIL_SUMM_INREPLYTO,  NULL, CTX_MAILSUM);
        RegisterNamespace("MAIL:BODY", 0, 2, tmplput_MAIL_BODY,  NULL, CTX_MAILSUM);
@@ -1432,26 +1463,21 @@ InitModule_MSGRENDERERS
        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:H_NODE", 0, Conditional_MAIL_SUMM_H_NODE, CTX_MAILSUM);
-       RegisterConditional("COND:MAIL:SUMM:OTHERNODE", 0, Conditional_MAIL_SUMM_OTHERNODE, 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: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("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);
+       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, NULL, CTX_MIME_ATACH);
@@ -1463,13 +1489,12 @@ InitModule_MSGRENDERERS
        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, 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 */
@@ -1481,14 +1506,13 @@ InitModule_MSGRENDERERS
        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);
-#ifdef HAVE_MARKDOWN
-       RegisterMimeRenderer(HKEY("text/x-markdown"), render_MAIL_markdown, 1, 30);
-#endif
        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);
@@ -1496,16 +1520,16 @@ InitModule_MSGRENDERERS
        RegisterMsgHdr(HKEY("wefw"), examine_wefw, 0);
        RegisterMsgHdr(HKEY("cccc"), examine_cccc, 0);
        RegisterMsgHdr(HKEY("rep2"), examine_replyto, 0);
-       RegisterMsgHdr(HKEY("hnod"), examine_hnod, 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);
@@ -1529,22 +1553,28 @@ void
 ServerStartModule_MSGRENDERERS
 (void)
 {
+       DflMsgHeaderHandler = NewHash (1, FourHash);
+       DflEnumMsgHeaderHandler = NewHash (1, Flathash);
        MsgHeaderHandler = NewHash(1, NULL);
        MimeRenderHandler = NewHash(1, NULL);
        ReadLoopHandler = NewHash(1, NULL);
+       FillMsgKeyLookupTable();
 }
 
 void 
 ServerShutdownModule_MSGRENDERERS
 (void)
 {
+       DeleteHash(&DflMsgHeaderHandler);
+       DeleteHash(&DflEnumMsgHeaderHandler);
+
+
        DeleteHash(&MsgHeaderHandler);
        DeleteHash(&MimeRenderHandler);
        DeleteHash(&ReadLoopHandler);
+       DeleteHash(&msgKeyLookup);
 }
 
-
-
 void 
 SessionDestroyModule_MSGRENDERERS
 (wcsession *sess)