* merge from dav_rework:
[citadel.git] / webcit / messages.c
index 0197d674513735bcd7c8f0e0b334902245a804a2..bb17f729665e5264d78800f37797c7cbb1b7eb5e 100644 (file)
 HashList *MsgHeaderHandler = NULL;
 HashList *MsgEvaluators = NULL;
 HashList *MimeRenderHandler = NULL;
+HashList *ReadLoopHandler = NULL;
+int dbg_analyze_msg = 0;
 
-#define SUBJ_COL_WIDTH_PCT             50      /**< Mailbox view column width */
-#define SENDER_COL_WIDTH_PCT           30      /**< Mailbox view column width */
-#define DATE_PLUS_BUTTONS_WIDTH_PCT    20      /**< Mailbox view column width */
-
+#define SUBJ_COL_WIDTH_PCT             50      /* Mailbox view column width */
+#define SENDER_COL_WIDTH_PCT           30      /* Mailbox view column width */
+#define DATE_PLUS_BUTTONS_WIDTH_PCT    20      /* Mailbox view column width */
 
+void jsonMessageListHdr(void);
 
 void display_enter(void);
-int longcmp_r(const void *s1, const void *s2);
-int summcmp_subj(const void *s1, const void *s2);
-int summcmp_rsubj(const void *s1, const void *s2);
-int summcmp_sender(const void *s1, const void *s2);
-int summcmp_rsender(const void *s1, const void *s2);
-int summcmp_date(const void *s1, const void *s2);
-int summcmp_rdate(const void *s1, const void *s2);
-
-/*----------------------------------------------------------------------------*/
-
 
 typedef void (*MsgPartEvaluatorFunc)(message_summary *Sum, StrBuf *Buf);
 
+typedef struct _MsgPartEvaluatorStruct {
+       MsgPartEvaluatorFunc f;
+} MsgPartEvaluatorStruct;
 
