* typedef wcsession, so we don't always need to say gcc again its a struct.
[citadel.git] / webcit / messages.c
index baa2255d86e4b871ad503f4151aa87443fbd7064..9d14b3c38a293354c8983f7781e319964fd7387f 100644 (file)
@@ -17,6 +17,8 @@ HashList *MimeRenderHandler = NULL;
 #define SENDER_COL_WIDTH_PCT           30      /**< Mailbox view column width */
 #define DATE_PLUS_BUTTONS_WIDTH_PCT    20      /**< Mailbox view column width */
 
+
+
 void display_enter(void);
 int longcmp_r(const void *s1, const void *s2);
 int summcmp_subj(const void *s1, const void *s2);
@@ -32,1395 +34,10 @@ int summcmp_rdate(const void *s1, const void *s2);
 typedef void (*MsgPartEvaluatorFunc)(message_summary *Sum, StrBuf *Buf);
 
 
-struct attach_link {
-       char partnum[32];
-       char html[1024];
-};
-
-
-
-typedef struct _headereval {
-       ExamineMsgHeaderFunc evaluator;
-       int Type;
-} headereval;
-
-
-
-enum {
-       eUp,
-       eDown,
-       eNone
-};
-
-const char* SortIcons[3] = {
-       "static/up_pointer.gif",
-       "static/down_pointer.gif",
-       "static/sort_none.gif"
-};
-
-enum  {/// SortByEnum
-       eDate,
-       eRDate,
-       eSubject,
-       eRSubject,
-       eSender,
-       eRSender,
-       eReverse,
-       eUnSet
-}; 
-
-/* SortEnum to plain string representation */
-static const char* SortByStrings[] = {
-       "date",
-       "rdate",
-       "subject", 
-       "rsubject", 
-       "sender",
-       "rsender",
-       "reverse",
-       "unset"
-};
-
-/* SortEnum to sort-Function Table */
-const CompareFunc SortFuncs[eUnSet] = {
-       summcmp_date,
-       summcmp_rdate,
-       summcmp_subj,
-       summcmp_rsubj,
-       summcmp_sender,
-       summcmp_rsender,
-       summcmp_rdate
-};
-
-/* given a SortEnum, which icon should we choose? */
-const int SortDateToIcon[eUnSet] = { eUp, eDown, eNone, eNone, eNone, eNone, eNone};
-const int SortSubjectToIcon[eUnSet] = { eNone, eNone, eUp, eDown, eNone, eNone, eNone};
-const int SortSenderToIcon[eUnSet] = { eNone, eNone, eNone, eNone, eUp, eDown, eNone};
-
-/* given a SortEnum, which would be the "opposite" search option? */
-const int DateInvertSortString[eUnSet] =  { eRDate, eDate, eDate, eDate, eDate, eDate, eDate};
-const int SubjectInvertSortString[eUnSet] =  { eSubject, eSubject, eRSubject, eUnSet, eSubject, eSubject, eSubject};
-const int SenderInvertSortString[eUnSet] =  { eSender, eSender, eSender, eSender, eRSender, eUnSet, eSender};
-
-
-
-
-/*
- * Address book entry (keep it short and sweet, it's just a quickie lookup
- * which we can use to get to the real meat and bones later)
- */
-struct addrbookent {
-       char ab_name[64]; /**< name string */
-       long ab_msgnum;   /**< message number of address book entry */
-};
-
-/*----------------------------------------------------------------------------*/
-
-/*
- * Translates sortoption String to its SortEnum representation 
- * returns the enum matching the string; defaults to RDate
- */
-//SortByEnum 
-int StrToESort (const StrBuf *sortby)
-{////todoo: hash
-       int result = eDate;
-
-       if (!IsEmptyStr(ChrPtr(sortby))) while (result < eUnSet){
-                       if (!strcasecmp(ChrPtr(sortby), 
-                                       SortByStrings[result])) 
-                               return result;
-                       result ++;
-               }
-       return eRDate;
-}
-
-
-typedef int (*QSortFunction) (const void*, const void*);
-
-/*
- * qsort() compatible function to compare two longs in descending order.
- */
-int longcmp_r(const void *s1, const void *s2) {
-       long l1;
-       long l2;
-
-       l1 = *(long *)GetSearchPayload(s1);
-       l2 = *(long *)GetSearchPayload(s2);
-
-       if (l1 > l2) return(-1);
-       if (l1 < l2) return(+1);
-       return(0);
-}
-
-/*
- * qsort() compatible function to compare two 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);
-       return strcasecmp(ChrPtr(summ1->subj), ChrPtr(summ2->subj));
-}
-
-/*
- * qsort() compatible function to compare two message summary structs by descending subject.
- */
-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);
-       return strcasecmp(ChrPtr(summ2->subj), ChrPtr(summ1->subj));
-}
-
-/*
- * qsort() compatible function to compare two message summary structs by ascending sender.
- */
-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);
-       return strcasecmp(ChrPtr(summ1->from), ChrPtr(summ2->from));
-}
-
-/*
- * qsort() compatible function to compare two message summary structs by descending sender.
- */
-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);
-       return strcasecmp(ChrPtr(summ2->from), ChrPtr(summ1->from));
-}
-
-/*
- * qsort() compatible function to compare two message summary structs by ascending date.
- */
-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;
-}
-
-/*
- * qsort() compatible function to compare two message summary structs by descending date.
- */
-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;
-}
-
-
-
-
-
-/*----------------------------------------------------------------------------*/
-
-/**
- * message index functions
- */
-
-void DestroyMimeParts(wc_mime_attachment *Mime)
-{
-       FreeStrBuf(&Mime->Name);
-       FreeStrBuf(&Mime->FileName);
-       FreeStrBuf(&Mime->PartNum);
-       FreeStrBuf(&Mime->Disposition);
-       FreeStrBuf(&Mime->ContentType);
-       FreeStrBuf(&Mime->Charset);
-       FreeStrBuf(&Mime->Data);
-}
-
-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;
-
-       FreeStrBuf(&Msg->from);
-       FreeStrBuf(&Msg->to);
-       FreeStrBuf(&Msg->subj);
-       FreeStrBuf(&Msg->reply_inreplyto);
-       FreeStrBuf(&Msg->reply_references);
-       FreeStrBuf(&Msg->cccc);
-       FreeStrBuf(&Msg->hnod);
-       FreeStrBuf(&Msg->AllRcpt);
-       FreeStrBuf(&Msg->Room);
-       FreeStrBuf(&Msg->Rfca);
-       FreeStrBuf(&Msg->OtherNode);
-
-       FreeStrBuf(&Msg->reply_to);
-
-       DeleteHash(&Msg->Attachments);  /**< list of Accachments */
-       DeleteHash(&Msg->Submessages);
-       DeleteHash(&Msg->AttachLinks);
-       DeleteHash(&Msg->AllAttach);
-
-       DestroyMimeParts(&Msg->MsgBody);
-
-       free(Msg);
-}
-
-
-
-void RegisterMsgHdr(const char *HeaderName, long HdrNLen, ExamineMsgHeaderFunc evaluator, int type)
-{
-       headereval *ev;
-       ev = (headereval*) malloc(sizeof(headereval));
-       ev->evaluator = evaluator;
-       ev->Type = type;
-       Put(MsgHeaderHandler, HeaderName, HdrNLen, ev, NULL);
-}
-
-void RegisterMimeRenderer(const char *HeaderName, long HdrNLen, RenderMimeFunc MimeRenderer)
-{
-       Put(MimeRenderHandler, HeaderName, HdrNLen, MimeRenderer, reference_free_handler);
-       
-}
-
-/*----------------------------------------------------------------------------*/
-
-
-void examine_nhdr(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
-{
-       Msg->nhdr = 0;
-       if (!strncasecmp(ChrPtr(HdrLine), "yes", 8))
-               Msg->nhdr = 1;
-}
-
-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)
-{
-       FreeStrBuf(&Msg->from);
-       Msg->from = NewStrBufPlain(NULL, StrLength(HdrLine));
-       StrBuf_RFC822_to_Utf8(Msg->from, HdrLine, WC->DefaultCharset, FoundCharset);
-}
-void tmplput_MAIL_SUMM_FROM(StrBuf *Target, int nArgs, WCTemplateToken *Token, void *Context, int ContextType)
-{
-       message_summary *Msg = (message_summary*) Context;
-       StrBufAppendBuf(Target, Msg->from, 0);
-       lprintf(1,"%s", ChrPtr(Msg->from));
-}
-
-
-
-void examine_subj(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
-{
-       FreeStrBuf(&Msg->subj);
-       Msg->subj = NewStrBufPlain(NULL, StrLength(HdrLine));
-       StrBuf_RFC822_to_Utf8(Msg->subj, HdrLine, WC->DefaultCharset, FoundCharset);
-       lprintf(1,"%s", ChrPtr(Msg->subj));
-}
-void tmplput_MAIL_SUMM_SUBJECT(StrBuf *Target, int nArgs, WCTemplateToken *Token, void *Context, int ContextType)
-{/////TODO: Fwd: and RE: filter!!
-       message_summary *Msg = (message_summary*) Context;
-       StrBufAppendBuf(Target, Msg->subj, 0);
-}
-
-
-void examine_msgn(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
-{
-       FreeStrBuf(&Msg->reply_inreplyto);
-       Msg->reply_inreplyto = NewStrBufPlain(NULL, StrLength(HdrLine));
-       StrBuf_RFC822_to_Utf8(Msg->reply_inreplyto, HdrLine, WC->DefaultCharset, FoundCharset);
-}
-void tmplput_MAIL_SUMM_INREPLYTO(StrBuf *Target, int nArgs, WCTemplateToken *Token, void *Context, int ContextType)
-{
-       message_summary *Msg = (message_summary*) Context;
-       StrBufAppendBuf(Target, Msg->reply_inreplyto, 0);
-}
-
-int Conditional_MAIL_SUMM_UNREAD(WCTemplateToken *Tokens, void *Context, int ContextType)
-{
-       message_summary *Msg = (message_summary*) Context;
-       return Msg->is_new != 0;
-}
-
-void examine_wefw(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
-{
-       FreeStrBuf(&Msg->reply_references);
-       Msg->reply_references = NewStrBufPlain(NULL, StrLength(HdrLine));
-       StrBuf_RFC822_to_Utf8(Msg->reply_references, HdrLine, WC->DefaultCharset, FoundCharset);
-}
-void tmplput_MAIL_SUMM_REFIDS(StrBuf *Target, int nArgs, WCTemplateToken *Token, void *Context, int ContextType)
-{
-       message_summary *Msg = (message_summary*) Context;
-       StrBufAppendBuf(Target, Msg->reply_references, 0);
-}
-
-
-void examine_cccc(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
-{
-       FreeStrBuf(&Msg->cccc);
-       Msg->cccc = NewStrBufPlain(NULL, StrLength(HdrLine));
-       StrBuf_RFC822_to_Utf8(Msg->cccc, HdrLine, WC->DefaultCharset, FoundCharset);
-       if (Msg->AllRcpt == NULL)
-               Msg->AllRcpt = NewStrBufPlain(NULL, StrLength(HdrLine));
-       if (StrLength(Msg->AllRcpt) > 0) {
-               StrBufAppendBufPlain(Msg->AllRcpt, HKEY(", "), 0);
-       }
-       StrBufAppendBuf(Msg->AllRcpt, Msg->cccc, 0);
-}
-void tmplput_MAIL_SUMM_CCCC(StrBuf *Target, int nArgs, WCTemplateToken *Token, void *Context, int ContextType)
-{
-       message_summary *Msg = (message_summary*) Context;
-       StrBufAppendBuf(Target, Msg->cccc, 0);
-}
-
-
-
-
-void examine_room(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
-{
-       if ((StrLength(HdrLine) > 0) &&
-           (strcasecmp(ChrPtr(HdrLine), WC->wc_roomname))) {
-               FreeStrBuf(&Msg->Room);
-               Msg->Room = NewStrBufDup(HdrLine);              
-       }
-}
-void tmplput_MAIL_SUMM_ORGROOM(StrBuf *Target, int nArgs, WCTemplateToken *Token, void *Context, int ContextType)
-{
-       message_summary *Msg = (message_summary*) Context;
-       StrBufAppendBuf(Target, Msg->Room, 0);
-}
-
-
-void examine_rfca(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
-{
-       FreeStrBuf(&Msg->Rfca);
-       Msg->Rfca = NewStrBufDup(HdrLine);
-}
-void tmplput_MAIL_SUMM_RFCA(StrBuf *Target, int nArgs, WCTemplateToken *Token, void *Context, int ContextType)
-{
-       message_summary *Msg = (message_summary*) Context;
-       StrBufAppendBuf(Target, Msg->Rfca, 0);
-}
-
-
-void examine_node(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
-{
-       if ( (StrLength(HdrLine) > 0) &&
-            ((WC->room_flags & QR_NETWORK)
-             || ((strcasecmp(ChrPtr(HdrLine), serv_info.serv_nodename)
-                  && (strcasecmp(ChrPtr(HdrLine), serv_info.serv_fqdn)))))) {
-               FreeStrBuf(&Msg->OtherNode);
-               Msg->OtherNode = NewStrBufDup(HdrLine);
-       }
-}
-void tmplput_MAIL_SUMM_OTHERNODE(StrBuf *Target, int nArgs, WCTemplateToken *Token, void *Context, int ContextType)
-{
-       message_summary *Msg = (message_summary*) Context;
-       StrBufAppendBuf(Target, Msg->OtherNode, 0);
-}
-int Conditional_MAIL_SUMM_OTHERNODE(WCTemplateToken *Tokens, void *Context, int ContextType)
-{
-       message_summary *Msg = (message_summary*) Context;
-       return StrLength(Msg->OtherNode) > 0;
-}
-
-
-void examine_rcpt(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
-{
-       FreeStrBuf(&Msg->to);
-       Msg->to = NewStrBufPlain(NULL, StrLength(HdrLine));
-       StrBuf_RFC822_to_Utf8(Msg->to, HdrLine, WC->DefaultCharset, FoundCharset);
-       if (Msg->AllRcpt == NULL)
-               Msg->AllRcpt = NewStrBufPlain(NULL, StrLength(HdrLine));
-       if (StrLength(Msg->AllRcpt) > 0) {
-               StrBufAppendBufPlain(Msg->AllRcpt, HKEY(", "), 0);
-       }
-       StrBufAppendBuf(Msg->AllRcpt, Msg->to, 0);
-}
-void tmplput_MAIL_SUMM_TO(StrBuf *Target, int nArgs, WCTemplateToken *Token, void *Context, int ContextType)
-{
-       message_summary *Msg = (message_summary*) Context;
-       StrBufAppendBuf(Target, Msg->to, 0);
-}
-void tmplput_MAIL_SUMM_ALLRCPT(StrBuf *Target, int nArgs, WCTemplateToken *Token, void *Context, int ContextType)
-{
-       message_summary *Msg = (message_summary*) Context;
-       StrBufAppendBuf(Target, Msg->AllRcpt, 0);
-}
-
-
-
-void examine_time(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
-{
-       Msg->date = StrTol(HdrLine);
-}
-void tmplput_MAIL_SUMM_DATE_STR(StrBuf *Target, int nArgs, WCTemplateToken *Token, void *Context, int ContextType)
-{
-       char datebuf[64];
-       message_summary *Msg = (message_summary*) Context;
-       webcit_fmt_date(datebuf, Msg->date, 1);
-       StrBufAppendBufPlain(Target, datebuf, -1, 0);
-}
-void tmplput_MAIL_SUMM_DATE_NO(StrBuf *Target, int nArgs, WCTemplateToken *Token, void *Context, int ContextType)
-{
-       message_summary *Msg = (message_summary*) Context;
-       StrBufAppendPrintf(Target, "%ld", Msg->date, 0);
-}
-
-
-
-void examine_mime_part(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
-{
-       wc_mime_attachment *mime;
-       StrBuf *Buf;
-
-       mime = (wc_mime_attachment*) malloc(sizeof(wc_mime_attachment));
-       memset(mime, 0, sizeof(wc_mime_attachment));
-       Buf = NewStrBuf();
-
-       mime->Name = NewStrBuf();
-       StrBufExtract_token(mime->Name, HdrLine, 0, '|');
-
-       StrBufExtract_token(Buf, HdrLine, 1, '|');
-       mime->FileName = NewStrBuf();
-       StrBuf_RFC822_to_Utf8(mime->FileName, Buf, WC->DefaultCharset, FoundCharset);
-
-       mime->PartNum = NewStrBuf();
-       StrBufExtract_token(mime->PartNum, HdrLine, 2, '|');
-
-       mime->Disposition = NewStrBuf();
-       StrBufExtract_token(mime->Disposition, HdrLine, 3, '|');
-
-       mime->ContentType = NewStrBuf();
-       StrBufExtract_token(mime->ContentType, HdrLine, 4, '|');
-
-       mime->length = StrBufExtract_int(HdrLine, 5, '|');
-
-       StrBufTrim(mime->Name);
-       StrBufTrim(mime->FileName);
-
-       if ( (StrLength(mime->FileName) == 0) && (StrLength(mime->Name) > 0) ) {
-               StrBufAppendBuf(mime->FileName, mime->Name, 0);
-       }
-
-       if (Msg->AllAttach == NULL)
-               Msg->AllAttach = NewHash(1,NULL);
-       Put(Msg->AllAttach, SKEY(mime->PartNum), mime, DestroyMime);
-
-       if (!strcasecmp(ChrPtr(mime->ContentType), "message/rfc822")) {
-               if (Msg->Submessages == NULL)
-                       Msg->Submessages = NewHash(1,NULL);
-               Put(Msg->Submessages, SKEY(mime->PartNum), mime, reference_free_handler);
-       }
-       else if ((!strcasecmp(ChrPtr(mime->Disposition), "inline"))
-                && (!strncasecmp(ChrPtr(mime->ContentType), "image/", 6)) ){
-               if (Msg->AttachLinks == NULL)
-                       Msg->AttachLinks = NewHash(1,NULL);
-               Put(Msg->AttachLinks, SKEY(mime->PartNum), mime, reference_free_handler);
-       }
-       else if ((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);
-               Put(Msg->AttachLinks, SKEY(mime->PartNum), mime, reference_free_handler);
-               if (strcasecmp(ChrPtr(mime->ContentType), "application/octet-stream") == 0) {
-                       FlushStrBuf(mime->ContentType);
-                       StrBufAppendBufPlain(mime->ContentType,
-                                            GuessMimeByFilename(SKEY(mime->FileName)),
-                                            -1, 0);
-               }
-       }
-
-       /** begin handler prep ** */
-       if (  (!strcasecmp(ChrPtr(mime->ContentType), "text/x-vcard"))
-             || (!strcasecmp(ChrPtr(mime->ContentType), "text/vcard")) ) {
-               Msg->vcard_partnum_ref = mime;
-       }
-       else if (  (!strcasecmp(ChrPtr(mime->ContentType), "text/calendar"))
-             || (!strcasecmp(ChrPtr(mime->ContentType), "application/ics")) ) {
-               Msg->cal_partnum_ref = mime;
-       }
-       /** end handler prep ***/
-
-       FreeStrBuf(&Buf);
-
-}
-void tmplput_MAIL_SUMM_NATTACH(StrBuf *Target, int nArgs, WCTemplateToken *Token, void *Context, int ContextType)
-{
-       message_summary *Msg = (message_summary*) Context;
-       StrBufAppendPrintf(Target, "%ld", GetCount(Msg->Attachments));
-}
-
-
-
-
-
-
-
-void examine_hnod(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
-{
-       FreeStrBuf(&Msg->hnod);
-       Msg->hnod = NewStrBufPlain(NULL, StrLength(HdrLine));
-       StrBuf_RFC822_to_Utf8(Msg->hnod, HdrLine, WC->DefaultCharset, FoundCharset);
-}
-void tmplput_MAIL_SUMM_H_NODE(StrBuf *Target, int nArgs, WCTemplateToken *Token, void *Context, int ContextType)
-{
-       message_summary *Msg = (message_summary*) Context;
-       StrBufAppendBuf(Target, Msg->hnod, 0);
-}
-int Conditional_MAIL_SUMM_H_NODE(WCTemplateToken *Tokens, void *Context, int ContextType)
-{
-       message_summary *Msg = (message_summary*) Context;
-       return StrLength(Msg->hnod) > 0;
-}
-
-
-
-void examine_text(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
-{////TODO: read messages here
-       Msg->MsgBody.Data = NewStrBuf();
-}
-
-void examine_msg4_partnum(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
-{
-       Msg->MsgBody.PartNum = NewStrBufDup(HdrLine);
-       StrBufTrim(Msg->MsgBody.PartNum);/////TODO: striplt == trim?
-}
-
-void examine_content_encoding(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
-{
-////TODO: do we care?
-}
-
-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)
-{////TODO
-       int len, i;
-       Msg->MsgBody.ContentType = NewStrBufDup(HdrLine);
-       StrBufTrim(Msg->MsgBody.ContentType);/////todo==striplt?
-       len = StrLength(Msg->MsgBody.ContentType);
-       for (i=0; i<len; ++i) {
-               if (!strncasecmp(ChrPtr(Msg->MsgBody.ContentType) + i, "charset=", 8)) {/// TODO: WHUT?
-//                     safestrncpy(mime_charset, &mime_content_type[i+8],
-                       ///                         sizeof mime_charset);
-               }
-       }/****
-       for (i=0; i<len; ++i) {
-               if (mime_content_type[i] == ';') {
-                       mime_content_type[i] = 0;
-                       len = i - 1;
-               }
-       }
-       len = strlen(mime_charset);
-       for (i=0; i<len; ++i) {
-               if (mime_charset[i] == ';') {
-                       mime_charset[i] = 0;
-                       len = i - 1;
-               }
-       }
-        */
-}
-
-void tmplput_MAIL_SUMM_N(StrBuf *Target, int nArgs, WCTemplateToken *Token, void *Context, int ContextType)
-{
-       message_summary *Msg = (message_summary*) Context;
-       StrBufAppendPrintf(Target, "%ld", Msg->msgnum);
-}
-
-
-
-int Conditional_MAIL_MIME_ALL(WCTemplateToken *Tokens, void *Context, int ContextType)
-{
-       message_summary *Msg = (message_summary*) Context;
-       return GetCount(Msg->Attachments) > 0;
-}
-
-int Conditional_MAIL_MIME_SUBMESSAGES(WCTemplateToken *Tokens, void *Context, int ContextType)
-{
-       message_summary *Msg = (message_summary*) Context;
-       return GetCount(Msg->Submessages) > 0;
-}
-
-int Conditional_MAIL_MIME_ATTACHLINKS(WCTemplateToken *Tokens, void *Context, int ContextType)
-{
-       message_summary *Msg = (message_summary*) Context;
-       return GetCount(Msg->AttachLinks) > 0;
-}
-
-int Conditional_MAIL_MIME_ATTACH(WCTemplateToken *Tokens, void *Context, int ContextType)
-{
-       message_summary *Msg = (message_summary*) Context;
-       return GetCount(Msg->AllAttach) > 0;
-}
-
-
 
 /*----------------------------------------------------------------------------*/
 
 
-void tmplput_MAIL_BODY(StrBuf *Target, int nArgs, WCTemplateToken *Token, void *Context, int ContextType)
-{
-       message_summary *Msg = (message_summary*) Context;
-       StrBufAppendBuf(Target, Msg->MsgBody.Data, 0);
-}
-
-
-void render_MAIL_variformat(wc_mime_attachment *Mime, StrBuf *RawData, StrBuf *FoundCharset)
-{
-       /* Messages in legacy Citadel variformat get handled thusly... */
-       StrBuf *Target = NewStrBufPlain(NULL, StrLength(Mime->Data));
-       FmOut(Target, "JUSTIFY", Mime->Data);
-       FreeStrBuf(&Mime->Data);
-       Mime->Data = Target;
-}
-
-void render_MAIL_text_plain(wc_mime_attachment *Mime, StrBuf *RawData, StrBuf *FoundCharset)
-{
-       StrBuf *cs = NULL;
-       const char *ptr, *pte;
-       const char *BufPtr = NULL;
-       StrBuf *Line = NewStrBuf();
-       StrBuf *Line1 = NewStrBuf();
-       StrBuf *Line2 = NewStrBuf();
-       StrBuf *Target = NewStrBufPlain(NULL, StrLength(Mime->Data));
-       int ConvertIt = 1;
-       int bn = 0;
-       int bq = 0;
-       int i, n, done = 0;
-       long len;
-#ifdef HAVE_ICONV
-       iconv_t ic = (iconv_t)(-1) ;
-#endif
-
-       /* Boring old 80-column fixed format text gets handled this way... */
-       if ((strcasecmp(ChrPtr(Mime->Charset), "us-ascii") == 0) &&
-           (strcasecmp(ChrPtr(Mime->Charset), "UTF-8") == 0))
-               ConvertIt = 0;
-
-#ifdef HAVE_ICONV
-       if (ConvertIt) {
-               if (StrLength(Mime->Charset) != 0)
-                       cs = Mime->Charset;
-               else if (StrLength(FoundCharset) > 0)
-                       cs = FoundCharset;
-               else if (StrLength(WC->DefaultCharset) > 0)
-                       cs = WC->DefaultCharset;
-               if (cs == 0) {
-                       ConvertIt = 0;
-               }
-               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));
-                       }
-               }
-       }
-#endif
-
-       while ((n = StrBufSipLine(Line, Mime->Data, &BufPtr), n >= 0) && !done)
-       {
-               done = n == 0;
-               bq = 0;
-               i = 0;
-               ptr = ChrPtr(Line);
-               len = StrLength(Line);
-               pte = ptr + len;
-               
-               while ((ptr < pte) &&
-                      ((*ptr == '>') ||
-                       isspace(*ptr)))
-               {
-                       if (*ptr == '>')
-                               bq++;
-                       ptr ++;
-                       i++;
-               }
-               if (i > 0) StrBufCutLeft(Line, i);
-               
-               if (StrLength(Line) == 0)
-                       continue;
-
-               for (i = bn; i < bq; i++)                               
-                       StrBufAppendBufPlain(Target, HKEY("<blockquote>"), 0);
-               for (i = bq; i < bn; i++)                               
-                       StrBufAppendBufPlain(Target, HKEY("</blockquote>"), 0);
-
-               if (ConvertIt == 1) {
-                       StrBufConvert(Line, Line1, &ic);
-               }
-
-               StrBufAppendBufPlain(Target, HKEY("<tt>"), 0);
-               UrlizeText(Line1, Line, Line2);
-
-               StrEscAppend(Target, Line1, NULL, 0, 0);
-               StrBufAppendBufPlain(Target, HKEY("</tt><br />\n"), 0);
-               bn = bq;
-       }
-
-       for (i = 0; i < bn; i++)                                
-               StrBufAppendBufPlain(Target, HKEY("</blockquote>"), 0);
-
-       StrBufAppendBufPlain(Target, HKEY("</i><br />"), 0);
-#ifdef HAVE_ICONV
-       if (ic != (iconv_t)(-1) ) {
-               iconv_close(ic);
-       }
-#endif
-       FreeStrBuf(&Mime->Data);
-       Mime->Data = Target;
-       FreeStrBuf(&Line);
-       FreeStrBuf(&Line1);
-       FreeStrBuf(&Line2);
-}
-
-void render_MAIL_html(wc_mime_attachment *Mime, StrBuf *RawData, StrBuf *FoundCharset)
-{
-       StrBuf *Buf;
-       /* HTML is fun, but we've got to strip it first */
-       Buf = NewStrBufPlain(NULL, StrLength(Mime->Data));
-       output_html(ChrPtr(Mime->Charset), 
-                   (WC->wc_view == VIEW_WIKI ? 1 : 0), 
-                   StrToi(Mime->PartNum), 
-                   Mime->Data, Buf);
-       FreeStrBuf(&Mime->Data);
-       Mime->Data = Buf;
-}
-
-void render_MAIL_UNKNOWN(wc_mime_attachment *Mime, StrBuf *RawData, StrBuf *FoundCharset)
-{
-       /* 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);
-}
-
-
-
-
-
-
-HashList *iterate_get_mime_All(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType)
-{
-       message_summary *Msg = (message_summary*) Context;
-       return Msg->Attachments;
-}
-HashList *iterate_get_mime_Submessages(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType)
-{
-       message_summary *Msg = (message_summary*) Context;
-       return Msg->Submessages;
-}
-HashList *iterate_get_mime_AttachLinks(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType)
-{
-       message_summary *Msg = (message_summary*) Context;
-       return Msg->AttachLinks;
-}
-HashList *iterate_get_mime_Attachments(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType)
-{
-       message_summary *Msg = (message_summary*) Context;
-       return Msg->AllAttach;
-}
-
-void tmplput_MIME_Name(StrBuf *Target, int nArgs, WCTemplateToken *Token, void *Context, int ContextType)
-{
-       wc_mime_attachment *mime = (wc_mime_attachment*) Context;
-       StrBufAppendBuf(Target, mime->Name, 0);
-}
-
-void tmplput_MIME_FileName(StrBuf *Target, int nArgs, WCTemplateToken *Token, void *Context, int ContextType)
-{
-       wc_mime_attachment *mime = (wc_mime_attachment*) Context;
-       StrBufAppendBuf(Target, mime->FileName, 0);
-}
-
-void tmplput_MIME_PartNum(StrBuf *Target, int nArgs, WCTemplateToken *Token, void *Context, int ContextType)
-{
-       wc_mime_attachment *mime = (wc_mime_attachment*) Context;
-       StrBufAppendBuf(Target, mime->PartNum, 0);
-}
-
-void tmplput_MIME_MsgNum(StrBuf *Target, int nArgs, WCTemplateToken *Token, void *Context, int ContextType)
-{
-       wc_mime_attachment *mime = (wc_mime_attachment*) Context;
-       StrBufAppendPrintf(Target, "%ld", mime->msgnum);
-}
-
-void tmplput_MIME_Disposition(StrBuf *Target, int nArgs, WCTemplateToken *Token, void *Context, int ContextType)
-{
-       wc_mime_attachment *mime = (wc_mime_attachment*) Context;
-       StrBufAppendBuf(Target, mime->Disposition, 0);
-}
-
-void tmplput_MIME_ContentType(StrBuf *Target, int nArgs, WCTemplateToken *Token, void *Context, int ContextType)
-{
-       wc_mime_attachment *mime = (wc_mime_attachment*) Context;
-       StrBufAppendBuf(Target, mime->ContentType, 0);
-}
-
-void tmplput_MIME_Charset(StrBuf *Target, int nArgs, WCTemplateToken *Token, void *Context, int ContextType)
-{
-       wc_mime_attachment *mime = (wc_mime_attachment*) Context;
-       StrBufAppendBuf(Target, mime->Charset, 0);
-}
-
-void tmplput_MIME_Data(StrBuf *Target, int nArgs, WCTemplateToken *Token, void *Context, int ContextType)
-{
-       wc_mime_attachment *mime = (wc_mime_attachment*) Context;
-       StrBufAppendBuf(Target, mime->Data, 0); /// TODO: check whether we need to load it now?
-}
-
-void tmplput_MIME_Length(StrBuf *Target, int nArgs, WCTemplateToken *Token, void *Context, int ContextType)
-{
-       wc_mime_attachment *mime = (wc_mime_attachment*) Context;
-       StrBufAppendPrintf(Target, "%ld", mime->length);
-}
-
-
-
-/*
- * Look for URL's embedded in a buffer and make them linkable.  We use a
- * target window in order to keep the Citadel session in its own window.
- */
-void UrlizeText(StrBuf* Target, StrBuf *Source, StrBuf *WrkBuf)
-{
-       int len, UrlLen, Offset, TrailerLen;
-       const char *start, *end, *pos;
-       
-       FlushStrBuf(Target);
-
-       start = NULL;
-       len = StrLength(Source);
-       end = ChrPtr(Source) + len;
-       for (pos = ChrPtr(Source); (pos < end) && (start == NULL); ++pos) {
-               if (!strncasecmp(pos, "http://", 7))
-                       start = pos;
-               if (!strncasecmp(pos, "ftp://", 6))
-                       start = pos;
-       }
-
-       if (start == NULL) {
-               StrBufAppendBuf(Target, Source, 0);
-               return;
-       }
-       FlushStrBuf(WrkBuf);
-
-       for (pos = ChrPtr(Source) + len; pos > start; --pos) {
-               if (  (!isprint(*pos))
-                  || (isspace(*pos))
-                  || (*pos == '{')
-                  || (*pos == '}')
-                  || (*pos == '|')
-                  || (*pos == '\\')
-                  || (*pos == '^')
-                  || (*pos == '[')
-                  || (*pos == ']')
-                  || (*pos == '`')
-                  || (*pos == '<')
-                  || (*pos == '>')
-                  || (*pos == '(')
-                  || (*pos == ')')
-               ) {
-                       end = pos;
-               }
-       }
-       
-       UrlLen = end - start;
-       StrBufAppendBufPlain(WrkBuf, start, UrlLen, 0);
-
-       Offset = start - ChrPtr(Source);
-       if (Offset != 0)
-               StrBufAppendBufPlain(Target, ChrPtr(Source), Offset, 0);
-       StrBufAppendPrintf(Target, "%ca href=%c%s%c TARGET=%c%s%c%c%s%c/A%c",
-                          LB, QU, ChrPtr(WrkBuf), QU, QU, TARGET, 
-                          QU, RB, ChrPtr(WrkBuf), LB, RB);
-
-       TrailerLen = len - (end - start);
-       if (TrailerLen > 0)
-               StrBufAppendBufPlain(Target, end, TrailerLen, 0);
-}
-void url(char *buf, size_t bufsize)
-{
-       int len, UrlLen, Offset, TrailerLen, outpos;
-       char *start, *end, *pos;
-       char urlbuf[SIZ];
-       char outbuf[SIZ];
-
-       start = NULL;
-       len = strlen(buf);
-       if (len > bufsize) {
-               lprintf(1, "URL: content longer than buffer!");
-               return;
-       }
-       end = buf + len;
-       for (pos = buf; (pos < end) && (start == NULL); ++pos) {
-               if (!strncasecmp(pos, "http://", 7))
-                       start = pos;
-               if (!strncasecmp(pos, "ftp://", 6))
-                       start = pos;
-       }
-
-       if (start == NULL)
-               return;
-
-       for (pos = buf+len; pos > start; --pos) {
-               if (  (!isprint(*pos))
-                  || (isspace(*pos))
-                  || (*pos == '{')
-                  || (*pos == '}')
-                  || (*pos == '|')
-                  || (*pos == '\\')
-                  || (*pos == '^')
-                  || (*pos == '[')
-                  || (*pos == ']')
-                  || (*pos == '`')
-                  || (*pos == '<')
-                  || (*pos == '>')
-                  || (*pos == '(')
-                  || (*pos == ')')
-               ) {
-                       end = pos;
-               }
-       }
-       
-       UrlLen = end - start;
-       if (UrlLen > sizeof(urlbuf)){
-               lprintf(1, "URL: content longer than buffer!");
-               return;
-       }
-       memcpy(urlbuf, start, UrlLen);
-       urlbuf[UrlLen] = '\0';
-
-       Offset = start - buf;
-       if ((Offset != 0) && (Offset < sizeof(outbuf)))
-               memcpy(outbuf, buf, Offset);
-       outpos = snprintf(&outbuf[Offset], sizeof(outbuf) - Offset,  
-                         "%ca href=%c%s%c TARGET=%c%s%c%c%s%c/A%c",
-                         LB, QU, urlbuf, QU, QU, TARGET, QU, RB, urlbuf, LB, RB);
-       if (outpos >= sizeof(outbuf) - Offset) {
-               lprintf(1, "URL: content longer than buffer!");
-               return;
-       }
-
-       TrailerLen = len - (end - start);
-       if (TrailerLen > 0)
-               memcpy(outbuf + Offset + outpos, end, TrailerLen);
-       if (Offset + outpos + TrailerLen > bufsize) {
-               lprintf(1, "URL: content longer than buffer!");
-               return;
-       }
-       memcpy (buf, outbuf, Offset + outpos + TrailerLen);
-       *(buf + Offset + outpos + TrailerLen) = '\0';
-}
-
-
-/**
- * \brief Turn a vCard "n" (name) field into something displayable.
- * \param name the name field to convert
- */
-void vcard_n_prettyize(char *name)
-{
-       char *original_name;
-       int i, j, len;
-
-       original_name = strdup(name);
-       len = strlen(original_name);
-       for (i=0; i<5; ++i) {
-               if (len > 0) {
-                       if (original_name[len-1] == ' ') {
-                               original_name[--len] = 0;
-                       }
-                       if (original_name[len-1] == ';') {
-                               original_name[--len] = 0;
-                       }
-               }
-       }
-       strcpy(name, "");
-       j=0;
-       for (i=0; i<len; ++i) {
-               if (original_name[i] == ';') {
-                       name[j++] = ',';
-                       name[j++] = ' ';                        
-               }
-               else {
-                       name[j++] = original_name[i];
-               }
-       }
-       name[j] = '\0';
-       free(original_name);
-}
-
-
-
-
-/**
- * \brief preparse a vcard name
- * display_vcard() calls this after parsing the textual vCard into
- * our 'struct vCard' data object.
- * This gets called instead of display_parsed_vcard() if we are only looking
- * to extract the person's name instead of displaying the card.
- * \param v the vcard to retrieve the name from
- * \param storename where to put the name at
- */
-void fetchname_parsed_vcard(struct vCard *v, char *storename) {
-       char *name;
-
-       strcpy(storename, "");
-
-       name = vcard_get_prop(v, "n", 1, 0, 0);
-       if (name != NULL) {
-               strcpy(storename, name);
-               /* vcard_n_prettyize(storename); */
-       }
-
-}
-
-
-
-/**
- * \brief html print a vcard
- * display_vcard() calls this after parsing the textual vCard into
- * our 'struct vCard' data object.
- *
- * Set 'full' to nonzero to display the full card, otherwise it will only
- * show a summary line.
- *
- * This code is a bit ugly, so perhaps an explanation is due: we do this
- * in two passes through the vCard fields.  On the first pass, we process
- * fields we understand, and then render them in a pretty fashion at the
- * end.  Then we make a second pass, outputting all the fields we don't
- * understand in a simple two-column name/value format.
- * \param v the vCard to display
- * \param full display all items of the vcard?
- * \param msgnum Citadel message pointer
- */
-void display_parsed_vcard(struct vCard *v, int full, long msgnum) {
-       int i, j;
-       char buf[SIZ];
-       char *name;
-       int is_qp = 0;
-       int is_b64 = 0;
-       char *thisname, *thisvalue;
-       char firsttoken[SIZ];
-       int pass;
-
-       char fullname[SIZ];
-       char title[SIZ];
-       char org[SIZ];
-       char phone[SIZ];
-       char mailto[SIZ];
-
-       strcpy(fullname, "");
-       strcpy(phone, "");
-       strcpy(mailto, "");
-       strcpy(title, "");
-       strcpy(org, "");
-
-       if (!full) {
-               wprintf("<TD>");
-               name = vcard_get_prop(v, "fn", 1, 0, 0);
-               if (name != NULL) {
-                       escputs(name);
-               }
-               else if (name = vcard_get_prop(v, "n", 1, 0, 0), name != NULL) {
-                       strcpy(fullname, name);
-                       vcard_n_prettyize(fullname);
-                       escputs(fullname);
-               }
-               else {
-                       wprintf("&nbsp;");
-               }
-               wprintf("</TD>");
-               return;
-       }
-
-       wprintf("<div align=center>"
-               "<table bgcolor=#aaaaaa width=50%%>");
-       for (pass=1; pass<=2; ++pass) {
-
-               if (v->numprops) for (i=0; i<(v->numprops); ++i) {
-                       int len;
-                       thisname = strdup(v->prop[i].name);
-                       extract_token(firsttoken, thisname, 0, ';', sizeof firsttoken);
-       
-                       for (j=0; j<num_tokens(thisname, ';'); ++j) {
-                               extract_token(buf, thisname, j, ';', sizeof buf);
-                               if (!strcasecmp(buf, "encoding=quoted-printable")) {
-                                       is_qp = 1;
-                                       remove_token(thisname, j, ';');
-                               }
-                               if (!strcasecmp(buf, "encoding=base64")) {
-                                       is_b64 = 1;
-                                       remove_token(thisname, j, ';');
-                               }
-                       }
-                       
-                       len = strlen(v->prop[i].value);
-                       /* if we have some untagged QP, detect it here. */
-                       if (!is_qp && (strstr(v->prop[i].value, "=?")!=NULL))
-                               utf8ify_rfc822_string(v->prop[i].value);
-
-                       if (is_qp) {
-                               // %ff can become 6 bytes in utf8 
-                               thisvalue = malloc(len * 2 + 3); 
-                               j = CtdlDecodeQuotedPrintable(
-                                       thisvalue, v->prop[i].value,
-                                       len);
-                               thisvalue[j] = 0;
-                       }
-                       else if (is_b64) {
-                               // ff will become one byte..
-                               thisvalue = malloc(len + 50);
-                               CtdlDecodeBase64(
-                                       thisvalue, v->prop[i].value,
-                                       strlen(v->prop[i].value) );
-                       }
-                       else {
-                               thisvalue = strdup(v->prop[i].value);
-                       }
-       
-                       /** Various fields we may encounter ***/
-       
-                       /** N is name, but only if there's no FN already there */
-                       if (!strcasecmp(firsttoken, "n")) {
-                               if (IsEmptyStr(fullname)) {
-                                       strcpy(fullname, thisvalue);
-                                       vcard_n_prettyize(fullname);
-                               }
-                       }
-       
-                       /** FN (full name) is a true 'display name' field */
-                       else if (!strcasecmp(firsttoken, "fn")) {
-                               strcpy(fullname, thisvalue);
-                       }
-
-                       /** title */
-                       else if (!strcasecmp(firsttoken, "title")) {
-                               strcpy(title, thisvalue);
-                       }
-       
-                       /** organization */
-                       else if (!strcasecmp(firsttoken, "org")) {
-                               strcpy(org, thisvalue);
-                       }
-       
-                       else if (!strcasecmp(firsttoken, "email")) {
-                               size_t len;
-                               if (!IsEmptyStr(mailto)) strcat(mailto, "<br />");
-                               strcat(mailto,
-                                       "<a href=\"display_enter"
-                                       "?force_room=_MAIL_?recp=");
-
-                               len = strlen(mailto);
-                               urlesc(&mailto[len], SIZ - len, "\"");
-                               len = strlen(mailto);
-                               urlesc(&mailto[len], SIZ - len,  fullname);
-                               len = strlen(mailto);
-                               urlesc(&mailto[len], SIZ - len, "\" <");
-                               len = strlen(mailto);
-                               urlesc(&mailto[len], SIZ - len, thisvalue);
-                               len = strlen(mailto);
-                               urlesc(&mailto[len], SIZ - len, ">");
-
-                               strcat(mailto, "\">");
-                               len = strlen(mailto);
-                               stresc(mailto+len, SIZ - len, thisvalue, 1, 1);
-                               strcat(mailto, "</A>");
-                       }
-                       else if (!strcasecmp(firsttoken, "tel")) {
-                               if (!IsEmptyStr(phone)) strcat(phone, "<br />");
-                               strcat(phone, thisvalue);
-                               for (j=0; j<num_tokens(thisname, ';'); ++j) {
-                                       extract_token(buf, thisname, j, ';', sizeof buf);
-                                       if (!strcasecmp(buf, "tel"))
-                                               strcat(phone, "");
-                                       else if (!strcasecmp(buf, "work"))
-                                               strcat(phone, _(" (work)"));
-                                       else if (!strcasecmp(buf, "home"))
-                                               strcat(phone, _(" (home)"));
-                                       else if (!strcasecmp(buf, "cell"))
-                                               strcat(phone, _(" (cell)"));
-                                       else {
-                                               strcat(phone, " (");
-                                               strcat(phone, buf);
-                                               strcat(phone, ")");
-                                       }
-                               }
-                       }
-                       else if (!strcasecmp(firsttoken, "adr")) {
-                               if (pass == 2) {
-                                       wprintf("<TR><TD>");
-                                       wprintf(_("Address:"));
-                                       wprintf("</TD><TD>");
-                                       for (j=0; j<num_tokens(thisvalue, ';'); ++j) {
-                                               extract_token(buf, thisvalue, j, ';', sizeof buf);
-                                               if (!IsEmptyStr(buf)) {
-                                                       escputs(buf);
-                                                       if (j<3) wprintf("<br />");
-                                                       else wprintf(" ");
-                                               }
-                                       }
-                                       wprintf("</TD></TR>\n");
-                               }
-                       }
-                       /* else if (!strcasecmp(firsttoken, "photo") && full && pass == 2) { 
-                               // Only output on second pass
-                               wprintf("<tr><td>");
-                               wprintf(_("Photo:"));
-                               wprintf("</td><td>");
-                               wprintf("<img src=\"/vcardphoto/%ld/\" alt=\"Contact photo\"/>",msgnum);
-                               wprintf("</td></tr>\n");
-                       } */
-                       else if (!strcasecmp(firsttoken, "version")) {
-                               /* ignore */
-                       }
-                       else if (!strcasecmp(firsttoken, "rev")) {
-                               /* ignore */
-                       }
-                       else if (!strcasecmp(firsttoken, "label")) {
-                               /* ignore */
-                       }
-                       else {
-
-                               /*** Don't show extra fields.  They're ugly.
-                               if (pass == 2) {
-                                       wprintf("<TR><TD>");
-                                       escputs(thisname);
-                                       wprintf("</TD><TD>");
-                                       escputs(thisvalue);
-                                       wprintf("</TD></TR>\n");
-                               }
-                               ***/
-                       }
-       
-                       free(thisname);
-                       free(thisvalue);
-               }
-       
-               if (pass == 1) {
-                       wprintf("<TR BGCOLOR=\"#AAAAAA\">"
-                       "<TD COLSPAN=2 BGCOLOR=\"#FFFFFF\">"
-                       "<IMG ALIGN=CENTER src=\"static/viewcontacts_48x.gif\">"
-                       "<FONT SIZE=+1><B>");
-                       escputs(fullname);
-                       wprintf("</B></FONT>");
-                       if (!IsEmptyStr(title)) {
-                               wprintf("<div align=right>");
-                               escputs(title);
-                               wprintf("</div>");
-                       }
-                       if (!IsEmptyStr(org)) {
-                               wprintf("<div align=right>");
-                               escputs(org);
-                               wprintf("</div>");
-                       }
-                       wprintf("</TD></TR>\n");
-               
-                       if (!IsEmptyStr(phone)) {
-                               wprintf("<tr><td>");
-                               wprintf(_("Telephone:"));
-                               wprintf("</td><td>%s</td></tr>\n", phone);
-                       }
-                       if (!IsEmptyStr(mailto)) {
-                               wprintf("<tr><td>");
-                               wprintf(_("E-mail:"));
-                               wprintf("</td><td>%s</td></tr>\n", mailto);
-                       }
-               }
-
-       }
-
-       wprintf("</table></div>\n");
-}
-
-
-
-/**
- * \brief  Display a textual vCard
- * (Converts to a vCard object and then calls the actual display function)
- * Set 'full' to nonzero to display the whole card instead of a one-liner.
- * Or, if "storename" is non-NULL, just store the person's name in that
- * buffer instead of displaying the card at all.
- * \param vcard_source the buffer containing the vcard text
- * \param alpha what???
- * \param full should we usse all lines?
- * \param storename where to store???
- * \param msgnum Citadel message pointer
- */
-void display_vcard(char *vcard_source, char alpha, int full, char *storename, 
-       long msgnum) {
-       struct vCard *v;
-       char *name;
-       char buf[SIZ];
-       char this_alpha = 0;
-
-       v = vcard_load(vcard_source);
-       if (v == NULL) return;
-
-       name = vcard_get_prop(v, "n", 1, 0, 0);
-       if (name != NULL) {
-               utf8ify_rfc822_string(name);
-               strcpy(buf, name);
-               this_alpha = buf[0];
-       }
-
-       if (storename != NULL) {
-               fetchname_parsed_vcard(v, storename);
-       }
-       else if (       (alpha == 0)
-                       || ((isalpha(alpha)) && (tolower(alpha) == tolower(this_alpha)) )
-                       || ((!isalpha(alpha)) && (!isalpha(this_alpha)))
-               ) {
-               display_parsed_vcard(v, full,msgnum);
-       }
-
-       vcard_free(v);
-}
-
-
-
-
-
-
-
-
-
-
-
 
 /*
  * I wanna SEE that message!
@@ -1429,47 +46,45 @@ void display_vcard(char *vcard_source, char alpha, int full, char *storename,
  * printable_view      Nonzero to display a printable view
  * section             Optional for encapsulated message/rfc822 submessage
  */
-void read_message(long msgnum, int printable_view, char *section) {
-       struct wcsession *WCC = WC;
+int read_message(StrBuf *Target, const char *tmpl, long tmpllen, long msgnum, int printable_view, const StrBuf *PartNum) {
        StrBuf *Buf;
-       StrBuf *Token;
+       StrBuf *HdrToken;
        StrBuf *FoundCharset;
+       HashPos  *it;
+       void *vMime;
        message_summary *Msg = NULL;
        headereval *Hdr;
        void *vHdr;
        char buf[SIZ];
-       struct attach_link *attach_links = NULL;
-       int num_attach_links = 0;
 //     char mime_submessages[256] = "";
        char reply_references[1024] = "";
-       int nhdr = 0;
-       int i = 0;
        int Done = 0;
        int state=0;
-       char vcard_partnum[256] = "";
-       char cal_partnum[256] = "";
-       char *part_source = NULL;
-       char msg4_partnum[32] = "";
-
-////   strcpy(mime_submessages, "");
+       long len;
+       const char *Key;
 
        Buf = NewStrBuf();
-       serv_printf("MSG4 %ld|%s", msgnum, section);
+       lprintf(1, "----------%s---------MSG4 %ld|%s--------------\n", tmpl, msgnum, ChrPtr(PartNum));
+       serv_printf("MSG4 %ld|%s", msgnum, ChrPtr(PartNum));
        StrBuf_ServGetln(Buf);
        if (GetServerStatus(Buf, NULL) != 1) {
-               wprintf("<strong>");
-               wprintf(_("ERROR:"));
-               wprintf("</strong> %s<br />\n", &buf[4]);
+               StrBufAppendPrintf(Target, "<strong>");
+               StrBufAppendPrintf(Target, _("ERROR:"));
+               StrBufAppendPrintf(Target, "</strong> %s<br />\n", &buf[4]);
                FreeStrBuf(&Buf);
-               return;
+               return 0;
        }
-       svputlong("MsgPrintable", printable_view);
+
        /** begin everythingamundo table */
 
 
-       Token = NewStrBuf();
+       HdrToken = NewStrBuf();
        Msg = (message_summary *)malloc(sizeof(message_summary));
        memset(Msg, 0, sizeof(message_summary));
+       Msg->msgnum = msgnum;
+       Msg->PartNum = PartNum;
+       Msg->MsgBody =  (wc_mime_attachment*) malloc(sizeof(wc_mime_attachment));
+       memset(Msg->MsgBody, 0, sizeof(wc_mime_attachment));
        FoundCharset = NewStrBuf();
        while ((StrBuf_ServGetln(Buf)>=0) && !Done) {
                if ( (StrLength(Buf)==3) && 
@@ -1477,19 +92,15 @@ void read_message(long msgnum, int printable_view, char *section) {
                {
                        Done = 1;
                        if (state < 2) {
-                               wprintf("<i>");
-                               wprintf(_("unexpected end of message"));
-                               wprintf(" (1)</i><br /><br />\n");
-                               wprintf("</div>\n");
-                               FreeStrBuf(&Buf);
-                               FreeStrBuf(&Token);
-                               DestroyMessageSummary(Msg);
-                               FreeStrBuf(&FoundCharset);
-                               return;
-                       }
-                       else {
-                               break;
+                               lprintf(1, _("unexpected end of message"));
+                               
+                               Msg->MsgBody->ContentType = NewStrBufPlain(HKEY("text/html"));
+                               StrBufAppendPrintf(Msg->MsgBody->Data, "<div><i>");
+                               StrBufAppendPrintf(Msg->MsgBody->Data, _("unexpected end of message"));
+                               StrBufAppendPrintf(Msg->MsgBody->Data, " (1)</i><br /><br />\n");
+                               StrBufAppendPrintf(Msg->MsgBody->Data, "</div>\n");
                        }
+                       break;
                }
                switch (state) {
                case 0:/* Citadel Message Headers */
@@ -1497,11 +108,11 @@ void read_message(long msgnum, int printable_view, char *section) {
                                state ++;
                                break;
                        }
-                       StrBufExtract_token(Token, Buf, 0, '=');
-                       StrBufCutLeft(Buf, StrLength(Token) + 1);
+                       StrBufExtract_token(HdrToken, Buf, 0, '=');
+                       StrBufCutLeft(Buf, StrLength(HdrToken) + 1);
                        
-                       lprintf(1, ":: [%s] = [%s]\n", ChrPtr(Token), ChrPtr(Buf));
-                       if (GetHash(MsgHeaderHandler, SKEY(Token), &vHdr) &&
+                       lprintf(1, ":: [%s] = [%s]\n", ChrPtr(HdrToken), ChrPtr(Buf));
+                       if (GetHash(MsgHeaderHandler, SKEY(HdrToken), &vHdr) &&
                            (vHdr != NULL)) {
                                Hdr = (headereval*)vHdr;
                                Hdr->evaluator(Msg, Buf, FoundCharset);
@@ -1509,23 +120,23 @@ void read_message(long msgnum, int printable_view, char *section) {
                                        state++;
                                }
                        }
-                       else lprintf(1, "don't know how to handle message header[%s]\n", ChrPtr(Token));
+                       else lprintf(1, "don't know how to handle message header[%s]\n", ChrPtr(HdrToken));
                        break;
                case 1:/* Message Mime Header */
                        if (StrLength(Buf) == 0) {
                                state++;
-                               if (Msg->MsgBody.ContentType == NULL)
+                               if (Msg->MsgBody->ContentType == NULL)
                                        /* end of header or no header? */
-                                       Msg->MsgBody.ContentType = NewStrBufPlain(HKEY("text/plain"));
+                                       Msg->MsgBody->ContentType = NewStrBufPlain(HKEY("text/plain"));
                                 /* usual end of mime header */
                        }
                        else
                        {
-                               StrBufExtract_token(Token, Buf, 0, ':');
-                               if (StrLength(Token) > 0) {
-                                       StrBufCutLeft(Buf, StrLength(Token) + 1);
-                                       lprintf(1, ":: [%s] = [%s]\n", ChrPtr(Token), ChrPtr(Buf));
-                                       if (GetHash(MsgHeaderHandler, SKEY(Token), &vHdr) &&
+                               StrBufExtract_token(HdrToken, Buf, 0, ':');
+                               if (StrLength(HdrToken) > 0) {
+                                       StrBufCutLeft(Buf, StrLength(HdrToken) + 1);
+                                       lprintf(1, ":: [%s] = [%s]\n", ChrPtr(HdrToken), ChrPtr(Buf));
+                                       if (GetHash(MsgHeaderHandler, SKEY(HdrToken), &vHdr) &&
                                            (vHdr != NULL)) {
                                                Hdr = (headereval*)vHdr;
                                                Hdr->evaluator(Msg, Buf, FoundCharset);
@@ -1535,34 +146,37 @@ void read_message(long msgnum, int printable_view, char *section) {
                        }
                case 2: /* Message Body */
                        
-                       if (Msg->MsgBody.size_known > 0) {
-                               StrBuf_ServGetBLOB(Msg->MsgBody.Data, Msg->MsgBody.length);
+                       if (Msg->MsgBody->size_known > 0) {
+                               StrBuf_ServGetBLOB(Msg->MsgBody->Data, Msg->MsgBody->length);
                                state ++;
                                        /// todo: check next line, if not 000, append following lines
                        }
                        else if (1){
-                               if (StrLength(Msg->MsgBody.Data) > 0)
-                                       StrBufAppendBufPlain(Msg->MsgBody.Data, "\n", 1, 0);
-                               StrBufAppendBuf(Msg->MsgBody.Data, Buf, 0);
+                               if (StrLength(Msg->MsgBody->Data) > 0)
+                                       StrBufAppendBufPlain(Msg->MsgBody->Data, "\n", 1, 0);
+                               StrBufAppendBuf(Msg->MsgBody->Data, Buf, 0);
                        }
                        break;
                case 3:
-                       StrBufAppendBuf(Msg->MsgBody.Data, Buf, 0);
+                       StrBufAppendBuf(Msg->MsgBody->Data, Buf, 0);
                        break;
                }
        }
+
+       if (Msg->AllAttach == NULL)
+               Msg->AllAttach = NewHash(1,NULL);
+       Put(Msg->AllAttach, SKEY(Msg->MsgBody->PartNum), Msg->MsgBody, DestroyMime);
        
        /* strip the bare contenttype, so we ommit charset etc. */
-       StrBufExtract_token(Buf, Msg->MsgBody.ContentType, 0, ';');
+       StrBufExtract_token(Buf, Msg->MsgBody->ContentType, 0, ';');
        StrBufTrim(Buf);
        if (GetHash(MimeRenderHandler, SKEY(Buf), &vHdr) &&
            (vHdr != NULL)) {
                RenderMimeFunc Render;
                Render = (RenderMimeFunc)vHdr;
-               Render(&Msg->MsgBody, NULL, FoundCharset);
+               Render(Msg->MsgBody, NULL, FoundCharset);
        }
 
-
        if (StrLength(Msg->reply_references)> 0) {
                /* Trim down excessively long lists of thread references.  We eliminate the
                 * second one in the list so that the thread root remains intact.
@@ -1606,84 +220,21 @@ void read_message(long msgnum, int printable_view, char *section) {
                        StrBufAppendBuf(Msg->reply_to, Msg->from, 0);
                }
        }
-///TODO: why this?
-       if (nhdr == 1) {
-               wprintf("****");
-       }
-       DoTemplate(HKEY("view_message"), NULL, Msg, CTX_MAILSUM);
-
-
-
-//// put message renderer lookup here.
-///ENDBODY:    /* If there are attached submessages, display them now... */
-///
-///    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>");
-///                    read_message(msgnum, 1, buf);
-///                    wprintf("</blockquote>");
-///            }
-///    }
-
-
-       /* Afterwards, offer links to download attachments 'n' such */
-       if ( (num_attach_links > 0) && (!section[0]) ) {
-               for (i=0; i<num_attach_links; ++i) {
-                       if (strcasecmp(attach_links[i].partnum, msg4_partnum)) {
-                               wprintf("%s", attach_links[i].html);
-                       }
-               }
-       }
-
-       /* Handler for vCard parts */
-       if (!IsEmptyStr(vcard_partnum)) {
-               part_source = load_mimepart(msgnum, vcard_partnum);
-               if (part_source != NULL) {
-
-                       /** If it's my vCard I can edit it */
-                       if (    (!strcasecmp(WC->wc_roomname, USERCONFIGROOM))
-                               || (!strcasecmp(&WC->wc_roomname[11], USERCONFIGROOM))
-                               || (WC->wc_view == VIEW_ADDRESSBOOK)
-                       ) {
-                               wprintf("<a href=\"edit_vcard?msgnum=%ld&partnum=%s\">",
-                                       msgnum, vcard_partnum);
-                               wprintf("[%s]</a>", _("edit"));
-                       }
-
-                       /* In all cases, display the full card */
-                       display_vcard(part_source, 0, 1, NULL,msgnum);
-               }
-       }
-
-       /* Handler for calendar parts */
-       if (!IsEmptyStr(cal_partnum)) {
-               part_source = load_mimepart(msgnum, cal_partnum);
-               if (part_source != NULL) {
-                       cal_process_attachment(part_source, msgnum, cal_partnum);
-               }
-       }
-
-       if (part_source) {
-               free(part_source);
-               part_source = NULL;
+       it = GetNewHashPos(Msg->AllAttach, 0);
+       while (GetNextHashPos(Msg->AllAttach, it, &len, &Key, &vMime) && 
+              (vMime != NULL)) {
+               wc_mime_attachment *Mime = (wc_mime_attachment*) vMime;
+               evaluate_mime_part(Msg, Mime);
        }
+       DeleteHashPos(&it);
 
-       wprintf("</div>\n");
-
-       /* end everythingamundo table */
-       if (!printable_view) {
-               wprintf("</div>\n");
-       }
+       DoTemplate(tmpl, tmpllen, Target, Msg, CTX_MAILSUM);
 
-       if (num_attach_links > 0) {
-               free(attach_links);
-       }
        DestroyMessageSummary(Msg);
        FreeStrBuf(&FoundCharset);
-       FreeStrBuf(&Token);
+       FreeStrBuf(&HdrToken);
        FreeStrBuf(&Buf);
+       return 1;
 }
 
 
@@ -1696,9 +247,13 @@ void read_message(long msgnum, int printable_view, char *section) {
  */
 void embed_message(void) {
        long msgnum = 0L;
+       const StrBuf *Tmpl = sbstr("template");
 
-       msgnum = StrTol(WC->UrlFragment1);
-       read_message(msgnum, 0, "");
+       msgnum = StrTol(WC->UrlFragment2);
+       if (StrLength(Tmpl) > 0) 
+               read_message(WC->WBuf, SKEY(Tmpl), msgnum, 0, NULL);
+       else 
+               read_message(WC->WBuf, HKEY("view_message"), msgnum, 0, NULL);
 }
 
 
@@ -1710,24 +265,17 @@ void embed_message(void) {
 void print_message(void) {
        long msgnum = 0L;
 
-       msgnum = StrTol(WC->UrlFragment1);
+       msgnum = StrTol(WC->UrlFragment2);
        output_headers(0, 0, 0, 0, 0, 0);
 
        hprintf("Content-type: text/html\r\n"
-               "Server: %s\r\n"
-               "Connection: close\r\n",
-               PACKAGE_STRING);
+               "Server: " PACKAGE_STRING "\r\n"
+               "Connection: close\r\n");
+
        begin_burst();
 
-       wprintf("\r\n<html>\n<head><title>");
-       escputs(WC->wc_fullname);
-       wprintf("</title></head>\n"
-               "<body onLoad=\" window.print(); window.close(); \">\n"
-       );
-       
-       read_message(msgnum, 1, "");
+       read_message(WC->WBuf, HKEY("view_message_print"), msgnum, 1, NULL);
 
-       wprintf("\n</body></html>\n\n");
        wDumpContent(0);
 }
 
@@ -1738,11 +286,11 @@ void print_message(void) {
  */
 void mobile_message_view(void) {
   long msgnum = 0L;
-  msgnum = StrTol(WC->UrlFragment1);
+  msgnum = StrTol(WC->UrlFragment2);
   output_headers(1, 0, 0, 0, 0, 1);
   begin_burst();
   do_template("msgcontrols", NULL);
-  read_message(msgnum,1, "");
+  read_message(WC->WBuf, HKEY("view_message"), msgnum,1, NULL);
   wDumpContent(0);
 }
 
@@ -1755,7 +303,7 @@ void display_headers(void) {
        long msgnum = 0L;
        char buf[1024];
 
-       msgnum = StrTol(WC->UrlFragment1);
+       msgnum = StrTol(WC->UrlFragment2);
        output_headers(0, 0, 0, 0, 0, 0);
 
        hprintf("Content-type: text/plain\r\n"
@@ -1776,355 +324,6 @@ void display_headers(void) {
 }
 
 
-
-/**
- * \brief Read message in simple, JavaScript-embeddable form for 'forward'
- *     or 'reply quoted' operations.
- *
- * NOTE: it is VITALLY IMPORTANT that we output no single-quotes or linebreaks
- *       in this function.  Doing so would throw a JavaScript error in the
- *       'supplied text' argument to the editor.
- *
- * \param msgnum Message number of the message we want to quote
- * \param forward_attachments Nonzero if we want attachments to be forwarded
- */
-void pullquote_message(long msgnum, int forward_attachments, int include_headers) {
-       char buf[SIZ];
-       char mime_partnum[256];
-       char mime_filename[256];
-       char mime_content_type[256];
-       char mime_charset[256];
-       char mime_disposition[256];
-       int mime_length;
-       char *attachments = NULL;
-       char *ptr = NULL;
-       int num_attachments = 0;
-       struct wc_attachment *att, *aptr;
-       char m_subject[1024];
-       char from[256];
-       char node[256];
-       char rfca[256];
-       char to[256];
-       char reply_to[512];
-       char now[256];
-       int format_type = 0;
-       int nhdr = 0;
-       int bq = 0;
-       int i = 0;
-#ifdef HAVE_ICONV
-       iconv_t ic = (iconv_t)(-1) ;
-       char *ibuf;                /**< Buffer of characters to be converted */
-       char *obuf;                /**< Buffer for converted characters      */
-       size_t ibuflen;    /**< Length of input buffer         */
-       size_t obuflen;    /**< Length of output buffer       */
-       char *osav;                /**< Saved pointer to output buffer       */
-#endif
-
-       strcpy(from, "");
-       strcpy(node, "");
-       strcpy(rfca, "");
-       strcpy(reply_to, "");
-       strcpy(mime_content_type, "text/plain");
-       strcpy(mime_charset, "us-ascii");
-
-       serv_printf("MSG4 %ld", msgnum);
-       serv_getln(buf, sizeof buf);
-       if (buf[0] != '1') {
-               wprintf(_("ERROR:"));
-               wprintf("%s<br />", &buf[4]);
-               return;
-       }
-
-       strcpy(m_subject, "");
-
-       while (serv_getln(buf, sizeof buf), strcasecmp(buf, "text")) {
-               if (!strcmp(buf, "000")) {
-                       wprintf("%s (3)", _("unexpected end of message"));
-                       return;
-               }
-               if (include_headers) {
-                       if (!strncasecmp(buf, "nhdr=yes", 8))
-                               nhdr = 1;
-                       if (nhdr == 1)
-                               buf[0] = '_';
-                       if (!strncasecmp(buf, "type=", 5))
-                               format_type = atoi(&buf[5]);
-                       if (!strncasecmp(buf, "from=", 5)) {
-                               strcpy(from, &buf[5]);
-                               wprintf(_("from "));
-                               utf8ify_rfc822_string(from);
-                               msgescputs(from);
-                       }
-                       if (!strncasecmp(buf, "subj=", 5)) {
-                               strcpy(m_subject, &buf[5]);
-                       }
-                       if ((!strncasecmp(buf, "hnod=", 5))
-                           && (strcasecmp(&buf[5], serv_info.serv_humannode))) {
-                               wprintf("(%s) ", &buf[5]);
-                       }
-                       if ((!strncasecmp(buf, "room=", 5))
-                           && (strcasecmp(&buf[5], WC->wc_roomname))
-                           && (!IsEmptyStr(&buf[5])) ) {
-                               wprintf(_("in "));
-                               wprintf("%s&gt; ", &buf[5]);
-                       }
-                       if (!strncasecmp(buf, "rfca=", 5)) {
-                               strcpy(rfca, &buf[5]);
-                               wprintf("&lt;");
-                               msgescputs(rfca);
-                               wprintf("&gt; ");
-                       }
-                       if (!strncasecmp(buf, "node=", 5)) {
-                               strcpy(node, &buf[5]);
-                               if ( ((WC->room_flags & QR_NETWORK)
-                               || ((strcasecmp(&buf[5], serv_info.serv_nodename)
-                               && (strcasecmp(&buf[5], serv_info.serv_fqdn)))))
-                               && (IsEmptyStr(rfca))
-                               ) {
-                                       wprintf("@%s ", &buf[5]);
-                               }
-                       }
-                       if (!strncasecmp(buf, "rcpt=", 5)) {
-                               wprintf(_("to "));
-                               strcpy(to, &buf[5]);
-                               utf8ify_rfc822_string(to);
-                               wprintf("%s ", to);
-                       }
-                       if (!strncasecmp(buf, "time=", 5)) {
-                               webcit_fmt_date(now, atol(&buf[5]), 0);
-                               wprintf("%s ", now);
-                       }
-               }
-
-               /**
-                * Save attachment info for later.  We can't start downloading them
-                * yet because we're in the middle of a server transaction.
-                */
-               if (!strncasecmp(buf, "part=", 5)) {
-                       ptr = malloc( (strlen(buf) + ((attachments != NULL) ? strlen(attachments) : 0)) ) ;
-                       if (ptr != NULL) {
-                               ++num_attachments;
-                               sprintf(ptr, "%s%s\n",
-                                       ((attachments != NULL) ? attachments : ""),
-                                       &buf[5]
-                               );
-                               free(attachments);
-                               attachments = ptr;
-                               lprintf(9, "attachments=<%s>\n", attachments);
-                       }
-               }
-
-       }
-
-       if (include_headers) {
-               wprintf("<br>");
-
-               utf8ify_rfc822_string(m_subject);
-               if (!IsEmptyStr(m_subject)) {
-                       wprintf(_("Subject:"));
-                       wprintf(" ");
-                       msgescputs(m_subject);
-                       wprintf("<br />");
-               }
-
-               /**
-                * Begin body
-                */
-               wprintf("<br />");
-       }
-
-       /**
-        * Learn the content type
-        */
-       strcpy(mime_content_type, "text/plain");
-       while (serv_getln(buf, sizeof buf), (!IsEmptyStr(buf))) {
-               if (!strcmp(buf, "000")) {
-                       wprintf("%s (4)", _("unexpected end of message"));
-                       goto ENDBODY;
-               }
-               if (!strncasecmp(buf, "Content-type: ", 14)) {
-                       int len;
-                       safestrncpy(mime_content_type, &buf[14],
-                               sizeof(mime_content_type));
-                       for (i=0; i<strlen(mime_content_type); ++i) {
-                               if (!strncasecmp(&mime_content_type[i], "charset=", 8)) {
-                                       safestrncpy(mime_charset, &mime_content_type[i+8],
-                                               sizeof mime_charset);
-                               }
-                       }
-                       len = strlen(mime_content_type);
-                       for (i=0; i<len; ++i) {
-                               if (mime_content_type[i] == ';') {
-                                       mime_content_type[i] = 0;
-                                       len = i - 1;
-                               }
-                       }
-                       len = strlen(mime_charset);
-                       for (i=0; i<len; ++i) {
-                               if (mime_charset[i] == ';') {
-                                       mime_charset[i] = 0;
-                                       len = i - 1;
-                               }
-                       }
-               }
-       }
-
-       /** Set up a character set conversion if we need to (and if we can) */
-#ifdef HAVE_ICONV
-       if ( (strcasecmp(mime_charset, "us-ascii"))
-          && (strcasecmp(mime_charset, "UTF-8"))
-          && (strcasecmp(mime_charset, ""))
-       ) {
-               ctdl_iconv_open("UTF-8", mime_charset, &ic);
-               if (ic == (iconv_t)(-1) ) {
-                       lprintf(5, "%s:%d iconv_open(%s, %s) failed: %s\n",
-                               __FILE__, __LINE__, "UTF-8", mime_charset, strerror(errno));
-               }
-       }
-#endif
-
-       /** Messages in legacy Citadel variformat get handled thusly... */
-       if (!strcasecmp(mime_content_type, "text/x-citadel-variformat")) {
-               pullquote_fmout();
-       }
-
-       /* Boring old 80-column fixed format text gets handled this way... */
-       else if (!strcasecmp(mime_content_type, "text/plain")) {
-               while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
-                       int len;
-                       len = strlen(buf);
-                       if ((len > 0) && (buf[len-1] == '\n')) buf[--len] = 0;
-                       if ((len > 0) && (buf[len-1] == '\r')) buf[--len] = 0;
-
-#ifdef HAVE_ICONV
-                       if (ic != (iconv_t)(-1) ) {
-                               ibuf = buf;
-                               ibuflen = len;
-                               obuflen = SIZ;
-                               obuf = (char *) malloc(obuflen);
-                               osav = obuf;
-                               iconv(ic, &ibuf, &ibuflen, &obuf, &obuflen);
-                               osav[SIZ-obuflen] = 0;
-                               safestrncpy(buf, osav, sizeof buf);
-                               free(osav);
-                       }
-#endif
-
-                       len = strlen(buf);
-                       while ((!IsEmptyStr(buf)) && (isspace(buf[len - 1]))) 
-                               buf[--len] = 0;
-                       if ((bq == 0) &&
-                       ((!strncmp(buf, ">", 1)) || (!strncmp(buf, " >", 2)) )) {
-                               wprintf("<blockquote>");
-                               bq = 1;
-                       } else if ((bq == 1) &&
-                               (strncmp(buf, ">", 1)) && (strncmp(buf, " >", 2)) ) {
-                               wprintf("</blockquote>");
-                               bq = 0;
-                       }
-                       wprintf("<tt>");
-                       url(buf, sizeof(buf));
-                       msgescputs1(buf);
-                       wprintf("</tt><br />");
-               }
-               wprintf("</i><br />");
-       }
-
-       /** HTML just gets escaped and stuffed back into the editor */
-       else if (!strcasecmp(mime_content_type, "text/html")) {
-               while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
-                       strcat(buf, "\n");
-                       msgescputs(buf);
-               }
-       }//// TODO: charset? utf8?
-
-       /** Unknown weirdness ... don't know how to handle this content type */
-       else {
-               while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) { }
-       }
-
-ENDBODY:
-       /** end of body handler */
-
-       /*
-        * If there were attachments, we have to download them and insert them
-        * into the attachment chain for the forwarded message we are composing.
-        */
-       if ( (forward_attachments) && (num_attachments) ) {
-               for (i=0; i<num_attachments; ++i) {
-                       extract_token(buf, attachments, i, '\n', sizeof buf);
-                       extract_token(mime_filename, buf, 1, '|', sizeof mime_filename);
-                       extract_token(mime_partnum, buf, 2, '|', sizeof mime_partnum);
-                       extract_token(mime_disposition, buf, 3, '|', sizeof mime_disposition);
-                       extract_token(mime_content_type, buf, 4, '|', sizeof mime_content_type);
-                       mime_length = extract_int(buf, 5);
-
-                       /*
-                        * tracing  ... uncomment if necessary
-                        *
-                        */
-                       lprintf(9, "fwd filename: %s\n", mime_filename);
-                       lprintf(9, "fwd partnum : %s\n", mime_partnum);
-                       lprintf(9, "fwd conttype: %s\n", mime_content_type);
-                       lprintf(9, "fwd dispose : %s\n", mime_disposition);
-                       lprintf(9, "fwd length  : %d\n", mime_length);
-
-                       if ( (!strcasecmp(mime_disposition, "inline"))
-                          || (!strcasecmp(mime_disposition, "attachment")) ) {
-               
-                               /* Create an attachment struct from this mime part... */
-                               att = malloc(sizeof(struct wc_attachment));
-                               memset(att, 0, sizeof(struct wc_attachment));
-                               att->length = mime_length;
-                               strcpy(att->content_type, mime_content_type);
-                               strcpy(att->filename, mime_filename);
-                               att->next = NULL;
-                               att->data = load_mimepart(msgnum, mime_partnum);
-               
-                               /* And add it to the list. */
-                               if (WC->first_attachment == NULL) {
-                                       WC->first_attachment = att;
-                               }
-                               else {
-                                       aptr = WC->first_attachment;
-                                       while (aptr->next != NULL) aptr = aptr->next;
-                                       aptr->next = att;
-                               }
-                       }
-
-               }
-       }
-
-#ifdef HAVE_ICONV
-       if (ic != (iconv_t)(-1) ) {
-               iconv_close(ic);
-       }
-#endif
-
-       if (attachments != NULL) {
-               free(attachments);
-       }
-}
-
-
-
-
-void EvaluateMimePart(message_summary *Sum, StrBuf *Buf)
-{//// paert=; TODO
-/*
-       extract_token(mime_filename, &buf[5], 1, '|', sizeof mime_filename);
-       extract_token(mime_partnum, &buf[5], 2, '|', sizeof mime_partnum);
-       extract_token(mime_disposition, &buf[5], 3, '|', sizeof mime_disposition);
-       extract_token(mime_content_type, &buf[5], 4, '|', sizeof mime_content_type);
-       mime_length = extract_int(&buf[5], 5);
-       
-       if (  (!strcasecmp(mime_content_type, "text/x-vcard"))
-             || (!strcasecmp(mime_content_type, "text/vcard")) ) {
-               strcpy(vcard_partnum, mime_partnum);
-       }
-*/
-}
-
 message_summary *ReadOneMessageSummary(StrBuf *RawMessage, const char *DefaultSubject, long MsgNum) 
 {
        void                 *vEval;
@@ -2165,273 +364,6 @@ message_summary *ReadOneMessageSummary(StrBuf *RawMessage, const char *DefaultSu
 }
 
 
-/**
- * \brief display the adressbook overview
- * \param msgnum the citadel message number
- * \param alpha what????
- */
-void display_addressbook(long msgnum, char alpha) {
-       //char buf[SIZ];
-       /* char mime_partnum[SIZ]; */
-/*     char mime_filename[SIZ]; */
-/*     char mime_content_type[SIZ]; */
-       ///char mime_disposition[SIZ];
-       //int mime_length;
-       char vcard_partnum[SIZ];
-       char *vcard_source = NULL;
-       message_summary summ;////TODO: this will leak
-
-       memset(&summ, 0, sizeof(summ));
-       ///safestrncpy(summ.subj, _("(no subject)"), sizeof summ.subj);
-///Load Message headers
-//     Msg = 
-       if (!IsEmptyStr(vcard_partnum)) {
-               vcard_source = load_mimepart(msgnum, vcard_partnum);
-               if (vcard_source != NULL) {
-
-                       /** Display the summary line */
-                       display_vcard(vcard_source, alpha, 0, NULL,msgnum);
-
-                       /** If it's my vCard I can edit it */
-                       if (    (!strcasecmp(WC->wc_roomname, USERCONFIGROOM))
-                               || (!strcasecmp(&WC->wc_roomname[11], USERCONFIGROOM))
-                               || (WC->wc_view == VIEW_ADDRESSBOOK)
-                       ) {
-                               wprintf("<a href=\"edit_vcard?"
-                                       "msgnum=%ld&partnum=%s\">",
-                                       msgnum, vcard_partnum);
-                               wprintf("[%s]</a>", _("edit"));
-                       }
-
-                       free(vcard_source);
-               }
-       }
-
-}
-
-
-
-/**
- * \brief  If it's an old "Firstname Lastname" style record, try to convert it.
- * \param namebuf name to analyze, reverse if nescessary
- */
-void lastfirst_firstlast(char *namebuf) {
-       char firstname[SIZ];
-       char lastname[SIZ];
-       int i;
-
-       if (namebuf == NULL) return;
-       if (strchr(namebuf, ';') != NULL) return;
-
-       i = num_tokens(namebuf, ' ');
-       if (i < 2) return;
-
-       extract_token(lastname, namebuf, i-1, ' ', sizeof lastname);
-       remove_token(namebuf, i-1, ' ');
-       strcpy(firstname, namebuf);
-       sprintf(namebuf, "%s; %s", lastname, firstname);
-}
-
-/**
- * \brief fetch what??? name
- * \param msgnum the citadel message number
- * \param namebuf where to put the name in???
- */
-void fetch_ab_name(message_summary *Msg, char *namebuf) {
-       char buf[SIZ];
-       char mime_partnum[SIZ];
-       char mime_filename[SIZ];
-       char mime_content_type[SIZ];
-       char mime_disposition[SIZ];
-       int mime_length;
-       char vcard_partnum[SIZ];
-       char *vcard_source = NULL;
-       int i, len;
-       message_summary summ;/// TODO this will lak
-
-       if (namebuf == NULL) return;
-       strcpy(namebuf, "");
-
-       memset(&summ, 0, sizeof(summ));
-       //////safestrncpy(summ.subj, "(no subject)", sizeof summ.subj);
-
-       sprintf(buf, "MSG0 %ld|0", Msg->msgnum);        /** unfortunately we need the mime info now */
-       serv_puts(buf);
-       serv_getln(buf, sizeof buf);
-       if (buf[0] != '1') return;
-
-       while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
-               if (!strncasecmp(buf, "part=", 5)) {
-                       extract_token(mime_filename, &buf[5], 1, '|', sizeof mime_filename);
-                       extract_token(mime_partnum, &buf[5], 2, '|', sizeof mime_partnum);
-                       extract_token(mime_disposition, &buf[5], 3, '|', sizeof mime_disposition);
-                       extract_token(mime_content_type, &buf[5], 4, '|', sizeof mime_content_type);
-                       mime_length = extract_int(&buf[5], 5);
-
-                       if (  (!strcasecmp(mime_content_type, "text/x-vcard"))
-                          || (!strcasecmp(mime_content_type, "text/vcard")) ) {
-                               strcpy(vcard_partnum, mime_partnum);
-                       }
-
-               }
-       }
-
-       if (!IsEmptyStr(vcard_partnum)) {
-               vcard_source = load_mimepart(Msg->msgnum, vcard_partnum);
-               if (vcard_source != NULL) {
-
-                       /* Grab the name off the card */
-                       display_vcard(vcard_source, 0, 0, namebuf, Msg->msgnum);
-
-                       free(vcard_source);
-               }
-       }
-
-       lastfirst_firstlast(namebuf);
-       striplt(namebuf);
-       len = strlen(namebuf);
-       for (i=0; i<len; ++i) {
-               if (namebuf[i] != ';') return;
-       }
-       strcpy(namebuf, _("(no name)"));
-}
-
-
-
-/**
- * \brief Record compare function for sorting address book indices
- * \param ab1 adressbook one
- * \param ab2 adressbook two
- */
-int abcmp(const void *ab1, const void *ab2) {
-       return(strcasecmp(
-               (((const struct addrbookent *)ab1)->ab_name),
-               (((const struct addrbookent *)ab2)->ab_name)
-       ));
-}
-
-
-/**
- * \brief Helper function for do_addrbook_view()
- * Converts a name into a three-letter tab label
- * \param tabbuf the tabbuffer to add name to
- * \param name the name to add to the tabbuffer
- */
-void nametab(char *tabbuf, long len, char *name) {
-       stresc(tabbuf, len, name, 0, 0);
-       tabbuf[0] = toupper(tabbuf[0]);
-       tabbuf[1] = tolower(tabbuf[1]);
-       tabbuf[2] = tolower(tabbuf[2]);
-       tabbuf[3] = 0;
-}
-
-
-/**
- * \brief Render the address book using info we gathered during the scan
- * \param addrbook the addressbook to render
- * \param num_ab the number of the addressbook
- */
-void do_addrbook_view(struct addrbookent *addrbook, int num_ab) {
-       int i = 0;
-       int displayed = 0;
-       int bg = 0;
-       static int NAMESPERPAGE = 60;
-       int num_pages = 0;
-       int tabfirst = 0;
-       char tabfirst_label[64];
-       int tablast = 0;
-       char tablast_label[64];
-       char this_tablabel[64];
-       int page = 0;
-       char **tablabels;
-
-       if (num_ab == 0) {
-               wprintf("<br /><br /><br /><div align=\"center\"><i>");
-               wprintf(_("This address book is empty."));
-               wprintf("</i></div>\n");
-               return;
-       }
-
-       if (num_ab > 1) {
-               qsort(addrbook, num_ab, sizeof(struct addrbookent), abcmp);
-       }
-
-       num_pages = (num_ab / NAMESPERPAGE) + 1;
-
-       tablabels = malloc(num_pages * sizeof (char *));
-       if (tablabels == NULL) {
-               wprintf("<br /><br /><br /><div align=\"center\"><i>");
-               wprintf(_("An internal error has occurred."));
-               wprintf("</i></div>\n");
-               return;
-       }
-
-       for (i=0; i<num_pages; ++i) {
-               tabfirst = i * NAMESPERPAGE;
-               tablast = tabfirst + NAMESPERPAGE - 1;
-               if (tablast > (num_ab - 1)) tablast = (num_ab - 1);
-               nametab(tabfirst_label, 64, addrbook[tabfirst].ab_name);
-               nametab(tablast_label, 64, addrbook[tablast].ab_name);
-               sprintf(this_tablabel, "%s&nbsp;-&nbsp;%s", tabfirst_label, tablast_label);
-               tablabels[i] = strdup(this_tablabel);
-       }
-
-       tabbed_dialog(num_pages, tablabels);
-       page = (-1);
-
-       for (i=0; i<num_ab; ++i) {
-
-               if ((i / NAMESPERPAGE) != page) {       /* New tab */
-                       page = (i / NAMESPERPAGE);
-                       if (page > 0) {
-                               wprintf("</tr></table>\n");
-                               end_tab(page-1, num_pages);
-                       }
-                       begin_tab(page, num_pages);
-                       wprintf("<table border=0 cellspacing=0 cellpadding=3 width=100%%>\n");
-                       displayed = 0;
-               }
-
-               if ((displayed % 4) == 0) {
-                       if (displayed > 0) {
-                               wprintf("</tr>\n");
-                       }
-                       bg = 1 - bg;
-                       wprintf("<tr bgcolor=\"#%s\">",
-                               (bg ? "DDDDDD" : "FFFFFF")
-                       );
-               }
-       
-               wprintf("<td>");
-
-               wprintf("<a href=\"readfwd?startmsg=%ld?is_singlecard=1",
-                       addrbook[i].ab_msgnum);
-               wprintf("?maxmsgs=1?is_summary=0?alpha=%s\">", bstr("alpha"));
-               vcard_n_prettyize(addrbook[i].ab_name);
-               escputs(addrbook[i].ab_name);
-               wprintf("</a></td>\n");
-               ++displayed;
-       }
-
-       /* Placeholders for empty columns at end */
-       if ((num_ab % 4) != 0) {
-               for (i=0; i<(4-(num_ab % 4)); ++i) {
-                       wprintf("<td>&nbsp;</td>");
-               }
-       }
-
-       wprintf("</tr></table>\n");
-       end_tab((num_pages-1), num_pages);
-
-       begin_tab(num_pages, num_pages);
-       /* FIXME there ought to be something here */
-       end_tab(num_pages, num_pages);
-
-       for (i=0; i<num_pages; ++i) {
-               free(tablabels[i]);
-       }
-       free(tablabels);
-}
 
 
 
@@ -2444,7 +376,7 @@ void do_addrbook_view(struct addrbookent *addrbook, int num_ab) {
 int load_msg_ptrs(char *servcmd, int with_headers)
 {
        StrBuf* FoundCharset = NULL;
-        struct wcsession *WCC = WC;
+        wcsession *WCC = WC;
        message_summary *Msg;
        StrBuf *Buf, *Buf2;
        ///char buf[1024];
@@ -2458,7 +390,7 @@ int load_msg_ptrs(char *servcmd, int with_headers)
        ////int sbjlen;
        int maxload = 0;
        long len;
-
+       int n;
        ////int num_summ_alloc = 0;
 
        if (WCC->summ != NULL) {
@@ -2467,7 +399,7 @@ int load_msg_ptrs(char *servcmd, int with_headers)
        }
        WCC->summ = NewHash(1, Flathash);
        nummsgs = 0;
-       maxload = 1000;/// TODO
+       maxload = 10000;
        
        Buf = NewStrBuf();
        serv_puts(servcmd);
@@ -2530,7 +462,8 @@ int load_msg_ptrs(char *servcmd, int with_headers)
                                StrBuf_Utf8StrCut(Msg->from, 23);
                                StrBufAppendBufPlain(Msg->from, HKEY("..."), 0);
                        }
-                       Put(WCC->summ, (const char*)&Msg->msgnum, sizeof(Msg->msgnum), Msg, DestroyMessageSummary);
+                       n = Msg->msgnum;
+                       Put(WCC->summ, (const char *)&n, sizeof(n), Msg, DestroyMessageSummary);
                }
                nummsgs++;
        }
@@ -2540,27 +473,97 @@ int load_msg_ptrs(char *servcmd, int with_headers)
 }
 
 
+inline message_summary* GetMessagePtrAt(int n, HashList *Summ)
+{
+       const char *Key;
+       long HKLen;
+       void *vMsg;
+
+       if (Summ == NULL)
+               return NULL;
+       GetHashAt(Summ, n, &HKLen, &Key, &vMsg);
+       return (message_summary*) vMsg;
+}
+
+
+void DrawMessageDropdown(StrBuf *Selector, long maxmsgs, long startmsg)
+{
+       StrBuf *TmpBuf;
+       wcsession *WCC = WC;
+       message_summary* Msg;
+       int lo, hi, n;
+       int i = 0;
+       long StartMsg;
+       void *vMsg;
+       long hklen;
+       const char *key;
+       int done = 0;
+       int nItems;
+       HashPos *At;
+       long vector[16];
+       int nMessages = DEFAULT_MAXMSGS;
+
+       TmpBuf = NewStrBuf();
+       At = GetNewHashPos(WCC->summ, (lbstr("SortOrder") == 1)? -nMessages : nMessages);
+       nItems = GetCount(WCC->summ);
+       
+       vector[0] = 7;
+       vector[1] = startmsg;
+       vector[2] = maxmsgs;
+       vector[3] = 0;
+       vector[4] = 1;
 
+       while (!done) {
+               lo = GetHashPosCounter(At);
+               if (lo + nMessages > nItems) {
+                       hi = nItems;
+               }
+               else {
+                       hi = lo + nMessages;
+               }
+               done = !GetNextHashPos(WCC->summ, At, &hklen, &key, &vMsg);
+               Msg = (message_summary*) vMsg;
+               n = (Msg==NULL)? 0 : Msg->msgnum;
+               if (i == 0)
+                       StartMsg = n;
+               vector[4] = lo;
+               vector[5] = hi;
+               vector[6] = n;
+               FlushStrBuf(TmpBuf);
+               DoTemplate(HKEY("select_messageindex"), TmpBuf, &vector, CTX_LONGVECTOR);
+               StrBufAppendBuf(Selector, TmpBuf, 0);
+               i++;
+       }
+       vector[6] = StartMsg;
+       FlushStrBuf(TmpBuf);
+       DoTemplate(HKEY("select_messageindex_all"), TmpBuf, &vector, CTX_LONGVECTOR);
+       StrBufAppendBuf(Selector, TmpBuf, 0);
+       FreeStrBuf(&TmpBuf);
+       DeleteHashPos(&At);
+}
 
 
+extern readloop_struct rlid[];
 
 /*
  * command loop for reading messages
  *
  * Set oper to "readnew" or "readold" or "readfwd" or "headers"
  */
-void readloop(char *oper)
+void readloop(long oper)
 {
+       StrBuf *MessageDropdown = NULL;
+       StrBuf *BBViewToolBar = NULL;
        void *vMsg;
        message_summary *Msg;
        char cmd[256] = "";
        char buf[SIZ];
        char old_msgs[SIZ];
        int a = 0;
-       int b = 0;
+       ///int b = 0;
        int nummsgs;
-       long startmsg;
-       int maxmsgs;
+       long startmsg = 0;
+       int maxmsgs = 0;
        long *displayed_msgs = NULL;
        int num_displayed = 0;
        int is_summary = 0;
@@ -2571,99 +574,109 @@ void readloop(char *oper)
        int is_tasks = 0;
        int is_notes = 0;
        int is_bbview = 0;
-       int lo, hi;
        int lowest_displayed = (-1);
        int highest_displayed = 0;
-       struct addrbookent *addrbook = NULL;
+       addrbookent *addrbook = NULL;
        int num_ab = 0;
-       const StrBuf *sortby = NULL;
-       //SortByEnum 
-       int SortBy = eRDate;
-       const StrBuf *sortpref_value;
        int bbs_reverse = 0;
-       struct wcsession *WCC = WC;     /* This is done to make it run faster; WC is a function */
+       wcsession *WCC = WC;
        HashPos *at;
        const char *HashKey;
        long HKLen;
+       int care_for_empty_list = 0;
+       int load_seen = 0;
+       int sortit = 0;
 
-       if (WCC->wc_view == VIEW_WIKI) {
+       switch (WCC->wc_view) {
+       case VIEW_WIKI:
                sprintf(buf, "wiki?room=%s&page=home", WCC->wc_roomname);
                http_redirect(buf);
                return;
-       }
-
-       startmsg = lbstr("startmsg");
-       maxmsgs = ibstr("maxmsgs");
-       is_summary = (ibstr("is_summary") && !WCC->is_mobile);
-       if (maxmsgs == 0) maxmsgs = DEFAULT_MAXMSGS;
-
-       sortpref_value = get_room_pref("sort");
+       case VIEW_CALENDAR:
+               load_seen = 1;
+               is_calendar = 1;
+               strcpy(cmd, "MSGS ALL|||1");
+               maxmsgs = 32767;
+               parse_calendar_view_request(&calv);
+               break;
+       case VIEW_TASKS:
+               is_tasks = 1;
+               strcpy(cmd, "MSGS ALL");
+               maxmsgs = 32767;
+               break;
+       case VIEW_NOTES:
+               is_notes = 1;
+               strcpy(cmd, "MSGS ALL");
+               maxmsgs = 32767;
+               wprintf("<div id=\"new_notes_here\"></div>\n");
+               break;
+       case VIEW_ADDRESSBOOK:
+               is_singlecard = ibstr("is_singlecard");
+               if (maxmsgs > 1) {
+                       is_addressbook = 1;
+                       if (oper == do_search) {
+                               snprintf(cmd, sizeof(cmd), "MSGS SEARCH|%s", bstr("query"));
+                       }
+                       else {
+                               strcpy(cmd, "MSGS ALL");
+                       }
+                       maxmsgs = 9999999;
+                       break;
+               }
 
-       sortby = sbstr("sortby");
-       if ( (!IsEmptyStr(ChrPtr(sortby))) && 
-            (strcasecmp(ChrPtr(sortby), ChrPtr(sortpref_value)) != 0)) {
-               set_room_pref("sort", NewStrBufDup(sortby), 1);
-               sortpref_value = NULL;
-               sortpref_value = sortby;
-       }
+       default:
+               care_for_empty_list = 1;
+               startmsg = lbstr("startmsg");
+               if (havebstr("maxmsgs"))
+                       maxmsgs = ibstr("maxmsgs");
+               is_summary = (ibstr("is_summary") && !WCC->is_mobile);
+               if (maxmsgs == 0) maxmsgs = DEFAULT_MAXMSGS;
+               
 
-       SortBy = StrToESort(sortpref_value);
-       /* message board sort */
-       if (SortBy == eReverse) {
-               bbs_reverse = 1;
-       }
-       else {
-               bbs_reverse = 0;
-       }
+               
+                /*
+                * When in summary mode, always show ALL messages instead of just
+                * new or old.  Otherwise, show what the user asked for.
+                */
+               rlid[oper].cmd(cmd, sizeof(cmd));
+               
+               if ((WCC->wc_view == VIEW_MAILBOX) && (maxmsgs > 1) && !WCC->is_mobile) {
+                       is_summary = 1;
+                       if (oper != do_search) {
+                               strcpy(cmd, "MSGS ALL");
+                       }
+               }
 
-       output_headers(1, 1, 1, 0, 0, 0);
+               is_bbview = !is_summary;
+               if (is_summary) {                       /**< fetch header summary */
+                       load_seen = 1;
+                       snprintf(cmd, sizeof(cmd), "MSGS %s|%s||1",
+                                (oper == do_search) ? "SEARCH" : "ALL",
+                                (oper == do_search) ? bstr("query") : ""
+                               );
+                       startmsg = 1;
+                       maxmsgs = 9999999;
+               } 
 
-       /*
-        * When in summary mode, always show ALL messages instead of just
-        * new or old.  Otherwise, show what the user asked for.
-        */
-       if (!strcmp(oper, "readnew")) {
-               strcpy(cmd, "MSGS NEW");
-       }
-       else if (!strcmp(oper, "readold")) {
-               strcpy(cmd, "MSGS OLD");
-       }
-       else if (!strcmp(oper, "do_search")) {
-               snprintf(cmd, sizeof(cmd), "MSGS SEARCH|%s", bstr("query"));
-       }
-       else {
-               strcpy(cmd, "MSGS ALL");
-       }
+               bbs_reverse = is_bbview && (lbstr("SortOrder") == 2);
 
-       if ((WCC->wc_view == VIEW_MAILBOX) && (maxmsgs > 1) && !WCC->is_mobile) {
-               is_summary = 1;
-               if (!strcmp(oper, "do_search")) {
-                       snprintf(cmd, sizeof(cmd), "MSGS SEARCH|%s", bstr("query"));
-               }
-               else {
-                       strcpy(cmd, "MSGS ALL");
+               if (is_bbview && (startmsg == 0L)) {
+                       if (bbs_reverse) {
+                               Msg = GetMessagePtrAt((nummsgs >= maxmsgs) ? (nummsgs - maxmsgs) : 0, WCC->summ);
+                               startmsg = (Msg==NULL)? 0 : Msg->msgnum;
+                       }
+                       else {
+                               Msg = GetMessagePtrAt(0, WCC->summ);
+                               startmsg = (Msg==NULL)? 0 : Msg->msgnum;
+                       }
                }
+               sortit = is_summary || WCC->is_mobile;
        }
 
-       if ((WCC->wc_view == VIEW_ADDRESSBOOK) && (maxmsgs > 1)) {
-               is_addressbook = 1;
-               if (!strcmp(oper, "do_search")) {
-                       snprintf(cmd, sizeof(cmd), "MSGS SEARCH|%s", bstr("query"));
-               }
-               else {
-                       strcpy(cmd, "MSGS ALL");
-               }
-               maxmsgs = 9999999;
-       }
 
-       if (is_summary) {                       /**< fetch header summary */
-               snprintf(cmd, sizeof(cmd), "MSGS %s|%s||1",
-                       (!strcmp(oper, "do_search") ? "SEARCH" : "ALL"),
-                       (!strcmp(oper, "do_search") ? bstr("query") : "")
-               );
-               startmsg = 1;
-               maxmsgs = 9999999;
-       } 
+       output_headers(1, 1, 1, 0, 0, 0);
+
+       /*
        if (WCC->is_mobile) {
                maxmsgs = 20;
                snprintf(cmd, sizeof(cmd), "MSGS %s|%s||1",
@@ -2678,48 +691,20 @@ void readloop(char *oper)
         * and new messages, so we can do that pretty boldface thing for the
         * new messages.
         */
-       strcpy(old_msgs, "");
-       if ((is_summary) || (WCC->wc_default_view == VIEW_CALENDAR) || WCC->is_mobile){
-               serv_puts("GTSN");
-               serv_getln(buf, sizeof buf);
-               if (buf[0] == '2') {
-                       strcpy(old_msgs, &buf[4]);
-               }
-       }
-
-       is_singlecard = ibstr("is_singlecard");
-
-       if (WCC->wc_default_view == VIEW_CALENDAR) {            /**< calendar */
-               is_calendar = 1;
-               strcpy(cmd, "MSGS ALL|||1");
-               maxmsgs = 32767;
-               parse_calendar_view_request(&calv);
-       }
-       if (WCC->wc_default_view == VIEW_TASKS) {               /**< tasks */
-               is_tasks = 1;
-               strcpy(cmd, "MSGS ALL");
-               maxmsgs = 32767;
-       }
-       if (WCC->wc_default_view == VIEW_NOTES) {               /**< notes */
-               is_notes = 1;
-               strcpy(cmd, "MSGS ALL");
-               maxmsgs = 32767;
-       }
 
-       if (is_notes) {
-               wprintf("<div id=\"new_notes_here\"></div>\n");
-       }
 
        nummsgs = load_msg_ptrs(cmd, (is_summary || WCC->is_mobile));
        if (nummsgs == 0) {
-
-               if ((!is_tasks) && (!is_calendar) && (!is_notes) && (!is_addressbook)) {
+               if (care_for_empty_list) {
                        wprintf("<div align=\"center\"><br /><em>");
-                       if (!strcmp(oper, "readnew")) {
+                       switch (oper) {
+                       case readnew:
                                wprintf(_("No new messages."));
-                       } else if (!strcmp(oper, "readold")) {
+                               break;
+                       case readold:
                                wprintf(_("No old messages."));
-                       } else {
+                               break;
+                       default:
                                wprintf(_("No messages here."));
                        }
                        wprintf("</em><br /></div>\n");
@@ -2728,185 +713,60 @@ void readloop(char *oper)
                goto DONE;
        }
 
-       if ((is_summary) || (WCC->wc_default_view == VIEW_CALENDAR) || WCC->is_mobile){
+       if (load_seen){
                void *vMsg;
-               message_summary *Msg;
 
-               at = GetNewHashPos();
+               strcpy(old_msgs, "");
+               serv_puts("GTSN");
+               serv_getln(buf, sizeof buf);
+               if (buf[0] == '2') {
+                       strcpy(old_msgs, &buf[4]);
+               }
+               at = GetNewHashPos(WCC->summ, 0);
                while (GetNextHashPos(WCC->summ, at, &HKLen, &HashKey, &vMsg)) {
                        /** Are you a new message, or an old message? */
                        Msg = (message_summary*) vMsg;
-                       if (is_summary) {
-                               if (is_msg_in_mset(old_msgs, Msg->msgnum)) {
-                                       Msg->is_new = 0;
-                               }
-                               else {
-                                       Msg->is_new = 1;
-                               }
+                       if (is_msg_in_mset(old_msgs, Msg->msgnum)) {
+                               Msg->is_new = 0;
+                       }
+                       else {
+                               Msg->is_new = 1;
                        }
                }
                DeleteHashPos(&at);
        }
 
-       if (startmsg == 0L) {
-               if (bbs_reverse) {
-                       startmsg = WCC->msgarr[(nummsgs >= maxmsgs) ? (nummsgs - maxmsgs) : 0];
-               }
-               else {
-                       startmsg = WCC->msgarr[0];
-               }
-       }
-
-       if (is_summary || WCC->is_mobile) {
-               SortByPayload(WCC->summ, SortFuncs[SortBy]);
+       if (sortit) {
+               CompareFunc SortIt;
+               SortIt =  RetrieveSort(CTX_MAILSUM, NULL, 
+                                      HKEY("date"), 2);
+               if (SortIt != NULL)
+                       SortByPayload(WCC->summ, SortIt);
        }
 
        if (is_summary) {
-
-               wprintf("<script language=\"javascript\" type=\"text/javascript\">"
-                       " document.onkeydown = CtdlMsgListKeyPress;     "
-                       " if (document.layers) {                        "
-                       "       document.captureEvents(Event.KEYPRESS); "
-                       " }                                             "
-                       "</script>\n"
-               );
-
-               /** note that Date and Delete are now in the same column */
-               wprintf("<div id=\"message_list_hdr\">"
-                       "<div class=\"fix_scrollbar_bug\">"
-                       "<table cellspacing=0 style=\"width:100%%\">"
-                       "<tr>"
-               );
-               wprintf("<th width=%d%%>%s <a href=\"readfwd?startmsg=1?maxmsgs=9999999?is_summary=1?sortby=%s\"><img border=\"0\" src=\"%s\" /></a> </th>\n"
-                       "<th width=%d%%>%s <a href=\"readfwd?startmsg=1?maxmsgs=9999999?is_summary=1?sortby=%s\"><img border=\"0\" src=\"%s\" /></a> </th>\n"
-                       "<th width=%d%%>%s <a href=\"readfwd?startmsg=1?maxmsgs=9999999?is_summary=1?sortby=%s\"><img border=\"0\" src=\"%s\" /></a> \n"
-                       "&nbsp;"
-                       "<input type=\"submit\" name=\"delete_button\" id=\"delbutton\" "
-                       " onClick=\"CtdlDeleteSelectedMessages(event)\" "
-                       " value=\"%s\">"
-                       "</th>"
-                       "</tr>\n"
-                       ,
-                       SUBJ_COL_WIDTH_PCT,
-                       _("Subject"),
-                       SortByStrings[SubjectInvertSortString[SortBy]],
-                       SortIcons[SortSubjectToIcon[SortBy]],
-                       SENDER_COL_WIDTH_PCT,
-                       _("Sender"),
-                       SortByStrings[SenderInvertSortString[SortBy]],
-                       SortIcons[SortSenderToIcon[SortBy]],
-                       DATE_PLUS_BUTTONS_WIDTH_PCT,
-                       _("Date"),
-                       SortByStrings[DateInvertSortString[SortBy]],
-                       SortIcons[SortDateToIcon[SortBy]],
-                       _("Delete")
-               );
-               wprintf("</table></div></div>\n");
-               wprintf("<div id=\"message_list\">"
-
-                       "<div class=\"fix_scrollbar_bug\">\n"
-                       "<table class=\"mailbox_summary\" id=\"summary_headers\" "
-                       "cellspacing=0 style=\"width:100%%;-moz-user-select:none;\">"
-               );
+               do_template("summary_header", NULL);
        } else if (WCC->is_mobile) {
                wprintf("<div id=\"message_list\">");
        }
 
 
-       /**
-        * Set the "is_bbview" variable if it appears that we are looking at
-        * a classic bulletin board view.
-        */
-       if ((!is_tasks) && (!is_calendar) && (!is_addressbook)
-             && (!is_notes) && (!is_singlecard) && (!is_summary)) {
-               is_bbview = 1;
-       }
-
        /**
         * If we're not currently looking at ALL requested
         * messages, then display the selector bar
         */
-       if (is_bbview) {
-               /** begin bbview scroller */
-               wprintf("<form name=\"msgomatictop\" class=\"selector_top\" > \n <p>");
-               wprintf(_("Reading #"));//// TODO this isn't used, should it? : , lowest_displayed, highest_displayed);
-
-               wprintf("<select name=\"whichones\" size=\"1\" "
-                       "OnChange=\"location.href=msgomatictop.whichones.options"
-                       "[selectedIndex].value\">\n");
-
-               if (bbs_reverse) {
-                       for (b=nummsgs-1; b>=0; b = b - maxmsgs) {
-                               hi = b + 1;
-                               lo = b - maxmsgs + 2;
-                               if (lo < 1) lo = 1;
-                               wprintf("<option %s value="
-                                       "\"%s"
-                                       "&startmsg=%ld"
-                                       "&maxmsgs=%d"
-                                       "&is_summary=%d\">"
-                                       "%d-%d</option> \n",
-                                       ((WCC->msgarr[lo-1] == startmsg) ? "selected" : ""),
-                                       oper,
-                                       WCC->msgarr[lo-1],
-                                       maxmsgs,
-                                       is_summary,
-                                       hi, lo);
-                       }
-               }
-               else {
-                       for (b=0; b<nummsgs; b = b + maxmsgs) {
-                               lo = b + 1;
-                               hi = b + maxmsgs + 1;
-                               if (hi > nummsgs) hi = nummsgs;
-                               wprintf("<option %s value="
-                                       "\"%s"
-                                       "&startmsg=%ld"
-                                       "&maxmsgs=%d"
-                                       "&is_summary=%d\">"
-                                       "%d-%d</option> \n",
-                                       ((WCC->msgarr[b] == startmsg) ? "selected" : ""),
-                                       oper,
-                                       WCC->msgarr[lo-1],
-                                       maxmsgs,
-                                       is_summary,
-                                       lo, hi);
-                       }
-               }
+       if (is_bbview)  {
+               BBViewToolBar = NewStrBuf();
+               MessageDropdown = NewStrBuf();
 
-               wprintf("<option value=\"%s?startmsg=%ld"
-                       "&maxmsgs=9999999&is_summary=%d\">",
-                       oper,
-                       WCC->msgarr[0], is_summary);
-               wprintf(_("All"));
-               wprintf("</option>");
-               wprintf("</select> ");
-               wprintf(_("of %d messages."), nummsgs);
-
-               /** forward/reverse */
-               wprintf("<input type=\"radio\" %s name=\"direction\" value=\"\""
-                       "OnChange=\"location.href='%s?sortby=forward'\"",  
-                       (bbs_reverse ? "" : "checked"),
-                       oper
-               );
-               wprintf(">");
-               wprintf(_("oldest to newest"));
-               wprintf("&nbsp;&nbsp;&nbsp;&nbsp;");
-
-               wprintf("<input type=\"radio\" %s name=\"direction\" value=\"\""
-                       "OnChange=\"location.href='%s?sortby=reverse'\"", 
-                       (bbs_reverse ? "checked" : ""),
-                       oper
-               );
-               wprintf(">");
-               wprintf(_("newest to oldest"));
-               wprintf("\n");
-       
-               wprintf("</p></form>\n");
-               /** end bbview scroller */
+               DrawMessageDropdown(MessageDropdown, maxmsgs, startmsg);
+               
+               DoTemplate(HKEY("msg_listselector_top"), BBViewToolBar, MessageDropdown, CTX_STRBUF);
+               StrBufAppendBuf(WCC->WBuf, BBViewToolBar, 0);
+               FlushStrBuf(BBViewToolBar);
        }
                        
-       at = GetNewHashPos();
+       at = GetNewHashPos(WCC->summ, 0);
        while (GetNextHashPos(WCC->summ, at, &HKLen, &HashKey, &vMsg)) {
                Msg = (message_summary*) vMsg;          
                if ((Msg->msgnum >= startmsg) && (num_displayed < maxmsgs)) {
@@ -2919,7 +779,7 @@ void readloop(char *oper)
                                fetch_ab_name(Msg, buf);
                                ++num_ab;
                                addrbook = realloc(addrbook,
-                                                  (sizeof(struct addrbookent) * num_ab) );
+                                                  (sizeof(addrbookent) * num_ab) );
                                safestrncpy(addrbook[num_ab-1].ab_name, buf,
                                            sizeof(addrbook[num_ab-1].ab_name));
                                addrbook[num_ab-1].ab_msgnum = Msg->msgnum;
@@ -2954,13 +814,13 @@ void readloop(char *oper)
        /** Output loop */
        if (displayed_msgs != NULL) {
                if (bbs_reverse) {
-                       qsort(displayed_msgs, num_displayed, sizeof(long), longcmp_r);
+                       ////TODOqsort(displayed_msgs, num_displayed, sizeof(long), qlongcmp_r);
                }
 
                /** if we do a split bbview in the future, begin messages div here */
 
                for (a=0; a<num_displayed; ++a) {
-                       read_message(displayed_msgs[a], 0, "");
+                       read_message(WC->WBuf, HKEY("view_message"), displayed_msgs[a], 0, NULL);
                }
 
                /** if we do a split bbview in the future, end messages div here */
@@ -2970,18 +830,7 @@ void readloop(char *oper)
        }
 
        if (is_summary) {
-               wprintf("</table>"
-                       "</div>\n");                    /**< end of 'fix_scrollbar_bug' div */
-               wprintf("</div>");                      /**< end of 'message_list' div */
-               
-               /** Here's the grab-it-to-resize-the-message-list widget */
-               wprintf("<div id=\"resize_msglist\" "
-                       "onMouseDown=\"CtdlResizeMsgListMouseDown(event)\">"
-                       "<div class=\"fix_scrollbar_bug\"> <hr>"
-                       "</div></div>\n"
-               );
-
-               wprintf("<div id=\"preview_pane\">");   /**< The preview pane will initially be empty */
+               do_template("summary_trailer", NULL);
        } else if (WCC->is_mobile) {
                wprintf("</div>");
        }
@@ -2999,81 +848,12 @@ void readloop(char *oper)
         */
        if (is_bbview) {
                /** begin bbview scroller */
-               wprintf("<form name=\"msgomatic\" class=\"selector_bottom\" > \n <p>");
-               wprintf(_("Reading #")); /// TODO: this isn't used: , lowest_displayed, highest_displayed);
-
-               wprintf("<select name=\"whichones\" size=\"1\" "
-                       "OnChange=\"location.href=msgomatic.whichones.options"
-                       "[selectedIndex].value\">\n");
-
-               if (bbs_reverse) {
-                       for (b=nummsgs-1; b>=0; b = b - maxmsgs) {
-                               hi = b + 1;
-                               lo = b - maxmsgs + 2;
-                               if (lo < 1) lo = 1;
-                               wprintf("<option %s value="
-                                       "\"%s"
-                                       "&startmsg=%ld"
-                                       "&maxmsgs=%d"
-                                       "&is_summary=%d\">"
-                                       "%d-%d</option> \n",
-                                       ((WCC->msgarr[lo-1] == startmsg) ? "selected" : ""),
-                                       oper,
-                                       WCC->msgarr[lo-1],
-                                       maxmsgs,
-                                       is_summary,
-                                       hi, lo);
-                       }
-               }
-               else {
-                       for (b=0; b<nummsgs; b = b + maxmsgs) {
-                               lo = b + 1;
-                               hi = b + maxmsgs + 1;
-                               if (hi > nummsgs) hi = nummsgs;
-                               wprintf("<option %s value="
-                                       "\"%s"
-                                       "&startmsg=%ld"
-                                       "&maxmsgs=%d"
-                                       "&is_summary=%d\">"
-                                       "%d-%d</option> \n",
-                                       ((WCC->msgarr[b] == startmsg) ? "selected" : ""),
-                                       oper,
-                                       WCC->msgarr[lo-1],
-                                       maxmsgs,
-                                       is_summary,
-                                       lo, hi);
-                       }
-               }
 
-               wprintf("<option value=\"%s&startmsg=%ld"
-                       "&maxmsgs=9999999&is_summary=%d\">",
-                       oper,
-                       WCC->msgarr[0], is_summary);
-               wprintf(_("All"));
-               wprintf("</option>");
-               wprintf("</select> ");
-               wprintf(_("of %d messages."), nummsgs);
-
-               /** forward/reverse */
-               wprintf("<input type=\"radio\" %s name=\"direction\" value=\"\""
-                       "OnChange=\"location.href='%s&sortby=forward'\"",  
-                       (bbs_reverse ? "" : "checked"),
-                       oper
-               );
-               wprintf(">");
-               wprintf(_("oldest to newest"));
-               wprintf("&nbsp;&nbsp;&nbsp;&nbsp;");
-               wprintf("<input type=\"radio\" %s name=\"direction\" value=\"\""
-                       "OnChange=\"location.href='%s&sortby=reverse'\"", 
-                       (bbs_reverse ? "checked" : ""),
-                       oper
-               );
-               wprintf(">");
-               wprintf(_("newest to oldest"));
-               wprintf("\n");
+               DoTemplate(HKEY("msg_listselector_bottom"), BBViewToolBar, MessageDropdown, CTX_STRBUF);
+               StrBufAppendBuf(WCC->WBuf, BBViewToolBar, 0);
 
-               wprintf("</p></form>\n");
-               /** end bbview scroller */
+               FreeStrBuf(&BBViewToolBar);
+               FreeStrBuf(&MessageDropdown);
        }
        
 DONE:
@@ -3098,6 +878,7 @@ DONE:
                DeleteHash(&WCC->summ);
        }
        if (addrbook != NULL) free(addrbook);
+       FreeStrBuf(&BBViewToolBar);
 }
 
 
@@ -3106,11 +887,12 @@ DONE:
  * ... this is where the actual message gets transmitted to the server.
  */
 void post_mime_to_server(void) {
+       wcsession *WCC = WC;
        char top_boundary[SIZ];
        char alt_boundary[SIZ];
        int is_multipart = 0;
        static int seq = 0;
-       struct wc_attachment *att;
+       wc_mime_attachment *att;
        char *encoded;
        size_t encoded_length;
        size_t encoded_strlen;
@@ -3132,7 +914,7 @@ void post_mime_to_server(void) {
        serv_puts("X-Mailer: " PACKAGE_STRING);
 
        /* If there are attachments, we have to do multipart/mixed */
-       if (WC->first_attachment != NULL) {
+       if (GetCount(WCC->attachments) > 0) {
                is_multipart = 1;
        }
 
@@ -3168,18 +950,23 @@ void post_mime_to_server(void) {
        serv_printf("--%s--", alt_boundary);
        
        if (is_multipart) {
+               long len;
+               const char *Key; 
+               void *vAtt;
+               HashPos  *it;
 
                /* Add in the attachments */
-               for (att = WC->first_attachment; att!=NULL; att=att->next) {
-
+               it = GetNewHashPos(WCC->attachments, 0);
+               while (GetNextHashPos(WCC->attachments, it, &len, &Key, &vAtt)) {
+                       att = (wc_mime_attachment *)vAtt;
                        encoded_length = ((att->length * 150) / 100);
                        encoded = malloc(encoded_length);
                        if (encoded == NULL) break;
-                       encoded_strlen = CtdlEncodeBase64(encoded, att->data, att->length, 1);
+                       encoded_strlen = CtdlEncodeBase64(encoded, ChrPtr(att->Data), StrLength(att->Data), 1);
 
                        serv_printf("--%s", top_boundary);
-                       serv_printf("Content-type: %s", att->content_type);
-                       serv_printf("Content-disposition: attachment; filename=\"%s\"", att->filename);
+                       serv_printf("Content-type: %s", ChrPtr(att->ContentType));
+                       serv_printf("Content-disposition: attachment; filename=\"%s\"", ChrPtr(att->FileName));
                        serv_puts("Content-transfer-encoding: base64");
                        serv_puts("");
                        serv_write(encoded, encoded_strlen);
@@ -3188,6 +975,7 @@ void post_mime_to_server(void) {
                        free(encoded);
                }
                serv_printf("--%s--", top_boundary);
+               DeleteHashPos(&it);
        }
 
        serv_puts("000");
@@ -3210,10 +998,10 @@ void post_message(void)
        char buf[1024];
        StrBuf *encoded_subject = NULL;
        static long dont_post = (-1L);
-       struct wc_attachment *att, *aptr;
+       wc_mime_attachment  *att;
        int is_anonymous = 0;
        const StrBuf *display_name = NULL;
-       struct wcsession *WCC = WC;
+       wcsession *WCC = WC;
        
        if (havebstr("force_room")) {
                gotoroom(bstr("force_room"));
@@ -3228,43 +1016,45 @@ void post_message(void)
        }
 
        if (WCC->upload_length > 0) {
+               const char *pch;
+               int n;
+               char N[64];
 
                lprintf(9, "%s:%d: we are uploading %d bytes\n", __FILE__, __LINE__, WCC->upload_length);
                /** There's an attachment.  Save it to this struct... */
-               att = malloc(sizeof(struct wc_attachment));
-               memset(att, 0, sizeof(struct wc_attachment));
+               att = malloc(sizeof(wc_mime_attachment));
+               memset(att, 0, sizeof(wc_mime_attachment ));
                att->length = WCC->upload_length;
-               strcpy(att->content_type, WCC->upload_content_type);
-               strcpy(att->filename, WCC->upload_filename);
-               att->next = NULL;
-
-               /** And add it to the list. */
-               if (WCC->first_attachment == NULL) {
-                       WCC->first_attachment = att;
-               }
-               else {
-                       aptr = WCC->first_attachment;
-                       while (aptr->next != NULL) aptr = aptr->next;
-                       aptr->next = att;
-               }
+               att->ContentType = NewStrBufPlain(WCC->upload_content_type, -1);
+               att->FileName = NewStrBufPlain(WCC->upload_filename, -1);
+               
+               
+               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);
 
                /**
                 * Mozilla sends a simple filename, which is what we want,
                 * but Satan's Browser sends an entire pathname.  Reduce
                 * the path to just a filename if we need to.
                 */
-               while (num_tokens(att->filename, '/') > 1) {
-                       remove_token(att->filename, 0, '/');
+               pch = strrchr(ChrPtr(att->FileName), '/');
+               if (pch != NULL) {
+                       StrBufCutLeft(att->FileName, pch - ChrPtr(att->FileName));
                }
-               while (num_tokens(att->filename, '\\') > 1) {
-                       remove_token(att->filename, 0, '\\');
+               pch = strrchr(ChrPtr(att->FileName), '\\');
+               if (pch != NULL) {
+                       StrBufCutLeft(att->FileName, pch - ChrPtr(att->FileName));
                }
 
                /**
                 * Transfer control of this memory from the upload struct
                 * to the attachment struct.
                 */
-               att->data = WCC->upload;
+               att->Data = NewStrBufPlain(WCC->upload, WCC->upload_length);
+               free(WCC->upload);
                WCC->upload_length = 0;
                WCC->upload = NULL;
                display_enter();
@@ -3338,7 +1128,7 @@ void post_message(void)
                             ChrPtr(references));
                FreeStrBuf(&references);
 
-               lprintf(9, "%s\n", CmdBuf);
+               lprintf(9, "%s\n", ChrPtr(CmdBuf));
                serv_puts(ChrPtr(CmdBuf));
                serv_getln(buf, sizeof buf);
                FreeStrBuf(&CmdBuf);
@@ -3363,7 +1153,7 @@ void post_message(void)
                }
        }
 
-       free_attachments(WCC);
+       DeleteHash(&WCC->attachments);
 
        /**
         *  We may have been supplied with instructions regarding the location
@@ -3383,7 +1173,7 @@ void post_message(void)
         *  Otherwise, just go to the "read messages" loop.
         */
        else {
-               readloop("readnew");
+               readloop(readnew);
        }
 }
 
@@ -3396,16 +1186,15 @@ void post_message(void)
 void display_enter(void)
 {
        char buf[SIZ];
-       StrBuf *ebuf;
        long now;
        const StrBuf *display_name = NULL;
-       struct wc_attachment *att;
+       /////wc_attachment *att;
        int recipient_required = 0;
        int subject_required = 0;
        int recipient_bad = 0;
        int is_anonymous = 0;
-       long existing_page = (-1L);
-       struct wcsession *WCC = WC;
+
+       wcsession *WCC = WC;
 
        now = time(NULL);
 
@@ -3428,7 +1217,7 @@ void display_enter(void)
        }
        else if (buf[0] != '2') {               /** Any other error means that we cannot continue */
                sprintf(WCC->ImportantMessage, "%s", &buf[4]);
-               readloop("readnew");
+               readloop(readnew);
                return;
        }
 
@@ -3468,14 +1257,7 @@ void display_enter(void)
         * Otherwise proceed normally.
         * Do a custom room banner with no navbar...
         */
-       output_headers(1, 1, 2, 0, 0, 0);
-       wprintf("<div id=\"banner\">\n");
-       embed_room_banner(NULL, navbar_none);
-       wprintf("</div>\n");
-       wprintf("<div id=\"content\">\n"
-               "<div class=\"fix_scrollbar_bug message \">");
 
-       /* Now check our actual recipients if there are any */
        if (recipient_required) {
                const StrBuf *Recp = NULL; 
                const StrBuf *Cc = NULL;
@@ -3517,316 +1299,21 @@ void display_enter(void)
                        }
                }
                else if (buf[0] != '2') {       /** Any other error means that we cannot continue */
-                       wprintf("<em>%s</em><br />\n", &buf[4]);
-                       goto DONE;
-               }
-       }
-
-       /** If we got this far, we can display the message entry screen. */
-
-       /* begin message entry screen */
-       wprintf("<form "
-               "enctype=\"multipart/form-data\" "
-               "method=\"POST\" "
-               "accept-charset=\"UTF-8\" "
-               "action=\"post\" "
-               "name=\"enterform\""
-               ">\n");
-       wprintf("<input type=\"hidden\" name=\"postseq\" value=\"%ld\">\n", now);
-       if (WCC->wc_view == VIEW_WIKI) {
-               wprintf("<input type=\"hidden\" name=\"wikipage\" value=\"%s\">\n", bstr("wikipage"));
-       }
-       wprintf("<input type=\"hidden\" name=\"return_to\" value=\"%s\">\n", bstr("return_to"));
-       wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WCC->nonce);
-       wprintf("<input type=\"hidden\" name=\"force_room\" value=\"");
-       escputs(WCC->wc_roomname);
-       wprintf("\">\n");
-       wprintf("<input type=\"hidden\" name=\"references\" value=\"");
-       escputs(bstr("references"));
-       wprintf("\">\n");
-
-       /** submit or cancel buttons */
-        wprintf("<p class=\"send_edit_msg\">");
-        wprintf("<input type=\"submit\" name=\"send_button\" value=\"");
-        if (recipient_required) {
-                wprintf(_("Send message"));
-        } else {
-                wprintf(_("Post message"));
-        }
-        wprintf("\">&nbsp;"
-                "<input type=\"submit\" name=\"cancel_button\" value=\"%s\">\n", _("Cancel"));
-        wprintf("</p>");
-
-       /** header bar */
-
-       wprintf("<img src=\"static/newmess3_24x.gif\" class=\"imgedit\">");
-       wprintf("  ");  /** header bar */
-       webcit_fmt_date(buf, now, 0);
-       wprintf("%s", buf);
-       wprintf("\n");  /** header bar */
-
-       wprintf("<table width=\"100%%\" class=\"edit_msg_table\">");
-       wprintf("<tr>");
-       wprintf("<th><label for=\"from_id\" > ");
-       wprintf(_(" <I>from</I> "));
-       wprintf("</label></th>");
-
-       wprintf("<td colspan=\"2\">");
-
-       /* Allow the user to select any of his valid screen names */
-
-       wprintf("<select name=\"display_name\" size=1 id=\"from_id\">\n");
-
-       serv_puts("GVSN");
-       serv_getln(buf, sizeof buf);
-       if (buf[0] == '1') {
-               while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
-                       wprintf("<option %s value=\"",
-                               ((!strcasecmp(bstr("display_name"), buf)) ? "selected" : "")
-                       );
-                       escputs(buf);
-                       wprintf("\">");
-                       escputs(buf);
-                       wprintf("</option>\n");
-               }
-       }
-
-       if (WCC->room_flags & QR_ANONOPT) {
-               wprintf("<option %s value=\"__ANONYMOUS__\">%s</option>\n",
-                       ((!strcasecmp(bstr("__ANONYMOUS__"), WCC->wc_fullname)) ? "selected" : ""),
-                       _("Anonymous")
-               );
-       }
-
-       wprintf("</select>\n");
-
-       /* If this is an email (not a post), allow the user to select any of his
-        * valid email addresses.
-        */
-       if (recipient_required) {
-               serv_puts("GVEA");
-               serv_getln(buf, sizeof buf);
-               if (buf[0] == '1') {
-                       wprintf("<select name=\"my_email_addr\" size=1>\n");
-                       while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
-                               wprintf("<option value=\"");
-                               escputs(buf);
-                               wprintf("\">&lt;");
-                               escputs(buf);
-                               wprintf("&gt;</option>\n");
-                       }
-                       wprintf("</select>\n");
-               }
-       }
-
-       wprintf(_(" <I>in</I> "));
-       escputs(WCC->wc_roomname);
-
-       wprintf("</td></tr>");
-
-       if (recipient_required) {
-               char *ccraw;
-               char *copy;
-               size_t len;
-               wprintf("<tr><th><label for=\"recp_id\"> ");
-               wprintf(_("To:"));
-               wprintf("</label></th>"
-                       "<td><input autocomplete=\"off\" type=\"text\" name=\"recp\" id=\"recp_id\" value=\"");
-               ccraw = xbstr("recp", &len);
-               copy = (char*) malloc(len * 2 + 1);
-               memcpy(copy, ccraw, len + 1); 
-               utf8ify_rfc822_string(copy);
-               escputs(copy);
-               free(copy);
-               wprintf("\" size=45 maxlength=1000 />");
-               wprintf("<div class=\"auto_complete\" id=\"recp_name_choices\"></div>");
-               wprintf("</td><td rowspan=\"3\" align=\"left\" valign=\"top\">");
-
-               /** Pop open an address book -- begin **/
-               wprintf(
-                       "<a href=\"javascript:PopOpenAddressBook('recp_id|%s|cc_id|%s|bcc_id|%s');\" "
-                       "title=\"%s\">"
-                       "<img align=middle border=0 width=24 height=24 src=\"static/viewcontacts_24x.gif\">"
-                       "&nbsp;%s</a>",
-                       _("To:"), _("CC:"), _("BCC:"),
-                       _("Contacts"), _("Contacts")
-               );
-               /** Pop open an address book -- end **/
-
-               wprintf("</td></tr>");
-
-               wprintf("<tr><th><label for=\"cc_id\"> ");
-               wprintf(_("CC:"));
-               wprintf("</label></th>"
-                       "<td><input autocomplete=\"off\" type=\"text\" name=\"cc\" id=\"cc_id\" value=\"");
-               ccraw = xbstr("cc", &len);
-               copy = (char*) malloc(len * 2 + 1);
-               memcpy(copy, ccraw, len + 1); 
-               utf8ify_rfc822_string(copy);
-               escputs(copy);
-               free(copy);
-               wprintf("\" size=45 maxlength=1000 />");
-               wprintf("<div class=\"auto_complete\" id=\"cc_name_choices\"></div>");
-               wprintf("</td></tr>");
-
-               wprintf("<tr><th><label for=\"bcc_id\"> ");
-               wprintf(_("BCC:"));
-               wprintf("</label></th>"
-                       "<td><input autocomplete=\"off\" type=\"text\" name=\"bcc\" id=\"bcc_id\" value=\"");
-               ccraw = xbstr("bcc", &len);
-               copy = (char*) malloc(len * 2 + 1);
-               memcpy(copy, ccraw, len + 1); 
-               utf8ify_rfc822_string(copy);
-               escputs(copy);
-               free(copy);
-               wprintf("\" size=45 maxlength=1000 />");
-               wprintf("<div class=\"auto_complete\" id=\"bcc_name_choices\"></div>");
-               wprintf("</td></tr>");
-
-               /** Initialize the autocomplete ajax helpers (found in wclib.js) */
-               wprintf("<script type=\"text/javascript\">      \n"
-                       " activate_entmsg_autocompleters();     \n"
-                       "</script>                              \n"
-               );
-
-       }
-
-       wprintf("<tr><th><label for=\"subject_id\" > ");
-       if (recipient_required || subject_required) {
-               wprintf(_("Subject:"));
-       }
-       else {
-               wprintf(_("Subject (optional):"));
-       }
-       wprintf("</label></th>"
-               "<td colspan=\"2\">"
-               "<input type=\"text\" name=\"subject\" id=\"subject_id\" value=\"");
-       escputs(bstr("subject"));
-       wprintf("\" size=45 maxlength=70>\n");
-       wprintf("</td></tr>");
-
-       wprintf("<tr><td colspan=\"3\">\n");
-
-       wprintf("<textarea name=\"msgtext\" cols=\"80\" rows=\"15\">");
-
-       /** If we're continuing from a previous edit, put our partially-composed message back... */
-       msgescputs(bstr("msgtext"));
-
-       /* If we're forwarding a message, insert it here... */
-       if (lbstr("fwdquote") > 0L) {
-               wprintf("<br><div align=center><i>");
-               wprintf(_("--- forwarded message ---"));
-               wprintf("</i></div><br>");
-               pullquote_message(lbstr("fwdquote"), 1, 1);
-       }
-
-       /** If we're replying quoted, insert the quote here... */
-       else if (lbstr("replyquote") > 0L) {
-               wprintf("<br>"
-                       "<blockquote>");
-               pullquote_message(lbstr("replyquote"), 0, 1);
-               wprintf("</blockquote><br>");
-       }
-
-       /** If we're editing a wiki page, insert the existing page here... */
-       else if (WCC->wc_view == VIEW_WIKI) {
-               safestrncpy(buf, bstr("wikipage"), sizeof buf);
-               str_wiki_index(buf);
-               existing_page = locate_message_by_uid(buf);
-               if (existing_page >= 0L) {
-                       pullquote_message(existing_page, 1, 0);
-               }
-       }
-
-       /** Insert our signature if appropriate... */
-       if ( (WCC->is_mailbox) && !yesbstr("sig_inserted") ) {
-               int UseSig;
-               get_pref_yesno("use_sig", &UseSig, 0);
-               if (UseSig) {
-                       StrBuf *Sig;
-                       const char *sig, *esig;
-
-                       get_preference("signature", &ebuf);
-                       Sig = NewStrBuf();
-                       StrBufEUid_unescapize(Sig, ebuf);
-                       sig = ChrPtr(Sig);
-                       esig = sig + StrLength(Sig);
-                       wprintf("<br>--<br>");
-                       while (sig <= esig) {
-                               if (*sig == '\n') {
-                                       wprintf("<br>");
-                               }
-                               else if (*sig == '<') {
-                                       wprintf("&lt;");
-                               }
-                               else if (*sig == '>') {
-                                       wprintf("&gt;");
-                               }
-                               else if (*sig == '&') {
-                                       wprintf("&amp;");
-                               }
-                               else if (*sig == '\"') {
-                                       wprintf("&quot;");
-                               }
-                               else if (*sig == '\'') {
-                                       wprintf("&#39;");
-                               }
-                               else /* since we're utf 8, is this a good idea? if (isprint(*sig))*/ {
-                                       wprintf("%c", *sig);
-                               } 
-                               sig ++;
-                       }
-                       FreeStrBuf(&Sig);
+                       wprintf("<em>%s</em><br />\n", &buf[4]);/// -> important message
+                       return;
                }
        }
+       svputlong("RCPTREQUIRED", recipient_required);
+       svputlong("SUBJREQUIRED", recipient_required || subject_required);
 
-       wprintf("</textarea>\n");
-
-       /** Make sure we only insert our signature once */
-       /** We don't care if it was there or not before, it needs to be there now. */
-       wprintf("<input type=\"hidden\" name=\"sig_inserted\" value=\"yes\">\n");
-       
-       /**
-        * The following template embeds the TinyMCE richedit control, and automatically
-        * transforms the textarea into a richedit textarea.
-        */
-       do_template("richedit", NULL);
-
-       /** Enumerate any attachments which are already in place... */
-       wprintf("<div class=\"attachment buttons\"><img src=\"static/diskette_24x.gif\" class=\"imgedit\" > ");
-       wprintf(_("Attachments:"));
-       wprintf(" ");
-       wprintf("<select name=\"which_attachment\" size=1>");
-       for (att = WCC->first_attachment; att != NULL; att = att->next) {
-               wprintf("<option value=\"");
-               urlescputs(att->filename);
-               wprintf("\">");
-               escputs(att->filename);
-               /* wprintf(" (%s, %d bytes)",att->content_type,att->length); */
-               wprintf("</option>\n");
-       }
-       wprintf("</select>");
-
-       /** Now offer the ability to attach additional files... */
-       wprintf("&nbsp;&nbsp;&nbsp;");
-       wprintf(_("Attach file:"));
-       wprintf(" <input name=\"attachfile\" class=\"attachfile\" "
-               "size=16 type=\"file\">\n&nbsp;&nbsp;"
-               "<input type=\"submit\" name=\"attach_button\" value=\"%s\">\n", _("Add"));
-       wprintf("</div>");      /* End of "attachment buttons" div */
-
-
-       wprintf("</td></tr></table>");
-       
-       wprintf("</form>\n");
-       wprintf("</div>\n");    /* end of "fix_scrollbar_bug" div */
+       begin_burst();
+       output_headers(1, 0, 0, 0, 1, 0);
+       DoTemplate(HKEY("edit_message"), NULL, NULL, CTX_NONE);
+       end_burst();
 
-       /* NOTE: address_book_popup() will close the "content" div.  Don't close it here. */
-DONE:  address_book_popup();
-       wDumpContent(1);
+       return;
 }
 
-
 /**
  * \brief delete a message
  */
@@ -3847,7 +1334,7 @@ void delete_msg(void)
        serv_getln(buf, sizeof buf);
        sprintf(WC->ImportantMessage, "%s", &buf[4]);
 
-       readloop("readnew");
+       readloop(readnew);
 }
 
 
@@ -3870,7 +1357,7 @@ void move_msg(void)
                sprintf(WC->ImportantMessage, (_("The message was not moved.")));
        }
 
-       readloop("readnew");
+       readloop(readnew);
 }
 
 
@@ -3930,11 +1417,170 @@ void confirm_move_msg(void)
        wDumpContent(1);
 }
 
-void readnew(void) { readloop("readnew");}
-void readold(void) { readloop("readold");}
-void readfwd(void) { readloop("readfwd");}
-void headers(void) { readloop("headers");}
-void do_search(void) { readloop("do_search");}
+
+/*
+ * Generic function to output an arbitrary MIME attachment from
+ * message being composed
+ *
+ * partnum             The MIME part to be output
+ * filename            Fake filename to give
+ * force_download      Nonzero to force set the Content-Type: header to "application/octet-stream"
+ */
+void postpart(StrBuf *partnum, StrBuf *filename, int force_download)
+{
+       void *vPart;
+       StrBuf *content_type;
+       wc_mime_attachment *part;
+       
+       if (GetHash(WC->attachments, SKEY(partnum), &vPart) &&
+           (vPart != NULL)) {
+               part = (wc_mime_attachment*) vPart;
+               if (force_download) {
+                       content_type = NewStrBufPlain(HKEY("application/octet-stream"));
+               }
+               else {
+                       content_type = NewStrBufDup(part->ContentType);
+               }
+               output_headers(0, 0, 0, 0, 0, 0);
+               StrBufAppendBuf(WC->WBuf, part->Data, 0);
+               http_transmit_thing(ChrPtr(content_type), 0);
+       } else {
+               hprintf("HTTP/1.1 404 %s\n", ChrPtr(partnum));
+               output_headers(0, 0, 0, 0, 0, 0);
+               hprintf("Content-Type: text/plain\r\n");
+               wprintf(_("An error occurred while retrieving this part: %s/%s\n"), 
+                       ChrPtr(partnum), ChrPtr(filename));
+               end_burst();
+       }
+       FreeStrBuf(&content_type);
+}
+
+
+/*
+ * Generic function to output an arbitrary MIME part from an arbitrary
+ * message number on the server.
+ *
+ * msgnum              Number of the item on the citadel server
+ * partnum             The MIME part to be output
+ * force_download      Nonzero to force set the Content-Type: header to "application/octet-stream"
+ */
+void mimepart(const char *msgnum, const char *partnum, int force_download)
+{
+       char buf[256];
+       off_t bytes;
+       char content_type[256];
+       
+       serv_printf("OPNA %s|%s", msgnum, partnum);
+       serv_getln(buf, sizeof buf);
+       if (buf[0] == '2') {
+               bytes = extract_long(&buf[4], 0);
+               if (force_download) {
+                       strcpy(content_type, "application/octet-stream");
+               }
+               else {
+                       extract_token(content_type, &buf[4], 3, '|', sizeof content_type);
+               }
+               output_headers(0, 0, 0, 0, 0, 0);
+
+               read_server_binary(WC->WBuf, bytes);
+               serv_puts("CLOS");
+               serv_getln(buf, sizeof buf);
+               http_transmit_thing(content_type, 0);
+       } else {
+               hprintf("HTTP/1.1 404 %s\n", &buf[4]);
+               output_headers(0, 0, 0, 0, 0, 0);
+               hprintf("Content-Type: text/plain\r\n");
+               wprintf(_("An error occurred while retrieving this part: %s\n"), &buf[4]);
+               end_burst();
+       }
+}
+
+
+/*
+ * Read any MIME part of a message, from the server, into memory.
+ */
+char *load_mimepart(long msgnum, char *partnum)
+{
+       char buf[SIZ];
+       off_t bytes;
+       char content_type[SIZ];
+       char *content;
+       
+       serv_printf("DLAT %ld|%s", msgnum, partnum);
+       serv_getln(buf, sizeof buf);
+       if (buf[0] == '6') {
+               bytes = extract_long(&buf[4], 0);
+               extract_token(content_type, &buf[4], 3, '|', sizeof content_type);
+
+               content = malloc(bytes + 2);
+               serv_read(content, bytes);
+
+               content[bytes] = 0;     /* null terminate for good measure */
+               return(content);
+       }
+       else {
+               return(NULL);
+       }
+}
+
+/*
+ * Read any MIME part of a message, from the server, into memory.
+ */
+void MimeLoadData(wc_mime_attachment *Mime)
+{
+       char buf[SIZ];
+       off_t bytes;
+//// TODO: is there a chance the contenttype is different  to the one we know? 
+       serv_printf("DLAT %ld|%s", Mime->msgnum, ChrPtr(Mime->PartNum));
+       serv_getln(buf, sizeof buf);
+       if (buf[0] == '6') {
+               bytes = extract_long(&buf[4], 0);
+
+               if (Mime->Data == NULL)
+                       Mime->Data = NewStrBufPlain(NULL, bytes);
+               StrBuf_ServGetBLOB(Mime->Data, bytes);
+
+       }
+       else {
+               FlushStrBuf(Mime->Data);
+               /// TODO XImportant message
+       }
+}
+
+
+
+
+void view_mimepart(void) {
+       mimepart(ChrPtr(WC->UrlFragment2),
+                ChrPtr(WC->UrlFragment3),
+                0);
+}
+
+void download_mimepart(void) {
+       mimepart(ChrPtr(WC->UrlFragment2),
+                ChrPtr(WC->UrlFragment3),
+                1);
+}
+
+void view_postpart(void) {
+       postpart(WC->UrlFragment2,
+                WC->UrlFragment3,
+                0);
+}
+
+void download_postpart(void) {
+       postpart(WC->UrlFragment2,
+                WC->UrlFragment3,
+                1);
+}
+
+
+
+void h_readnew(void) { readloop(readnew);}
+void h_readold(void) { readloop(readold);}
+void h_readfwd(void) { readloop(readfwd);}
+void h_headers(void) { readloop(headers);}
+void h_do_search(void) { readloop(do_search);}
 
 
 
@@ -3945,11 +1591,11 @@ void
 InitModule_MSG
 (void)
 {
-       WebcitAddUrlHandler(HKEY("readnew"), readnew, 0);
-       WebcitAddUrlHandler(HKEY("readold"), readold, 0);
-       WebcitAddUrlHandler(HKEY("readfwd"), readfwd, 0);
-       WebcitAddUrlHandler(HKEY("headers"), headers, 0);
-       WebcitAddUrlHandler(HKEY("do_search"), do_search, 0);
+       WebcitAddUrlHandler(HKEY("readnew"), h_readnew, NEED_URL);
+       WebcitAddUrlHandler(HKEY("readold"), h_readold, NEED_URL);
+       WebcitAddUrlHandler(HKEY("readfwd"), h_readfwd, NEED_URL);
+       WebcitAddUrlHandler(HKEY("headers"), h_headers, NEED_URL);
+       WebcitAddUrlHandler(HKEY("do_search"), h_do_search, 0);
        WebcitAddUrlHandler(HKEY("display_enter"), display_enter, 0);
        WebcitAddUrlHandler(HKEY("post"), post_message, 0);
        WebcitAddUrlHandler(HKEY("move_msg"), move_msg, 0);
@@ -3960,79 +1606,10 @@ InitModule_MSG
        WebcitAddUrlHandler(HKEY("mobilemsg"), mobile_message_view, NEED_URL);
        WebcitAddUrlHandler(HKEY("msgheaders"), display_headers, NEED_URL);
 
-       RegisterNamespace("MAIL:SUMM:DATESTR", 0, 0, tmplput_MAIL_SUMM_DATE_STR, 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:NATTACH", 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, 0, 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);
-
-
-       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: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);
-       RegisterIterator("MAIL:MIME:ATTACH:SUBMESSAGES", 0, NULL, iterate_get_mime_Submessages, 
-                        NULL, NULL, CTX_MIME_ATACH, CTX_MAILSUM);
-       RegisterIterator("MAIL:MIME:ATTACH:LINKS", 0, NULL, iterate_get_mime_AttachLinks, 
-                        NULL, NULL, CTX_MIME_ATACH, CTX_MAILSUM);
-       RegisterIterator("MAIL:MIME:ATTACH:ATT", 0, NULL, iterate_get_mime_Attachments, 
-                        NULL, NULL, CTX_MIME_ATACH, CTX_MAILSUM);
-
-       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);
-
-
-
-       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);
-
-       RegisterMsgHdr(HKEY("nhdr"), examine_nhdr, 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("room"), examine_room, 0);
-       RegisterMsgHdr(HKEY("rfca"), examine_rfca, 0);
-       RegisterMsgHdr(HKEY("node"), examine_node, 0);
-       RegisterMsgHdr(HKEY("rcpt"), examine_rcpt, 0);
-       RegisterMsgHdr(HKEY("time"), examine_time, 0);
-       RegisterMsgHdr(HKEY("part"), examine_mime_part, 0);
-       RegisterMsgHdr(HKEY("text"), examine_text, 1);
-       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);
+       WebcitAddUrlHandler(HKEY("mimepart"), view_mimepart, NEED_URL);
+       WebcitAddUrlHandler(HKEY("mimepart_download"), download_mimepart, NEED_URL);
+       WebcitAddUrlHandler(HKEY("postpart"), view_postpart, NEED_URL);
+       WebcitAddUrlHandler(HKEY("postpart_download"), download_postpart, NEED_URL);
+
        return ;
 }