-
-/*----------------------------------------------------------------------------*/
-
-
-
-/*
- * I wanna SEE that message!
- *
- * msgnum              Message number to display
- * printable_view      Nonzero to display a printable view
- * section             Optional for encapsulated message/rfc822 submessage
- */
-int read_message(StrBuf *Target, const char *tmpl, long tmpllen, long msgnum, int printable_view, const StrBuf *PartNum) {
+int load_message(message_summary *Msg, 
+                StrBuf *FoundCharset,
+                StrBuf **Error)
+{
+       wcsession *WCC = WC;
        StrBuf *Buf;
        StrBuf *HdrToken;
-       StrBuf *FoundCharset;
-       HashPos  *it;
-       void *vMime;
-       message_summary *Msg = NULL;
        headereval *Hdr;
        void *vHdr;
        char buf[SIZ];
-//     char mime_submessages[256] = "";
-       char reply_references[1024] = "";
        int Done = 0;
        int state=0;
-       long len;
-       const char *Key;
-
+       
        Buf = NewStrBuf();
-       lprintf(1, "----------%s---------MSG4 %ld|%s--------------\n", tmpl, msgnum, ChrPtr(PartNum));
-       serv_printf("MSG4 %ld|%s", msgnum, ChrPtr(PartNum));
+       lprintf(9, "MSG4 %ld|%s\n", Msg->msgnum, ChrPtr(Msg->PartNum));
+       if (Msg->PartNum != NULL) {
+               serv_printf("MSG4 %ld|%s", Msg->msgnum, ChrPtr(Msg->PartNum));
+       }
+       else {
+               serv_printf("MSG4 %ld", Msg->msgnum);
+       }
+
        StrBuf_ServGetln(Buf);
        if (GetServerStatus(Buf, NULL) != 1) {
-               StrBufAppendPrintf(Target, "<strong>");
-               StrBufAppendPrintf(Target, _("ERROR:"));
-               StrBufAppendPrintf(Target, "</strong> %s<br />\n", &buf[4]);
+               *Error = NewStrBuf();
+               StrBufAppendPrintf(*Error, "<strong>");
+               StrBufAppendPrintf(*Error, _("ERROR:"));
+               StrBufAppendPrintf(*Error, "</strong> %s<br />\n", &buf[4]);
                FreeStrBuf(&Buf);
                return 0;
        }
 
-       /** begin everythingamundo table */
-
-
+       /* begin everythingamundo table */
        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) {
+       while (!Done && StrBuf_ServGetln(Buf)>=0) {
                if ( (StrLength(Buf)==3) && 
                    !strcmp(ChrPtr(Buf), "000")) 
                {
                        Done = 1;
                        if (state < 2) {
                                lprintf(1, _("unexpected end of message"));
-                               
+                               if (Msg->MsgBody->Data == NULL)
+                                       Msg->MsgBody->Data = NewStrBuf();
                                Msg->MsgBody->ContentType = NewStrBufPlain(HKEY("text/html"));
                                StrBufAppendPrintf(Msg->MsgBody->Data, "<div><i>");
                                StrBufAppendPrintf(Msg->MsgBody->Data, _("unexpected end of message"));
@@ -111,7 +89,10 @@ int read_message(StrBuf *Target, const char *tmpl, long tmpllen, long msgnum, in
                        StrBufExtract_token(HdrToken, Buf, 0, '=');
                        StrBufCutLeft(Buf, StrLength(HdrToken) + 1);
                        
-                       lprintf(1, ":: [%s] = [%s]\n", ChrPtr(HdrToken), ChrPtr(Buf));
+#ifdef TECH_PREVIEW
+                       if (dbg_analyze_msg) lprintf(1, ":: [%s] = [%s]\n", ChrPtr(HdrToken), ChrPtr(Buf));
+#endif
+                       /* look up one of the examine_* functions to parse the content */
                        if (GetHash(MsgHeaderHandler, SKEY(HdrToken), &vHdr) &&
                            (vHdr != NULL)) {
                                Hdr = (headereval*)vHdr;
@@ -119,8 +100,12 @@ int read_message(StrBuf *Target, const char *tmpl, long tmpllen, long msgnum, in
                                if (Hdr->Type == 1) {
                                        state++;
                                }
-                       }
-                       else lprintf(1, "don't know how to handle message header[%s]\n", ChrPtr(HdrToken));
+                       }/* TODO: 
+                       else LogError(Target, 
+                                     __FUNCTION__,  
+                                     "don't know how to handle message header[%s]\n", 
+                                     ChrPtr(HdrToken));
+                        */
                        break;
                case 1:/* Message Mime Header */
                        if (StrLength(Buf) == 0) {
@@ -135,7 +120,10 @@ int read_message(StrBuf *Target, const char *tmpl, long tmpllen, long msgnum, in
                                StrBufExtract_token(HdrToken, Buf, 0, ':');
                                if (StrLength(HdrToken) > 0) {
                                        StrBufCutLeft(Buf, StrLength(HdrToken) + 1);
-                                       lprintf(1, ":: [%s] = [%s]\n", ChrPtr(HdrToken), ChrPtr(Buf));
+#ifdef TECH_PREVIEW
+                                       if (dbg_analyze_msg) lprintf(1, ":: [%s] = [%s]\n", ChrPtr(HdrToken), ChrPtr(Buf));
+#endif
+                                       /* the examine*'s know how to do with mime headers too... */
                                        if (GetHash(MsgHeaderHandler, SKEY(HdrToken), &vHdr) &&
                                            (vHdr != NULL)) {
                                                Hdr = (headereval*)vHdr;
@@ -147,9 +135,9 @@ int read_message(StrBuf *Target, const char *tmpl, long tmpllen, long msgnum, in
                case 2: /* Message Body */
                        
                        if (Msg->MsgBody->size_known > 0) {
-                               StrBuf_ServGetBLOB(Msg->MsgBody->Data, Msg->MsgBody->length);
+                               StrBuf_ServGetBLOBBuffered(Msg->MsgBody->Data, Msg->MsgBody->length);
                                state ++;
-                                       /// todo: check next line, if not 000, append following lines
+                               /*/ todo: check next line, if not 000, append following lines */
                        }
                        else if (1){
                                if (StrLength(Msg->MsgBody->Data) > 0)
@@ -165,29 +153,9 @@ int read_message(StrBuf *Target, const char *tmpl, long tmpllen, long msgnum, in
 
        if (Msg->AllAttach == NULL)
                Msg->AllAttach = NewHash(1,NULL);
+       /* now we put the body mimepart we read above into the mimelist */
        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, ';');
-       StrBufTrim(Buf);
-       if (GetHash(MimeRenderHandler, SKEY(Buf), &vHdr) &&
-           (vHdr != NULL)) {
-               RenderMimeFunc Render;
-               Render = (RenderMimeFunc)vHdr;
-               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.
-                */
-               int rrtok = num_tokens(ChrPtr(Msg->reply_references), '|');
-               int rrlen = StrLength(Msg->reply_references);
-               if ( ((rrtok >= 3) && (rrlen > 900)) || (rrtok > 10) ) {
-                       remove_token(reply_references, 1, '|');////todo
-               }
-       }
-
        /* Generate a reply-to address */
        if (StrLength(Msg->Rfca) > 0) {
                if (Msg->reply_to == NULL)
@@ -203,8 +171,8 @@ int read_message(StrBuf *Target, const char *tmpl, long tmpllen, long msgnum, in
        else 
        {
                if ((StrLength(Msg->OtherNode)>0) && 
-                   (strcasecmp(ChrPtr(Msg->OtherNode), serv_info.serv_nodename)) &&
-                   (strcasecmp(ChrPtr(Msg->OtherNode), serv_info.serv_humannode)) ) 
+                   (strcasecmp(ChrPtr(Msg->OtherNode), ChrPtr(WCC->serv_info->serv_nodename))) &&
+                   (strcasecmp(ChrPtr(Msg->OtherNode), ChrPtr(WCC->serv_info->serv_humannode)) ))
                {
                        if (Msg->reply_to == NULL)
                                Msg->reply_to = NewStrBuf();
@@ -220,52 +188,285 @@ int read_message(StrBuf *Target, const char *tmpl, long tmpllen, long msgnum, in
                        StrBufAppendBuf(Msg->reply_to, Msg->from, 0);
                }
        }
-       it = GetNewHashPos();
+       FreeStrBuf(&Buf);
+       FreeStrBuf(&HdrToken);
+       return 1;
+}
+
+
+
+/*
+ * I wanna SEE that message!
+ *
+ * msgnum              Message number to display
+ * printable_view      Nonzero to display a printable view
+ * section             Optional for encapsulated message/rfc822 submessage
+ */
+int read_message(StrBuf *Target, const char *tmpl, long tmpllen, long msgnum, const StrBuf *PartNum, const StrBuf **OutMime) 
+{
+       StrBuf *Buf;
+       StrBuf *FoundCharset;
+       HashPos  *it;
+       void *vMime;
+       message_summary *Msg = NULL;
+       void *vHdr;
+       long len;
+       const char *Key;
+       WCTemplputParams SubTP;
+       StrBuf *Error = NULL;
+
+       Buf = NewStrBuf();
+       FoundCharset = 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));
+       Msg->MsgBody->msgnum = msgnum;
+
+       if (!load_message(Msg, FoundCharset, &Error)) {
+               StrBufAppendBuf(Target, Error, 0);
+               FreeStrBuf(&Error);
+       }
+
+       /* Extract just the content-type (omit attributes such as "charset") */
+       StrBufExtract_token(Buf, Msg->MsgBody->ContentType, 0, ';');
+       StrBufTrim(Buf);
+       StrBufLowerCase(Buf);
+
+       /* Locate a renderer capable of converting this MIME part into HTML */
+       if (GetHash(MimeRenderHandler, SKEY(Buf), &vHdr) &&
+           (vHdr != NULL)) {
+               RenderMimeFuncStruct *Render;
+               Render = (RenderMimeFuncStruct*)vHdr;
+               Render->f(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.
+                */
+               int rrtok = num_tokens(ChrPtr(Msg->reply_references), '|');
+               int rrlen = StrLength(Msg->reply_references);
+               if ( ((rrtok >= 3) && (rrlen > 900)) || (rrtok > 10) ) {
+                       StrBufRemove_token(Msg->reply_references, 1, '|');
+               }
+       }
+
+       /* now check if we need to translate some mimeparts, and remove the duplicate */
+       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);
-
-       DoTemplate(tmpl, tmpllen, Target, Msg, CTX_MAILSUM);
+       memset(&SubTP, 0, sizeof(WCTemplputParams));
+       SubTP.Filter.ContextType = CTX_MAILSUM;
+       SubTP.Context = Msg;
+       *OutMime = DoTemplate(tmpl, tmpllen, Target, &SubTP);
 
        DestroyMessageSummary(Msg);
        FreeStrBuf(&FoundCharset);
-       FreeStrBuf(&HdrToken);
        FreeStrBuf(&Buf);
        return 1;
 }
 
 
+void
+HttpStatus(long CitadelStatus)
+{
+       long httpstatus = 502;
+       
+       switch (MAJORCODE(CitadelStatus))
+       {
+       case LISTING_FOLLOWS:
+       case CIT_OK:
+               httpstatus = 201;
+               break;
+       case ERROR:
+               switch (MINORCODE(CitadelStatus))
+               {
+               case INTERNAL_ERROR:
+                       httpstatus = 403;
+                       break;
+                       
+               case TOO_BIG:
+               case ILLEGAL_VALUE:
+               case HIGHER_ACCESS_REQUIRED:
+               case MAX_SESSIONS_EXCEEDED:
+               case RESOURCE_BUSY:
+               case RESOURCE_NOT_OPEN:
+               case NOT_HERE:
+               case INVALID_FLOOR_OPERATION:
+               case FILE_NOT_FOUND:
+               case ROOM_NOT_FOUND:
+                       httpstatus = 409;
+                       break;
+
+               case MESSAGE_NOT_FOUND:
+               case ALREADY_EXISTS:
+                       httpstatus = 403;
+                       break;
+
+               case NO_SUCH_SYSTEM:
+                       httpstatus = 502;
+                       break;
+
+               default:
+               case CMD_NOT_SUPPORTED:
+               case PASSWORD_REQUIRED:
+               case ALREADY_LOGGED_IN:
+               case USERNAME_REQUIRED:
+               case NOT_LOGGED_IN:
+               case SERVER_SHUTTING_DOWN:
+               case NO_SUCH_USER:
+               case ASYNC_GEXP:
+                       httpstatus = 502;
+                       break;
+               }
+               break;
+
+       default:
+       case BINARY_FOLLOWS:
+       case SEND_BINARY:
+       case START_CHAT_MODE:
+       case ASYNC_MSG:
+       case MORE_DATA:
+       case SEND_LISTING:
+               httpstatus = 502; /* aeh... whut? */
+               break;
+       }
+
+
+}
+
+/*
+ * Unadorned HTML output of an individual message, suitable
+ * for placing in a hidden iframe, for printing, or whatever
+ */
+void handle_one_message(void) 
+{
+       long CitStatus;
+       int CopyMessage = 0;
+       const StrBuf *Destination;
+       void *vLine;
+       const StrBuf *Mime;
+       long msgnum = 0L;
+       wcsession *WCC = WC;
+       const StrBuf *Tmpl;
+       StrBuf *CmdBuf = NULL;
+       const char *pMsg;
+
+
+       pMsg = strchr(ChrPtr(WCC->Hdr->HR.ReqLine), '/');
+       if (pMsg == NULL) {
+               HttpStatus(CitStatus);
+               return;
+       }
+
+       msgnum = atol(pMsg + 1);
+       StrBufCutAt(WCC->Hdr->HR.ReqLine, 0, pMsg);
+       gotoroom(WCC->Hdr->HR.ReqLine);
+       switch (WCC->Hdr->HR.eReqType)
+       {
+       case eGET:
+       case ePOST:
+               Tmpl = sbstr("template");
+               if (StrLength(Tmpl) > 0) 
+                       read_message(WCC->WBuf, SKEY(Tmpl), msgnum, NULL, &Mime);
+               else 
+                       read_message(WCC->WBuf, HKEY("view_message"), msgnum, NULL, &Mime);
+               http_transmit_thing(ChrPtr(Mime), 0);
+               break;
+       case eDELETE:
+               CmdBuf = NewStrBuf ();
+               if ((WCC->CurRoom.RAFlags & UA_ISTRASH) != 0) { /* Delete from Trash is a real delete */
+                       serv_printf("DELE %ld", msgnum);        
+               }
+               else {                  /* Otherwise move it to Trash */
+                       serv_printf("MOVE %ld|_TRASH_|0", msgnum);
+               }
+               StrBuf_ServGetln(CmdBuf);
+               FlushStrBuf(WCC->ImportantMsg);
+               StrBufAppendBuf(WCC->ImportantMsg, CmdBuf, 4);
+               GetServerStatus(CmdBuf, &CitStatus);
+               HttpStatus(CitStatus);
+               break;
+       case eCOPY:
+               CopyMessage = 1;
+       case eMOVE:
+               if (GetHash(WCC->Hdr->HTTPHeaders, HKEY("DESTINATION"), &vLine) &&
+                   (vLine!=NULL)) {
+                       Destination = (StrBuf*) vLine;
+                       serv_printf("MOVE %ld|%s|%d", msgnum, ChrPtr(Destination), CopyMessage);
+                       StrBuf_ServGetln(CmdBuf);
+                       FlushStrBuf(WCC->ImportantMsg);
+                       StrBufAppendBuf(WCC->ImportantMsg, CmdBuf, 4);
+                       GetServerStatus(CmdBuf, &CitStatus);
+                       HttpStatus(CitStatus);
+               }
+               else
+                       HttpStatus(500);
+               break;
+       default:
+               break;
+
+       }
+}
+
 
 /*
  * Unadorned HTML output of an individual message, suitable
  * for placing in a hidden iframe, for printing, or whatever
- *
- * msgnum_as_string == Message number, as a string instead of as a long int
  */
 void embed_message(void) {
+       const StrBuf *Mime;
        long msgnum = 0L;
-       const StrBuf *Tmpl = sbstr("template");
+       wcsession *WCC = WC;
+       const StrBuf *Tmpl;
+       StrBuf *CmdBuf = NULL;
 
-       msgnum = StrTol(WC->UrlFragment1);
-       if (StrLength(Tmpl) > 0) 
-               read_message(WC->WBuf, SKEY(Tmpl), msgnum, 0, NULL);
-       else 
-               read_message(WC->WBuf, HKEY("view_message"), msgnum, 0, NULL);
+       msgnum = StrBufExtract_long(WCC->Hdr->HR.ReqLine, 0, '/');
+       switch (WCC->Hdr->HR.eReqType)
+       {
+       case eGET:
+       case ePOST:
+               Tmpl = sbstr("template");
+               if (StrLength(Tmpl) > 0) 
+                       read_message(WCC->WBuf, SKEY(Tmpl), msgnum, NULL, &Mime);
+               else 
+                       read_message(WCC->WBuf, HKEY("view_message"), msgnum, NULL, &Mime);
+               http_transmit_thing(ChrPtr(Mime), 0);
+               break;
+       case eDELETE:
+               CmdBuf = NewStrBuf ();
+               if ((WCC->CurRoom.RAFlags & UA_ISTRASH) != 0) { /* Delete from Trash is a real delete */
+                       serv_printf("DELE %ld", msgnum);        
+               }
+               else {                  /* Otherwise move it to Trash */
+                       serv_printf("MOVE %ld|_TRASH_|0", msgnum);
+               }
+               StrBuf_ServGetln(CmdBuf);
+               FlushStrBuf(WCC->ImportantMsg);
+               StrBufAppendBuf(WCC->ImportantMsg, CmdBuf, 4);
+               break;
+       default:
+               break;
+
+       }
 }
 
 
 /*
  * Printable view of a message
- *
- * msgnum_as_string == Message number, as a string instead of as a long int
  */
 void print_message(void) {
        long msgnum = 0L;
+       const StrBuf *Mime;
 
-       msgnum = StrTol(WC->UrlFragment1);
+       msgnum = StrBufExtract_long(WC->Hdr->HR.ReqLine, 0, '/');
        output_headers(0, 0, 0, 0, 0, 0);
 
        hprintf("Content-type: text/html\r\n"
@@ -274,36 +475,35 @@ void print_message(void) {
 
        begin_burst();
 
-       read_message(WC->WBuf, HKEY("view_message_print"), msgnum, 1, NULL);
+       read_message(WC->WBuf, HKEY("view_message_print"), msgnum, NULL, &Mime);
 
        wDumpContent(0);
 }
 
 /* 
  * Mobile browser view of message
- *
- * @param msg_num_as_string Message number as a string instead of as a long int 
  */
-void mobile_message_view(void) {
-  long msgnum = 0L;
-  msgnum = StrTol(WC->UrlFragment1);
-  output_headers(1, 0, 0, 0, 0, 1);
-  begin_burst();
-  do_template("msgcontrols", NULL);
-  read_message(WC->WBuf, HKEY("view_message"), msgnum,1, NULL);
-  wDumpContent(0);
+void mobile_message_view(void) 
+{
+       long msgnum = 0L;
+       const StrBuf *Mime;
+  
+       msgnum = StrBufExtract_long(WC->Hdr->HR.ReqLine, 0, '/');
+       output_headers(1, 0, 0, 0, 0, 1);
+       begin_burst();
+       do_template("msgcontrols", NULL);
+       read_message(WC->WBuf, HKEY("view_message"), msgnum, NULL, &Mime);
+       wDumpContent(0);
 }
 
-/**
- * \brief Display a message's headers
- *
- * \param msgnum_as_string Message number, as a string instead of as a long int
+/*
+ * Display a message's headers
  */
 void display_headers(void) {
        long msgnum = 0L;
        char buf[1024];
 
-       msgnum = StrTol(WC->UrlFragment1);
+       msgnum = StrBufExtract_long(WC->Hdr->HR.ReqLine, 0, '/');
        output_headers(0, 0, 0, 0, 0, 0);
 
        hprintf("Content-type: text/plain\r\n"
@@ -316,7 +516,7 @@ void display_headers(void) {
        serv_getln(buf, sizeof buf);
        if (buf[0] == '1') {
                while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
-                       wprintf("%s\n", buf);
+                       wc_printf("%s\n", buf);
                }
        }
 
@@ -324,341 +524,10 @@ 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) {
-       struct wcsession *WCC = WC;
-       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;
-       wc_attachment *att;
-       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")) ) {
-               
-                               int n;
-                               char N[64];
-                               /* Create an attachment struct from this mime part... */
-                               att = malloc(sizeof(wc_attachment));
-                               memset(att, 0, sizeof(wc_attachment));
-                               att->length = mime_length;
-                               att->content_type = NewStrBufPlain(mime_content_type, -1);
-                               att->filename = NewStrBufPlain(mime_filename, -1);
-                               att->data = load_mimepart(msgnum, mime_partnum);
-               
-                               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, free_attachment);
-                       }
-
-               }
-       }
-
-#ifdef HAVE_ICONV
-       if (ic != (iconv_t)(-1) ) {
-               iconv_close(ic);
-       }
-#endif
-
-       if (attachments != NULL) {
-               free(attachments);
-       }
-}
-
-
-
-
 message_summary *ReadOneMessageSummary(StrBuf *RawMessage, const char *DefaultSubject, long MsgNum) 
 {
        void                 *vEval;
-       MsgPartEvaluatorFunc  Eval;
+       MsgPartEvaluatorStruct  *Eval;
        message_summary      *Msg;
        StrBuf *Buf;
        const char *buf;
@@ -685,9 +554,9 @@ message_summary *ReadOneMessageSummary(StrBuf *RawMessage, const char *DefaultSu
                ebuf = strchr(ChrPtr(Buf), '=');
                nBuf = ebuf - buf;
                if (GetHash(MsgEvaluators, buf, nBuf, &vEval) && vEval != NULL) {
-                       Eval = (MsgPartEvaluatorFunc) vEval;
+                       Eval = (MsgPartEvaluatorStruct*) vEval;
                        StrBufCutLeft(Buf, nBuf + 1);
-                       Eval(Msg, Buf);
+                       Eval->f(Msg, Buf);
                }
                else lprintf(1, "Don't know how to handle Message Headerline [%s]", ChrPtr(Buf));
        }
@@ -695,138 +564,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(WC->WBuf, 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(WC->WBuf, 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)"));
-}
-
-
 
 
 
@@ -834,564 +571,295 @@ void fetch_ab_name(message_summary *Msg, char *namebuf) {
  * load message pointers from the server for a "read messages" operation
  *
  * servcmd:            the citadel command to send to the citserver
- * with_headers:       also include some of the headers with the message numbers (more expensive)
  */
-int load_msg_ptrs(char *servcmd, int with_headers)
+int load_msg_ptrs(const char *servcmd, 
+                 SharedMessageStatus *Stat, 
+                 load_msg_ptrs_detailheaders LH)
 {
-       StrBuf* FoundCharset = NULL;
-        struct wcsession *WCC = WC;
+        wcsession *WCC = WC;
        message_summary *Msg;
        StrBuf *Buf, *Buf2;
-       ///char buf[1024];
-       ///time_t datestamp;
-       //char fullname[128];
-       //char nodename[128];
-       //char inetaddr[128];
-       //char subject[1024];
-       ///char *ptr;
-       int nummsgs;
-       ////int sbjlen;
-       int maxload = 0;
        long len;
        int n;
-       ////int num_summ_alloc = 0;
+       int skipit;
+       const char *Ptr = NULL;
+
+       Stat->lowest_found = LONG_MAX;
+       Stat->highest_found = LONG_MIN;
 
        if (WCC->summ != NULL) {
-               if (WCC->summ != NULL)
-                       DeleteHash(&WCC->summ);
+               DeleteHash(&WCC->summ);
        }
        WCC->summ = NewHash(1, Flathash);
-       nummsgs = 0;
-       maxload = 10000;
        
        Buf = NewStrBuf();
        serv_puts(servcmd);
        StrBuf_ServGetln(Buf);
        if (GetServerStatus(Buf, NULL) != 1) {
                FreeStrBuf(&Buf);
-               return (nummsgs);
+               return (Stat->nummsgs);
        }
-// TODO                        if (with_headers) { //// TODO: Have Attachments?
        Buf2 = NewStrBuf();
-       while (len = StrBuf_ServGetln(Buf),
-              ((len != 3)  ||
-               strcmp(ChrPtr(Buf), "000")!= 0))
+       while (len = StrBuf_ServGetln(Buf), ((len != 3) || strcmp(ChrPtr(Buf), "000")!= 0))
        {
-               if (nummsgs < maxload) {
+               if (Stat->nummsgs < Stat->maxload) {
+                       skipit = 0;
+                       Ptr = NULL;
                        Msg = (message_summary*)malloc(sizeof(message_summary));
                        memset(Msg, 0, sizeof(message_summary));
 
-                       Msg->msgnum = StrBufExtract_long(Buf, 0, '|');
-                       Msg->date = StrBufExtract_long(Buf, 1, '|');
+                       Msg->msgnum = StrBufExtractNext_long(Buf, &Ptr, '|');
+                       Msg->date = StrBufExtractNext_long(Buf, &Ptr, '|');
 
-                       Msg->from = NewStrBufPlain(NULL, StrLength(Buf));
-                       StrBufExtract_token(Buf2, Buf, 2, '|');
-                       if (StrLength(Buf2) != 0) {
-                               /** Handle senders with RFC2047 encoding */
-                               StrBuf_RFC822_to_Utf8(Msg->from, Buf2, WCC->DefaultCharset, FoundCharset);
-                       }
-                       
-                       /** Nodename */
-                       StrBufExtract_token(Buf2, Buf, 3, '|');
-                       if ((StrLength(Buf2) !=0 ) &&
-                           ( ((WCC->room_flags & QR_NETWORK)
-                              || ((strcasecmp(ChrPtr(Buf2), serv_info.serv_nodename)
-                                   && (strcasecmp(ChrPtr(Buf2), serv_info.serv_fqdn)))))))
-                       {
-                               StrBufAppendBufPlain(Msg->from, HKEY(" @ "), 0);
-                               StrBufAppendBuf(Msg->from, Buf2, 0);
-                       }
-
-                       /** Not used:
-                       StrBufExtract_token(Msg->inetaddr, Buf, 4, '|');
-                       */
-
-                       Msg->subj = NewStrBufPlain(NULL, StrLength(Buf));
-                       StrBufExtract_token(Buf2,  Buf, 5, '|');
-                       if (StrLength(Buf2) == 0)
-                               StrBufAppendBufPlain(Msg->subj, _("(no subj)"), 0, -1);
-                       else {
-                               StrBuf_RFC822_to_Utf8(Msg->subj, Buf2, WCC->DefaultCharset, FoundCharset);
-                               if ((StrLength(Msg->subj) > 75) && 
-                                   (StrBuf_Utf8StrLen(Msg->subj) > 75)) {
-                                       StrBuf_Utf8StrCut(Msg->subj, 72);
-                                       StrBufAppendBufPlain(Msg->subj, HKEY("..."), 0);
+                       if (Stat->nummsgs == 0) {
+                               if (Msg->msgnum < Stat->lowest_found) {
+                                       Stat->lowest_found = Msg->msgnum;
+                               }
+                               if (Msg->msgnum > Stat->highest_found) {
+                                       Stat->highest_found = Msg->msgnum;
                                }
                        }
 
+                       if ((Msg->msgnum == 0) && (StrLength(Buf) < 32)) {
+                               free(Msg);
+                               continue;
+                       }
 
-                       if ((StrLength(Msg->from) > 25) && 
-                           (StrBuf_Utf8StrLen(Msg->from) > 25)) {
-                               StrBuf_Utf8StrCut(Msg->from, 23);
-                               StrBufAppendBufPlain(Msg->from, HKEY("..."), 0);
+                       /* 
+                        * as citserver probably gives us messages in forward date sorting
+                        * nummsgs should be the same order as the message date.
+                        */
+                       if (Msg->date == 0) {
+                               Msg->date = Stat->nummsgs;
+                               if (StrLength(Buf) < 32) 
+                                       skipit = 1;
+                       }
+                       if ((!skipit) && (LH != NULL)) {
+                               if (!LH(Buf, &Ptr, Msg, Buf2)){
+                                       free(Msg);
+                                       continue;
+                               }                                       
                        }
                        n = Msg->msgnum;
                        Put(WCC->summ, (const char *)&n, sizeof(n), Msg, DestroyMessageSummary);
                }
-               nummsgs++;
+               Stat->nummsgs++;
+       }
+       FreeStrBuf(&Buf2);
+       FreeStrBuf(&Buf);
+       return (Stat->nummsgs);
+}
+
+
+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 load_seen_flags(void)
+{
+       message_summary *Msg;
+       const char *HashKey;
+       long HKLen;
+       HashPos *at;
+       void *vMsg;
+       StrBuf *OldMsg;
+       wcsession *WCC = WC;
+
+       OldMsg = NewStrBuf();
+       serv_puts("GTSN");
+       StrBuf_ServGetln(OldMsg);
+       if (GetServerStatus(OldMsg, NULL) == 2) {
+               StrBufCutLeft(OldMsg, 4);
+       }
+       else {
+               FreeStrBuf(&OldMsg);
+               return;
+       }
+       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_msg_in_mset(ChrPtr(OldMsg), Msg->msgnum)) {
+                       Msg->is_new = 0;
+               }
+               else {
+                       Msg->is_new = 1;
+               }
        }
-       FreeStrBuf(&Buf2);
-       FreeStrBuf(&Buf);
-       return (nummsgs);
+       FreeStrBuf(&OldMsg);
+       DeleteHashPos(&at);
 }
 
+extern readloop_struct rlid[];
 
-inline message_summary* GetMessagePtrAt(int n, HashList *Summ)
-{
-       void *vMsg;
-       if (Summ == NULL)
-               return NULL;
-       GetHash(Summ, (const char*)&n, sizeof(n), &vMsg);
-       return (message_summary*) vMsg;
-}
+typedef struct _RoomRenderer{
+       int RoomType;
+
+       GetParamsGetServerCall_func GetParamsGetServerCall;
+       PrintViewHeader_func PrintViewHeader;
+       LoadMsgFromServer_func LoadMsgFromServer;
+       RenderView_or_Tail_func RenderView_or_Tail;
+       View_Cleanup_func ViewCleanup;
+       load_msg_ptrs_detailheaders LHParse;
+} RoomRenderer;
 
 
 /*
  * command loop for reading messages
  *
- * Set oper to "readnew" or "readold" or "readfwd" or "headers"
+ * Set oper to "readnew" or "readold" or "readfwd" or "headers" or "readgt" or "readlt" or "do_search"
  */
-void readloop(char *oper)
+void readloop(long oper, eCustomRoomRenderer ForceRenderer)
 {
-       StrBuf *BBViewToolBar = NULL;
+       RoomRenderer *ViewMsg;
+       void *vViewMsg;
        void *vMsg;
        message_summary *Msg;
        char cmd[256] = "";
-       char buf[SIZ];
-       char old_msgs[SIZ];
-       int a = 0;
-       int b = 0;
-       int n;
-       int nummsgs;
-       long startmsg;
-       int maxmsgs;
-       long *displayed_msgs = NULL;
-       int num_displayed = 0;
-       int is_summary = 0;
-       int is_addressbook = 0;
-       int is_singlecard = 0;
-       int is_calendar = 0;
-       struct calview calv;
-       int is_tasks = 0;
-       int is_notes = 0;
-       int is_bbview = 0;
-       int lo, hi;
-       int lowest_displayed = (-1);
-       int highest_displayed = 0;
-       addrbookent *addrbook = NULL;
-       int num_ab = 0;
-       int bbs_reverse = 0;
-       struct wcsession *WCC = WC;     /* This is done to make it run faster; WC is a function */
+       int i, r;
+       wcsession *WCC = WC;
        HashPos *at;
        const char *HashKey;
        long HKLen;
-       int care_for_empty_list = 0;
-       int load_seen = 0;
-       int sortit = 0;
-
-       switch (WCC->wc_view) {
-       case VIEW_WIKI:
-               sprintf(buf, "wiki?room=%s&page=home", WCC->wc_roomname);
-               http_redirect(buf);
-               return;
-       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 (!strcmp(oper, "do_search")) {
-                               snprintf(cmd, sizeof(cmd), "MSGS SEARCH|%s", bstr("query"));
-                       }
-                       else {
-                               strcpy(cmd, "MSGS ALL");
-                       }
-                       maxmsgs = 9999999;
-                       break;
-               }
-
-       default:
-               care_for_empty_list = 1;
-               startmsg = lbstr("startmsg");
-               maxmsgs = ibstr("maxmsgs");
-               is_summary = (ibstr("is_summary") && !WCC->is_mobile);
-               if (maxmsgs == 0) maxmsgs = DEFAULT_MAXMSGS;
-               
-
-               
-                /*
-                * 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");
-               }
-               
-               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");
-                       }
-               }
+       WCTemplputParams SubTP;
+       SharedMessageStatus Stat;
+       void *ViewSpecific;
 
-               is_bbview = !is_summary;
-               if (is_summary) {                       /**< fetch header summary */
-                       load_seen = 1;
-                       snprintf(cmd, sizeof(cmd), "MSGS %s|%s||1",
-                                (!strcmp(oper, "do_search") ? "SEARCH" : "ALL"),
-                                (!strcmp(oper, "do_search") ? bstr("query") : "")
-                               );
-                       startmsg = 1;
-                       maxmsgs = 9999999;
-               } 
-               if (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 (havebstr("is_summary") && (1 == (ibstr("is_summary")))) {
+               WCC->CurRoom.view = VIEW_MAILBOX;
        }
 
-
-
-
-
-
-
-       output_headers(1, 1, 1, 0, 0, 0);
-
-       /*
-       if (WCC->is_mobile) {
-               maxmsgs = 20;
-               snprintf(cmd, sizeof(cmd), "MSGS %s|%s||1",
-                       (!strcmp(oper, "do_search") ? "SEARCH" : "ALL"),
-                       (!strcmp(oper, "do_search") ? bstr("query") : "")
-               );
-               SortBy =  eRDate;
+       if (havebstr("is_ajax") && (1 == (ibstr("is_ajax")))) {
+               WCC->is_ajax = 1;
        }
 
-       /*
-        * Are we doing a summary view?  If so, we need to know old messages
-        * and new messages, so we can do that pretty boldface thing for the
-        * new messages.
-        */
-
+       if ((oper == do_search) && (WCC->CurRoom.view == VIEW_WIKI)) {
+               display_wiki_pagelist();
+               return;
+       }
 
-       nummsgs = load_msg_ptrs(cmd, (is_summary || WCC->is_mobile));
-       if (nummsgs == 0) {
-               if (care_for_empty_list) {
-                       wprintf("<div align=\"center\"><br /><em>");
-                       if (!strcmp(oper, "readnew")) {
-                               wprintf(_("No new messages."));
-                       } else if (!strcmp(oper, "readold")) {
-                               wprintf(_("No old messages."));
-                       } else {
-                               wprintf(_("No messages here."));
-                       }
-                       wprintf("</em><br /></div>\n");
-               }
+       memset(&Stat, 0, sizeof(SharedMessageStatus));
+       Stat.maxload = 10000;
+       Stat.lowest_found = (-1);
+       Stat.highest_found = (-1);
+       if (ForceRenderer == eUseDefault)
+               GetHash(ReadLoopHandler, IKEY(WCC->CurRoom.view), &vViewMsg);
+       else 
+               GetHash(ReadLoopHandler, IKEY(ForceRenderer), &vViewMsg);
+       if (vViewMsg == NULL) {
+               WCC->CurRoom.view = VIEW_BBS;
+               GetHash(ReadLoopHandler, IKEY(WCC->CurRoom.view), &vViewMsg);
+       }
+       if (vViewMsg == NULL) {
+               return;                 // TODO: print message
+       }
 
-               goto DONE;
+       ViewMsg = (RoomRenderer*) vViewMsg;
+       if (!WCC->is_ajax) {
+               output_headers(1, 1, 1, 0, 0, 0);
+       } else if (WCC->CurRoom.view == VIEW_MAILBOX) {
+               jsonMessageListHdr();
        }
 
-       if (load_seen){
-               void *vMsg;
+       if (ViewMsg->GetParamsGetServerCall != NULL) {
+               r = ViewMsg->GetParamsGetServerCall(
+                      &Stat,
+                      &ViewSpecific,
+                      oper,
+                      cmd, sizeof(cmd)
+               );
+       } else {
+               r = 0;
+       }
+       switch(r)
+       {
+       case 400:
+       case 404:
 
-               strcpy(old_msgs, "");
-               serv_puts("GTSN");
-               serv_getln(buf, sizeof buf);
-               if (buf[0] == '2') {
-                       strcpy(old_msgs, &buf[4]);
-               }
-               at = GetNewHashPos();
-               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;
-                               }
-                       }
-               }
-               DeleteHashPos(&at);
+               return;
+       case 300: /* the callback hook should do the work for us here, since he knows what to do. */
+               return;
+       case 200:
+       default:
+               break;
        }
+       if (!IsEmptyStr(cmd))
+               Stat.nummsgs = load_msg_ptrs(cmd, &Stat, ViewMsg->LHParse);
 
-       if (sortit) {
+       if (Stat.sortit) {
                CompareFunc SortIt;
-               SortIt =  RetrieveSort(CTX_MAILSUM, NULL, 
-                                      HKEY("date"), 2);
+               memset(&SubTP, 0, sizeof(WCTemplputParams));
+               SubTP.Filter.ContextType = CTX_MAILSUM;
+               SubTP.Context = NULL;
+               SortIt =  RetrieveSort(&SubTP, NULL, 0,
+                                      HKEY("date"), Stat.defaultsortorder);
                if (SortIt != NULL)
                        SortByPayload(WCC->summ, SortIt);
        }
-
-       if (is_summary) {
-               do_template("summary_header", NULL);
-       } else if (WCC->is_mobile) {
-               wprintf("<div id=\"message_list\">");
+       if (Stat.startmsg < 0) {
+               Stat.startmsg =  0;
        }
 
-
-       /**
-        * If we're not currently looking at ALL requested
-        * messages, then display the selector bar
+       if (Stat.load_seen) load_seen_flags();
+       
+        /*
+        * Print any inforation above the message list...
         */
-       if (is_bbview) {
-               const char *selected;
-               StrBuf *Selector = NewStrBuf();
-               BBViewToolBar = NewStrBuf();
-/////          DoTemplate("bbview_scrollbar");
-               /** begin bbview scroller */
-               StrBufAppendPrintf(BBViewToolBar, "<form name=\"msgomatictop\" class=\"selector_top\" > \n <p>");
-               StrBufAppendPrintf(BBViewToolBar, _("Reading #"));//// TODO this isn't used, should it? : , lowest_displayed, highest_displayed);
-
-               StrBufAppendPrintf(BBViewToolBar, "<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;
-                               
-                               Msg = GetMessagePtrAt(lo-1, WCC->summ);
-                               n = (Msg==NULL)? 0 : Msg->msgnum;
-                               selected = ((n == startmsg) ? "selected" : "");
-                               
-                               StrBufAppendPrintf(Selector, 
-                                                  "<option %s value="
-                                                  "\"%s"
-                                                  "&startmsg=%ld"
-                                                  "&maxmsgs=%d"
-                                                  "&is_summary=%d\">"
-                                                  "%d-%d</option> \n",
-                                                  selected,
-                                                  oper,
-
-
-                                                  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;
-
-                               Msg = GetMessagePtrAt(b, WCC->summ);
-                               n = (Msg==NULL)? 0 : Msg->msgnum;
-                               selected = ((n == startmsg) ? "selected" : "");
-                               Msg = GetMessagePtrAt(lo-1,  WCC->summ);
-                               StrBufAppendPrintf(Selector, 
-                                                  "<option %s value="
-                                                  "\"%s"
-                                                  "&startmsg=%ld"
-                                                  "&maxmsgs=%d"
-                                                  "&is_summary=%d\">"
-                                                  "%d-%d</option> \n",
-                                                  selected,
-                                                  oper,
-                                                  (Msg==NULL)? 0 : Msg->msgnum,
-                                                  maxmsgs,
-                                                  is_summary,
-                                                  lo, hi);
-                       }
-               }
-
-               StrBufAppendBuf(BBViewToolBar, Selector, 0);
-
-               Msg = GetMessagePtrAt(0,  WCC->summ);
+       if (ViewMsg->PrintViewHeader != NULL)
+               ViewMsg->PrintViewHeader(&Stat, &ViewSpecific);
 
-               StrBufAppendPrintf(BBViewToolBar, "<option value=\"%s?startmsg=%ld"
-                       "&maxmsgs=9999999&is_summary=0\">",
-                       oper,
-                       (Msg==NULL)? 0 : Msg->msgnum);
-               StrBufAppendPrintf(BBViewToolBar, _("All"));
-
-               StrBufAppendPrintf(BBViewToolBar, "</option>");
-               StrBufAppendPrintf(BBViewToolBar, "</select> ");
-               StrBufAppendPrintf(BBViewToolBar, _("of %d messages."), nummsgs);
-
-               /** forward/reverse */
-               StrBufAppendPrintf(BBViewToolBar, "<input type=\"radio\" %s name=\"direction\" value=\"\""
-                       "OnChange=\"location.href='%s?sortby=forward'\"",  
-                       (bbs_reverse ? "" : "checked"),
-                       oper
-               );
-               StrBufAppendPrintf(BBViewToolBar, ">");
-               StrBufAppendPrintf(BBViewToolBar, _("oldest to newest"));
-               StrBufAppendPrintf(BBViewToolBar, "&nbsp;&nbsp;&nbsp;&nbsp;");
-
-               StrBufAppendPrintf(BBViewToolBar, "<input type=\"radio\" %s name=\"direction\" value=\"\""
-                       "OnChange=\"location.href='%s?sortby=reverse'\"", 
-                       (bbs_reverse ? "checked" : ""),
-                       oper
-               );
-               StrBufAppendPrintf(BBViewToolBar, ">");
-               StrBufAppendPrintf(BBViewToolBar, _("newest to oldest"));
-               StrBufAppendPrintf(BBViewToolBar, "\n");
-       
-               StrBufAppendPrintf(BBViewToolBar, "</p></form>\n");
-               StrBufAppendBuf(WCC->WBuf, BBViewToolBar, 0);
-               /** end bbview scroller */
-       }
-                       
-       at = GetNewHashPos();
-       while (GetNextHashPos(WCC->summ, at, &HKLen, &HashKey, &vMsg)) {
-               Msg = (message_summary*) vMsg;          
-               if ((Msg->msgnum >= startmsg) && (num_displayed < maxmsgs)) {
-                               
-                       /** Display the message */
-                       if (is_summary) {
-                               DoTemplate(HKEY("section_mailsummary"), NULL, Msg, CTX_MAILSUM);
-                       }
-                       else if (is_addressbook) {
-                               fetch_ab_name(Msg, buf);
-                               ++num_ab;
-                               addrbook = realloc(addrbook,
-                                                  (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;
-                       }
-                       else if (is_calendar) {
-                               load_calendar_item(Msg, Msg->is_new, &calv);
-                       }
-                       else if (is_tasks) {
-                               display_task(Msg, Msg->is_new);
-                       }
-                       else if (is_notes) {
-                               display_note(Msg, Msg->is_new);
-                       } else if (WCC->is_mobile) {
-                               DoTemplate(HKEY("section_mailsummary"), NULL, Msg, CTX_MAILSUM);
-                       }
-                       else {
-                               if (displayed_msgs == NULL) {
-                                       displayed_msgs = malloc(sizeof(long) *
-                                                               (maxmsgs<nummsgs ? maxmsgs : nummsgs));
-                               }
-                               displayed_msgs[num_displayed] = Msg->msgnum;
-                       }
-                       
-                       if (lowest_displayed < 0) lowest_displayed = a;
-                       highest_displayed = a;
-                       
-                       ++num_displayed;
-               }
-       }
-       DeleteHashPos(&at);
+       WCC->startmsg =  Stat.startmsg;
+       WCC->maxmsgs = Stat.maxmsgs;
+       WCC->num_displayed = 0;
 
-       /** Output loop */
-       if (displayed_msgs != NULL) {
-               if (bbs_reverse) {
-                       ////TODOqsort(displayed_msgs, num_displayed, sizeof(long), qlongcmp_r);
-               }
+       /* Put some helpful data in vars for mailsummary_json */
+       svputlong("READLOOP:TOTALMSGS", Stat.nummsgs);
+       svputlong("READLOOP:STARTMSG", Stat.startmsg);
+       svputlong("WCVIEW", WCC->CurRoom.view);
 
-               /** if we do a split bbview in the future, begin messages div here */
+       /*
+        * iterate over each message. if we need to load an attachment, do it here. 
+        */
 
-               for (a=0; a<num_displayed; ++a) {
-                       read_message(WC->WBuf, HKEY("view_message"), displayed_msgs[a], 0, NULL);
+       if ((ViewMsg->LoadMsgFromServer != NULL) && 
+           (!IsEmptyStr(cmd)))
+       {
+               at = GetNewHashPos(WCC->summ, 0);
+               Stat.num_displayed = i = 0;
+               while ( GetNextHashPos(WCC->summ, at, &HKLen, &HashKey, &vMsg)) {
+                       Msg = (message_summary*) vMsg;          
+                       if ((Msg->msgnum >= Stat.startmsg) && (Stat.num_displayed <= Stat.maxmsgs)) {
+                               ViewMsg->LoadMsgFromServer(&Stat, &ViewSpecific, Msg, Msg->is_new, i);
+                       } 
+                       i++;
                }
-
-               /** if we do a split bbview in the future, end messages div here */
-
-               free(displayed_msgs);
-               displayed_msgs = NULL;
-       }
-
-       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 */
-       } else if (WCC->is_mobile) {
-               wprintf("</div>");
+               DeleteHashPos(&at);
        }
 
-       /**
-        * Bump these because although we're thinking in zero base, the user
-        * is a drooling idiot and is thinking in one base.
-        */
-       ++lowest_displayed;
-       ++highest_displayed;
-
-       /**
-        * If we're not currently looking at ALL requested
-        * messages, then display the selector bar
+       /*
+        * Done iterating the message list. now tasks we want to do after.
         */
-       if (is_bbview) {
-               /** begin bbview scroller */
-               StrBufAppendBuf(WCC->WBuf, BBViewToolBar, 0);
-       }
-       
-DONE:
-       if (is_tasks) {
-               do_tasks_view();        /** Render the task list */
-       }
-
-       if (is_calendar) {
-               render_calendar_view(&calv);
-       }
-
-       if (is_addressbook) {
-               do_addrbook_view(addrbook, num_ab);     /** Render the address book */
-       }
+       if (ViewMsg->RenderView_or_Tail != NULL)
+               ViewMsg->RenderView_or_Tail(&Stat, &ViewSpecific, oper);
 
-       /** Note: wDumpContent() will output one additional </div> tag. */
-       wprintf("</div>\n");            /** end of 'content' div */
-       wDumpContent(1);
+       if (ViewMsg->ViewCleanup != NULL)
+               ViewMsg->ViewCleanup(&ViewSpecific);
 
-       /** free the summary */
+       WCC->startmsg = 0;
+       WCC->maxmsgs = 0;
        if (WCC->summ != NULL) {
                DeleteHash(&WCC->summ);
        }
-       if (addrbook != NULL) free(addrbook);
 }
 
 
@@ -1400,24 +868,25 @@ DONE:
  * ... this is where the actual message gets transmitted to the server.
  */
 void post_mime_to_server(void) {
-       struct wcsession *WCC = WC;
+       wcsession *WCC = WC;
        char top_boundary[SIZ];
        char alt_boundary[SIZ];
        int is_multipart = 0;
        static int seq = 0;
-       wc_attachment *att;
+       wc_mime_attachment *att;
        char *encoded;
        size_t encoded_length;
        size_t encoded_strlen;
        char *txtmail = NULL;
+       int include_text_alt = 0;       /* Set to nonzero to include multipart/alternative text/plain */
 
        sprintf(top_boundary, "Citadel--Multipart--%s--%04x--%04x",
-               serv_info.serv_fqdn,
+               ChrPtr(WCC->serv_info->serv_fqdn),
                getpid(),
                ++seq
        );
        sprintf(alt_boundary, "Citadel--Multipart--%s--%04x--%04x",
-               serv_info.serv_fqdn,
+               ChrPtr(WCC->serv_info->serv_fqdn),
                getpid(),
                ++seq
        );
@@ -1431,6 +900,11 @@ void post_mime_to_server(void) {
                is_multipart = 1;
        }
 
+       /* Only do multipart/alternative for mailboxes.  BBS and Wiki rooms don't need it. */
+       if (WC->CurRoom.view == VIEW_MAILBOX) {
+               include_text_alt = 1;
+       }
+
        if (is_multipart) {
                /* Remember, serv_printf() appends an extra newline */
                serv_printf("Content-type: multipart/mixed; boundary=\"%s\"\n", top_boundary);
@@ -1439,19 +913,21 @@ void post_mime_to_server(void) {
        }
 
        /* Remember, serv_printf() appends an extra newline */
-       serv_printf("Content-type: multipart/alternative; "
-               "boundary=\"%s\"\n", alt_boundary);
-       serv_printf("This is a multipart message in MIME format.\n");
-       serv_printf("--%s", alt_boundary);
+       if (include_text_alt) {
+               serv_printf("Content-type: multipart/alternative; "
+                       "boundary=\"%s\"\n", alt_boundary);
+               serv_printf("This is a multipart message in MIME format.\n");
+               serv_printf("--%s", alt_boundary);
 
-       serv_puts("Content-type: text/plain; charset=utf-8");
-       serv_puts("Content-Transfer-Encoding: quoted-printable");
-       serv_puts("");
-       txtmail = html_to_ascii(bstr("msgtext"), 0, 80, 0);
-        text_to_server_qp(txtmail);     /* Transmit message in quoted-printable encoding */
-        free(txtmail);
+               serv_puts("Content-type: text/plain; charset=utf-8");
+               serv_puts("Content-Transfer-Encoding: quoted-printable");
+               serv_puts("");
+               txtmail = html_to_ascii(bstr("msgtext"), 0, 80, 0);
+               text_to_server_qp(txtmail);     /* Transmit message in quoted-printable encoding */
+               free(txtmail);
 
-       serv_printf("--%s", alt_boundary);
+               serv_printf("--%s", alt_boundary);
+       }
 
        serv_puts("Content-type: text/html; charset=utf-8");
        serv_puts("Content-Transfer-Encoding: quoted-printable");
@@ -1460,7 +936,9 @@ void post_mime_to_server(void) {
        text_to_server_qp(bstr("msgtext"));     /* Transmit message in quoted-printable encoding */
        serv_puts("</body></html>\r\n");
 
-       serv_printf("--%s--", alt_boundary);
+       if (include_text_alt) {
+               serv_printf("--%s--", alt_boundary);
+       }
        
        if (is_multipart) {
                long len;
@@ -1469,17 +947,19 @@ void post_mime_to_server(void) {
                HashPos  *it;
 
                /* Add in the attachments */
-               it = GetNewHashPos();
+               it = GetNewHashPos(WCC->attachments, 0);
                while (GetNextHashPos(WCC->attachments, it, &len, &Key, &vAtt)) {
-                       att = (wc_attachment*)vAtt;
+                       att = (wc_mime_attachment *)vAtt;
+                       if (att->length == 0)
+                               continue;
                        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", ChrPtr(att->content_type));
-                       serv_printf("Content-disposition: attachment; filename=\"%s\"", ChrPtr(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);
@@ -1511,13 +991,14 @@ void post_message(void)
        char buf[1024];
        StrBuf *encoded_subject = NULL;
        static long dont_post = (-1L);
-       wc_attachment *att;
+       wc_mime_attachment  *att;
        int is_anonymous = 0;
        const StrBuf *display_name = NULL;
-       struct wcsession *WCC = WC;
+       wcsession *WCC = WC;
+       StrBuf *Buf;
        
        if (havebstr("force_room")) {
-               gotoroom(bstr("force_room"));
+               gotoroom(sbstr("force_room"));
        }
 
        if (havebstr("display_name")) {
@@ -1533,42 +1014,43 @@ void post_message(void)
                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(wc_attachment));
-               memset(att, 0, sizeof(wc_attachment));
+               /* There's an attachment.  Save it to this struct... */
+               lprintf(9, "Client is uploading %d bytes\n", WCC->upload_length);
+               att = malloc(sizeof(wc_mime_attachment));
+               memset(att, 0, sizeof(wc_mime_attachment ));
                att->length = WCC->upload_length;
-               att->content_type = NewStrBufPlain(WCC->upload_content_type, -1);
-               att->filename = NewStrBufPlain(WCC->upload_filename, -1);
+               att->ContentType = NewStrBufPlain(WCC->upload_content_type, -1);
+               att->FileName = NewStrBufPlain(WCC->upload_filename, -1);
                
-               
-               if (WCC->attachments == NULL)
+               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, free_attachment);
+               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.
                 */
-               pch = strrchr(ChrPtr(att->filename), '/');
+               pch = strrchr(ChrPtr(att->FileName), '/');
                if (pch != NULL) {
-                       StrBufCutLeft(att->filename, pch - ChrPtr(att->filename));
+                       StrBufCutLeft(att->FileName, pch - ChrPtr(att->FileName) + 1);
                }
-               pch = strrchr(ChrPtr(att->filename), '\\');
+               pch = strrchr(ChrPtr(att->FileName), '\\');
                if (pch != NULL) {
-                       StrBufCutLeft(att->filename, pch - ChrPtr(att->filename));
+                       StrBufCutLeft(att->FileName, pch - ChrPtr(att->FileName) + 1);
                }
 
-               /**
+               /*
                 * Transfer control of this memory from the upload struct
                 * to the attachment struct.
                 */
-               att->data = WCC->upload;
-               WCC->upload_length = 0;
+               att->Data = WCC->upload;
                WCC->upload = NULL;
+               WCC->upload_length = 0;
                display_enter();
                return;
        }
@@ -1590,16 +1072,37 @@ void post_message(void)
                const StrBuf *Bcc = NULL;
                const StrBuf *Wikipage = NULL;
                const StrBuf *my_email_addr = NULL;
-               StrBuf *CmdBuf = NULL;;
+               StrBuf *CmdBuf = NULL;
                StrBuf *references = NULL;
+               int save_to_drafts;
+
+               save_to_drafts = havebstr("save_button");
+               Buf = NewStrBuf();
+
+               if (save_to_drafts) {
+                       /* temporarily change to the drafts room */
+                       serv_puts("GOTO _DRAFTS_");
+                       StrBuf_ServGetln(Buf);
+                       if (GetServerStatus(Buf, NULL) != 2) {
+                               /* You probably don't even have a dumb Drafts folder */
+                               StrBufCutLeft(Buf, 4);
+                               lprintf(9, "%s:%d: server save to drafts error: %s\n", __FILE__, __LINE__, ChrPtr(Buf));
+                               StrBufAppendBufPlain(WCC->ImportantMsg, _("Saved to Drafts failed: "), -1, 0);
+                               StrBufAppendBuf(WCC->ImportantMsg, Buf, 0);
+                               display_enter();
+                               FreeStrBuf(&Buf);
+                               return;
+                       }
+               }
 
                if (havebstr("references"))
                {
                        const StrBuf *ref = sbstr("references");
-                       references = NewStrBufPlain(ChrPtr(ref), StrLength(ref));
-                       lprintf(9, "Converting: %s\n", ChrPtr(references));
+                       references = NewStrBufDup(ref);
+                       if (*ChrPtr(references) == '|') {       /* remove leading '|' if present */
+                               StrBufCutLeft(references, 1);
+                       }
                        StrBufReplaceChars(references, '|', '!');
-                       lprintf(9, "Converted: %s\n", ChrPtr(references));
                }
                if (havebstr("subject")) {
                        const StrBuf *Subj;
@@ -1614,7 +1117,7 @@ void post_message(void)
                Recp = sbstr("recp");
                Cc = sbstr("cc");
                Bcc = sbstr("bcc");
-               Wikipage = sbstr("wikipage");
+               Wikipage = sbstr("page");
                my_email_addr = sbstr("my_email_addr");
                
                CmdBuf = NewStrBufPlain(NULL, 
@@ -1629,89 +1132,111 @@ void post_message(void)
 
                StrBufPrintf(CmdBuf, 
                             CMD,
-                            ChrPtr(Recp),
+                            save_to_drafts?"":ChrPtr(Recp),
                             is_anonymous,
                             ChrPtr(encoded_subject),
                             ChrPtr(display_name),
-                            ChrPtr(Cc),
-                            ChrPtr(Bcc),
+                            save_to_drafts?"":ChrPtr(Cc),
+                            save_to_drafts?"":ChrPtr(Bcc),
                             ChrPtr(Wikipage),
                             ChrPtr(my_email_addr),
                             ChrPtr(references));
                FreeStrBuf(&references);
+               FreeStrBuf(&encoded_subject);
 
-               lprintf(9, "%s\n", CmdBuf);
+               lprintf(9, "%s\n", ChrPtr(CmdBuf));
                serv_puts(ChrPtr(CmdBuf));
-               serv_getln(buf, sizeof buf);
                FreeStrBuf(&CmdBuf);
-               FreeStrBuf(&encoded_subject);
-               if (buf[0] == '4') {
+
+               StrBuf_ServGetln(Buf);
+               if (GetServerStatus(Buf, NULL) == 4) {
+                       if (save_to_drafts) {
+                               if (  (havebstr("recp"))
+                                   || (havebstr("cc"  ))
+                                   || (havebstr("bcc" )) ) {
+                                       /* save recipient headers or room to post to */
+                                       serv_printf("To: %s", ChrPtr(Recp));
+                                       serv_printf("Cc: %s", ChrPtr(Cc));
+                                       serv_printf("Bcc: %s", ChrPtr(Bcc));
+                               } else {
+                                       serv_printf("X-Citadel-Room: %s", ChrPtr(WC->CurRoom.name));
+                               }
+                       }
                        post_mime_to_server();
-                       if (  (havebstr("recp"))
+                       if (save_to_drafts) {
+                               StrBufAppendBufPlain(WCC->ImportantMsg, _("Message has been saved to Drafts.\n"), -1, 0);
+                               gotoroom(WCC->CurRoom.name);
+                               display_enter();
+                               FreeStrBuf(&Buf);
+                               return;
+                       } else if (  (havebstr("recp"))
                           || (havebstr("cc"  ))
                           || (havebstr("bcc" ))
                        ) {
-                               sprintf(WCC->ImportantMessage, _("Message has been sent.\n"));
+                               StrBufAppendBufPlain(WCC->ImportantMsg, _("Message has been sent.\n"), -1, 0);
                        }
                        else {
-                               sprintf(WC->ImportantMessage, _("Message has been posted.\n"));
+                               StrBufAppendBufPlain(WCC->ImportantMsg, _("Message has been posted.\n"), -1, 0);
                        }
                        dont_post = lbstr("postseq");
                } else {
-                       lprintf(9, "%s:%d: server post error: %s\n", __FILE__, __LINE__, buf);
-                       sprintf(WC->ImportantMessage, "%s", &buf[4]);
+                       StrBufCutLeft(Buf, 4);
+
+                       lprintf(9, "%s:%d: server post error: %s\n", __FILE__, __LINE__, ChrPtr(Buf));
+                       StrBufAppendBuf(WCC->ImportantMsg, Buf, 0);
+                       if (save_to_drafts) gotoroom(WCC->CurRoom.name);
                        display_enter();
+                       FreeStrBuf(&Buf);
                        return;
                }
+               FreeStrBuf(&Buf);
        }
 
        DeleteHash(&WCC->attachments);
 
-       /**
+       /*
         *  We may have been supplied with instructions regarding the location
         *  to which we must return after posting.  If found, go there.
         */
        if (havebstr("return_to")) {
                http_redirect(bstr("return_to"));
        }
-       /**
+       /*
         *  If we were editing a page in a wiki room, go to that page now.
         */
-       else if (havebstr("wikipage")) {
-               snprintf(buf, sizeof buf, "wiki?page=%s", bstr("wikipage"));
+       else if (havebstr("page")) {
+               snprintf(buf, sizeof buf, "wiki?page=%s", bstr("page"));
                http_redirect(buf);
        }
-       /**
+       /*
         *  Otherwise, just go to the "read messages" loop.
         */
        else {
-               readloop("readnew");
+               readloop(readnew, eUseDefault);
        }
 }
 
 
 
 
-/**
- * \brief display the message entry screen
+/*
+ * display the message entry screen
  */
 void display_enter(void)
 {
        char buf[SIZ];
        long now;
        const StrBuf *display_name = NULL;
-       /////wc_attachment *att;
        int recipient_required = 0;
        int subject_required = 0;
        int recipient_bad = 0;
        int is_anonymous = 0;
-
-       struct wcsession *WCC = WC;
+       wcsession *WCC = WC;
 
        now = time(NULL);
 
        if (havebstr("force_room")) {
-               gotoroom(bstr("force_room"));
+               gotoroom(sbstr("force_room"));
        }
 
        display_name = sbstr("display_name");
@@ -1720,16 +1245,16 @@ void display_enter(void)
                is_anonymous = 1;
        }
 
-       /** First test to see whether this is a room that requires recipients to be entered */
+       /* First test to see whether this is a room that requires recipients to be entered */
        serv_puts("ENT0 0");
        serv_getln(buf, sizeof buf);
 
-       if (!strncmp(buf, "570", 3)) {          /** 570 means that we need a recipient here */
+       if (!strncmp(buf, "570", 3)) {          /* 570 means that we need a recipient here */
                recipient_required = 1;
        }
-       else if (buf[0] != '2') {               /** Any other error means that we cannot continue */
+       else if (buf[0] != '2') {               /* Any other error means that we cannot continue */
                sprintf(WCC->ImportantMessage, "%s", &buf[4]);
-               readloop("readnew");
+               readloop(readnew, eUseDefault);
                return;
        }
 
@@ -1738,12 +1263,12 @@ void display_enter(void)
                subject_required = extract_int(&buf[4], 1);
        }
 
-       /**
+       /*
         * Are we perhaps in an address book view?  If so, then an "enter
         * message" command really means "add new entry."
         */
-       if (WCC->wc_default_view == VIEW_ADDRESSBOOK) {
-               do_edit_vcard(-1, "", "", WCC->wc_roomname);
+       if (WCC->CurRoom.defview == VIEW_ADDRESSBOOK) {
+               do_edit_vcard(-1, "", NULL, NULL, "",  ChrPtr(WCC->CurRoom.name));
                return;
        }
 
@@ -1751,7 +1276,7 @@ void display_enter(void)
         * Are we perhaps in a calendar room?  If so, then an "enter
         * message" command really means "add new calendar item."
         */
-       if (WCC->wc_default_view == VIEW_CALENDAR) {
+       if (WCC->CurRoom.defview == VIEW_CALENDAR) {
                display_edit_event();
                return;
        }
@@ -1760,7 +1285,7 @@ void display_enter(void)
         * Are we perhaps in a tasks view?  If so, then an "enter
         * message" command really means "add new task."
         */
-       if (WCC->wc_default_view == VIEW_TASKS) {
+       if (WCC->CurRoom.defview == VIEW_TASKS) {
                display_edit_task();
                return;
        }
@@ -1775,13 +1300,13 @@ void display_enter(void)
                const StrBuf *Cc = NULL;
                const StrBuf *Bcc = NULL;
                const StrBuf *Wikipage = NULL;
-               StrBuf *CmdBuf = NULL;;
+               StrBuf *CmdBuf = NULL;
                const char CMD[] = "ENT0 0|%s|%d|0||%s||%s|%s|%s";
                
                Recp = sbstr("recp");
                Cc = sbstr("cc");
                Bcc = sbstr("bcc");
-               Wikipage = sbstr("wikipage");
+               Wikipage = sbstr("page");
                
                CmdBuf = NewStrBufPlain(NULL, 
                                        sizeof (CMD) + 
@@ -1803,15 +1328,15 @@ void display_enter(void)
                serv_getln(buf, sizeof buf);
                FreeStrBuf(&CmdBuf);
 
-               if (!strncmp(buf, "570", 3)) {  /** 570 means we have an invalid recipient listed */
+               if (!strncmp(buf, "570", 3)) {  /* 570 means we have an invalid recipient listed */
                        if (havebstr("recp") && 
                            havebstr("cc"  ) && 
                            havebstr("bcc" )) {
                                recipient_bad = 1;
                        }
                }
-               else if (buf[0] != '2') {       /** Any other error means that we cannot continue */
-                       wprintf("<em>%s</em><br />\n", &buf[4]);/// -> important message
+               else if (buf[0] != '2') {       /* Any other error means that we cannot continue */
+                       wc_printf("<em>%s</em><br />\n", &buf[4]);      /* TODO -> important message */
                        return;
                }
        }
@@ -1820,14 +1345,14 @@ void display_enter(void)
 
        begin_burst();
        output_headers(1, 0, 0, 0, 1, 0);
-       DoTemplate(HKEY("edit_message"), NULL, NULL, CTX_NONE);
+       DoTemplate(HKEY("edit_message"), NULL, &NoCtx);
        end_burst();
 
        return;
 }
 
-/**
- * \brief delete a message
+/*
+ * delete a message
  */
 void delete_msg(void)
 {
@@ -1836,22 +1361,21 @@ void delete_msg(void)
 
        msgid = lbstr("msgid");
 
-       if (WC->wc_is_trash) {  /** Delete from Trash is a real delete */
+       if ((WC->CurRoom.RAFlags & UA_ISTRASH) != 0) {  /* Delete from Trash is a real delete */
                serv_printf("DELE %ld", msgid); 
        }
-       else {                  /** Otherwise move it to Trash */
+       else {                  /* Otherwise move it to Trash */
                serv_printf("MOVE %ld|_TRASH_|0", msgid);
        }
 
        serv_getln(buf, sizeof buf);
        sprintf(WC->ImportantMessage, "%s", &buf[4]);
-
-       readloop("readnew");
+       readloop(readnew, eUseDefault);
 }
 
 
-/**
- * \brief move a message to another folder
+/*
+ * move a message to another room
  */
 void move_msg(void)
 {
@@ -1869,13 +1393,10 @@ void move_msg(void)
                sprintf(WC->ImportantMessage, (_("The message was not moved.")));
        }
 
-       readloop("readnew");
+       readloop(readnew, eUseDefault);
 }
 
 
-
-
-
 /*
  * Confirm move of a message
  */
@@ -1889,76 +1410,343 @@ void confirm_move_msg(void)
 
 
        output_headers(1, 1, 2, 0, 0, 0);
-       wprintf("<div id=\"banner\">\n");
-       wprintf("<h1>");
-       wprintf(_("Confirm move of message"));
-       wprintf("</h1>");
-       wprintf("</div>\n");
+       wc_printf("<div id=\"banner\">\n");
+       wc_printf("<h1>");
+       wc_printf(_("Confirm move of message"));
+       wc_printf("</h1>");
+       wc_printf("</div>\n");
 
-       wprintf("<div id=\"content\" class=\"service\">\n");
+       wc_printf("<div id=\"content\" class=\"service\">\n");
 
-       wprintf("<CENTER>");
+       wc_printf("<CENTER>");
 
-       wprintf(_("Move this message to:"));
-       wprintf("<br />\n");
+       wc_printf(_("Move this message to:"));
+       wc_printf("<br />\n");
 
-       wprintf("<form METHOD=\"POST\" action=\"move_msg\">\n");
-       wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
-       wprintf("<INPUT TYPE=\"hidden\" NAME=\"msgid\" VALUE=\"%s\">\n", bstr("msgid"));
+       wc_printf("<form METHOD=\"POST\" action=\"move_msg\">\n");
+       wc_printf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
+       wc_printf("<INPUT TYPE=\"hidden\" NAME=\"msgid\" VALUE=\"%s\">\n", bstr("msgid"));
 
-       wprintf("<SELECT NAME=\"target_room\" SIZE=5>\n");
+       wc_printf("<SELECT NAME=\"target_room\" SIZE=5>\n");
        serv_puts("LKRA");
        serv_getln(buf, sizeof buf);
        if (buf[0] == '1') {
                while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
                        extract_token(targ, buf, 0, '|', sizeof targ);
-                       wprintf("<OPTION>");
+                       wc_printf("<OPTION>");
                        escputs(targ);
-                       wprintf("\n");
+                       wc_printf("\n");
                }
        }
-       wprintf("</SELECT>\n");
-       wprintf("<br />\n");
+       wc_printf("</SELECT>\n");
+       wc_printf("<br />\n");
 
-       wprintf("<INPUT TYPE=\"submit\" NAME=\"move_button\" VALUE=\"%s\">", _("Move"));
-       wprintf("&nbsp;");
-       wprintf("<INPUT TYPE=\"submit\" NAME=\"cancel_button\" VALUE=\"%s\">", _("Cancel"));
-       wprintf("</form></CENTER>\n");
+       wc_printf("<INPUT TYPE=\"submit\" NAME=\"move_button\" VALUE=\"%s\">", _("Move"));
+       wc_printf("&nbsp;");
+       wc_printf("<INPUT TYPE=\"submit\" NAME=\"cancel_button\" VALUE=\"%s\">", _("Cancel"));
+       wc_printf("</form></CENTER>\n");
 
-       wprintf("</CENTER>\n");
+       wc_printf("</CENTER>\n");
        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);
+               }
+               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");
+               begin_burst();
+               wc_printf(_("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(int force_download)
+{
+       long msgnum;
+       StrBuf *att;
+       wcsession *WCC = WC;
+       StrBuf *Buf;
+       off_t bytes;
+       StrBuf *ContentType = NewStrBufPlain(HKEY("application/octet-stream"));
+       const char *CT;
+
+       att = Buf = NewStrBuf();
+       msgnum = StrBufExtract_long(WCC->Hdr->HR.ReqLine, 0, '/');
+       StrBufExtract_token(att, WCC->Hdr->HR.ReqLine, 1, '/');
+
+       serv_printf("OPNA %ld|%s", msgnum, ChrPtr(att));
+       StrBuf_ServGetln(Buf);
+       if (GetServerStatus(Buf, NULL) == 2) {
+               StrBufCutLeft(Buf, 4);
+               bytes = StrBufExtract_long(Buf, 0, '|');
+               if (!force_download) {
+                       StrBufExtract_token(ContentType, Buf, 3, '|');
+               }
+
+               read_server_binary(WCC->WBuf, bytes, Buf);
+               serv_puts("CLOS");
+               StrBuf_ServGetln(Buf);
+               CT = ChrPtr(ContentType);
+
+               if (!force_download) {
+                       if (!strcasecmp(ChrPtr(ContentType), "application/octet-stream")) {
+                               StrBufExtract_token(Buf, WCC->Hdr->HR.ReqLine, 2, '/');
+                               CT = GuessMimeByFilename(SKEY(Buf));
+                       }
+                       if (!strcasecmp(ChrPtr(ContentType), "application/octet-stream")) {
+                               CT = GuessMimeType(SKEY(WCC->WBuf));
+                       }
+               }
+               http_transmit_thing(CT, 0);
+       } else {
+               StrBufCutLeft(Buf, 4);
+               hprintf("HTTP/1.1 404 %s\n", ChrPtr(Buf));
+               output_headers(0, 0, 0, 0, 0, 0);
+               hprintf("Content-Type: text/plain\r\n");
+               begin_burst();
+               wc_printf(_("An error occurred while retrieving this part: %s\n"), 
+                       ChrPtr(Buf));
+               end_burst();
+       }
+       FreeStrBuf(&ContentType);
+       FreeStrBuf(&Buf);
+}
+
+
+/*
+ * Read any MIME part of a message, from the server, into memory.
+ */
+StrBuf *load_mimepart(long msgnum, char *partnum)
+{
+       off_t bytes;
+       StrBuf *Buf;
+       
+       Buf = NewStrBuf();
+       serv_printf("DLAT %ld|%s", msgnum, partnum);
+       StrBuf_ServGetln(Buf);
+       if (GetServerStatus(Buf, NULL) == 6) {
+               StrBufCutLeft(Buf, 4);
+               bytes = StrBufExtract_long(Buf, 0, '|');
+               FreeStrBuf(&Buf);
+               Buf = NewStrBuf();
+               StrBuf_ServGetBLOBBuffered(Buf, bytes);
+               return(Buf);
+       }
+       else {
+               FreeStrBuf(&Buf);
+               return(NULL);
+       }
+}
+
+/*
+ * Read any MIME part of a message, from the server, into memory.
+ */
+void MimeLoadData(wc_mime_attachment *Mime)
+{
+       StrBuf *Buf;
+       off_t bytes;
+       /* TODO: is there a chance the content type is different from the one we know? */
+       serv_printf("DLAT %ld|%s", Mime->msgnum, ChrPtr(Mime->PartNum));
+       Buf = NewStrBuf();
+       StrBuf_ServGetln(Buf);
+       if (GetServerStatus(Buf, NULL) == 6) {
+               bytes = extract_long(&(ChrPtr(Buf)[4]), 0);
+                                    
+               if (Mime->Data == NULL)
+                       Mime->Data = NewStrBufPlain(NULL, bytes);
+               StrBuf_ServGetBLOBBuffered(Mime->Data, bytes);
+       }
+       else {
+               FlushStrBuf(Mime->Data);
+               /* TODO XImportant message */
+       }
+       FreeStrBuf(&Buf);
+}
+
+
+
+
+void view_mimepart(void) {
+       mimepart(0);
+}
+
+void download_mimepart(void) {
+       mimepart(1);
+}
+
+void view_postpart(void) {
+       StrBuf *filename = NewStrBuf();
+       StrBuf *partnum = NewStrBuf();
+
+       StrBufExtract_token(partnum, WC->Hdr->HR.ReqLine, 0, '/');
+       StrBufExtract_token(filename, WC->Hdr->HR.ReqLine, 1, '/');
+
+       postpart(partnum, filename, 0);
+
+       FreeStrBuf(&filename);
+       FreeStrBuf(&partnum);
+}
+
+void download_postpart(void) {
+       StrBuf *filename = NewStrBuf();
+       StrBuf *partnum = NewStrBuf();
+
+       StrBufExtract_token(partnum, WC->Hdr->HR.ReqLine, 0, '/');
+       StrBufExtract_token(filename, WC->Hdr->HR.ReqLine, 1, '/');
+
+       postpart(partnum, filename, 1);
+
+       FreeStrBuf(&filename);
+       FreeStrBuf(&partnum);
+}
+
+void h_readnew(void) { readloop(readnew, eUseDefault);}
+void h_readold(void) { readloop(readold, eUseDefault);}
+void h_readfwd(void) { readloop(readfwd, eUseDefault);}
+void h_headers(void) { readloop(headers, eUseDefault);}
+void h_do_search(void) { readloop(do_search, eUseDefault);}
+void h_readgt(void) { readloop(readgt, eUseDefault);}
+void h_readlt(void) { readloop(readlt, eUseDefault);}
+
+void jsonMessageListHdr(void) 
+{
+       /* TODO: make a generic function */
+       hprintf("HTTP/1.1 200 OK\r\n");
+       hprintf("Content-type: application/json; charset=utf-8\r\n");
+       hprintf("Server: %s / %s\r\n", PACKAGE_STRING, ChrPtr(WC->serv_info->serv_software));
+       hprintf("Connection: close\r\n");
+       hprintf("Pragma: no-cache\r\nCache-Control: no-store\r\nExpires:-1\r\n");
+       begin_burst();
+}
+
+
+/* Output message list in JSON format */
+void jsonMessageList(void) {
+       const StrBuf *room = sbstr("room");
+       long oper = (havebstr("query")) ? do_search : readnew;
+       WC->is_ajax = 1; 
+       gotoroom(room);
+       readloop(oper, eUseDefault);
+       WC->is_ajax = 0;
+}
 
+void RegisterReadLoopHandlerset(
+       int RoomType,
+       GetParamsGetServerCall_func GetParamsGetServerCall,
+       PrintViewHeader_func PrintViewHeader,
+       load_msg_ptrs_detailheaders LH,
+       LoadMsgFromServer_func LoadMsgFromServer,
+       RenderView_or_Tail_func RenderView_or_Tail,
+       View_Cleanup_func ViewCleanup
+       )
+{
+       RoomRenderer *Handler;
 
+       Handler = (RoomRenderer*) malloc(sizeof(RoomRenderer));
 
+       Handler->RoomType = RoomType;
+       Handler->GetParamsGetServerCall = GetParamsGetServerCall;
+       Handler->PrintViewHeader = PrintViewHeader;
+       Handler->LoadMsgFromServer = LoadMsgFromServer;
+       Handler->RenderView_or_Tail = RenderView_or_Tail;
+       Handler->ViewCleanup = ViewCleanup;
+       Handler->LHParse = LH;
 
+       Put(ReadLoopHandler, IKEY(RoomType), Handler, NULL);
+}
 
 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("display_enter"), display_enter, 0);
-       WebcitAddUrlHandler(HKEY("post"), post_message, 0);
-       WebcitAddUrlHandler(HKEY("move_msg"), move_msg, 0);
-       WebcitAddUrlHandler(HKEY("delete_msg"), delete_msg, 0);
-       WebcitAddUrlHandler(HKEY("confirm_move_msg"), confirm_move_msg, 0);
-       WebcitAddUrlHandler(HKEY("msg"), embed_message, NEED_URL|AJAX);
-       WebcitAddUrlHandler(HKEY("printmsg"), print_message, NEED_URL);
-       WebcitAddUrlHandler(HKEY("mobilemsg"), mobile_message_view, NEED_URL);
-       WebcitAddUrlHandler(HKEY("msgheaders"), display_headers, NEED_URL);
-
-
+       RegisterPreference("use_sig",
+                          _("Attach signature to email messages?"), 
+                          PRF_YESNO, 
+                          NULL);
+       RegisterPreference("signature", _("Use this signature:"), PRF_QP_STRING, NULL);
+       RegisterPreference("default_header_charset", 
+                          _("Default character set for email headers:"), 
+                          PRF_STRING, 
+                          NULL);
+       RegisterPreference("defaultfrom", _("Preferred email address"), PRF_STRING, NULL);
+       RegisterPreference("defaultname", 
+                          _("Preferred display name for email messages"), 
+                          PRF_STRING, 
+                          NULL);
+       RegisterPreference("defaulthandle", 
+                          _("Preferred display name for bulletin board posts"), 
+                          PRF_STRING, 
+                          NULL);
+       RegisterPreference("mailbox",_("Mailbox view mode"), PRF_STRING, NULL);
+
+       WebcitAddUrlHandler(HKEY("readnew"), "", 0, h_readnew, NEED_URL);
+       WebcitAddUrlHandler(HKEY("readold"), "", 0, h_readold, NEED_URL);
+       WebcitAddUrlHandler(HKEY("readfwd"), "", 0, h_readfwd, NEED_URL);
+       WebcitAddUrlHandler(HKEY("headers"), "", 0, h_headers, NEED_URL);
+       WebcitAddUrlHandler(HKEY("readgt"), "", 0, h_readgt, NEED_URL);
+       WebcitAddUrlHandler(HKEY("readlt"), "", 0, h_readlt, NEED_URL);
+       WebcitAddUrlHandler(HKEY("do_search"), "", 0, h_do_search, 0);
+       WebcitAddUrlHandler(HKEY("display_enter"), "", 0, display_enter, 0);
+       WebcitAddUrlHandler(HKEY("post"), "", 0, post_message, 0);
+       WebcitAddUrlHandler(HKEY("move_msg"), "", 0, move_msg, 0);
+       WebcitAddUrlHandler(HKEY("delete_msg"), "", 0, delete_msg, 0);
+       WebcitAddUrlHandler(HKEY("confirm_move_msg"), "", 0, confirm_move_msg, 0);
+       WebcitAddUrlHandler(HKEY("msg"), "", 0, embed_message, NEED_URL);
+       WebcitAddUrlHandler(HKEY("message"), "", 0, handle_one_message, NEED_URL|XHTTP_COMMANDS|COOKIEUNNEEDED|FORCE_SESSIONCLOSE);
+       WebcitAddUrlHandler(HKEY("printmsg"), "", 0, print_message, NEED_URL);
+       WebcitAddUrlHandler(HKEY("mobilemsg"), "", 0, mobile_message_view, NEED_URL);
+       WebcitAddUrlHandler(HKEY("msgheaders"), "", 0, display_headers, NEED_URL);
+
+       WebcitAddUrlHandler(HKEY("mimepart"), "", 0, view_mimepart, NEED_URL);
+       WebcitAddUrlHandler(HKEY("mimepart_download"), "", 0, download_mimepart, NEED_URL);
+       WebcitAddUrlHandler(HKEY("postpart"), "", 0, view_postpart, NEED_URL);
+       WebcitAddUrlHandler(HKEY("postpart_download"), "", 0, download_postpart, NEED_URL);
+
+       /* json */
+       WebcitAddUrlHandler(HKEY("roommsgs"), "", 0, jsonMessageList,0);
        return ;
 }
+
+void
+SessionDetachModule_MSG
+(wcsession *sess)
+{
+       DeleteHash(&sess->summ);
+}