Began fixing http://uncensored.citadel.org/wiki?page=stefan2012mar07?go=exterminate
[citadel.git] / webcit / messages.c
index 2200841f3953a01011ce4b6ff81560a834ee70c5..f990c8700b09d1e358e502181194cccc5ec5c045 100644 (file)
 /*
- * $Id$
- *
  * Functions which deal with the fetching and displaying of messages.
  *
+ * Copyright (c) 1996-2012 by the citadel.org team
+ *
+ * This program is open source software.  You can redistribute it and/or
+ * modify it under the terms of the GNU General Public License, version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  */
 
 #include "webcit.h"
 #include "webserver.h"
-#include "groupdav.h"
-
-#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 display_enter(void);
-
-/*
- * Address book entry (keep it short and sweet, it's just a quickie lookup
- * which we can use to get to the real meat and bones later)
- */
-struct addrbookent {
-       char ab_name[64]; /**< name string */
-       long ab_msgnum;   /**< message number of address book entry */
-};
-
-
-
-#ifdef HAVE_ICONV
-
-/*
- * Wrapper around iconv_open()
- * Our version adds aliases for non-standard Microsoft charsets
- * such as 'MS950', aliasing them to names like 'CP950'
- *
- * tocode      Target encoding
- * fromcode    Source encoding
- */
-iconv_t ctdl_iconv_open(const char *tocode, const char *fromcode)
-{
-       iconv_t ic = (iconv_t)(-1) ;
-       ic = iconv_open(tocode, fromcode);
-       if (ic == (iconv_t)(-1) ) {
-               char alias_fromcode[64];
-               if ( (strlen(fromcode) == 5) && (!strncasecmp(fromcode, "MS", 2)) ) {
-                       safestrncpy(alias_fromcode, fromcode, sizeof alias_fromcode);
-                       alias_fromcode[0] = 'C';
-                       alias_fromcode[1] = 'P';
-                       ic = iconv_open(tocode, alias_fromcode);
-               }
-       }
-       return(ic);
-}
-
-
-
-inline char *FindNextEnd (char *bptr)
-{
-       char * end;
-       /* Find the next ?Q? */
-       end = strchr(bptr + 2, '?');
-       if (end == NULL) return NULL;
-       if (((*(end + 1) == 'B') || (*(end + 1) == 'Q')) && 
-           (*(end + 2) == '?')) {
-               /* skip on to the end of the cluster, the next ?= */
-               end = strstr(end + 3, "?=");
-       }
-       else
-               /* sort of half valid encoding, try to find an end. */
-               end = strstr(bptr, "?=");
-       return end;
-}
-
-/*
- * Handle subjects with RFC2047 encoding such as:
- * =?koi8-r?B?78bP0s3Mxc7JxSDXz9rE1dvO2c3JINvB0sHNySDP?=
- */
-void utf8ify_rfc822_string(char *buf) {
-       char *start, *end, *next, *nextend, *ptr;
-       char newbuf[1024];
-       char charset[128];
-       char encoding[16];
-       char istr[1024];
-       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 *isav;                     /**< Saved pointer to input buffer */
-       char *osav;                     /**< Saved pointer to output buffer */
-       int passes = 0;
-       int i, len, delta;
-       int illegal_non_rfc2047_encoding = 0;
-
-       /* Sometimes, badly formed messages contain strings which were simply
-        *  written out directly in some foreign character set instead of
-        *  using RFC2047 encoding.  This is illegal but we will attempt to
-        *  handle it anyway by converting from a user-specified default
-        *  charset to UTF-8 if we see any nonprintable characters.
-        */
-       len = strlen(buf);
-       for (i=0; i<len; ++i) {
-               if ((buf[i] < 32) || (buf[i] > 126)) {
-                       illegal_non_rfc2047_encoding = 1;
-                       i = len; ///< take a shortcut, it won't be more than one.
-               }
-       }
-       if (illegal_non_rfc2047_encoding) {
-               StrBuf *default_header_charset;
-               get_preference("default_header_charset", &default_header_charset);
-               if ( (strcasecmp(ChrPtr(default_header_charset), "UTF-8")) && 
-                    (strcasecmp(ChrPtr(default_header_charset), "us-ascii")) ) {
-                       ic = ctdl_iconv_open("UTF-8", ChrPtr(default_header_charset));
-                       if (ic != (iconv_t)(-1) ) {
-                               ibuf = malloc(1024);
-                               isav = ibuf;
-                               safestrncpy(ibuf, buf, 1024);
-                               ibuflen = strlen(ibuf);
-                               obuflen = 1024;
-                               obuf = (char *) malloc(obuflen);
-                               osav = obuf;
-                               iconv(ic, &ibuf, &ibuflen, &obuf, &obuflen);
-                               osav[1024-obuflen] = 0;
-                               strcpy(buf, osav);
-                               free(osav);
-                               iconv_close(ic);
-                               free(isav);
-                       }
-               }
-       }
-
-       /* pre evaluate the first pair */
-       nextend = end = NULL;
-       len = strlen(buf);
-       start = strstr(buf, "=?");
-       if (start != NULL) 
-               end = FindNextEnd (start);
-
-       while ((start != NULL) && (end != NULL))
-       {
-               next = strstr(end, "=?");
-               if (next != NULL)
-                       nextend = FindNextEnd(next);
-               if (nextend == NULL)
-                       next = NULL;
-
-               /* did we find two partitions */
-               if ((next != NULL) && 
-                   ((next - end) > 2))
-               {
-                       ptr = end + 2;
-                       while ((ptr < next) && 
-                              (isspace(*ptr) ||
-                               (*ptr == '\r') ||
-                               (*ptr == '\n') || 
-                               (*ptr == '\t')))
-                               ptr ++;
-                       /* did we find a gab just filled with blanks? */
-                       if (ptr == next)
-                       {
-                               memmove (end + 2,
-                                        next,
-                                        len - (next - start));
-
-                               /* now terminate the gab at the end */
-                               delta = (next - end) - 2;
-                               len -= delta;
-                               buf[len] = '\0';
-
-                               /* move next to its new location. */
-                               next -= delta;
-                               nextend -= delta;
-                       }
-               }
-               /* our next-pair is our new first pair now. */
-               start = next;
-               end = nextend;
-       }
-
-       /* Now we handle foreign character sets properly encoded
-        * in RFC2047 format.
-        */
-       while (start=strstr(buf, "=?"), end=FindNextEnd((start != NULL)? start : buf),
-               ((start != NULL) && (end != NULL) && (end > start)) )
-       {
-               extract_token(charset, start, 1, '?', sizeof charset);
-               extract_token(encoding, start, 2, '?', sizeof encoding);
-               extract_token(istr, start, 3, '?', sizeof istr);
-
-               ibuf = malloc(1024);
-               isav = ibuf;
-               if (!strcasecmp(encoding, "B")) {       /**< base64 */
-                       ibuflen = CtdlDecodeBase64(ibuf, istr, strlen(istr));
-               }
-               else if (!strcasecmp(encoding, "Q")) {  /**< quoted-printable */
-                       size_t len;
-                       long pos;
-                       
-                       len = strlen(istr);
-                       pos = 0;
-                       while (pos < len)
-                       {
-                               if (istr[pos] == '_') istr[pos] = ' ';
-                               pos++;
-                       }
-
-                       ibuflen = CtdlDecodeQuotedPrintable(ibuf, istr, len);
-               }
-               else {
-                       strcpy(ibuf, istr);             /**< unknown encoding */
-                       ibuflen = strlen(istr);
-               }
-
-               ic = ctdl_iconv_open("UTF-8", charset);
-               if (ic != (iconv_t)(-1) ) {
-                       obuflen = 1024;
-                       obuf = (char *) malloc(obuflen);
-                       osav = obuf;
-                       iconv(ic, &ibuf, &ibuflen, &obuf, &obuflen);
-                       osav[1024-obuflen] = 0;
-
-                       end = start;
-                       end++;
-                       strcpy(start, "");
-                       remove_token(end, 0, '?');
-                       remove_token(end, 0, '?');
-                       remove_token(end, 0, '?');
-                       remove_token(end, 0, '?');
-                       strcpy(end, &end[1]);
-
-                       snprintf(newbuf, sizeof newbuf, "%s%s%s", buf, osav, end);
-                       strcpy(buf, newbuf);
-                       free(osav);
-                       iconv_close(ic);
-               }
-               else {
-                       end = start;
-                       end++;
-                       strcpy(start, "");
-                       remove_token(end, 0, '?');
-                       remove_token(end, 0, '?');
-                       remove_token(end, 0, '?');
-                       remove_token(end, 0, '?');
-                       strcpy(end, &end[1]);
-
-                       snprintf(newbuf, sizeof newbuf, "%s(unreadable)%s", buf, end);
-                       strcpy(buf, newbuf);
-               }
-
-               free(isav);
-
-               /*
-                * Since spammers will go to all sorts of absurd lengths to get their
-                * messages through, there are LOTS of corrupt headers out there.
-                * So, prevent a really badly formed RFC2047 header from throwing
-                * this function into an infinite loop.
-                */
-               ++passes;
-               if (passes > 20) return;
-       }
-
-}
-#else
-inline void utf8ify_rfc822_string(char *a){};
+#include "dav.h"
+#include "calendar.h"
 
-#endif
+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 */
 
+void jsonMessageListHdr(void);
 
+void display_enter(void);
 
-/**
- * \brief      RFC2047-encode a header field if necessary.
- *             If no non-ASCII characters are found, the string
- *             will be copied verbatim without encoding.
- *
- * \param      target          Target buffer.
- * \param      maxlen          Maximum size of target buffer.
- * \param      source          Source string to be encoded.
- * \param       SourceLen       Length of the source string
- * \returns     encoded length; -1 if non success.
- */
-int webcit_rfc2047encode(char *target, int maxlen, char *source, long SourceLen)
-{
-       const char headerStr[] = "=?UTF-8?Q?";
-       int need_to_encode = 0;
-       int i = 0;
-       int len;
-       unsigned char ch;
-
-       if ((source == NULL) || 
-           (target == NULL) ||
-           (SourceLen > maxlen)) return -1;
-
-       while ((!IsEmptyStr (&source[i])) && 
-              (need_to_encode == 0) &&
-              (i < SourceLen) ) {
-               if (((unsigned char) source[i] < 32) || 
-                   ((unsigned char) source[i] > 126)) {
-                       need_to_encode = 1;
-               }
-               i++;
-       }
-
-       if (!need_to_encode) {
-               memcpy (target, source, SourceLen);
-               target[SourceLen] = '\0';
-               return SourceLen;
-       }
-       
-       if (sizeof (headerStr + SourceLen + 2) > maxlen)
-               return -1;
-       memcpy (target, headerStr, sizeof (headerStr));
-       len = sizeof (headerStr) - 1;
-       for (i=0; (i < SourceLen) && (len + 3< maxlen) ; ++i) {
-               ch = (unsigned char) source[i];
-               if ((ch < 32) || (ch > 126) || (ch == 61)) {
-                       sprintf(&target[len], "=%02X", ch);
-                       len += 3;
-               }
-               else {
-                       sprintf(&target[len], "%c", ch);
-                       len ++;
-               }
-       }
-       
-       if (len + 2 < maxlen) {
-               strcat(&target[len], "?=");
-               len +=2;
-               return len;
-       }
-       else
-               return -1;
-}
-
-
+typedef void (*MsgPartEvaluatorFunc)(message_summary *Sum, StrBuf *Buf);
 
+typedef struct _MsgPartEvaluatorStruct {
+       MsgPartEvaluatorFunc f;
+} MsgPartEvaluatorStruct;
 
-/*
- * Look for URL's embedded in a buffer and make them linkable.  We use a
- * target window in order to keep the Citadel session in its own window.
- */
-void url(char *buf, size_t bufsize)
+int load_message(message_summary *Msg, 
+                StrBuf *FoundCharset,
+                StrBuf **Error)
 {
-       int len, UrlLen, Offset, TrailerLen, outpos;
-       char *start, *end, *pos;
-       char urlbuf[SIZ];
-       char outbuf[SIZ];
-
-       start = NULL;
-       len = strlen(buf);
-       if (len > bufsize) {
-               lprintf(1, "URL: content longer than buffer!");
-               return;
-       }
-       end = buf + len;
-       for (pos = buf; (pos < end) && (start == NULL); ++pos) {
-               if (!strncasecmp(pos, "http://", 7))
-                       start = pos;
-               if (!strncasecmp(pos, "ftp://", 6))
-                       start = pos;
-       }
-
-       if (start == NULL)
-               return;
-
-       for (pos = buf+len; pos > start; --pos) {
-               if (  (!isprint(*pos))
-                  || (isspace(*pos))
-                  || (*pos == '{')
-                  || (*pos == '}')
-                  || (*pos == '|')
-                  || (*pos == '\\')
-                  || (*pos == '^')
-                  || (*pos == '[')
-                  || (*pos == ']')
-                  || (*pos == '`')
-                  || (*pos == '<')
-                  || (*pos == '>')
-                  || (*pos == '(')
-                  || (*pos == ')')
-               ) {
-                       end = pos;
-               }
-       }
+       StrBuf *Buf;
+       StrBuf *HdrToken;
+       headereval *Hdr;
+       void *vHdr;
+       char buf[SIZ];
+       int Done = 0;
+       int state=0;
        
-       UrlLen = end - start;
-       if (UrlLen > sizeof(urlbuf)){
-               lprintf(1, "URL: content longer than buffer!");
-               return;
-       }
-       memcpy(urlbuf, start, UrlLen);
-       urlbuf[UrlLen] = '\0';
-
-       Offset = start - buf;
-       if ((Offset != 0) && (Offset < sizeof(outbuf)))
-               memcpy(outbuf, buf, Offset);
-       outpos = snprintf(&outbuf[Offset], sizeof(outbuf) - Offset,  
-                         "%ca href=%c%s%c TARGET=%c%s%c%c%s%c/A%c",
-                         LB, QU, urlbuf, QU, QU, TARGET, QU, RB, urlbuf, LB, RB);
-       if (outpos >= sizeof(outbuf) - Offset) {
-               lprintf(1, "URL: content longer than buffer!");
-               return;
-       }
-
-       TrailerLen = len - (end - start);
-       if (TrailerLen > 0)
-               memcpy(outbuf + Offset + outpos, end, TrailerLen);
-       if (Offset + outpos + TrailerLen > bufsize) {
-               lprintf(1, "URL: content longer than buffer!");
-               return;
-       }
-       memcpy (buf, outbuf, Offset + outpos + TrailerLen);
-       *(buf + Offset + outpos + TrailerLen) = '\0';
-}
-
-
-/**
- * \brief Turn a vCard "n" (name) field into something displayable.
- * \param name the name field to convert
- */
-void vcard_n_prettyize(char *name)
-{
-       char *original_name;
-       int i, j, len;
-
-       original_name = strdup(name);
-       len = strlen(original_name);
-       for (i=0; i<5; ++i) {
-               if (len > 0) {
-                       if (original_name[len-1] == ' ') {
-                               original_name[--len] = 0;
-                       }
-                       if (original_name[len-1] == ';') {
-                               original_name[--len] = 0;
-                       }
-               }
+       Buf = NewStrBuf();
+       if (Msg->PartNum != NULL) {
+               serv_printf("MSG4 %ld|%s", Msg->msgnum, ChrPtr(Msg->PartNum));
        }
-       strcpy(name, "");
-       j=0;
-       for (i=0; i<len; ++i) {
-               if (original_name[i] == ';') {
-                       name[j++] = ',';
-                       name[j++] = ' ';                        
-               }
-               else {
-                       name[j++] = original_name[i];
-               }
-       }
-       name[j] = '\0';
-       free(original_name);
-}
-
-
-
-
-/**
- * \brief preparse a vcard name
- * display_vcard() calls this after parsing the textual vCard into
- * our 'struct vCard' data object.
- * This gets called instead of display_parsed_vcard() if we are only looking
- * to extract the person's name instead of displaying the card.
- * \param v the vcard to retrieve the name from
- * \param storename where to put the name at
- */
-void fetchname_parsed_vcard(struct vCard *v, char *storename) {
-       char *name;
-
-       strcpy(storename, "");
-
-       name = vcard_get_prop(v, "n", 1, 0, 0);
-       if (name != NULL) {
-               strcpy(storename, name);
-               /* vcard_n_prettyize(storename); */
+       else {
+               serv_printf("MSG4 %ld", Msg->msgnum);
        }
 
-}
-
-
-
-/**
- * \brief html print a vcard
- * display_vcard() calls this after parsing the textual vCard into
- * our 'struct vCard' data object.
- *
- * Set 'full' to nonzero to display the full card, otherwise it will only
- * show a summary line.
- *
- * This code is a bit ugly, so perhaps an explanation is due: we do this
- * in two passes through the vCard fields.  On the first pass, we process
- * fields we understand, and then render them in a pretty fashion at the
- * end.  Then we make a second pass, outputting all the fields we don't
- * understand in a simple two-column name/value format.
- * \param v the vCard to display
- * \param full display all items of the vcard?
- * \param msgnum Citadel message pointer
- */
-void display_parsed_vcard(struct vCard *v, int full, long msgnum) {
-       int i, j;
-       char buf[SIZ];
-       char *name;
-       int is_qp = 0;
-       int is_b64 = 0;
-       char *thisname, *thisvalue;
-       char firsttoken[SIZ];
-       int pass;
-
-       char fullname[SIZ];
-       char title[SIZ];
-       char org[SIZ];
-       char phone[SIZ];
-       char mailto[SIZ];
-
-       strcpy(fullname, "");
-       strcpy(phone, "");
-       strcpy(mailto, "");
-       strcpy(title, "");
-       strcpy(org, "");
-
-       if (!full) {
-               wprintf("<TD>");
-               name = vcard_get_prop(v, "fn", 1, 0, 0);
-               if (name != NULL) {
-                       escputs(name);
-               }
-               else if (name = vcard_get_prop(v, "n", 1, 0, 0), name != NULL) {
-                       strcpy(fullname, name);
-                       vcard_n_prettyize(fullname);
-                       escputs(fullname);
-               }
-               else {
-                       wprintf("&nbsp;");
-               }
-               wprintf("</TD>");
-               return;
+       StrBuf_ServGetln(Buf);
+       if (GetServerStatus(Buf, NULL) != 1) {
+               *Error = NewStrBuf();
+               StrBufAppendPrintf(*Error, "<strong>");
+               StrBufAppendPrintf(*Error, _("ERROR:"));
+               StrBufAppendPrintf(*Error, "</strong> %s<br>\n", &buf[4]);
+               FreeStrBuf(&Buf);
+               return 0;
        }
 
-       wprintf("<div align=center>"
-               "<table bgcolor=#aaaaaa width=50%%>");
-       for (pass=1; pass<=2; ++pass) {
-
-               if (v->numprops) for (i=0; i<(v->numprops); ++i) {
-                       int len;
-                       thisname = strdup(v->prop[i].name);
-                       extract_token(firsttoken, thisname, 0, ';', sizeof firsttoken);
-       
-                       for (j=0; j<num_tokens(thisname, ';'); ++j) {
-                               extract_token(buf, thisname, j, ';', sizeof buf);
-                               if (!strcasecmp(buf, "encoding=quoted-printable")) {
-                                       is_qp = 1;
-                                       remove_token(thisname, j, ';');
-                               }
-                               if (!strcasecmp(buf, "encoding=base64")) {
-                                       is_b64 = 1;
-                                       remove_token(thisname, j, ';');
-                               }
-                       }
+       /* begin everythingamundo table */
+       HdrToken = NewStrBuf();
+       while (!Done && StrBuf_ServGetln(Buf)>=0) {
+               if ( (StrLength(Buf)==3) && 
+                   !strcmp(ChrPtr(Buf), "000")) 
+               {
+                       Done = 1;
+                       if (state < 2) {
+                               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, _("Empty message"));
+                               StrBufAppendPrintf(Msg->MsgBody->Data, "</i><br><br>\n");
+                               StrBufAppendPrintf(Msg->MsgBody->Data, "</div>\n");
+                       }
+                       break;
+               }
+               switch (state) {
+               case 0:/* Citadel Message Headers */
+                       if (StrLength(Buf) == 0) {
+                               state ++;
+                               break;
+                       }
+                       StrBufExtract_token(HdrToken, Buf, 0, '=');
+                       StrBufCutLeft(Buf, StrLength(HdrToken) + 1);
                        
-                       len = strlen(v->prop[i].value);
-                       /* if we have some untagged QP, detect it here. */
-                       if (!is_qp && (strstr(v->prop[i].value, "=?")!=NULL))
-                               utf8ify_rfc822_string(v->prop[i].value);
-
-                       if (is_qp) {
-                               // %ff can become 6 bytes in utf8 
-                               thisvalue = malloc(len * 2 + 3); 
-                               j = CtdlDecodeQuotedPrintable(
-                                       thisvalue, v->prop[i].value,
-                                       len);
-                               thisvalue[j] = 0;
-                       }
-                       else if (is_b64) {
-                               // ff will become one byte..
-                               thisvalue = malloc(len + 50);
-                               CtdlDecodeBase64(
-                                       thisvalue, v->prop[i].value,
-                                       strlen(v->prop[i].value) );
-                       }
-                       else {
-                               thisvalue = strdup(v->prop[i].value);
-                       }
-       
-                       /** Various fields we may encounter ***/
-       
-                       /** N is name, but only if there's no FN already there */
-                       if (!strcasecmp(firsttoken, "n")) {
-                               if (IsEmptyStr(fullname)) {
-                                       strcpy(fullname, thisvalue);
-                                       vcard_n_prettyize(fullname);
-                               }
-                       }
-       
-                       /** FN (full name) is a true 'display name' field */
-                       else if (!strcasecmp(firsttoken, "fn")) {
-                               strcpy(fullname, thisvalue);
-                       }
-
-                       /** title */
-                       else if (!strcasecmp(firsttoken, "title")) {
-                               strcpy(title, thisvalue);
-                       }
-       
-                       /** organization */
-                       else if (!strcasecmp(firsttoken, "org")) {
-                               strcpy(org, thisvalue);
-                       }
-       
-                       else if (!strcasecmp(firsttoken, "email")) {
-                               size_t len;
-                               if (!IsEmptyStr(mailto)) strcat(mailto, "<br />");
-                               strcat(mailto,
-                                       "<a href=\"display_enter"
-                                       "?force_room=_MAIL_?recp=");
-
-                               len = strlen(mailto);
-                               urlesc(&mailto[len], SIZ - len, "\"");
-                               len = strlen(mailto);
-                               urlesc(&mailto[len], SIZ - len,  fullname);
-                               len = strlen(mailto);
-                               urlesc(&mailto[len], SIZ - len, "\" <");
-                               len = strlen(mailto);
-                               urlesc(&mailto[len], SIZ - len, thisvalue);
-                               len = strlen(mailto);
-                               urlesc(&mailto[len], SIZ - len, ">");
-
-                               strcat(mailto, "\">");
-                               len = strlen(mailto);
-                               stresc(mailto+len, SIZ - len, thisvalue, 1, 1);
-                               strcat(mailto, "</A>");
-                       }
-                       else if (!strcasecmp(firsttoken, "tel")) {
-                               if (!IsEmptyStr(phone)) strcat(phone, "<br />");
-                               strcat(phone, thisvalue);
-                               for (j=0; j<num_tokens(thisname, ';'); ++j) {
-                                       extract_token(buf, thisname, j, ';', sizeof buf);
-                                       if (!strcasecmp(buf, "tel"))
-                                               strcat(phone, "");
-                                       else if (!strcasecmp(buf, "work"))
-                                               strcat(phone, _(" (work)"));
-                                       else if (!strcasecmp(buf, "home"))
-                                               strcat(phone, _(" (home)"));
-                                       else if (!strcasecmp(buf, "cell"))
-                                               strcat(phone, _(" (cell)"));
-                                       else {
-                                               strcat(phone, " (");
-                                               strcat(phone, buf);
-                                               strcat(phone, ")");
-                                       }
+                       /* look up one of the examine_* functions to parse the content */
+                       if (GetHash(MsgHeaderHandler, SKEY(HdrToken), &vHdr) &&
+                           (vHdr != NULL)) {
+                               Hdr = (headereval*)vHdr;
+                               Hdr->evaluator(Msg, Buf, FoundCharset);
+                               if (Hdr->Type == 1) {
+                                       state++;
                                }
-                       }
-                       else if (!strcasecmp(firsttoken, "adr")) {
-                               if (pass == 2) {
-                                       wprintf("<TR><TD>");
-                                       wprintf(_("Address:"));
-                                       wprintf("</TD><TD>");
-                                       for (j=0; j<num_tokens(thisvalue, ';'); ++j) {
-                                               extract_token(buf, thisvalue, j, ';', sizeof buf);
-                                               if (!IsEmptyStr(buf)) {
-                                                       escputs(buf);
-                                                       if (j<3) wprintf("<br />");
-                                                       else wprintf(" ");
-                                               }
+                       }/* 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) {
+                               state++;
+                               if (Msg->MsgBody->ContentType == NULL)
+                                       /* end of header or no header? */
+                                       Msg->MsgBody->ContentType = NewStrBufPlain(HKEY("text/plain"));
+                                /* usual end of mime header */
+                       }
+                       else
+                       {
+                               StrBufExtract_token(HdrToken, Buf, 0, ':');
+                               if (StrLength(HdrToken) > 0) {
+                                       StrBufCutLeft(Buf, StrLength(HdrToken) + 1);
+                                       /* the examine*'s know how to do with mime headers too... */
+                                       if (GetHash(MsgHeaderHandler, SKEY(HdrToken), &vHdr) &&
+                                           (vHdr != NULL)) {
+                                               Hdr = (headereval*)vHdr;
+                                               Hdr->evaluator(Msg, Buf, FoundCharset);
                                        }
-                                       wprintf("</TD></TR>\n");
-                               }
-                       }
-                       /* else if (!strcasecmp(firsttoken, "photo") && full && pass == 2) { 
-                               // Only output on second pass
-                               wprintf("<tr><td>");
-                               wprintf(_("Photo:"));
-                               wprintf("</td><td>");
-                               wprintf("<img src=\"/vcardphoto/%ld/\" alt=\"Contact photo\"/>",msgnum);
-                               wprintf("</td></tr>\n");
-                       } */
-                       else if (!strcasecmp(firsttoken, "version")) {
-                               /* ignore */
-                       }
-                       else if (!strcasecmp(firsttoken, "rev")) {
-                               /* ignore */
-                       }
-                       else if (!strcasecmp(firsttoken, "label")) {
-                               /* ignore */
-                       }
-                       else {
-
-                               /*** Don't show extra fields.  They're ugly.
-                               if (pass == 2) {
-                                       wprintf("<TR><TD>");
-                                       escputs(thisname);
-                                       wprintf("</TD><TD>");
-                                       escputs(thisvalue);
-                                       wprintf("</TD></TR>\n");
-                               }
-                               ***/
-                       }
-       
-                       free(thisname);
-                       free(thisvalue);
-               }
-       
-               if (pass == 1) {
-                       wprintf("<TR BGCOLOR=\"#AAAAAA\">"
-                       "<TD COLSPAN=2 BGCOLOR=\"#FFFFFF\">"
-                       "<IMG ALIGN=CENTER src=\"static/viewcontacts_48x.gif\">"
-                       "<FONT SIZE=+1><B>");
-                       escputs(fullname);
-                       wprintf("</B></FONT>");
-                       if (!IsEmptyStr(title)) {
-                               wprintf("<div align=right>");
-                               escputs(title);
-                               wprintf("</div>");
-                       }
-                       if (!IsEmptyStr(org)) {
-                               wprintf("<div align=right>");
-                               escputs(org);
-                               wprintf("</div>");
-                       }
-                       wprintf("</TD></TR>\n");
-               
-                       if (!IsEmptyStr(phone)) {
-                               wprintf("<tr><td>");
-                               wprintf(_("Telephone:"));
-                               wprintf("</td><td>%s</td></tr>\n", phone);
-                       }
-                       if (!IsEmptyStr(mailto)) {
-                               wprintf("<tr><td>");
-                               wprintf(_("E-mail:"));
-                               wprintf("</td><td>%s</td></tr>\n", mailto);
-                       }
-               }
-
-       }
-
-       wprintf("</table></div>\n");
-}
-
-
-
-/**
- * \brief  Display a textual vCard
- * (Converts to a vCard object and then calls the actual display function)
- * Set 'full' to nonzero to display the whole card instead of a one-liner.
- * Or, if "storename" is non-NULL, just store the person's name in that
- * buffer instead of displaying the card at all.
- * \param vcard_source the buffer containing the vcard text
- * \param alpha what???
- * \param full should we usse all lines?
- * \param storename where to store???
- * \param msgnum Citadel message pointer
- */
-void display_vcard(char *vcard_source, char alpha, int full, char *storename, 
-       long msgnum) {
-       struct vCard *v;
-       char *name;
-       char buf[SIZ];
-       char this_alpha = 0;
-
-       v = vcard_load(vcard_source);
-       if (v == NULL) return;
-
-       name = vcard_get_prop(v, "n", 1, 0, 0);
-       if (name != NULL) {
-               utf8ify_rfc822_string(name);
-               strcpy(buf, name);
-               this_alpha = buf[0];
-       }
-
-       if (storename != NULL) {
-               fetchname_parsed_vcard(v, storename);
-       }
-       else if (       (alpha == 0)
-                       || ((isalpha(alpha)) && (tolower(alpha) == tolower(this_alpha)) )
-                       || ((!isalpha(alpha)) && (!isalpha(this_alpha)))
-               ) {
-               display_parsed_vcard(v, full,msgnum);
-       }
-
-       vcard_free(v);
-}
-
-
-struct attach_link {
-       char partnum[32];
-       char html[1024];
-};
-
-
-/*
- * 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
- */
-void read_message(long msgnum, int printable_view, char *section) {
-       char buf[SIZ];
-       char mime_partnum[256] = "";
-       char mime_name[256] = "";
-       char mime_filename[256] = "";
-       char escaped_mime_filename[256] = "";
-       char mime_content_type[256] = "";
-       const char *mime_content_type_ptr;
-       char mime_charset[256] = "";
-       char mime_disposition[256] = "";
-       int mime_length;
-       struct attach_link *attach_links = NULL;
-       int num_attach_links = 0;
-       char mime_submessages[256] = "";
-       char m_subject[1024] = "";
-       char m_cc[1024] = "";
-       char from[256] = "";
-       char node[256] = "";
-       char rfca[256] = "";
-       char reply_to[512] = "";
-       char reply_all[4096] = "";
-       char reply_references[1024] = "";
-       char reply_inreplyto[256] = "";
-       char now[64] = "";
-       int format_type = 0;
-       int nhdr = 0;
-       int bq = 0;
-       int i = 0;
-       char vcard_partnum[256] = "";
-       char cal_partnum[256] = "";
-       char *part_source = NULL;
-       char msg4_partnum[32] = "";
-#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(mime_content_type, "text/plain");
-       strcpy(mime_charset, "us-ascii");
-       strcpy(mime_submessages, "");
-
-       serv_printf("MSG4 %ld|%s", msgnum, section);
-       serv_getln(buf, sizeof buf);
-       if (buf[0] != '1') {
-               wprintf("<strong>");
-               wprintf(_("ERROR:"));
-               wprintf("</strong> %s<br />\n", &buf[4]);
-               return;
-       }
-
-       /** begin everythingamundo table */
-        if (!printable_view) {
-                wprintf("<div class=\"fix_scrollbar_bug message\" ");
-                wprintf("onMouseOver=document.getElementById(\"msg%ld\").style.visibility=\"visible\" ", msgnum);
-                wprintf("onMouseOut=document.getElementById(\"msg%ld\").style.visibility=\"hidden\" >", msgnum);
-        }
-
-       /** begin message header table */
-       wprintf("<div class=\"message_header\">");
-
-       strcpy(m_subject, "");
-       strcpy(m_cc, "");
-
-       while (serv_getln(buf, sizeof buf), strcasecmp(buf, "text")) {
-               if (!strcmp(buf, "000")) {
-                       wprintf("<i>");
-                       wprintf(_("unexpected end of message"));
-                       wprintf(" (1)</i><br /><br />\n");
-                       wprintf("</div>\n");
-                       return;
-               }
-               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 "));
-                       wprintf("<a href=\"showuser?who=");
-                       utf8ify_rfc822_string(from);
-                       urlescputs(from);
-                       wprintf("\">");
-                       escputs(from);
-                       wprintf("</a> ");
-               }
-               if (!strncasecmp(buf, "subj=", 5)) {
-                       safestrncpy(m_subject, &buf[5], sizeof m_subject);
-               }
-               if (!strncasecmp(buf, "msgn=", 5)) {
-                       safestrncpy(reply_inreplyto, &buf[5], sizeof reply_inreplyto);
-               }
-               if (!strncasecmp(buf, "wefw=", 5)) {
-                       safestrncpy(reply_references, &buf[5], sizeof reply_references);
-               }
-               if (!strncasecmp(buf, "cccc=", 5)) {
-                       int len;
-                       safestrncpy(m_cc, &buf[5], sizeof m_cc);
-                       if (!IsEmptyStr(reply_all)) {
-                               strcat(reply_all, ", ");
-                       }
-                       len = strlen(reply_all);
-                       safestrncpy(&reply_all[len], &buf[5],
-                               (sizeof reply_all - len) );
-               }
-               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;");
-                       escputs(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)) {
-                       int len;
-                       wprintf(_("to "));
-                       if (!IsEmptyStr(reply_all)) {
-                               strcat(reply_all, ", ");
-                       }
-                       len = strlen(reply_all);
-                       safestrncpy(&reply_all[len], &buf[5],
-                               (sizeof reply_all - len) );
-                       utf8ify_rfc822_string(&buf[5]);
-                       escputs(&buf[5]);
-                       wprintf(" ");
-               }
-               if (!strncasecmp(buf, "time=", 5)) {
-                       webcit_fmt_date(now, atol(&buf[5]), 0);
-                       wprintf("<span>");
-                       wprintf("%s ", now);
-                       wprintf("</span>");
-               }
-
-               if (!strncasecmp(buf, "part=", 5)) {
-                       extract_token(mime_name, &buf[5], 0, '|', sizeof mime_filename);
-                       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);
-
-                       striplt(mime_name);
-                       striplt(mime_filename);
-                       if ( (IsEmptyStr(mime_filename)) && (!IsEmptyStr(mime_name)) ) {
-                               strcpy(mime_filename, mime_name);
-                       }
-
-                       if (!strcasecmp(mime_content_type, "message/rfc822")) {
-                               if (!IsEmptyStr(mime_submessages)) {
-                                       strcat(mime_submessages, "|");
-                               }
-                               strcat(mime_submessages, mime_partnum);
-                       }
-                       else if ((!strcasecmp(mime_disposition, "inline"))
-                          && (!strncasecmp(mime_content_type, "image/", 6)) ){
-                               ++num_attach_links;
-                               attach_links = realloc(attach_links,
-                                       (num_attach_links*sizeof(struct attach_link)));
-                               safestrncpy(attach_links[num_attach_links-1].partnum, mime_partnum, 32);
-                               snprintf(attach_links[num_attach_links-1].html, 1024,
-                                       "<img src=\"mimepart/%ld/%s/%s\">",
-                                       msgnum, mime_partnum, mime_filename);
-                       }
-                       else if ( ( (!strcasecmp(mime_disposition, "attachment")) 
-                            || (!strcasecmp(mime_disposition, "inline"))
-                            || (!strcasecmp(mime_disposition, ""))
-                            ) && (!IsEmptyStr(mime_content_type))
-                       ) {
-                               ++num_attach_links;
-                               attach_links = realloc(attach_links,
-                                       (num_attach_links*sizeof(struct attach_link)));
-                               safestrncpy(attach_links[num_attach_links-1].partnum, mime_partnum, 32);
-                               utf8ify_rfc822_string(mime_filename);
-
-                               mime_content_type_ptr = mime_content_type;
-                               if (strcasecmp(mime_content_type, "application/octet-stream") == 0) {
-                                       mime_content_type_ptr = GuessMimeByFilename(mime_filename, 
-                                                                                   strlen(mime_filename));
+                                       break;
                                }
-                               urlesc(escaped_mime_filename, 265, mime_filename);
-                               snprintf(attach_links[num_attach_links-1].html, 1024,
-                                       "<img src=\"display_mime_icon?type=%s\" "
-                                       "border=0 align=middle>\n"
-                                       "%s (%s, %d bytes) [ "
-                                       "<a href=\"mimepart/%ld/%s/%s\""
-                                       "target=\"wc.%ld.%s\">%s</a>"
-                                       " | "
-                                       "<a href=\"mimepart_download/%ld/%s/%s\">%s</a>"
-                                       " ]<br />\n",
-                                       mime_content_type_ptr,
-                                       mime_filename,
-                                       mime_content_type, mime_length,
-                                       msgnum, mime_partnum, escaped_mime_filename,
-                                       msgnum, mime_partnum,
-                                       _("View"),
-                                       msgnum, mime_partnum, escaped_mime_filename,
-                                       _("Download")
-                               );
                        }
-
-                       /** begin handler prep ***/
-                       if (  (!strcasecmp(mime_content_type, "text/x-vcard"))
-                          || (!strcasecmp(mime_content_type, "text/vcard")) ) {
-                               strcpy(vcard_partnum, mime_partnum);
+               case 2: /* Message Body */
+                       
+                       if (Msg->MsgBody->size_known > 0) {
+                               StrBuf_ServGetBLOBBuffered(Msg->MsgBody->Data, Msg->MsgBody->length);
+                               state ++;
+                               /*/ todo: check next line, if not 000, append following lines */
                        }
-
-                       if (  (!strcasecmp(mime_content_type, "text/calendar"))
-                          || (!strcasecmp(mime_content_type, "application/ics")) ) {
-                               strcpy(cal_partnum, mime_partnum);
+                       else if (1){
+                               if (StrLength(Msg->MsgBody->Data) > 0)
+                                       StrBufAppendBufPlain(Msg->MsgBody->Data, "\n", 1, 0);
+                               StrBufAppendBuf(Msg->MsgBody->Data, Buf, 0);
                        }
+                       break;
+               case 3:
+                       StrBufAppendBuf(Msg->MsgBody->Data, Buf, 0);
+                       break;
+               }
+       }
 
-                       /** end handler prep ***/
-
-               }
-
-       }
-
-       /* 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(reply_references, '|');
-       int rrlen = strlen(reply_references);
-       if ( ((rrtok >= 3) && (rrlen > 900)) || (rrtok > 10) ) {
-               remove_token(reply_references, 1, '|');
-       }
-
-       /* Generate a reply-to address */
-       if (!IsEmptyStr(rfca)) {
-               if (!IsEmptyStr(from)) {
-                       snprintf(reply_to, sizeof(reply_to), "%s <%s>", from, rfca);
-               }
-               else {
-                       strcpy(reply_to, rfca);
-               }
-       }
-       else {
-       if ((!IsEmptyStr(node))
-                  && (strcasecmp(node, serv_info.serv_nodename))
-                  && (strcasecmp(node, serv_info.serv_humannode)) ) {
-                       snprintf(reply_to, sizeof(reply_to), "%s @ %s",
-                               from, node);
-               }
-               else {
-                       snprintf(reply_to, sizeof(reply_to), "%s", from);
-               }
-       }
-
-       if (nhdr == 1) {
-               wprintf("****");
-       }
-
-       utf8ify_rfc822_string(m_cc);
-       utf8ify_rfc822_string(m_subject);
-
-        /** start msg buttons */
-
-       char Urlsep = '?';
-
-        if (!printable_view) {
-                wprintf("<p id=\"msg%ld\" class=\"msgbuttons\" >\n",msgnum);
-
-               /* Reply */
-               if ( (WC->wc_view == VIEW_MAILBOX) || (WC->wc_view == VIEW_BBS) ) {
-                       wprintf("<a href=\"display_enter");
-                       if (WC->is_mailbox) {
-                               wprintf("%creplyquote=%ld", Urlsep, msgnum);
-                               Urlsep = '&';
-                       }
-                       wprintf("%crecp=", Urlsep);
-                       Urlsep = '&';
-                       urlescputs(reply_to);
-                       if (!IsEmptyStr(m_subject)) {
-                               wprintf("%csubject=", Urlsep);
-                               if (strncasecmp(m_subject, "Re:", 3)) wprintf("Re:%%20");
-                               urlescputs(m_subject);
-                       }
-                       wprintf("%creferences=", Urlsep);
-                       if (!IsEmptyStr(reply_references)) {
-                               urlescputs(reply_references);
-                               urlescputs("|");
-                       }
-                       urlescputs(reply_inreplyto);
-                       wprintf("\"><span>[</span>%s<span>]</span></a> ", _("Reply"));
-               }
-
-               /* ReplyQuoted */
-               if ( (WC->wc_view == VIEW_MAILBOX) || (WC->wc_view == VIEW_BBS) ) {
-                       if (!WC->is_mailbox) {
-                               wprintf("<a href=\"display_enter");
-                               wprintf("?replyquote=%ld", msgnum);
-                               wprintf("&recp=");
-                               urlescputs(reply_to);
-                               if (!IsEmptyStr(m_subject)) {
-                                       wprintf("&subject=");
-                                       if (strncasecmp(m_subject, "Re:", 3)) wprintf("Re:%%20");
-                                       urlescputs(m_subject);
-                               }
-                               wprintf("&references=");
-                               if (!IsEmptyStr(reply_references)) {
-                                       urlescputs(reply_references);
-                                       urlescputs("|");
-                               }
-                               urlescputs(reply_inreplyto);
-                               wprintf("\"><span>[</span>%s<span>]</span></a> ", _("ReplyQuoted"));
-                       }
-               }
-
-               /* ReplyAll */
-               if (WC->wc_view == VIEW_MAILBOX) {
-                       wprintf("<a href=\"display_enter");
-                       wprintf("?replyquote=%ld", msgnum);
-                       wprintf("&recp=");
-                       urlescputs(reply_to);
-                       wprintf("&cc=");
-                       urlescputs(reply_all);
-                       if (!IsEmptyStr(m_subject)) {
-                               wprintf("&subject=");
-                               if (strncasecmp(m_subject, "Re:", 3)) wprintf("Re:%%20");
-                               urlescputs(m_subject);
-                       }
-                       wprintf("&references=");
-                       if (!IsEmptyStr(reply_references)) {
-                               urlescputs(reply_references);
-                               urlescputs("|");
-                       }
-                       urlescputs(reply_inreplyto);
-                       wprintf("\"><span>[</span>%s<span>]</span></a> ", _("ReplyAll"));
-               }
-
-               /* Forward */
-               if (WC->wc_view == VIEW_MAILBOX) {
-                       wprintf("<a href=\"display_enter?fwdquote=%ld&subject=", msgnum);
-                       if (strncasecmp(m_subject, "Fwd:", 4)) wprintf("Fwd:%%20");
-                       urlescputs(m_subject);
-                       wprintf("\"><span>[</span>%s<span>]</span></a> ", _("Forward"));
-               }
-
-               /* If this is one of my own rooms, or if I'm an Aide or Room Aide, I can move/delete */
-               if ( (WC->is_room_aide) || (WC->is_mailbox) || (WC->room_flags2 & QR2_COLLABDEL) ) {
-                       /** Move */
-                       wprintf("<a href=\"confirm_move_msg?msgid=%ld\"><span>[</span>%s<span>]</span></a> ",
-                               msgnum, _("Move"));
-       
-                       /** Delete */
-                       wprintf("<a href=\"delete_msg?msgid=%ld\" "
-                               "onClick=\"return confirm('%s');\">"
-                               "<span>[</span>%s<span>]</span> "
-                               "</a> ", msgnum, _("Delete this message?"), _("Delete")
-                       );
-               }
-
-               /* Headers */
-               wprintf("<a href=\"#\" onClick=\"window.open('msgheaders/%ld', 'headers%ld', 'toolbar=no,location=no,directories=no,copyhistory=no,status=yes,scrollbars=yes,resizable=yes,width=600,height=400'); \" >"
-                       "<span>[</span>%s<span>]</span></a>", msgnum, msgnum, _("Headers"));
-
-
-               /* Print */
-               wprintf("<a href=\"#\" onClick=\"window.open('printmsg/%ld', 'print%ld', 'toolbar=no,location=no,directories=no,copyhistory=no,status=yes,scrollbars=yes,resizable=yes,width=600,height=400'); \" >"
-                       "<span>[</span>%s<span>]</span></a>", msgnum, msgnum, _("Print"));
-
-               wprintf("</p>");
-
-       }
-
-       if (!IsEmptyStr(m_cc)) {
-               wprintf("<p>");
-               wprintf(_("CC:"));
-               wprintf(" ");
-               escputs(m_cc);
-               wprintf("</p>");
-       }
-       if (!IsEmptyStr(m_subject)) {
-               wprintf("<p class=\"message_subject\">");
-               wprintf(_("Subject:"));
-               wprintf(" ");
-               escputs(m_subject);
-               wprintf("</p>");
-       }
-
-       wprintf("</div>");
-
-       /* Begin body */
-       wprintf("<div class=\"message_content\">");
-
-       /*
-        * Learn the content type
-        */
-       strcpy(mime_content_type, "text/plain");
-       while (serv_getln(buf, sizeof buf), (!IsEmptyStr(buf))) {
-               if (!strcmp(buf, "000")) {
-                       /* This is not necessarily an error condition.  See bug #226. */
-                       goto ENDBODY;
-               }
-               if (!strncasecmp(buf, "X-Citadel-MSG4-Partnum:", 23)) {
-                       safestrncpy(msg4_partnum, &buf[23], sizeof(msg4_partnum));
-                       striplt(msg4_partnum);
-               }
-               if (!strncasecmp(buf, "Content-type:", 13)) {
-                       int len;
-                       safestrncpy(mime_content_type, &buf[13], sizeof(mime_content_type));
-                       striplt(mime_content_type);
-                       len = strlen(mime_content_type);
-                       for (i=0; i<len; ++i) {
-                               if (!strncasecmp(&mime_content_type[i], "charset=", 8)) {
-                                       safestrncpy(mime_charset, &mime_content_type[i+8],
-                                               sizeof mime_charset);
-                               }
-                       }
-                       for (i=0; i<len; ++i) {
-                               if (mime_content_type[i] == ';') {
-                                       mime_content_type[i] = 0;
-                                       len = i - 1;
-                               }
-                       }
-                       len = strlen(mime_charset);
-                       for (i=0; i<len; ++i) {
-                               if (mime_charset[i] == ';') {
-                                       mime_charset[i] = 0;
-                                       len = i - 1;
-                               }
-                       }
-               }
-       }
-
-       /* Set up a character set conversion if we need to (and if we can) */
-#ifdef HAVE_ICONV
-       if (strchr(mime_charset, ';')) strcpy(strchr(mime_charset, ';'), "");
-       if ( (strcasecmp(mime_charset, "us-ascii"))
-          && (strcasecmp(mime_charset, "UTF-8"))
-          && (strcasecmp(mime_charset, ""))
-       ) {
-               ic = ctdl_iconv_open("UTF-8", mime_charset);
-               if (ic == (iconv_t)(-1) ) {
-                       lprintf(5, "%s:%d iconv_open(UTF-8, %s) failed: %s\n",
-                               __FILE__, __LINE__, mime_charset, strerror(errno));
-               }
-       }
-#endif
-
-       /* Messages in legacy Citadel variformat get handled thusly... */
-       if (!strcasecmp(mime_content_type, "text/x-citadel-variformat")) {
-               fmout("JUSTIFY");
-       }
-
-       /* Boring old 80-column fixed format text gets handled this way... */
-       else if ( (!strcasecmp(mime_content_type, "text/plain"))
-               || (!strcasecmp(mime_content_type, "text")) ) {
-               buf [0] = '\0';
-               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 = strlen(ibuf);
-                               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));
-                       escputs(buf);
-                       wprintf("</tt><br />\n");
-               }
-               wprintf("</i><br />");
-       }
-
-       /* HTML is fun, but we've got to strip it first */
-       else if (!strcasecmp(mime_content_type, "text/html")) {
-               output_html(mime_charset, (WC->wc_view == VIEW_WIKI ? 1 : 0));
-       }
-
-       /* Unknown weirdness */
-       else {
-               wprintf(_("I don't know how to display %s"), mime_content_type);
-               wprintf("<br />\n");
-               while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) { }
-       }
-
-ENDBODY:       /* If there are attached submessages, display them now... */
-
-       if ( (!IsEmptyStr(mime_submessages)) && (!section[0]) ) {
-               for (i=0; i<num_tokens(mime_submessages, '|'); ++i) {
-                       extract_token(buf, mime_submessages, i, '|', sizeof buf);
-                       /** use printable_view to suppress buttons */
-                       wprintf("<blockquote>");
-                       read_message(msgnum, 1, buf);
-                       wprintf("</blockquote>");
-               }
-       }
-
-
-       /* Afterwards, offer links to download attachments 'n' such */
-       if ( (num_attach_links > 0) && (!section[0]) ) {
-               for (i=0; i<num_attach_links; ++i) {
-                       if (strcasecmp(attach_links[i].partnum, msg4_partnum)) {
-                               wprintf("%s", attach_links[i].html);
-                       }
-               }
-       }
-
-       /* Handler for vCard parts */
-       if (!IsEmptyStr(vcard_partnum)) {
-               part_source = load_mimepart(msgnum, vcard_partnum);
-               if (part_source != NULL) {
-
-                       /** If it's my vCard I can edit it */
-                       if (    (!strcasecmp(WC->wc_roomname, USERCONFIGROOM))
-                               || (!strcasecmp(&WC->wc_roomname[11], USERCONFIGROOM))
-                               || (WC->wc_view == VIEW_ADDRESSBOOK)
-                       ) {
-                               wprintf("<a href=\"edit_vcard?msgnum=%ld&partnum=%s\">",
-                                       msgnum, vcard_partnum);
-                               wprintf("[%s]</a>", _("edit"));
-                       }
-
-                       /* In all cases, display the full card */
-                       display_vcard(part_source, 0, 1, NULL,msgnum);
-               }
-       }
-
-       /* Handler for calendar parts */
-       if (!IsEmptyStr(cal_partnum)) {
-               part_source = load_mimepart(msgnum, cal_partnum);
-               if (part_source != NULL) {
-                       cal_process_attachment(part_source, msgnum, cal_partnum);
-               }
-       }
-
-       if (part_source) {
-               free(part_source);
-               part_source = NULL;
-       }
-
-       wprintf("</div>\n");
-
-       /* end everythingamundo table */
-       if (!printable_view) {
-               wprintf("</div>\n");
-       }
-
-       if (num_attach_links > 0) {
-               free(attach_links);
-       }
-
-#ifdef HAVE_ICONV
-       if (ic != (iconv_t)(-1) ) {
-               iconv_close(ic);
-       }
-#endif
-}
-
-
-
-/*
- * 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) {
-       long msgnum = 0L;
-
-       msgnum = StrTol(WC->UrlFragment1);
-       read_message(msgnum, 0, "");
-}
-
-
-/*
- * 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;
-
-       msgnum = StrTol(WC->UrlFragment1);
-       output_headers(0, 0, 0, 0, 0, 0);
-
-       hprintf("Content-type: text/html\r\n"
-               "Server: %s\r\n"
-               "Connection: close\r\n",
-               PACKAGE_STRING);
-       begin_burst();
-
-       wprintf("\r\n<html>\n<head><title>");
-       escputs(WC->wc_fullname);
-       wprintf("</title></head>\n"
-               "<body onLoad=\" window.print(); window.close(); \">\n"
-       );
-       
-       read_message(msgnum, 1, "");
-
-       wprintf("\n</body></html>\n\n");
-       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(msgnum,1, "");
-  wDumpContent(0);
-}
-
-/**
- * \brief Display a message's headers
- *
- * \param msgnum_as_string Message number, as a string instead of as a long int
- */
-void display_headers(void) {
-       long msgnum = 0L;
-       char buf[1024];
-
-       msgnum = StrTol(WC->UrlFragment1);
-       output_headers(0, 0, 0, 0, 0, 0);
-
-       hprintf("Content-type: text/plain\r\n"
-               "Server: %s\r\n"
-               "Connection: close\r\n",
-               PACKAGE_STRING);
-       begin_burst();
-
-       serv_printf("MSG2 %ld|3", msgnum);
-       serv_getln(buf, sizeof buf);
-       if (buf[0] == '1') {
-               while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
-                       wprintf("%s\n", buf);
-               }
-       }
-
-       wDumpContent(0);
-}
-
-
-
-/**
- * \brief Read message in simple, JavaScript-embeddable form for 'forward'
- *     or 'reply quoted' operations.
- *
- * NOTE: it is VITALLY IMPORTANT that we output no single-quotes or linebreaks
- *       in this function.  Doing so would throw a JavaScript error in the
- *       'supplied text' argument to the editor.
- *
- * \param msgnum Message number of the message we want to quote
- * \param forward_attachments Nonzero if we want attachments to be forwarded
- */
-void pullquote_message(long msgnum, int forward_attachments, int include_headers) {
-       char buf[SIZ];
-       char mime_partnum[256];
-       char mime_filename[256];
-       char mime_content_type[256];
-       char mime_charset[256];
-       char mime_disposition[256];
-       int mime_length;
-       char *attachments = NULL;
-       char *ptr = NULL;
-       int num_attachments = 0;
-       struct wc_attachment *att, *aptr;
-       char m_subject[1024];
-       char from[256];
-       char node[256];
-       char rfca[256];
-       char to[256];
-       char reply_to[512];
-       char now[256];
-       int format_type = 0;
-       int nhdr = 0;
-       int bq = 0;
-       int i = 0;
-#ifdef HAVE_ICONV
-       iconv_t ic = (iconv_t)(-1) ;
-       char *ibuf;                /**< Buffer of characters to be converted */
-       char *obuf;                /**< Buffer for converted characters      */
-       size_t ibuflen;    /**< Length of input buffer         */
-       size_t obuflen;    /**< Length of output buffer       */
-       char *osav;                /**< Saved pointer to output buffer       */
-#endif
-
-       strcpy(from, "");
-       strcpy(node, "");
-       strcpy(rfca, "");
-       strcpy(reply_to, "");
-       strcpy(mime_content_type, "text/plain");
-       strcpy(mime_charset, "us-ascii");
-
-       serv_printf("MSG4 %ld", msgnum);
-       serv_getln(buf, sizeof buf);
-       if (buf[0] != '1') {
-               wprintf(_("ERROR:"));
-               wprintf("%s<br />", &buf[4]);
-               return;
-       }
-
-       strcpy(m_subject, "");
-
-       while (serv_getln(buf, sizeof buf), strcasecmp(buf, "text")) {
-               if (!strcmp(buf, "000")) {
-                       wprintf("%s (3)", _("unexpected end of message"));
-                       return;
-               }
-               if (include_headers) {
-                       if (!strncasecmp(buf, "nhdr=yes", 8))
-                               nhdr = 1;
-                       if (nhdr == 1)
-                               buf[0] = '_';
-                       if (!strncasecmp(buf, "type=", 5))
-                               format_type = atoi(&buf[5]);
-                       if (!strncasecmp(buf, "from=", 5)) {
-                               strcpy(from, &buf[5]);
-                               wprintf(_("from "));
-                               utf8ify_rfc822_string(from);
-                               msgescputs(from);
-                       }
-                       if (!strncasecmp(buf, "subj=", 5)) {
-                               strcpy(m_subject, &buf[5]);
-                       }
-                       if ((!strncasecmp(buf, "hnod=", 5))
-                           && (strcasecmp(&buf[5], serv_info.serv_humannode))) {
-                               wprintf("(%s) ", &buf[5]);
-                       }
-                       if ((!strncasecmp(buf, "room=", 5))
-                           && (strcasecmp(&buf[5], WC->wc_roomname))
-                           && (!IsEmptyStr(&buf[5])) ) {
-                               wprintf(_("in "));
-                               wprintf("%s&gt; ", &buf[5]);
-                       }
-                       if (!strncasecmp(buf, "rfca=", 5)) {
-                               strcpy(rfca, &buf[5]);
-                               wprintf("&lt;");
-                               msgescputs(rfca);
-                               wprintf("&gt; ");
-                       }
-                       if (!strncasecmp(buf, "node=", 5)) {
-                               strcpy(node, &buf[5]);
-                               if ( ((WC->room_flags & QR_NETWORK)
-                               || ((strcasecmp(&buf[5], serv_info.serv_nodename)
-                               && (strcasecmp(&buf[5], serv_info.serv_fqdn)))))
-                               && (IsEmptyStr(rfca))
-                               ) {
-                                       wprintf("@%s ", &buf[5]);
-                               }
-                       }
-                       if (!strncasecmp(buf, "rcpt=", 5)) {
-                               wprintf(_("to "));
-                               strcpy(to, &buf[5]);
-                               utf8ify_rfc822_string(to);
-                               wprintf("%s ", to);
-                       }
-                       if (!strncasecmp(buf, "time=", 5)) {
-                               webcit_fmt_date(now, atol(&buf[5]), 0);
-                               wprintf("%s ", now);
-                       }
-               }
-
-               /**
-                * Save attachment info for later.  We can't start downloading them
-                * yet because we're in the middle of a server transaction.
-                */
-               if (!strncasecmp(buf, "part=", 5)) {
-                       ptr = malloc( (strlen(buf) + ((attachments != NULL) ? strlen(attachments) : 0)) ) ;
-                       if (ptr != NULL) {
-                               ++num_attachments;
-                               sprintf(ptr, "%s%s\n",
-                                       ((attachments != NULL) ? attachments : ""),
-                                       &buf[5]
-                               );
-                               free(attachments);
-                               attachments = ptr;
-                               lprintf(9, "attachments=<%s>\n", attachments);
-                       }
-               }
-
-       }
-
-       if (include_headers) {
-               wprintf("<br>");
-
-               utf8ify_rfc822_string(m_subject);
-               if (!IsEmptyStr(m_subject)) {
-                       wprintf(_("Subject:"));
-                       wprintf(" ");
-                       msgescputs(m_subject);
-                       wprintf("<br />");
-               }
-
-               /**
-                * Begin body
-                */
-               wprintf("<br />");
-       }
-
-       /**
-        * Learn the content type
-        */
-       strcpy(mime_content_type, "text/plain");
-       while (serv_getln(buf, sizeof buf), (!IsEmptyStr(buf))) {
-               if (!strcmp(buf, "000")) {
-                       wprintf("%s (4)", _("unexpected end of message"));
-                       goto ENDBODY;
-               }
-               if (!strncasecmp(buf, "Content-type: ", 14)) {
-                       int len;
-                       safestrncpy(mime_content_type, &buf[14],
-                               sizeof(mime_content_type));
-                       for (i=0; i<strlen(mime_content_type); ++i) {
-                               if (!strncasecmp(&mime_content_type[i], "charset=", 8)) {
-                                       safestrncpy(mime_charset, &mime_content_type[i+8],
-                                               sizeof mime_charset);
-                               }
-                       }
-                       len = strlen(mime_content_type);
-                       for (i=0; i<len; ++i) {
-                               if (mime_content_type[i] == ';') {
-                                       mime_content_type[i] = 0;
-                                       len = i - 1;
-                               }
-                       }
-                       len = strlen(mime_charset);
-                       for (i=0; i<len; ++i) {
-                               if (mime_charset[i] == ';') {
-                                       mime_charset[i] = 0;
-                                       len = i - 1;
-                               }
-                       }
-               }
-       }
-
-       /** Set up a character set conversion if we need to (and if we can) */
-#ifdef HAVE_ICONV
-       if ( (strcasecmp(mime_charset, "us-ascii"))
-          && (strcasecmp(mime_charset, "UTF-8"))
-          && (strcasecmp(mime_charset, ""))
-       ) {
-               ic = ctdl_iconv_open("UTF-8", mime_charset);
-               if (ic == (iconv_t)(-1) ) {
-                       lprintf(5, "%s:%d iconv_open(%s, %s) failed: %s\n",
-                               __FILE__, __LINE__, "UTF-8", mime_charset, strerror(errno));
-               }
-       }
-#endif
-
-       /** Messages in legacy Citadel variformat get handled thusly... */
-       if (!strcasecmp(mime_content_type, "text/x-citadel-variformat")) {
-               pullquote_fmout();
-       }
-
-       /* Boring old 80-column fixed format text gets handled this way... */
-       else if (!strcasecmp(mime_content_type, "text/plain")) {
-               while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
-                       int len;
-                       len = strlen(buf);
-                       if ((len > 0) && (buf[len-1] == '\n')) buf[--len] = 0;
-                       if ((len > 0) && (buf[len-1] == '\r')) buf[--len] = 0;
-
-#ifdef HAVE_ICONV
-                       if (ic != (iconv_t)(-1) ) {
-                               ibuf = buf;
-                               ibuflen = len;
-                               obuflen = SIZ;
-                               obuf = (char *) malloc(obuflen);
-                               osav = obuf;
-                               iconv(ic, &ibuf, &ibuflen, &obuf, &obuflen);
-                               osav[SIZ-obuflen] = 0;
-                               safestrncpy(buf, osav, sizeof buf);
-                               free(osav);
-                       }
-#endif
-
-                       len = strlen(buf);
-                       while ((!IsEmptyStr(buf)) && (isspace(buf[len - 1]))) 
-                               buf[--len] = 0;
-                       if ((bq == 0) &&
-                       ((!strncmp(buf, ">", 1)) || (!strncmp(buf, " >", 2)) )) {
-                               wprintf("<blockquote>");
-                               bq = 1;
-                       } else if ((bq == 1) &&
-                               (strncmp(buf, ">", 1)) && (strncmp(buf, " >", 2)) ) {
-                               wprintf("</blockquote>");
-                               bq = 0;
-                       }
-                       wprintf("<tt>");
-                       url(buf, sizeof(buf));
-                       msgescputs1(buf);
-                       wprintf("</tt><br />");
-               }
-               wprintf("</i><br />");
-       }
-
-       /** HTML just gets escaped and stuffed back into the editor */
-       else if (!strcasecmp(mime_content_type, "text/html")) {
-               while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
-                       strcat(buf, "\n");
-                       msgescputs(buf);
-               }
-       }//// TODO: charset? utf8?
-
-       /** Unknown weirdness ... don't know how to handle this content type */
-       else {
-               while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) { }
-       }
-
-ENDBODY:
-       /** end of body handler */
-
-       /*
-        * If there were attachments, we have to download them and insert them
-        * into the attachment chain for the forwarded message we are composing.
-        */
-       if ( (forward_attachments) && (num_attachments) ) {
-               for (i=0; i<num_attachments; ++i) {
-                       extract_token(buf, attachments, i, '\n', sizeof buf);
-                       extract_token(mime_filename, buf, 1, '|', sizeof mime_filename);
-                       extract_token(mime_partnum, buf, 2, '|', sizeof mime_partnum);
-                       extract_token(mime_disposition, buf, 3, '|', sizeof mime_disposition);
-                       extract_token(mime_content_type, buf, 4, '|', sizeof mime_content_type);
-                       mime_length = extract_int(buf, 5);
-
-                       /*
-                        * tracing  ... uncomment if necessary
-                        *
-                        */
-                       lprintf(9, "fwd filename: %s\n", mime_filename);
-                       lprintf(9, "fwd partnum : %s\n", mime_partnum);
-                       lprintf(9, "fwd conttype: %s\n", mime_content_type);
-                       lprintf(9, "fwd dispose : %s\n", mime_disposition);
-                       lprintf(9, "fwd length  : %d\n", mime_length);
-
-                       if ( (!strcasecmp(mime_disposition, "inline"))
-                          || (!strcasecmp(mime_disposition, "attachment")) ) {
-               
-                               /* Create an attachment struct from this mime part... */
-                               att = malloc(sizeof(struct wc_attachment));
-                               memset(att, 0, sizeof(struct wc_attachment));
-                               att->length = mime_length;
-                               strcpy(att->content_type, mime_content_type);
-                               strcpy(att->filename, mime_filename);
-                               att->next = NULL;
-                               att->data = load_mimepart(msgnum, mime_partnum);
-               
-                               /* And add it to the list. */
-                               if (WC->first_attachment == NULL) {
-                                       WC->first_attachment = att;
-                               }
-                               else {
-                                       aptr = WC->first_attachment;
-                                       while (aptr->next != NULL) aptr = aptr->next;
-                                       aptr->next = att;
-                               }
-                       }
-
-               }
-       }
-
-#ifdef HAVE_ICONV
-       if (ic != (iconv_t)(-1) ) {
-               iconv_close(ic);
-       }
-#endif
-
-       if (attachments != NULL) {
-               free(attachments);
-       }
-}
-
-/**
- * \brief Display one row in the mailbox summary view
- *
- * \param num The row number to be displayed
- */
-void display_summarized(int num) {
-       char datebuf[64];
-       wprintf("<tr id=\"m%ld\" style=\"font-weight:%s;\" "
-               "onMouseDown=\"CtdlMoveMsgMouseDown(event,%ld)\">",
-               WC->summ[num].msgnum,
-               ((WC->summ[num].is_new) ? "bold" : "normal"),
-               WC->summ[num].msgnum
-       );
-
-       wprintf("<td width=%d%%>", SUBJ_COL_WIDTH_PCT);
-
-       escputs(WC->summ[num].subj);//////////////////////////////////TODO: QP DECODE
-       wprintf("</td>");
-
-       wprintf("<td width=%d%%>", SENDER_COL_WIDTH_PCT);
-       escputs(WC->summ[num].from);
-       wprintf("</td>");
-
-       wprintf("<td width=%d%%>", DATE_PLUS_BUTTONS_WIDTH_PCT);
-       webcit_fmt_date(datebuf, WC->summ[num].date, 1);        /* brief */
-       escputs(datebuf);
-       wprintf("</td>");
-
-       wprintf("</tr>\n");
-}
-/**
- * \brief Output a message row for the mobile view
- * \param The row number 
- */
-void display_mobile_summary(int num) {
-       char datebuf[64];
-       wprintf("\n<div><div id=\"m%ld\" style=\"font-weight:%s;\" "
-               "onClick=\"CtdlLoadMsgMouseDown(event,%ld)\">",
-               WC->summ[num].msgnum,
-               (WC->summ[num].is_new ? "bold" : "normal"),
-               WC->summ[num].msgnum
-       );
-               wprintf("<span class=\"from\">%s</span>",WC->summ[num].from);
-               wprintf("<span style=\"float: right;\">");
-               webcit_fmt_date(datebuf, WC->summ[num].date, 1);        /* brief */
-               escputs(datebuf);
-               wprintf("</span><br/><span class=\"subject\">");
-               escputs(WC->summ[num].subj);
-               wprintf("</span></div><div id=\"m_%ld\" class=\"msgview\" onMouseDown=\"\"></div></div>",WC->summ[num].msgnum);
-}
-
-/**
- * \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;
-       struct message_summary summ;
-
-       memset(&summ, 0, sizeof(summ));
-       safestrncpy(summ.subj, _("(no subject)"), sizeof summ.subj);
-
-       sprintf(buf, "MSG0 %ld|1", msgnum);     /* ask for headers only */
-       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(msgnum, vcard_partnum);
-               if (vcard_source != NULL) {
-
-                       /** Display the summary line */
-                       display_vcard(vcard_source, alpha, 0, NULL,msgnum);
-
-                       /** If it's my vCard I can edit it */
-                       if (    (!strcasecmp(WC->wc_roomname, USERCONFIGROOM))
-                               || (!strcasecmp(&WC->wc_roomname[11], USERCONFIGROOM))
-                               || (WC->wc_view == VIEW_ADDRESSBOOK)
-                       ) {
-                               wprintf("<a href=\"edit_vcard?"
-                                       "msgnum=%ld&partnum=%s\">",
-                                       msgnum, vcard_partnum);
-                               wprintf("[%s]</a>", _("edit"));
-                       }
-
-                       free(vcard_source);
-               }
-       }
-
-}
-
-
-
-/**
- * \brief  If it's an old "Firstname Lastname" style record, try to convert it.
- * \param namebuf name to analyze, reverse if nescessary
- */
-void lastfirst_firstlast(char *namebuf) {
-       char firstname[SIZ];
-       char lastname[SIZ];
-       int i;
-
-       if (namebuf == NULL) return;
-       if (strchr(namebuf, ';') != NULL) return;
-
-       i = num_tokens(namebuf, ' ');
-       if (i < 2) return;
-
-       extract_token(lastname, namebuf, i-1, ' ', sizeof lastname);
-       remove_token(namebuf, i-1, ' ');
-       strcpy(firstname, namebuf);
-       sprintf(namebuf, "%s; %s", lastname, firstname);
-}
-
-/**
- * \brief fetch what??? name
- * \param msgnum the citadel message number
- * \param namebuf where to put the name in???
- */
-void fetch_ab_name(long msgnum, 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;
-       struct message_summary summ;
-
-       if (namebuf == NULL) return;
-       strcpy(namebuf, "");
-
-       memset(&summ, 0, sizeof(summ));
-       safestrncpy(summ.subj, "(no subject)", sizeof summ.subj);
-
-       sprintf(buf, "MSG0 %ld|0", 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(msgnum, vcard_partnum);
-               if (vcard_source != NULL) {
-
-                       /* Grab the name off the card */
-                       display_vcard(vcard_source, 0, 0, namebuf,msgnum);
-
-                       free(vcard_source);
-               }
-       }
-
-       lastfirst_firstlast(namebuf);
-       striplt(namebuf);
-       len = strlen(namebuf);
-       for (i=0; i<len; ++i) {
-               if (namebuf[i] != ';') return;
-       }
-       strcpy(namebuf, _("(no name)"));
-}
-
-
-
-/**
- * \brief Record compare function for sorting address book indices
- * \param ab1 adressbook one
- * \param ab2 adressbook two
- */
-int abcmp(const void *ab1, const void *ab2) {
-       return(strcasecmp(
-               (((const struct addrbookent *)ab1)->ab_name),
-               (((const struct addrbookent *)ab2)->ab_name)
-       ));
-}
-
-
-/**
- * \brief Helper function for do_addrbook_view()
- * Converts a name into a three-letter tab label
- * \param tabbuf the tabbuffer to add name to
- * \param name the name to add to the tabbuffer
- */
-void nametab(char *tabbuf, long len, char *name) {
-       stresc(tabbuf, len, name, 0, 0);
-       tabbuf[0] = toupper(tabbuf[0]);
-       tabbuf[1] = tolower(tabbuf[1]);
-       tabbuf[2] = tolower(tabbuf[2]);
-       tabbuf[3] = 0;
-}
-
-
-/**
- * \brief Render the address book using info we gathered during the scan
- * \param addrbook the addressbook to render
- * \param num_ab the number of the addressbook
- */
-void do_addrbook_view(struct addrbookent *addrbook, int num_ab) {
-       int i = 0;
-       int displayed = 0;
-       int bg = 0;
-       static int NAMESPERPAGE = 60;
-       int num_pages = 0;
-       int tabfirst = 0;
-       char tabfirst_label[64];
-       int tablast = 0;
-       char tablast_label[64];
-       char this_tablabel[64];
-       int page = 0;
-       char **tablabels;
-
-       if (num_ab == 0) {
-               wprintf("<br /><br /><br /><div align=\"center\"><i>");
-               wprintf(_("This address book is empty."));
-               wprintf("</i></div>\n");
-               return;
-       }
-
-       if (num_ab > 1) {
-               qsort(addrbook, num_ab, sizeof(struct addrbookent), abcmp);
-       }
-
-       num_pages = (num_ab / NAMESPERPAGE) + 1;
-
-       tablabels = malloc(num_pages * sizeof (char *));
-       if (tablabels == NULL) {
-               wprintf("<br /><br /><br /><div align=\"center\"><i>");
-               wprintf(_("An internal error has occurred."));
-               wprintf("</i></div>\n");
-               return;
-       }
-
-       for (i=0; i<num_pages; ++i) {
-               tabfirst = i * NAMESPERPAGE;
-               tablast = tabfirst + NAMESPERPAGE - 1;
-               if (tablast > (num_ab - 1)) tablast = (num_ab - 1);
-               nametab(tabfirst_label, 64, addrbook[tabfirst].ab_name);
-               nametab(tablast_label, 64, addrbook[tablast].ab_name);
-               sprintf(this_tablabel, "%s&nbsp;-&nbsp;%s", tabfirst_label, tablast_label);
-               tablabels[i] = strdup(this_tablabel);
-       }
-
-       tabbed_dialog(num_pages, tablabels);
-       page = (-1);
-
-       for (i=0; i<num_ab; ++i) {
-
-               if ((i / NAMESPERPAGE) != page) {       /* New tab */
-                       page = (i / NAMESPERPAGE);
-                       if (page > 0) {
-                               wprintf("</tr></table>\n");
-                               end_tab(page-1, num_pages);
-                       }
-                       begin_tab(page, num_pages);
-                       wprintf("<table border=0 cellspacing=0 cellpadding=3 width=100%%>\n");
-                       displayed = 0;
-               }
-
-               if ((displayed % 4) == 0) {
-                       if (displayed > 0) {
-                               wprintf("</tr>\n");
-                       }
-                       bg = 1 - bg;
-                       wprintf("<tr bgcolor=\"#%s\">",
-                               (bg ? "DDDDDD" : "FFFFFF")
-                       );
-               }
-       
-               wprintf("<td>");
-
-               wprintf("<a href=\"readfwd?startmsg=%ld&is_singlecard=1",
-                       addrbook[i].ab_msgnum);
-               wprintf("?maxmsgs=1&is_summary=0&alpha=%s\">", bstr("alpha"));
-               vcard_n_prettyize(addrbook[i].ab_name);
-               escputs(addrbook[i].ab_name);
-               wprintf("</a></td>\n");
-               ++displayed;
-       }
-
-       /* Placeholders for empty columns at end */
-       if ((num_ab % 4) != 0) {
-               for (i=0; i<(4-(num_ab % 4)); ++i) {
-                       wprintf("<td>&nbsp;</td>");
-               }
-       }
-
-       wprintf("</tr></table>\n");
-       end_tab((num_pages-1), num_pages);
-
-       begin_tab(num_pages, num_pages);
-       /* FIXME there ought to be something here */
-       end_tab(num_pages, num_pages);
-
-       for (i=0; i<num_pages; ++i) {
-               free(tablabels[i]);
-       }
-       free(tablabels);
-}
-
-
-
-/*
- * 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)
-{
-       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;
-
-       int num_summ_alloc = 0;
-
-       if (WC->summ != NULL) {
-               free(WC->summ);
-               WC->num_summ = 0;
-               WC->summ = NULL;
-       }
-       num_summ_alloc = 100;
-       WC->num_summ = 0;
-       WC->summ = malloc(num_summ_alloc * sizeof(struct message_summary));
-
-       nummsgs = 0;
-       maxload = sizeof(WC->msgarr) / sizeof(long) ;
-       serv_puts(servcmd);
-       serv_getln(buf, sizeof buf);
-       if (buf[0] != '1') {
-               return (nummsgs);
-       }
-       while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
-               if (nummsgs < maxload) {
-                       WC->msgarr[nummsgs] = extract_long(buf, 0);
-                       datestamp = extract_long(buf, 1);
-                       extract_token(fullname, buf, 2, '|', sizeof fullname);
-                       extract_token(nodename, buf, 3, '|', sizeof nodename);
-                       extract_token(inetaddr, buf, 4, '|', sizeof inetaddr);
-                       extract_token(subject, buf, 5, '|', sizeof subject);
-                       ++nummsgs;
-
-                       if (with_headers) {
-                               if (nummsgs > num_summ_alloc) {
-                                       num_summ_alloc *= 2;
-                                       WC->summ = realloc(WC->summ,
-                                               num_summ_alloc * sizeof(struct message_summary));
-                               }
-                               ++WC->num_summ;
-
-                               memset(&WC->summ[nummsgs-1], 0, sizeof(struct message_summary));
-                               WC->summ[nummsgs-1].msgnum = WC->msgarr[nummsgs-1];
-                               safestrncpy(WC->summ[nummsgs-1].subj,
-                                       _("(no subject)"), sizeof WC->summ[nummsgs-1].subj);
-                               if (!IsEmptyStr(subject)) {
-                               /** Handle subjects with RFC2047 encoding */
-                                       utf8ify_rfc822_string(subject);
-                                       safestrncpy(WC->summ[nummsgs-1].subj, subject,
-                                                   sizeof WC->summ[nummsgs-1].subj);
-                               }
-                               sbjlen = Ctdl_Utf8StrLen(WC->summ[nummsgs-1].subj);
-                               if (sbjlen > 75) {
-                                       ptr = Ctdl_Utf8StrCut(WC->summ[nummsgs-1].subj, 72);
-
-                                       strcpy(ptr, "...");
-                               }
-
-                               if (!IsEmptyStr(fullname)) {
-                               /** Handle senders with RFC2047 encoding */
-                                       utf8ify_rfc822_string(fullname);
-                                       safestrncpy(WC->summ[nummsgs-1].from,
-                                               fullname, sizeof WC->summ[nummsgs-1].from);
-                               }
-                               if ((!IsEmptyStr(nodename)) &&
-                                   ( ((WC->room_flags & QR_NETWORK)
-                                      || ((strcasecmp(nodename, serv_info.serv_nodename)
-                                                && (strcasecmp(nodename, serv_info.serv_fqdn)))))))
-                               {
-                                       strcat(WC->summ[nummsgs-1].from, " @ ");
-                                       strcat(WC->summ[nummsgs-1].from, nodename);
-                                       
-                               }
-                               sbjlen = Ctdl_Utf8StrLen(WC->summ[nummsgs-1].from);
-                               if (sbjlen > 25) {
-                                       ptr = Ctdl_Utf8StrCut(WC->summ[nummsgs-1].from, 23);
-                                       strcpy(ptr, "...");
-                               }
-
-                               WC->summ[nummsgs-1].date = datestamp;
-                       }
-               }
-       }
-       return (nummsgs);
-}
-
-
-typedef int (*QSortFunction) (const void*, const void*);
-
-/*
- * qsort() compatible function to compare two longs in descending order.
- */
-int longcmp_r(const void *s1, const void *s2) {
-       long l1;
-       long l2;
-
-       l1 = *(long *)s1;
-       l2 = *(long *)s2;
-
-       if (l1 > l2) return(-1);
-       if (l1 < l2) return(+1);
-       return(0);
-}
-
-/*
- * qsort() compatible function to compare two message summary structs by ascending subject.
- */
-int summcmp_subj(const void *s1, const void *s2) {
-       struct message_summary *summ1;
-       struct message_summary *summ2;
-       
-       summ1 = (struct message_summary *)s1;
-       summ2 = (struct message_summary *)s2;
-       return strcasecmp(summ1->subj, summ2->subj);
-}
-
-/*
- * qsort() compatible function to compare two message summary structs by descending subject.
- */
-int summcmp_rsubj(const void *s1, const void *s2) {
-       struct message_summary *summ1;
-       struct message_summary *summ2;
+       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);
        
-       summ1 = (struct message_summary *)s1;
-       summ2 = (struct message_summary *)s2;
-       return strcasecmp(summ2->subj, summ1->subj);
+       FreeStrBuf(&Buf);
+       FreeStrBuf(&HdrToken);
+       return 1;
 }
 
-/*
- * qsort() compatible function to compare two message summary structs by ascending sender.
- */
-int summcmp_sender(const void *s1, const void *s2) {
-       struct message_summary *summ1;
-       struct message_summary *summ2;
-       
-       summ1 = (struct message_summary *)s1;
-       summ2 = (struct message_summary *)s2;
-       return strcasecmp(summ1->from, summ2->from);
-}
+
 
 /*
- * qsort() compatible function to compare two message summary structs by descending sender.
+ * 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 summcmp_rsender(const void *s1, const void *s2) {
-       struct message_summary *summ1;
-       struct message_summary *summ2;
-       
-       summ1 = (struct message_summary *)s1;
-       summ2 = (struct message_summary *)s2;
-       return strcasecmp(summ2->from, summ1->from);
+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);
+       memset(&SubTP, 0, sizeof(WCTemplputParams));
+       SubTP.Filter.ContextType = CTX_MAILSUM;
+       SubTP.Context = Msg;
+       *OutMime = DoTemplate(tmpl, tmpllen, Target, &SubTP);
+
+       DestroyMessageSummary(Msg);
+       FreeStrBuf(&FoundCharset);
+       FreeStrBuf(&Buf);
+       return 1;
 }
 
-/*
- * qsort() compatible function to compare two message summary structs by ascending date.
- */
-int summcmp_date(const void *s1, const void *s2) {
-       struct message_summary *summ1;
-       struct message_summary *summ2;
-       
-       summ1 = (struct message_summary *)s1;
-       summ2 = (struct message_summary *)s2;
 
-       if (summ1->date < summ2->date) return -1;
-       else if (summ1->date > summ2->date) return +1;
-       else return 0;
+long
+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;
+       }
+
+       return httpstatus;
 }
 
 /*
- * qsort() compatible function to compare two message summary structs by descending date.
+ * Unadorned HTML output of an individual message, suitable
+ * for placing in a hidden iframe, for printing, or whatever
  */
-int summcmp_rdate(const void *s1, const void *s2) {
-       struct message_summary *summ1;
-       struct message_summary *summ2;
-       
-       summ1 = (struct message_summary *)s1;
-       summ2 = (struct message_summary *)s2;
+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;
 
-       if (summ1->date < summ2->date) return +1;
-       else if (summ1->date > summ2->date) return -1;
-       else return 0;
-}
 
+       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);
+               GetServerStatusMsg(CmdBuf, &CitStatus, 1, 0);
+               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);
+                       GetServerStatusMsg(CmdBuf, NULL, 1, 0);
+                       GetServerStatus(CmdBuf, &CitStatus);
+                       HttpStatus(CitStatus);
+               }
+               else
+                       HttpStatus(500);
+               break;
+       default:
+               break;
 
-enum {
-       eUp,
-       eDown,
-       eNone
-};
-
-const char* SortIcons[3] = {
-       "static/up_pointer.gif",
-       "static/down_pointer.gif",
-       "static/sort_none.gif"
-};
-
- enum  {/// SortByEnum
-       eDate,
-       eRDate,
-       eSubject,
-       eRSubject,
-       eSender,
-       eRSender,
-       eReverse,
-       eUnSet
-}; 
-
-/* SortEnum to plain string representation */
-static const char* SortByStrings[] = {
-       "date",
-       "rdate",
-       "subject", 
-       "rsubject", 
-       "sender",
-       "rsender",
-       "reverse",
-       "unset"
-};
-
-/* SortEnum to sort-Function Table */
-const QSortFunction SortFuncs[eUnSet] = {
-       summcmp_date,
-       summcmp_rdate,
-       summcmp_subj,
-       summcmp_rsubj,
-       summcmp_sender,
-       summcmp_rsender,
-       summcmp_rdate
-};
-
-/* given a SortEnum, which icon should we choose? */
-const int SortDateToIcon[eUnSet] = { eUp, eDown, eNone, eNone, eNone, eNone, eNone};
-const int SortSubjectToIcon[eUnSet] = { eNone, eNone, eUp, eDown, eNone, eNone, eNone};
-const int SortSenderToIcon[eUnSet] = { eNone, eNone, eNone, eNone, eUp, eDown, eNone};
-
-/* given a SortEnum, which would be the "opposite" search option? */
-const int DateInvertSortString[eUnSet] =  { eRDate, eDate, eDate, eDate, eDate, eDate, eDate};
-const int SubjectInvertSortString[eUnSet] =  { eSubject, eSubject, eRSubject, eUnSet, eSubject, eSubject, eSubject};
-const int SenderInvertSortString[eUnSet] =  { eSender, eSender, eSender, eSender, eRSender, eUnSet, eSender};
+       }
+}
 
 
 /*
- * Translates sortoption String to its SortEnum representation 
- * returns the enum matching the string; defaults to RDate
+ * Unadorned HTML output of an individual message, suitable
+ * for placing in a hidden iframe, for printing, or whatever
  */
-//SortByEnum 
-int StrToESort (const StrBuf *sortby)
-{
-       int result = eDate;
+void embed_message(void) {
+       const StrBuf *Mime;
+       long msgnum = 0L;
+       wcsession *WCC = WC;
+       const StrBuf *Tmpl;
+       StrBuf *CmdBuf = NULL;
 
-       if (!IsEmptyStr(ChrPtr(sortby))) while (result < eUnSet){
-                       if (!strcasecmp(ChrPtr(sortby), 
-                                       SortByStrings[result])) 
-                               return result;
-                       result ++;
-               }
-       return eRDate;
-}
+       msgnum = StrBufExtract_long(WCC->Hdr->HR.ReqLine, 0, '/');
+       if (msgnum <= 0) return;
 
+       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);
+               GetServerStatusMsg(CmdBuf, NULL, 1, 0);
+               break;
+       default:
+               break;
 
+       }
+}
 
 
 /*
- * command loop for reading messages
- *
- * Set oper to "readnew" or "readold" or "readfwd" or "headers"
+ * Printable view of a message
  */
-void readloop(char *oper)
-{
-       char cmd[256] = "";
-       char buf[SIZ];
-       char old_msgs[SIZ];
-       int a, b;
-       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;
-       int is_tasks = 0;
-       int is_notes = 0;
-       int is_bbview = 0;
-       int lo, hi;
-       int lowest_displayed = (-1);
-       int highest_displayed = 0;
-       struct addrbookent *addrbook = NULL;
-       int num_ab = 0;
-       const StrBuf *sortby = NULL;
-       //SortByEnum 
-       int SortBy = eRDate;
-       const StrBuf *sortpref_value;
-       int bbs_reverse = 0;
-       struct wcsession *WCC = WC;     /* This is done to make it run faster; WC is a function */
-
-       if (WCC->wc_view == VIEW_WIKI) {
-               sprintf(buf, "wiki?room=%s&page=home", WCC->wc_roomname);
-               http_redirect(buf);
-               return;
-       }
+void print_message(void) {
+       long msgnum = 0L;
+       const StrBuf *Mime;
 
-       startmsg = lbstr("startmsg");
-       maxmsgs = ibstr("maxmsgs");
-       is_summary = (ibstr("is_summary") && !WCC->is_mobile);
-       if (maxmsgs == 0) maxmsgs = DEFAULT_MAXMSGS;
+       msgnum = StrBufExtract_long(WC->Hdr->HR.ReqLine, 0, '/');
+       output_headers(0, 0, 0, 0, 0, 0);
 
-       sortpref_value = get_room_pref("sort");
+       hprintf("Content-type: text/html\r\n"
+               "Server: " PACKAGE_STRING "\r\n"
+               "Connection: close\r\n");
 
-       sortby = sbstr("sortby");
-       if ( (!IsEmptyStr(ChrPtr(sortby))) && 
-            (strcasecmp(ChrPtr(sortby), ChrPtr(sortpref_value)) != 0)) {
-               set_room_pref("sort", NewStrBufDup(sortby), 1);
-               sortpref_value = NULL;
-               sortpref_value = sortby;
-       }
+       begin_burst();
 
-       SortBy = StrToESort(sortpref_value);
-       /* message board sort */
-       if (SortBy == eReverse) {
-               bbs_reverse = 1;
-       }
-       else {
-               bbs_reverse = 0;
-       }
+       read_message(WC->WBuf, HKEY("view_message_print"), msgnum, NULL, &Mime);
 
-       output_headers(1, 1, 1, 0, 0, 0);
+       wDumpContent(0);
+}
 
-       /*
-        * 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");
-       }
+/*
+ * Display a message's headers
+ */
+void display_headers(void) {
+       long msgnum = 0L;
+       char buf[1024];
 
-       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");
-               }
-       }
+       msgnum = StrBufExtract_long(WC->Hdr->HR.ReqLine, 0, '/');
+       output_headers(0, 0, 0, 0, 0, 0);
 
-       if ((WCC->wc_view == VIEW_ADDRESSBOOK) && (maxmsgs > 1)) {
-               is_addressbook = 1;
-               if (!strcmp(oper, "do_search")) {
-                       snprintf(cmd, sizeof(cmd), "MSGS SEARCH|%s", bstr("query"));
-               }
-               else {
-                       strcpy(cmd, "MSGS ALL");
+       hprintf("Content-type: text/plain\r\n"
+               "Server: %s\r\n"
+               "Connection: close\r\n",
+               PACKAGE_STRING);
+       begin_burst();
+
+       serv_printf("MSG2 %ld|3", msgnum);
+       serv_getln(buf, sizeof buf);
+       if (buf[0] == '1') {
+               while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
+                       wc_printf("%s\n", buf);
                }
-               maxmsgs = 9999999;
        }
 
-       if (is_summary) {                       /**< fetch header summary */
-               snprintf(cmd, sizeof(cmd), "MSGS %s|%s||1",
-                       (!strcmp(oper, "do_search") ? "SEARCH" : "ALL"),
-                       (!strcmp(oper, "do_search") ? bstr("query") : "")
-               );
-               startmsg = 1;
-               maxmsgs = 9999999;
-       } 
-       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;
-       }
+       wDumpContent(0);
+}
 
-       /*
-        * 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.
-        */
-       strcpy(old_msgs, "");
-       if ((is_summary) || (WCC->wc_default_view == VIEW_CALENDAR) || WCC->is_mobile){
-               serv_puts("GTSN");
-               serv_getln(buf, sizeof buf);
-               if (buf[0] == '2') {
-                       strcpy(old_msgs, &buf[4]);
+
+message_summary *ReadOneMessageSummary(StrBuf *RawMessage, const char *DefaultSubject, long MsgNum) 
+{
+       void                 *vEval;
+       MsgPartEvaluatorStruct  *Eval;
+       message_summary      *Msg;
+       StrBuf *Buf;
+       const char *buf;
+       const char *ebuf;
+       int nBuf;
+       long len;
+       
+       Buf = NewStrBuf();
+
+       serv_printf("MSG0 %ld|1", MsgNum);      /* ask for headers only */
+       
+       StrBuf_ServGetln(Buf);
+       if (GetServerStatus(Buf, NULL) == 1) {
+               FreeStrBuf(&Buf);
+               return NULL;
+       }
+
+       Msg = (message_summary*)malloc(sizeof(message_summary));
+       memset(Msg, 0, sizeof(message_summary));
+       while (len = StrBuf_ServGetln(Buf),
+              (len >= 0) && 
+              ((len != 3)  ||
+               strcmp(ChrPtr(Buf), "000")))
+       {
+               buf = ChrPtr(Buf);
+               ebuf = strchr(ChrPtr(Buf), '=');
+               nBuf = ebuf - buf;
+               if (GetHash(MsgEvaluators, buf, nBuf, &vEval) && vEval != NULL) {
+                       Eval = (MsgPartEvaluatorStruct*) vEval;
+                       StrBufCutLeft(Buf, nBuf + 1);
+                       Eval->f(Msg, Buf);
                }
+               else syslog(1, "Don't know how to handle Message Headerline [%s]", ChrPtr(Buf));
        }
+       return Msg;
+}
 
-       is_singlecard = ibstr("is_singlecard");
 
-       if (WCC->wc_default_view == VIEW_CALENDAR) {            /**< calendar */
-               is_calendar = 1;
-               strcpy(cmd, "MSGS ALL|||1");
-               maxmsgs = 32767;
-       }
-       if (WCC->wc_default_view == VIEW_TASKS) {               /**< tasks */
-               is_tasks = 1;
-               strcpy(cmd, "MSGS ALL");
-               maxmsgs = 32767;
-       }
-       if (WCC->wc_default_view == VIEW_NOTES) {               /**< notes */
-               is_notes = 1;
-               strcpy(cmd, "MSGS ALL");
-               maxmsgs = 32767;
-       }
 
-       if (is_notes) {
-               wprintf("<div id=\"new_notes_here\"></div>\n");
-       }
 
-       nummsgs = load_msg_ptrs(cmd, (is_summary || WCC->is_mobile));
-       if (nummsgs == 0) {
 
-               if ((!is_tasks) && (!is_calendar) && (!is_notes) && (!is_addressbook)) {
-                       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");
-               }
+/*
+ * load message pointers from the server for a "read messages" operation
+ *
+ * servcmd:            the citadel command to send to the citserver
+ */
+int load_msg_ptrs(const char *servcmd,
+                 const char *filter,
+                 SharedMessageStatus *Stat, 
+                 load_msg_ptrs_detailheaders LH)
+{
+        wcsession *WCC = WC;
+       message_summary *Msg;
+       StrBuf *Buf, *Buf2;
+       long len;
+       int n;
+       int skipit;
+       const char *Ptr = NULL;
+       int StatMajor;
+
+       Stat->lowest_found = LONG_MAX;
+       Stat->highest_found = LONG_MIN;
 
-               goto DONE;
+       if (WCC->summ != NULL) {
+               DeleteHash(&WCC->summ);
        }
-
-       if ((is_summary) || (WCC->wc_default_view == VIEW_CALENDAR) || WCC->is_mobile){
-               for (a = 0; a < nummsgs; ++a) {
-                       /** Are you a new message, or an old message? */
-                       if (is_summary) {
-                               if (is_msg_in_mset(old_msgs, WCC->msgarr[a])) {
-                                       WCC->summ[a].is_new = 0;
+       WCC->summ = NewHash(1, Flathash);
+       
+       Buf = NewStrBuf();
+       serv_puts(servcmd);
+       StrBuf_ServGetln(Buf);
+       StatMajor = GetServerStatus(Buf, NULL);
+       switch (StatMajor) {
+       case 1:
+               break;
+       case 8:
+               if (filter != NULL) {
+                       serv_puts(filter);
+                        serv_puts("000");
+                       break;
+               }
+               /* fall back to empty filter in case of we were fooled... */
+               serv_puts("");
+               serv_puts("000");
+               break;
+       default:
+               FreeStrBuf(&Buf);
+               return (Stat->nummsgs);
+       }
+       Buf2 = NewStrBuf();
+       while (len = StrBuf_ServGetln(Buf), 
+              ((len >= 0) &&
+               ((len != 3) || 
+                strcmp(ChrPtr(Buf), "000")!= 0)))
+       {
+               if (Stat->nummsgs < Stat->maxload) {
+                       skipit = 0;
+                       Ptr = NULL;
+                       Msg = (message_summary*)malloc(sizeof(message_summary));
+                       memset(Msg, 0, sizeof(message_summary));
+
+                       Msg->msgnum = StrBufExtractNext_long(Buf, &Ptr, '|');
+                       Msg->date = StrBufExtractNext_long(Buf, &Ptr, '|');
+
+                       if (Stat->nummsgs == 0) {
+                               if (Msg->msgnum < Stat->lowest_found) {
+                                       Stat->lowest_found = Msg->msgnum;
                                }
-                               else {
-                                       WCC->summ[a].is_new = 1;
+                               if (Msg->msgnum > Stat->highest_found) {
+                                       Stat->highest_found = Msg->msgnum;
                                }
                        }
-               }
-       }
 
-       if (startmsg == 0L) {
-               if (bbs_reverse) {
-                       startmsg = WCC->msgarr[(nummsgs >= maxmsgs) ? (nummsgs - maxmsgs) : 0];
-               }
-               else {
-                       startmsg = WCC->msgarr[0];
-               }
-       }
+                       if ((Msg->msgnum == 0) && (StrLength(Buf) < 32)) {
+                               free(Msg);
+                               continue;
+                       }
 
-       if (is_summary || WCC->is_mobile) {
-               qsort(WCC->summ, WCC->num_summ,
-                     sizeof(struct message_summary), SortFuncs[SortBy]);
+                       /* 
+                        * 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);
+               }
+               Stat->nummsgs++;
        }
+       FreeStrBuf(&Buf2);
+       FreeStrBuf(&Buf);
+       return (Stat->nummsgs);
+}
 
 
-       if (is_summary) {
-
-               wprintf("<script language=\"javascript\" type=\"text/javascript\">"
-                       " document.onkeydown = CtdlMsgListKeyPress;     "
-                       " if (document.layers) {                        "
-                       "       document.captureEvents(Event.KEYPRESS); "
-                       " }                                             "
-                       "</script>\n"
-               );
-
-               /** note that Date and Delete are now in the same column */
-               wprintf("<div id=\"message_list_hdr\">"
-                       "<div class=\"fix_scrollbar_bug\">"
-                       "<table cellspacing=0 style=\"width:100%%\">"
-                       "<tr>"
-               );
-               wprintf("<th width=%d%%>%s <a href=\"readfwd?startmsg=1&maxmsgs=9999999&is_summary=1&sortby=%s\"><img border=\"0\" src=\"%s\" /></a> </th>\n"
-                       "<th width=%d%%>%s <a href=\"readfwd?startmsg=1&maxmsgs=9999999&is_summary=1&sortby=%s\"><img border=\"0\" src=\"%s\" /></a> </th>\n"
-                       "<th width=%d%%>%s <a href=\"readfwd?startmsg=1&maxmsgs=9999999&is_summary=1&sortby=%s\"><img border=\"0\" src=\"%s\" /></a> \n"
-                       "&nbsp;"
-                       "<input type=\"submit\" name=\"delete_button\" id=\"delbutton\" "
-                       " onClick=\"CtdlDeleteSelectedMessages(event)\" "
-                       " value=\"%s\">"
-                       "</th>"
-                       "</tr>\n"
-                       ,
-                       SUBJ_COL_WIDTH_PCT,
-                       _("Subject"),
-                       SortByStrings[SubjectInvertSortString[SortBy]],
-                       SortIcons[SortSubjectToIcon[SortBy]],
-                       SENDER_COL_WIDTH_PCT,
-                       _("Sender"),
-                       SortByStrings[SenderInvertSortString[SortBy]],
-                       SortIcons[SortSenderToIcon[SortBy]],
-                       DATE_PLUS_BUTTONS_WIDTH_PCT,
-                       _("Date"),
-                       SortByStrings[DateInvertSortString[SortBy]],
-                       SortIcons[SortDateToIcon[SortBy]],
-                       _("Delete")
-               );
-               wprintf("</table></div></div>\n");
-               wprintf("<div id=\"message_list\">"
-
-                       "<div class=\"fix_scrollbar_bug\">\n"
-                       "<table class=\"mailbox_summary\" id=\"summary_headers\" "
-                       "cellspacing=0 style=\"width:100%%;-moz-user-select:none;\">"
-               );
-       } else if (WCC->is_mobile) {
-               wprintf("<div id=\"message_list\">");
-       }
-
 
-       /**
-        * Set the "is_bbview" variable if it appears that we are looking at
-        * a classic bulletin board view.
-        */
-       if ((!is_tasks) && (!is_calendar) && (!is_addressbook)
-             && (!is_notes) && (!is_singlecard) && (!is_summary)) {
-               is_bbview = 1;
-       }
+/**
+ * \brief sets FlagToSet for each of ScanMe that appears in MatchMSet
+ * \param ScanMe List of BasicMsgStruct to be searched it MatchSet
+ * \param MatchMSet MSet we want to flag
+ * \param FlagToSet Flag to set on each BasicMsgStruct->Flags if in MSet
+ */
+void SetFlagsFromMSet(HashList *ScanMe, MSet *MatchMSet, int FlagToSet, int Reverse)
+{
+       const char *HashKey;
+       long HKLen;
+       HashPos *at;
+       void *vMsg;
+       message_summary *Msg;
 
-       /**
-        * If we're not currently looking at ALL requested
-        * messages, then display the selector bar
-        */
-       if (is_bbview) {
-               /** begin bbview scroller */
-               wprintf("<form name=\"msgomatictop\" class=\"selector_top\" > \n <p>");
-               wprintf(_("Reading #"));//// TODO this isn't used, should it? : , lowest_displayed, highest_displayed);
-
-               wprintf("<select name=\"whichones\" size=\"1\" "
-                       "OnChange=\"location.href=msgomatictop.whichones.options"
-                       "[selectedIndex].value\">\n");
-
-               if (bbs_reverse) {
-                       for (b=nummsgs-1; b>=0; b = b - maxmsgs) {
-                               hi = b + 1;
-                               lo = b - maxmsgs + 2;
-                               if (lo < 1) lo = 1;
-                               wprintf("<option %s value="
-                                       "\"%s"
-                                       "&startmsg=%ld"
-                                       "&maxmsgs=%d"
-                                       "&is_summary=%d\">"
-                                       "%d-%d</option> \n",
-                                       ((WCC->msgarr[lo-1] == startmsg) ? "selected" : ""),
-                                       oper,
-                                       WCC->msgarr[lo-1],
-                                       maxmsgs,
-                                       is_summary,
-                                       hi, lo);
-                       }
+       at = GetNewHashPos(ScanMe, 0);
+       while (GetNextHashPos(ScanMe, at, &HKLen, &HashKey, &vMsg)) {
+               /* Are you a new message, or an old message? */
+               Msg = (message_summary*) vMsg;
+               if (Reverse && IsInMSetList(MatchMSet, Msg->msgnum)) {
+                       Msg->Flags = Msg->Flags | FlagToSet;
                }
-               else {
-                       for (b=0; b<nummsgs; b = b + maxmsgs) {
-                               lo = b + 1;
-                               hi = b + maxmsgs + 1;
-                               if (hi > nummsgs) hi = nummsgs;
-                               wprintf("<option %s value="
-                                       "\"%s"
-                                       "&startmsg=%ld"
-                                       "&maxmsgs=%d"
-                                       "&is_summary=%d\">"
-                                       "%d-%d</option> \n",
-                                       ((WCC->msgarr[b] == startmsg) ? "selected" : ""),
-                                       oper,
-                                       WCC->msgarr[lo-1],
-                                       maxmsgs,
-                                       is_summary,
-                                       lo, hi);
-                       }
+               else if (!Reverse && !IsInMSetList(MatchMSet, Msg->msgnum)) {
+                       Msg->Flags = Msg->Flags | FlagToSet;
                }
-
-               wprintf("<option value=\"%s?startmsg=%ld"
-                       "&maxmsgs=9999999&is_summary=%d\">",
-                       oper,
-                       WCC->msgarr[0], is_summary);
-               wprintf(_("All"));
-               wprintf("</option>");
-               wprintf("</select> ");
-               wprintf(_("of %d messages."), nummsgs);
-
-               /** forward/reverse */
-               wprintf("<input type=\"radio\" %s name=\"direction\" value=\"\""
-                       "OnChange=\"location.href='%s?sortby=forward'\"",  
-                       (bbs_reverse ? "" : "checked"),
-                       oper
-               );
-               wprintf(">");
-               wprintf(_("oldest to newest"));
-               wprintf("&nbsp;&nbsp;&nbsp;&nbsp;");
-
-               wprintf("<input type=\"radio\" %s name=\"direction\" value=\"\""
-                       "OnChange=\"location.href='%s?sortby=reverse'\"", 
-                       (bbs_reverse ? "checked" : ""),
-                       oper
-               );
-               wprintf(">");
-               wprintf(_("newest to oldest"));
-               wprintf("\n");
-       
-               wprintf("</p></form>\n");
-               /** end bbview scroller */
        }
-       for (a = 0; a < nummsgs; ++a) {
-               if ((WCC->msgarr[a] >= startmsg) && (num_displayed < maxmsgs)) {
+       DeleteHashPos(&at);
+}
 
-                       /** Display the message */
-                       if (is_summary) {
-                               display_summarized(a);
-                       }
-                       else if (is_addressbook) {
-                               fetch_ab_name(WCC->msgarr[a], buf);
-                               ++num_ab;
-                               addrbook = realloc(addrbook,
-                                       (sizeof(struct addrbookent) * num_ab) );
-                               safestrncpy(addrbook[num_ab-1].ab_name, buf,
-                                       sizeof(addrbook[num_ab-1].ab_name));
-                               addrbook[num_ab-1].ab_msgnum = WCC->msgarr[a];
-                       }
-                       else if (is_calendar) {
-                               display_calendar(WCC->msgarr[a], WCC->summ[a].is_new);
-                       }
-                       else if (is_tasks) {
-                               display_task(WCC->msgarr[a], WCC->summ[a].is_new);
-                       }
-                       else if (is_notes) {
-                               display_note(WCC->msgarr[a], WCC->summ[a].is_new);
-                       } else if (WCC->is_mobile) {
-                               display_mobile_summary(a);
-                       }
-                       else {
-                               if (displayed_msgs == NULL) {
-                                       displayed_msgs = malloc(sizeof(long) *
-                                                               (maxmsgs<nummsgs ? maxmsgs : nummsgs));
-                               }
-                               displayed_msgs[num_displayed] = WCC->msgarr[a];
-                       }
 
-                       if (lowest_displayed < 0) lowest_displayed = a;
-                       highest_displayed = a;
+void load_seen_flags(void)
+{
+       StrBuf *OldMsg;
+       wcsession *WCC = WC;
+       MSet *MatchMSet;
 
-                       ++num_displayed;
-               }
+       OldMsg = NewStrBuf();
+       serv_puts("GTSN");
+       StrBuf_ServGetln(OldMsg);
+       if (GetServerStatus(OldMsg, NULL) == 2) {
+               StrBufCutLeft(OldMsg, 4);
+       }
+       else {
+               FreeStrBuf(&OldMsg);
+               return;
        }
 
-       /** Output loop */
-       if (displayed_msgs != NULL) {
-               if (bbs_reverse) {
-                       qsort(displayed_msgs, num_displayed, sizeof(long), longcmp_r);
-               }
+       if (ParseMSet(&MatchMSet, OldMsg))
+       {
+               SetFlagsFromMSet(WCC->summ, MatchMSet, MSGFLAG_READ, 0);
+       }
+       DeleteMSet(&MatchMSet);
+       FreeStrBuf(&OldMsg);
+}
 
-               /** if we do a split bbview in the future, begin messages div here */
+extern readloop_struct rlid[];
 
-               for (a=0; a<num_displayed; ++a) {
-                       read_message(displayed_msgs[a], 0, "");
-               }
+typedef struct _RoomRenderer{
+       int RoomType;
 
-               /** if we do a split bbview in the future, end messages div here */
+       GetParamsGetServerCall_func GetParamsGetServerCall;
+       
+       PrintViewHeader_func PrintPageHeader;
+       PrintViewHeader_func PrintViewHeader;
+       LoadMsgFromServer_func LoadMsgFromServer;
+       RenderView_or_Tail_func RenderView_or_Tail;
+       View_Cleanup_func ViewCleanup;
+       load_msg_ptrs_detailheaders LHParse;
+} RoomRenderer;
 
-               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"
+/*
+ * command loop for reading messages
+ *
+ * Set oper to "readnew" or "readold" or "readfwd" or "headers" or "readgt" or "readlt" or "do_search"
+ */
+void readloop(long oper, eCustomRoomRenderer ForceRenderer)
+{
+       RoomRenderer *ViewMsg;
+       void *vViewMsg;
+       void *vMsg;
+       message_summary *Msg;
+       char cmd[256] = "";
+       char filter[256] = "";
+       int i, r;
+       wcsession *WCC = WC;
+       HashPos *at;
+       const char *HashKey;
+       long HKLen;
+       WCTemplputParams SubTP;
+       SharedMessageStatus Stat;
+       void *ViewSpecific;
+
+       if (havebstr("is_summary") && (1 == (ibstr("is_summary")))) {
+               WCC->CurRoom.view = VIEW_MAILBOX;
+       }
+
+       if (havebstr("view")) {
+               WCC->CurRoom.view = ibstr("view");
+       }
+
+       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 */
+       }
+
+       ViewMsg = (RoomRenderer*) vViewMsg;
+       if (ViewMsg->PrintPageHeader == NULL)
+               output_headers(1, 1, 1, 0, 0, 0);
+       else 
+               ViewMsg->PrintPageHeader(&Stat, ViewSpecific);
+
+       if (ViewMsg->GetParamsGetServerCall != NULL) {
+               r = ViewMsg->GetParamsGetServerCall(
+                      &Stat,
+                      &ViewSpecific,
+                      oper,
+                      cmd, sizeof(cmd),
+                      filter, sizeof(filter)
                );
+       } else {
+               r = 0;
+       }
+
+       switch(r)
+       {
+       case 400:
+       case 404:
 
-               wprintf("<div id=\"preview_pane\">");   /**< The preview pane will initially be empty */
-       } else if (WCC->is_mobile) {
-               wprintf("</div>");
+               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)) {
+               const char *p = NULL;
+               if (!IsEmptyStr(filter))
+                       p = filter;
+               Stat.nummsgs = load_msg_ptrs(cmd, p, &Stat, ViewMsg->LHParse);
        }
 
-       /**
-        * 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 (Stat.sortit) {
+               CompareFunc SortIt;
+               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 (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) {
-               /** begin bbview scroller */
-               wprintf("<form name=\"msgomatic\" class=\"selector_bottom\" > \n <p>");
-               wprintf(_("Reading #")); /// TODO: this isn't used: , lowest_displayed, highest_displayed);
-
-               wprintf("<select name=\"whichones\" size=\"1\" "
-                       "OnChange=\"location.href=msgomatic.whichones.options"
-                       "[selectedIndex].value\">\n");
-
-               if (bbs_reverse) {
-                       for (b=nummsgs-1; b>=0; b = b - maxmsgs) {
-                               hi = b + 1;
-                               lo = b - maxmsgs + 2;
-                               if (lo < 1) lo = 1;
-                               wprintf("<option %s value="
-                                       "\"%s"
-                                       "&startmsg=%ld"
-                                       "&maxmsgs=%d"
-                                       "&is_summary=%d\">"
-                                       "%d-%d</option> \n",
-                                       ((WCC->msgarr[lo-1] == startmsg) ? "selected" : ""),
-                                       oper,
-                                       WCC->msgarr[lo-1],
-                                       maxmsgs,
-                                       is_summary,
-                                       hi, lo);
-                       }
-               }
-               else {
-                       for (b=0; b<nummsgs; b = b + maxmsgs) {
-                               lo = b + 1;
-                               hi = b + maxmsgs + 1;
-                               if (hi > nummsgs) hi = nummsgs;
-                               wprintf("<option %s value="
-                                       "\"%s"
-                                       "&startmsg=%ld"
-                                       "&maxmsgs=%d"
-                                       "&is_summary=%d\">"
-                                       "%d-%d</option> \n",
-                                       ((WCC->msgarr[b] == startmsg) ? "selected" : ""),
-                                       oper,
-                                       WCC->msgarr[lo-1],
-                                       maxmsgs,
-                                       is_summary,
-                                       lo, hi);
-                       }
-               }
+       if (ViewMsg->PrintViewHeader != NULL)
+               ViewMsg->PrintViewHeader(&Stat, &ViewSpecific);
 
-               wprintf("<option value=\"%s&startmsg=%ld"
-                       "&maxmsgs=9999999&is_summary=%d\">",
-                       oper,
-                       WCC->msgarr[0], is_summary);
-               wprintf(_("All"));
-               wprintf("</option>");
-               wprintf("</select> ");
-               wprintf(_("of %d messages."), nummsgs);
-
-               /** forward/reverse */
-               wprintf("<input type=\"radio\" %s name=\"direction\" value=\"\""
-                       "OnChange=\"location.href='%s&sortby=forward'\"",  
-                       (bbs_reverse ? "" : "checked"),
-                       oper
-               );
-               wprintf(">");
-               wprintf(_("oldest to newest"));
-               wprintf("&nbsp;&nbsp;&nbsp;&nbsp;");
-               wprintf("<input type=\"radio\" %s name=\"direction\" value=\"\""
-                       "OnChange=\"location.href='%s&sortby=reverse'\"", 
-                       (bbs_reverse ? "checked" : ""),
-                       oper
-               );
-               wprintf(">");
-               wprintf(_("newest to oldest"));
-               wprintf("\n");
+       WCC->startmsg =  Stat.startmsg;
+       WCC->maxmsgs = Stat.maxmsgs;
+       WCC->num_displayed = 0;
 
-               wprintf("</p></form>\n");
-               /** end bbview scroller */
-       }
-       
-DONE:
-       if (is_tasks) {
-               do_tasks_view();        /** Render the task list */
+       /* Put some helpful data in vars for mailsummary_json */
+       {
+               StrBuf *Foo;
+               
+               Foo = NewStrBuf ();
+               StrBufPrintf(Foo, "%ld", Stat.nummsgs);
+               PutBstr(HKEY("__READLOOP:TOTALMSGS"), NewStrBufDup(Foo));
+               StrBufPrintf(Foo, "%ld", Stat.startmsg);
+               PutBstr(HKEY("__READLOOP:STARTMSG"), Foo);
        }
 
-       if (is_calendar) {
-               do_calendar_view();     /** Render the calendar */
-       }
+       /*
+        * iterate over each message. if we need to load an attachment, do it here. 
+        */
 
-       if (is_addressbook) {
-               do_addrbook_view(addrbook, num_ab);     /** Render the address book */
+       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->Flags & MSGFLAG_READ) != 0, 
+                                                          i);
+                       } 
+                       i++;
+               }
+               DeleteHashPos(&at);
        }
 
-       /** Note: wDumpContent() will output one additional </div> tag. */
-       wprintf("</div>\n");            /** end of 'content' div */
-       wDumpContent(1);
+       /*
+        * Done iterating the message list. now tasks we want to do after.
+        */
+       if (ViewMsg->RenderView_or_Tail != NULL)
+               ViewMsg->RenderView_or_Tail(&Stat, &ViewSpecific, oper);
+
+       if (ViewMsg->ViewCleanup != NULL)
+               ViewMsg->ViewCleanup(&ViewSpecific);
 
-       /** free the summary */
+       WCC->startmsg = 0;
+       WCC->maxmsgs = 0;
        if (WCC->summ != NULL) {
-               free(WCC->summ);
-               WCC->num_summ = 0;
-               WCC->summ = NULL;
+               DeleteHash(&WCC->summ);
        }
-       if (addrbook != NULL) free(addrbook);
 }
 
 
@@ -2973,23 +857,25 @@ DONE:
  * ... this is where the actual message gets transmitted to the server.
  */
 void post_mime_to_server(void) {
+       wcsession *WCC = WC;
        char top_boundary[SIZ];
        char alt_boundary[SIZ];
        int is_multipart = 0;
        static int seq = 0;
-       struct wc_attachment *att;
+       wc_mime_attachment *att;
        char *encoded;
        size_t encoded_length;
        size_t encoded_strlen;
        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
        );
@@ -2999,10 +885,15 @@ void post_mime_to_server(void) {
        serv_puts("X-Mailer: " PACKAGE_STRING);
 
        /* If there are attachments, we have to do multipart/mixed */
-       if (WC->first_attachment != NULL) {
+       if (GetCount(WCC->attachments) > 0) {
                is_multipart = 1;
        }
 
+       /* 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);
@@ -3011,19 +902,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("\n--%s", alt_boundary);
+       }
 
        serv_puts("Content-type: text/html; charset=utf-8");
        serv_puts("Content-Transfer-Encoding: quoted-printable");
@@ -3032,21 +925,30 @@ 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;
+               const char *Key; 
+               void *vAtt;
+               HashPos  *it;
 
                /* Add in the attachments */
-               for (att = WC->first_attachment; att!=NULL; att=att->next) {
-
+               it = GetNewHashPos(WCC->attachments, 0);
+               while (GetNextHashPos(WCC->attachments, it, &len, &Key, &vAtt)) {
+                       att = (wc_mime_attachment *)vAtt;
+                       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", att->content_type);
-                       serv_printf("Content-disposition: attachment; filename=\"%s\"", att->filename);
+                       serv_printf("Content-type: %s", ChrPtr(att->ContentType));
+                       serv_printf("Content-disposition: attachment; filename=\"%s\"", ChrPtr(att->FileName));
                        serv_puts("Content-transfer-encoding: base64");
                        serv_puts("");
                        serv_write(encoded, encoded_strlen);
@@ -3055,6 +957,7 @@ void post_mime_to_server(void) {
                        free(encoded);
                }
                serv_printf("--%s--", top_boundary);
+               DeleteHashPos(&it);
        }
 
        serv_puts("000");
@@ -3074,16 +977,19 @@ void post_mime_to_server(void) {
  */
 void post_message(void)
 {
+       StrBuf *UserName;
+       StrBuf *EmailAddress;
+       StrBuf *EncBuf;
        char buf[1024];
        StrBuf *encoded_subject = NULL;
        static long dont_post = (-1L);
-       struct wc_attachment *att, *aptr;
        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")) {
@@ -3094,77 +1000,49 @@ void post_message(void)
                }
        }
 
-       if (WCC->upload_length > 0) {
-
-               lprintf(9, "%s:%d: we are uploading %d bytes\n", __FILE__, __LINE__, WCC->upload_length);
-               /** There's an attachment.  Save it to this struct... */
-               att = malloc(sizeof(struct wc_attachment));
-               memset(att, 0, sizeof(struct wc_attachment));
-               att->length = WCC->upload_length;
-               strcpy(att->content_type, WCC->upload_content_type);
-               strcpy(att->filename, WCC->upload_filename);
-               att->next = NULL;
-
-               /** And add it to the list. */
-               if (WCC->first_attachment == NULL) {
-                       WCC->first_attachment = att;
-               }
-               else {
-                       aptr = WCC->first_attachment;
-                       while (aptr->next != NULL) aptr = aptr->next;
-                       aptr->next = att;
-               }
-
-               /**
-                * Mozilla sends a simple filename, which is what we want,
-                * but Satan's Browser sends an entire pathname.  Reduce
-                * the path to just a filename if we need to.
-                */
-               while (num_tokens(att->filename, '/') > 1) {
-                       remove_token(att->filename, 0, '/');
-               }
-               while (num_tokens(att->filename, '\\') > 1) {
-                       remove_token(att->filename, 0, '\\');
-               }
-
-               /**
-                * Transfer control of this memory from the upload struct
-                * to the attachment struct.
-                */
-               att->data = WCC->upload;
-               WCC->upload_length = 0;
-               WCC->upload = NULL;
-               display_enter();
-               return;
-       }
-
-       if (havebstr("cancel_button")) {
-               sprintf(WCC->ImportantMessage, 
-                       _("Cancelled.  Message was not posted."));
-       } else if (havebstr("attach_button")) {
-               display_enter();
-               return;
+       if (!strcasecmp(bstr("submit_action"), "cancel")) {
+               AppendImportantMessage(_("Cancelled.  Message was not posted."), -1);
        } else if (lbstr("postseq") == dont_post) {
-               sprintf(WCC->ImportantMessage, 
+               AppendImportantMessage(
                        _("Automatically cancelled because you have already "
-                       "saved this message."));
+                         "saved this message."), -1);
        } else {
                const char CMD[] = "ENT0 1|%s|%d|4|%s|%s||%s|%s|%s|%s|%s";
-               const StrBuf *Recp = NULL; 
-               const StrBuf *Cc = NULL;
-               const StrBuf *Bcc = NULL;
-               const StrBuf *Wikipage = NULL;
+               StrBuf *Recp = NULL; 
+               StrBuf *Cc = NULL;
+               StrBuf *Bcc = NULL;
+               char *wikipage = NULL;
                const StrBuf *my_email_addr = NULL;
-               StrBuf *CmdBuf = NULL;;
+               StrBuf *CmdBuf = NULL;
                StrBuf *references = NULL;
+               int saving_to_drafts = 0;
+               long HeaderLen = 0;
+
+               saving_to_drafts = !strcasecmp(bstr("submit_action"), "draft");
+               Buf = NewStrBuf();
+
+               if (saving_to_drafts) {
+                       /* temporarily change to the drafts room */
+                       serv_puts("GOTO _DRAFTS_");
+                       StrBuf_ServGetln(Buf);
+                       if (GetServerStatusMsg(Buf, NULL, 1, 2) != 2) {
+                               /* You probably don't even have a dumb Drafts folder */
+                               syslog(9, "%s:%d: server save to drafts error: %s\n", __FILE__, __LINE__, ChrPtr(Buf) + 4);
+                               AppendImportantMessage(_("Saved to Drafts failed: "), -1);
+                               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;
@@ -3174,110 +1052,278 @@ void post_message(void)
                         */
                        Subj = sbstr("subject");
                        
-                       StrBufRFC2047encode(&encoded_subject, Subj);
-               }
-               Recp = sbstr("recp");
-               Cc = sbstr("cc");
-               Bcc = sbstr("bcc");
-               Wikipage = sbstr("wikipage");
+                       StrBufRFC2047encode(&encoded_subject, Subj);
+               }
+               UserName = NewStrBuf();
+               EmailAddress = NewStrBuf();
+               EncBuf = NewStrBuf();
+
+               Recp = StrBufSanitizeEmailRecipientVector(sbstr("recp"), UserName, EmailAddress, EncBuf);
+               Cc = StrBufSanitizeEmailRecipientVector(sbstr("cc"), UserName, EmailAddress, EncBuf);
+               Bcc = StrBufSanitizeEmailRecipientVector(sbstr("bcc"), UserName, EmailAddress, EncBuf);
+
+               FreeStrBuf(&UserName);
+               FreeStrBuf(&EmailAddress);
+               FreeStrBuf(&EncBuf);
+
+               wikipage = strdup(bstr("page"));
+               str_wiki_index(wikipage);
                my_email_addr = sbstr("my_email_addr");
                
-               CmdBuf = NewStrBufPlain(NULL, 
-                                       sizeof (CMD) + 
-                                       StrLength(Recp) + 
-                                       StrLength(encoded_subject) +
-                                       StrLength(Cc) +
-                                       StrLength(Bcc) + 
-                                       StrLength(Wikipage) +
-                                       StrLength(my_email_addr) + 
-                                       StrLength(references));
-
+               HeaderLen = StrLength(Recp) + 
+                       StrLength(encoded_subject) +
+                       StrLength(Cc) +
+                       StrLength(Bcc) + 
+                       strlen(wikipage) +
+                       StrLength(my_email_addr) + 
+                       StrLength(references);
+               CmdBuf = NewStrBufPlain(NULL, sizeof (CMD) + HeaderLen);
                StrBufPrintf(CmdBuf, 
                             CMD,
-                            ChrPtr(Recp),
+                            saving_to_drafts?"":ChrPtr(Recp),
                             is_anonymous,
                             ChrPtr(encoded_subject),
                             ChrPtr(display_name),
-                            ChrPtr(Cc),
-                            ChrPtr(Bcc),
-                            ChrPtr(Wikipage),
+                            saving_to_drafts?"":ChrPtr(Cc),
+                            saving_to_drafts?"":ChrPtr(Bcc),
+                            wikipage,
                             ChrPtr(my_email_addr),
                             ChrPtr(references));
                FreeStrBuf(&references);
-
-               lprintf(9, "%s\n", CmdBuf);
-               serv_puts(ChrPtr(CmdBuf));
-               serv_getln(buf, sizeof buf);
-               FreeStrBuf(&CmdBuf);
                FreeStrBuf(&encoded_subject);
-               if (buf[0] == '4') {
-                       post_mime_to_server();
-                       if (  (havebstr("recp"))
-                          || (havebstr("cc"  ))
-                          || (havebstr("bcc" ))
-                       ) {
-                               sprintf(WCC->ImportantMessage, _("Message has been sent.\n"));
-                       }
-                       else {
-                               sprintf(WC->ImportantMessage, _("Message has been posted.\n"));
+               free(wikipage);
+
+               if ((HeaderLen + StrLength(sbstr("msgtext")) < 10) && 
+                   (GetCount(WCC->attachments) == 0)){
+                       AppendImportantMessage(_("Refusing to post empty message.\n"), -1);
+                       FreeStrBuf(&CmdBuf);
+                               
+               }
+               else 
+               {
+                       syslog(9, "%s\n", ChrPtr(CmdBuf));
+                       serv_puts(ChrPtr(CmdBuf));
+                       FreeStrBuf(&CmdBuf);
+
+                       StrBuf_ServGetln(Buf);
+                       if (GetServerStatus(Buf, NULL) == 4) {
+                               if (saving_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 (saving_to_drafts) {
+                                       AppendImportantMessage(_("Message has been saved to Drafts.\n"), -1);
+                                       gotoroom(WCC->CurRoom.name);
+                                       readloop(readnew, eUseDefault);
+                                       FreeStrBuf(&Buf);
+                                       return;
+                               } else if (  (havebstr("recp"))
+                                            || (havebstr("cc"  ))
+                                            || (havebstr("bcc" ))
+                                       ) {
+                                       AppendImportantMessage(_("Message has been sent.\n"), -1);
+                               }
+                               else {
+                                       AppendImportantMessage(_("Message has been posted.\n"), -1);
+                               }
+                               dont_post = lbstr("postseq");
+                       } else {
+                               syslog(9, "%s:%d: server post error: %s", __FILE__, __LINE__, ChrPtr(Buf) + 4);
+                               AppendImportantMessage(ChrPtr(Buf) + 4, StrLength(Buf) - 4);
+                               display_enter();
+                               if (saving_to_drafts) gotoroom(WCC->CurRoom.name);
+                               FreeStrBuf(&Recp);
+                               FreeStrBuf(&Buf);
+                               FreeStrBuf(&Cc);
+                               FreeStrBuf(&Bcc);
+                               return;
                        }
-                       dont_post = lbstr("postseq");
-               } else {
-                       lprintf(9, "%s:%d: server post error: %s\n", __FILE__, __LINE__, buf);
-                       sprintf(WC->ImportantMessage, "%s", &buf[4]);
-                       display_enter();
-                       return;
                }
+               FreeStrBuf(&Recp);
+               FreeStrBuf(&Buf);
+               FreeStrBuf(&Cc);
+               FreeStrBuf(&Bcc);
        }
 
-       free_attachments(WCC);
+       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);
+       }
+}
+
+
+/*
+ * Client is uploading an attachment
+ */
+void upload_attachment(void) {
+       wcsession *WCC = WC;
+       const char *pch;
+       int n;
+       const char *newn;
+       long newnlen;
+       void *v;
+       wc_mime_attachment *att;
+
+       syslog(9, "upload_attachment()\n");
+       wc_printf("upload_attachment()<br>\n");
+
+       if (WCC->upload_length <= 0) {
+               syslog(9, "ERROR no attachment was uploaded\n");
+               wc_printf("ERROR no attachment was uploaded<br>\n");
+               return;
+       }
+
+       syslog(9, "Client is uploading %d bytes\n", WCC->upload_length);
+       wc_printf("Client is uploading %d bytes<br>\n", WCC->upload_length);
+       att = malloc(sizeof(wc_mime_attachment));
+       memset(att, 0, sizeof(wc_mime_attachment ));
+       att->length = WCC->upload_length;
+       att->ContentType = NewStrBufPlain(WCC->upload_content_type, -1);
+       att->FileName = NewStrBufDup(WCC->upload_filename);
+       
+       if (WCC->attachments == NULL) {
+               WCC->attachments = NewHash(1, Flathash);
+       }
+
+       /* And add it to the list. */
+       n = 0;
+       if ((GetCount(WCC->attachments) > 0) && 
+           GetHashAt(WCC->attachments, 
+                     GetCount(WCC->attachments) -1, 
+                     &newnlen, &newn, &v))
+           n = *((int*) newn) + 1;
+       Put(WCC->attachments, IKEY(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), '/');
+       if (pch != NULL) {
+               StrBufCutLeft(att->FileName, pch - ChrPtr(att->FileName) + 1);
+       }
+       pch = strrchr(ChrPtr(att->FileName), '\\');
+       if (pch != NULL) {
+               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 = NULL;
+       WCC->upload_length = 0;
+}
+
+
+/*
+ * Remove an attachment from the message currently being composed.
+ *
+ * Currently we identify the attachment to be removed by its filename.
+ * There is probably a better way to do this.
+ */
+void remove_attachment(void) {
+       wcsession *WCC = WC;
+       wc_mime_attachment *att;
+       void *vAtt;
+       StrBuf *WhichAttachment;
+       HashPos *at;
+       long len;
+       const char *key;
+
+       WhichAttachment = NewStrBufDup(sbstr("which_attachment"));
+       StrBufUnescape(WhichAttachment, 0);
+       at = GetNewHashPos(WCC->attachments, 0);
+       do {
+               GetHashPos(WCC->attachments, at, &len, &key, &vAtt);
+       
+               att = (wc_mime_attachment*) vAtt;
+               if ((att != NULL) && 
+                   (strcmp(ChrPtr(WhichAttachment), 
+                           ChrPtr(att->FileName)   ) == 0))
+               {
+                       DeleteEntryFromHash(WCC->attachments, at);
+                       break;
+               }
        }
+       while (NextHashPos(WCC->attachments, at));
+       FreeStrBuf(&WhichAttachment);
+       wc_printf("remove_attachment() completed\n");
 }
 
 
+long FourHash(const char *key, long length) 
+{
+        int i;
+        long ret = 0;
+        const unsigned char *ptr = (const unsigned char*)key;
+
+        for (i = 0; i < 4; i++, ptr ++) 
+                ret = (ret << 8) | 
+                        ( ((*ptr >= 'a') &&
+                           (*ptr <= 'z'))? 
+                          *ptr - 'a' + 'A': 
+                          *ptr);
+
+        return ret;
+}
 
+long l_subj;
+long l_wefw;
+long l_msgn;
+long l_from;
+long l_rcpt;
+long l_cccc;
+long l_node;
+long l_rfca;
 
-/**
- * \brief display the message entry screen
+/*
+ * display the message entry screen
  */
 void display_enter(void)
 {
-       char buf[SIZ];
-       StrBuf *ebuf;
-       long now;
+       StrBuf *Line;
+       long Result;
+       int rc;
        const StrBuf *display_name = NULL;
-       struct wc_attachment *att;
        int recipient_required = 0;
        int subject_required = 0;
-       int recipient_bad = 0;
        int is_anonymous = 0;
-       long existing_page = (-1L);
-       struct wcsession *WCC = WC;
-
-       now = time(NULL);
+       wcsession *WCC = WC;
+       int i = 0;
+       long replying_to;
 
        if (havebstr("force_room")) {
-               gotoroom(bstr("force_room"));
+               gotoroom(sbstr("force_room"));
        }
 
        display_name = sbstr("display_name");
@@ -3286,30 +1332,36 @@ void display_enter(void)
                is_anonymous = 1;
        }
 
-       /** First test to see whether this is a room that requires recipients to be entered */
+       /*
+        * First, do we have permission to enter messages in this room at all?
+        */
+       Line = NewStrBuf();
        serv_puts("ENT0 0");
-       serv_getln(buf, sizeof buf);
+       StrBuf_ServGetln(Line);
+       rc = GetServerStatusMsg(Line, &Result, 0, 2);
 
-       if (!strncmp(buf, "570", 3)) {          /** 570 means that we need a recipient here */
+       if (Result == 570) {            /* 570 means that we need a recipient here */
                recipient_required = 1;
        }
-       else if (buf[0] != '2') {               /** Any other error means that we cannot continue */
-               sprintf(WCC->ImportantMessage, "%s", &buf[4]);
-               readloop("readnew");
+       else if (rc != 2) {             /* Any other error means that we cannot continue */
+               rc = GetServerStatusMsg(Line, &Result, 0, 2);
+               readloop(readnew, eUseDefault);
+               FreeStrBuf(&Line);
                return;
        }
 
        /* Is the server strongly recommending that the user enter a message subject? */
-       if ((buf[3] != '\0') && (buf[4] != '\0')) {
-               subject_required = extract_int(&buf[4], 1);
+       if (StrLength(Line) > 4) {
+               subject_required = extract_int(ChrPtr(Line) + 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));
+               FreeStrBuf(&Line);
                return;
        }
 
@@ -3317,8 +1369,9 @@ 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();
+               FreeStrBuf(&Line);
                return;
        }
 
@@ -3326,35 +1379,211 @@ 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();
+               FreeStrBuf(&Line);
                return;
        }
 
+
+       /*
+        * If the "replying_to" variable is set, it refers to a message
+        * number from which we must extract some header fields...
+        */
+       replying_to = lbstr("replying_to");
+       if (replying_to > 0) {
+               long len;
+               StrBuf *wefw = NULL;
+               StrBuf *msgn = NULL;
+               StrBuf *from = NULL;
+               StrBuf *node = NULL;
+               StrBuf *rfca = NULL;
+               StrBuf *rcpt = NULL;
+               StrBuf *cccc = NULL;
+               serv_printf("MSG0 %ld|1", replying_to); 
+
+               StrBuf_ServGetln(Line);
+               if (GetServerStatusMsg(Line, NULL, 0, 0) == 1)
+                       while (len = StrBuf_ServGetln(Line),
+                              (len >= 0) && 
+                              ((len != 3)  ||
+                               strcmp(ChrPtr(Line), "000")))
+                       {
+                               long which = 0;
+                               if ((StrLength(Line) > 4) && 
+                                   (ChrPtr(Line)[4] == '='))
+                                       which = FourHash(ChrPtr(Line), 4);
+
+                               if (which == l_subj)
+                               {
+                                       StrBuf *subj = NewStrBuf();
+                                       StrBuf *FlatSubject;
+
+                                       if (!strcasecmp(bstr("replying_mode"), "forward")) {
+                                               if (strncasecmp(ChrPtr(Line) + 5, "Fw:", 3)) {
+                                                       StrBufAppendBufPlain(subj, HKEY("Fw: "), 0);
+                                               }
+                                       }
+                                       else {
+                                               if (strncasecmp(ChrPtr(Line) + 5, "Re:", 3)) {
+                                                       StrBufAppendBufPlain(subj, HKEY("Re: "), 0);
+                                               }
+                                       }
+                                       StrBufAppendBufPlain(subj, 
+                                                            ChrPtr(Line) + 5, 
+                                                            StrLength(Line) - 5, 0);
+                                       FlatSubject = NewStrBufPlain(NULL, StrLength(subj));
+                                       StrBuf_RFC822_to_Utf8(FlatSubject, subj, NULL, NULL);
+
+                                       PutBstr(HKEY("subject"), FlatSubject);
+                               }
+
+                               else if (which == l_wefw)
+                               {
+                                       int rrtok;
+                                       int rrlen;
+
+                                       wefw = NewStrBufPlain(ChrPtr(Line) + 5, StrLength(Line) - 5);
+                                       
+                                       /* Trim down excessively long lists of thread references.  We eliminate the
+                                        * second one in the list so that the thread root remains intact.
+                                        */
+                                       rrtok = num_tokens(ChrPtr(wefw), '|');
+                                       rrlen = StrLength(wefw);
+                                       if ( ((rrtok >= 3) && (rrlen > 900)) || (rrtok > 10) ) {
+                                               StrBufRemove_token(wefw, 1, '|');
+                                       }
+                               }
+
+                               else if (which == l_msgn) {
+                                       msgn = NewStrBufPlain(ChrPtr(Line) + 5, StrLength(Line) - 5);
+                               }
+
+                               else if (which == l_from) {
+                                       StrBuf *FlatFrom;
+                                       from = NewStrBufPlain(ChrPtr(Line) + 5, StrLength(Line) - 5);
+                                       FlatFrom = NewStrBufPlain(NULL, StrLength(from));
+                                       StrBuf_RFC822_to_Utf8(FlatFrom, from, NULL, NULL);
+                                       FreeStrBuf(&from);
+                                       from = FlatFrom;
+                                       for (i=0; i<StrLength(from); ++i) {
+                                               if (ChrPtr(from)[i] == ',')
+                                                       StrBufPeek(from, NULL, i, ' ');
+                                       }
+                               }
+                               
+                               else if (which == l_rcpt) {
+                                       rcpt = NewStrBufPlain(ChrPtr(Line) + 5, StrLength(Line) - 5);
+                               }
+                               
+                               else if (which == l_cccc) {
+                                       cccc = NewStrBufPlain(ChrPtr(Line) + 5, StrLength(Line) - 5);
+                               }
+                               
+                               else if (which == l_node) {
+                                       node = NewStrBufPlain(ChrPtr(Line) + 5, StrLength(Line) - 5);
+                               }
+                               
+                               else if (which == l_rfca) {
+                                       StrBuf *FlatRFCA;
+                                       rfca = NewStrBufPlain(ChrPtr(Line) + 5, StrLength(Line) - 5);
+                                       FlatRFCA = NewStrBufPlain(NULL, StrLength(rfca));
+                                       StrBuf_RFC822_to_Utf8(FlatRFCA, rfca, NULL, NULL);
+                                       FreeStrBuf(&rfca);
+                                       rfca = FlatRFCA;
+                               }
+                       }
+
+
+               if (StrLength(wefw) + StrLength(msgn) > 0) {
+                       StrBuf *refs = NewStrBuf();
+                       if (StrLength(wefw) > 0) {
+                               StrBufAppendBuf(refs, wefw, 0);
+                       }
+                       if ( (StrLength(wefw) > 0) && 
+                            (StrLength(msgn) > 0) ) 
+                       {
+                               StrBufAppendBufPlain(refs, HKEY("|"), 0);
+                       }
+                       if (StrLength(msgn) > 0) {
+                               StrBufAppendBuf(refs, msgn, 0);
+                       }
+                       PutBstr(HKEY("references"), refs);
+               }
+
+               /*
+                * If this is a Reply or a ReplyAll, copy the sender's email into the To: field
+                */
+               if (    (!strcasecmp(bstr("replying_mode"), "reply"))
+                       || (!strcasecmp(bstr("replying_mode"), "replyall"))
+               ) {
+                       StrBuf *to_rcpt;
+                       if (StrLength(rfca) > 0) {
+                               to_rcpt = NewStrBuf();
+                               StrBufAppendBuf(to_rcpt, from, 0);
+                               StrBufAppendBufPlain(to_rcpt, HKEY(" <"), 0);
+                               StrBufAppendBuf(to_rcpt, rfca, 0);
+                               StrBufAppendBufPlain(to_rcpt, HKEY(">"), 0);
+                       }
+                       else {
+                               to_rcpt =  from;
+                               from = NULL;
+                               if (    (StrLength(node) > 0)
+                                       && (strcasecmp(ChrPtr(node), ChrPtr(WC->serv_info->serv_nodename)))
+                               ) {
+                                       StrBufAppendBufPlain(to_rcpt, HKEY(" @ "), 0);
+                                       StrBufAppendBuf(to_rcpt, node, 0);
+                               }
+                       }
+                       PutBstr(HKEY("recp"), to_rcpt);
+               }
+
+               /*
+                * Only if this is a ReplyAll, copy all recipients into the Cc: field
+                */
+               if (    (!strcasecmp(bstr("replying_mode"), "replyall"))
+               ) {
+                       StrBuf *cc_rcpt = rcpt;
+                       rcpt = NULL;
+                       if (StrLength(cccc) > 0) {
+                               if (cc_rcpt != NULL)  {
+                                       StrBufAppendPrintf(cc_rcpt, ", ");
+                                       StrBufAppendBuf(cc_rcpt, cccc, 0);
+                               } else {
+                                       cc_rcpt = cccc;
+                                       cccc = NULL;
+                               }
+                       }
+                       if (cc_rcpt != NULL)
+                               PutBstr(HKEY("cc"), cc_rcpt);
+               }
+               FreeStrBuf(&wefw);
+               FreeStrBuf(&msgn);
+               FreeStrBuf(&from);
+               FreeStrBuf(&node);
+               FreeStrBuf(&rfca);
+               FreeStrBuf(&rcpt);
+               FreeStrBuf(&cccc);
+       }
+       FreeStrBuf(&Line);
        /*
         * Otherwise proceed normally.
         * Do a custom room banner with no navbar...
         */
-       output_headers(1, 1, 2, 0, 0, 0);
-       wprintf("<div id=\"banner\">\n");
-       embed_room_banner(NULL, navbar_none);
-       wprintf("</div>\n");
-       wprintf("<div id=\"content\">\n"
-               "<div class=\"fix_scrollbar_bug message \">");
-
-       /* Now check our actual recipients if there are any */
+
        if (recipient_required) {
                const StrBuf *Recp = NULL; 
                const StrBuf *Cc = NULL;
                const StrBuf *Bcc = NULL;
-               const StrBuf *Wikipage = NULL;
-               StrBuf *CmdBuf = NULL;;
+               char *wikipage = 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 = strdup(bstr("page"));
+               str_wiki_index(wikipage);
                
                CmdBuf = NewStrBufPlain(NULL, 
                                        sizeof (CMD) + 
@@ -3362,7 +1591,7 @@ void display_enter(void)
                                        StrLength(display_name) +
                                        StrLength(Cc) +
                                        StrLength(Bcc) + 
-                                       StrLength(Wikipage));
+                                       strlen(wikipage));
 
                StrBufPrintf(CmdBuf, 
                             CMD,
@@ -3371,455 +1600,419 @@ void display_enter(void)
                             ChrPtr(display_name),
                             ChrPtr(Cc), 
                             ChrPtr(Bcc), 
-                            ChrPtr(Wikipage));
+                            wikipage
+               );
                serv_puts(ChrPtr(CmdBuf));
-               serv_getln(buf, sizeof buf);
-               FreeStrBuf(&CmdBuf);
+               StrBuf_ServGetln(CmdBuf);
+               free(wikipage);
 
-               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]);
-                       goto DONE;
-               }
-       }
+               rc = GetServerStatusMsg(CmdBuf, &Result, 0, 0);
 
-       /** If we got this far, we can display the message entry screen. */
-
-       /* begin message entry screen */
-       wprintf("<form "
-               "enctype=\"multipart/form-data\" "
-               "method=\"POST\" "
-               "accept-charset=\"UTF-8\" "
-               "action=\"post\" "
-               "name=\"enterform\""
-               ">\n");
-       wprintf("<input type=\"hidden\" name=\"postseq\" value=\"%ld\">\n", now);
-       if (WCC->wc_view == VIEW_WIKI) {
-               wprintf("<input type=\"hidden\" name=\"wikipage\" value=\"%s\">\n", bstr("wikipage"));
-       }
-       wprintf("<input type=\"hidden\" name=\"return_to\" value=\"%s\">\n", bstr("return_to"));
-       wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WCC->nonce);
-       wprintf("<input type=\"hidden\" name=\"force_room\" value=\"");
-       escputs(WCC->wc_roomname);
-       wprintf("\">\n");
-       wprintf("<input type=\"hidden\" name=\"references\" value=\"");
-       escputs(bstr("references"));
-       wprintf("\">\n");
-
-       /** submit or cancel buttons */
-        wprintf("<p class=\"send_edit_msg\">");
-        wprintf("<input type=\"submit\" name=\"send_button\" value=\"");
-        if (recipient_required) {
-                wprintf(_("Send message"));
-        } else {
-                wprintf(_("Post message"));
-        }
-        wprintf("\">&nbsp;"
-                "<input type=\"submit\" name=\"cancel_button\" value=\"%s\">\n", _("Cancel"));
-        wprintf("</p>");
-
-       /** header bar */
-
-       wprintf("<img src=\"static/newmess3_24x.gif\" class=\"imgedit\">");
-       wprintf("  ");  /** header bar */
-       webcit_fmt_date(buf, now, 0);
-       wprintf("%s", buf);
-       wprintf("\n");  /** header bar */
-
-       wprintf("<table width=\"100%%\" class=\"edit_msg_table\">");
-       wprintf("<tr>");
-       wprintf("<th><label for=\"from_id\" > ");
-       wprintf(_(" <I>from</I> "));
-       wprintf("</label></th>");
-
-       wprintf("<td colspan=\"2\">");
-
-       /* Allow the user to select any of his valid screen names */
-
-       wprintf("<select name=\"display_name\" size=1 id=\"from_id\">\n");
-
-       serv_puts("GVSN");
-       serv_getln(buf, sizeof buf);
-       if (buf[0] == '1') {
-               while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
-                       wprintf("<option %s value=\"",
-                               ((!strcasecmp(bstr("display_name"), buf)) ? "selected" : "")
-                       );
-                       escputs(buf);
-                       wprintf("\">");
-                       escputs(buf);
-                       wprintf("</option>\n");
+               if (    (Result == 570)         /* invalid or missing recipient(s) */
+                       || (Result == 550)      /* higher access required to send Internet mail */
+               ) {
+                       /* These errors will have been displayed and are excusable */
+               }
+               else if (rc != 2) {     /* Any other error means that we cannot continue */
+                       AppendImportantMessage(ChrPtr(CmdBuf) + 4, StrLength(CmdBuf) - 4);
+                       FreeStrBuf(&CmdBuf);
+                       readloop(readnew, eUseDefault);
+                       return;
                }
+               FreeStrBuf(&CmdBuf);
        }
+       if (recipient_required)
+               PutBstr(HKEY("__RCPTREQUIRED"), NewStrBufPlain(HKEY("1")));
+       if (recipient_required || subject_required)
+               PutBstr(HKEY("__SUBJREQUIRED"), NewStrBufPlain(HKEY("1")));
 
-       if (WCC->room_flags & QR_ANONOPT) {
-               wprintf("<option %s value=\"__ANONYMOUS__\">%s</option>\n",
-                       ((!strcasecmp(bstr("__ANONYMOUS__"), WCC->wc_fullname)) ? "selected" : ""),
-                       _("Anonymous")
-               );
-       }
+       begin_burst();
+       output_headers(1, 0, 0, 0, 1, 0);
+       DoTemplate(HKEY("edit_message"), NULL, &NoCtx);
+       end_burst();
 
-       wprintf("</select>\n");
+       return;
+}
 
-       /* If this is an email (not a post), allow the user to select any of his
-        * valid email addresses.
-        */
-       if (recipient_required) {
-               serv_puts("GVEA");
-               serv_getln(buf, sizeof buf);
-               if (buf[0] == '1') {
-                       wprintf("<select name=\"my_email_addr\" size=1>\n");
-                       while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
-                               wprintf("<option value=\"");
-                               escputs(buf);
-                               wprintf("\">&lt;");
-                               escputs(buf);
-                               wprintf("&gt;</option>\n");
-                       }
-                       wprintf("</select>\n");
-               }
+/*
+ * delete a message
+ */
+void delete_msg(void)
+{
+       long msgid;
+       StrBuf *Line;
+       
+       msgid = lbstr("msgid");
+       Line = NewStrBuf();
+       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 */
+               serv_printf("MOVE %ld|_TRASH_|0", msgid);
        }
 
-       wprintf(_(" <I>in</I> "));
-       escputs(WCC->wc_roomname);
+       StrBuf_ServGetln(Line);
+       GetServerStatusMsg(Line, NULL, 1, 0);
 
-       wprintf("</td></tr>");
+       readloop(readnew, eUseDefault);
+}
 
-       if (recipient_required) {
-               char *ccraw;
-               char *copy;
-               size_t len;
-               wprintf("<tr><th><label for=\"recp_id\"> ");
-               wprintf(_("To:"));
-               wprintf("</label></th>"
-                       "<td><input autocomplete=\"off\" type=\"text\" name=\"recp\" id=\"recp_id\" value=\"");
-               ccraw = xbstr("recp", &len);
-               copy = (char*) malloc(len * 2 + 1);
-               memcpy(copy, ccraw, len + 1); 
-               utf8ify_rfc822_string(copy);
-               escputs(copy);
-               free(copy);
-               wprintf("\" size=45 maxlength=1000 />");
-               wprintf("<div class=\"auto_complete\" id=\"recp_name_choices\"></div>");
-               wprintf("</td><td rowspan=\"3\" align=\"left\" valign=\"top\">");
-
-               /** Pop open an address book -- begin **/
-               wprintf(
-                       "<a href=\"javascript:PopOpenAddressBook('recp_id|%s|cc_id|%s|bcc_id|%s');\" "
-                       "title=\"%s\">"
-                       "<img align=middle border=0 width=24 height=24 src=\"static/viewcontacts_24x.gif\">"
-                       "&nbsp;%s</a>",
-                       _("To:"), _("CC:"), _("BCC:"),
-                       _("Contacts"), _("Contacts")
-               );
-               /** Pop open an address book -- end **/
-
-               wprintf("</td></tr>");
-
-               wprintf("<tr><th><label for=\"cc_id\"> ");
-               wprintf(_("CC:"));
-               wprintf("</label></th>"
-                       "<td><input autocomplete=\"off\" type=\"text\" name=\"cc\" id=\"cc_id\" value=\"");
-               ccraw = xbstr("cc", &len);
-               copy = (char*) malloc(len * 2 + 1);
-               memcpy(copy, ccraw, len + 1); 
-               utf8ify_rfc822_string(copy);
-               escputs(copy);
-               free(copy);
-               wprintf("\" size=45 maxlength=1000 />");
-               wprintf("<div class=\"auto_complete\" id=\"cc_name_choices\"></div>");
-               wprintf("</td></tr>");
-
-               wprintf("<tr><th><label for=\"bcc_id\"> ");
-               wprintf(_("BCC:"));
-               wprintf("</label></th>"
-                       "<td><input autocomplete=\"off\" type=\"text\" name=\"bcc\" id=\"bcc_id\" value=\"");
-               ccraw = xbstr("bcc", &len);
-               copy = (char*) malloc(len * 2 + 1);
-               memcpy(copy, ccraw, len + 1); 
-               utf8ify_rfc822_string(copy);
-               escputs(copy);
-               free(copy);
-               wprintf("\" size=45 maxlength=1000 />");
-               wprintf("<div class=\"auto_complete\" id=\"bcc_name_choices\"></div>");
-               wprintf("</td></tr>");
-
-               /** Initialize the autocomplete ajax helpers (found in wclib.js) */
-               wprintf("<script type=\"text/javascript\">      \n"
-                       " activate_entmsg_autocompleters();     \n"
-                       "</script>                              \n"
-               );
 
-       }
+/*
+ * move a message to another room
+ */
+void move_msg(void)
+{
+       long msgid;
 
-       wprintf("<tr><th><label for=\"subject_id\" > ");
-       if (recipient_required || subject_required) {
-               wprintf(_("Subject:"));
-       }
-       else {
-               wprintf(_("Subject (optional):"));
-       }
-       wprintf("</label></th>"
-               "<td colspan=\"2\">"
-               "<input type=\"text\" name=\"subject\" id=\"subject_id\" value=\"");
-       escputs(bstr("subject"));
-       wprintf("\" size=45 maxlength=70>\n");
-       wprintf("</td></tr>");
+       msgid = lbstr("msgid");
 
-       wprintf("<tr><td colspan=\"3\">\n");
+       if (havebstr("move_button")) {
+               StrBuf *Line;
+               serv_printf("MOVE %ld|%s", msgid, bstr("target_room"));
+               Line = NewStrBuf();
+               StrBuf_ServGetln(Line);
+               GetServerStatusMsg(Line, NULL, 1, 0);
+               FreeStrBuf(&Line);
+       } else {
+               AppendImportantMessage(_("The message was not moved."), -1);
+       }
 
-       wprintf("<textarea name=\"msgtext\" cols=\"80\" rows=\"15\">");
+       readloop(readnew, eUseDefault);
+}
 
-       /** If we're continuing from a previous edit, put our partially-composed message back... */
-       msgescputs(bstr("msgtext"));
 
-       /* If we're forwarding a message, insert it here... */
-       if (lbstr("fwdquote") > 0L) {
-               wprintf("<br><div align=center><i>");
-               wprintf(_("--- forwarded message ---"));
-               wprintf("</i></div><br>");
-               pullquote_message(lbstr("fwdquote"), 1, 1);
-       }
 
-       /** If we're replying quoted, insert the quote here... */
-       else if (lbstr("replyquote") > 0L) {
-               wprintf("<br>"
-                       "<blockquote>");
-               pullquote_message(lbstr("replyquote"), 0, 1);
-               wprintf("</blockquote><br>");
-       }
+/*
+ * 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;
+       int i;
 
-       /** If we're editing a wiki page, insert the existing page here... */
-       else if (WCC->wc_view == VIEW_WIKI) {
-               safestrncpy(buf, bstr("wikipage"), sizeof buf);
-               str_wiki_index(buf);
-               existing_page = locate_message_by_uid(buf);
-               if (existing_page >= 0L) {
-                       pullquote_message(existing_page, 1, 0);
+       i = StrToi(partnum);
+       if (GetHash(WC->attachments, IKEY(i), &vPart) &&
+           (vPart != NULL)) {
+               part = (wc_mime_attachment*) vPart;
+               if (force_download) {
+                       content_type = NewStrBufPlain(HKEY("application/octet-stream"));
                }
-       }
-
-       /** Insert our signature if appropriate... */
-       if ( (WCC->is_mailbox) && !yesbstr("sig_inserted") ) {
-               int UseSig;
-               get_pref_yesno("use_sig", &UseSig, 0);
-               if (UseSig) {
-                       StrBuf *Sig;
-                       const char *sig, *esig;
-
-                       get_preference("signature", &ebuf);
-                       Sig = NewStrBuf();
-                       StrBufEUid_unescapize(Sig, ebuf);
-                       sig = ChrPtr(Sig);
-                       esig = sig + StrLength(Sig);
-                       wprintf("<br>--<br>");
-                       while (sig <= esig) {
-                               if (*sig == '\n') {
-                                       wprintf("<br>");
-                               }
-                               else if (*sig == '<') {
-                                       wprintf("&lt;");
-                               }
-                               else if (*sig == '>') {
-                                       wprintf("&gt;");
-                               }
-                               else if (*sig == '&') {
-                                       wprintf("&amp;");
-                               }
-                               else if (*sig == '\"') {
-                                       wprintf("&quot;");
-                               }
-                               else if (*sig == '\'') {
-                                       wprintf("&#39;");
-                               }
-                               else /* since we're utf 8, is this a good idea? if (isprint(*sig))*/ {
-                                       wprintf("%c", *sig);
-                               } 
-                               sig ++;
-                       }
-                       FreeStrBuf(&Sig);
+               else {
+                       content_type = NewStrBufDup(part->ContentType);
                }
-       }
-
-       wprintf("</textarea>\n");
+               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);
+}
 
-       /** Make sure we only insert our signature once */
-       /** We don't care if it was there or not before, it needs to be there now. */
-       wprintf("<input type=\"hidden\" name=\"sig_inserted\" value=\"yes\">\n");
-       
-       /**
-        * The following template embeds the TinyMCE richedit control, and automatically
-        * transforms the textarea into a richedit textarea.
-        */
-       do_template("richedit", NULL);
-
-       /** Enumerate any attachments which are already in place... */
-       wprintf("<div class=\"attachment buttons\"><img src=\"static/diskette_24x.gif\" class=\"imgedit\" > ");
-       wprintf(_("Attachments:"));
-       wprintf(" ");
-       wprintf("<select name=\"which_attachment\" size=1>");
-       for (att = WCC->first_attachment; att != NULL; att = att->next) {
-               wprintf("<option value=\"");
-               urlescputs(att->filename);
-               wprintf("\">");
-               escputs(att->filename);
-               /* wprintf(" (%s, %d bytes)",att->content_type,att->length); */
-               wprintf("</option>\n");
-       }
-       wprintf("</select>");
-
-       /** Now offer the ability to attach additional files... */
-       wprintf("&nbsp;&nbsp;&nbsp;");
-       wprintf(_("Attach file:"));
-       wprintf(" <input name=\"attachfile\" class=\"attachfile\" "
-               "size=16 type=\"file\">\n&nbsp;&nbsp;"
-               "<input type=\"submit\" name=\"attach_button\" value=\"%s\">\n", _("Add"));
-       wprintf("</div>");      /* End of "attachment buttons" div */
-
-
-       wprintf("</td></tr></table>");
-       
-       wprintf("</form>\n");
-       wprintf("</div>\n");    /* end of "fix_scrollbar_bug" div */
 
-       /* NOTE: address_book_popup() will close the "content" div.  Don't close it here. */
-DONE:  address_book_popup();
-       wDumpContent(1);
+/*
+ * 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;
+       long ErrorDetail;
+       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, &ErrorDetail) == 2) {
+               StrBufCutLeft(Buf, 4);
+               bytes = StrBufExtract_long(Buf, 0, '|');
+               if (!force_download) {
+                       StrBufExtract_token(ContentType, Buf, 3, '|');
+               }
+
+               serv_read_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);
+               switch (ErrorDetail) {
+               default:
+               case ERROR + MESSAGE_NOT_FOUND:
+                       hprintf("HTTP/1.1 404 %s\n", ChrPtr(Buf));
+                       break;
+               case ERROR + NOT_LOGGED_IN:
+                       hprintf("HTTP/1.1 401 %s\n", ChrPtr(Buf));
+                       break;
+
+               case ERROR + HIGHER_ACCESS_REQUIRED:
+                       hprintf("HTTP/1.1 403 %s\n", ChrPtr(Buf));
+                       break;
+               case ERROR + INTERNAL_ERROR:
+               case ERROR + TOO_BIG:
+                       hprintf("HTTP/1.1 500 %s\n", ChrPtr(Buf));
+                       break;
+               }
+               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);
 }
 
 
-/**
- * \brief delete a message
+/*
+ * Read any MIME part of a message, from the server, into memory.
  */
-void delete_msg(void)
+StrBuf *load_mimepart(long msgnum, char *partnum)
 {
-       long msgid;
-       char buf[SIZ];
-
-       msgid = lbstr("msgid");
+       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);
+       }
+}
 
-       if (WC->wc_is_trash) {  /** Delete from Trash is a real delete */
-               serv_printf("DELE %ld", msgid); 
+/*
+ * Read any MIME part of a message, from the server, into memory.
+ */
+void MimeLoadData(wc_mime_attachment *Mime)
+{
+       StrBuf *Buf;
+       const char *Ptr;
+       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) {
+               Ptr = &(ChrPtr(Buf)[4]);
+               bytes = StrBufExtractNext_long(Buf, &Ptr, '|');
+               StrBufSkip_NTokenS(Buf, &Ptr, '|', 3);  /* filename, cbtype, mimetype */
+               if (Mime->Charset == NULL) Mime->Charset = NewStrBuf();
+               StrBufExtract_NextToken(Mime->Charset, Buf, &Ptr, '|');
+               
+               if (Mime->Data == NULL)
+                       Mime->Data = NewStrBufPlain(NULL, bytes);
+               StrBuf_ServGetBLOBBuffered(Mime->Data, bytes);
        }
-       else {                  /** Otherwise move it to Trash */
-               serv_printf("MOVE %ld|_TRASH_|0", msgid);
+       else {
+               FlushStrBuf(Mime->Data);
+               /* TODO XImportant message */
        }
+       FreeStrBuf(&Buf);
+}
 
-       serv_getln(buf, sizeof buf);
-       sprintf(WC->ImportantMessage, "%s", &buf[4]);
 
-       readloop("readnew");
+void view_mimepart(void) {
+       mimepart(0);
 }
 
+void download_mimepart(void) {
+       mimepart(1);
+}
 
-/**
- * \brief move a message to another folder
- */
-void move_msg(void)
-{
-       long msgid;
-       char buf[SIZ];
+void view_postpart(void) {
+       StrBuf *filename = NewStrBuf();
+       StrBuf *partnum = NewStrBuf();
 
-       msgid = lbstr("msgid");
+       StrBufExtract_token(partnum, WC->Hdr->HR.ReqLine, 0, '/');
+       StrBufExtract_token(filename, WC->Hdr->HR.ReqLine, 1, '/');
 
-       if (havebstr("move_button")) {
-               sprintf(buf, "MOVE %ld|%s", msgid, bstr("target_room"));
-               serv_puts(buf);
-               serv_getln(buf, sizeof buf);
-               sprintf(WC->ImportantMessage, "%s", &buf[4]);
-       } else {
-               sprintf(WC->ImportantMessage, (_("The message was not moved.")));
-       }
+       postpart(partnum, filename, 0);
 
-       readloop("readnew");
+       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);
+}
 
-/*
- * Confirm move of a message
- */
-void confirm_move_msg(void)
-{
-       long msgid;
-       char buf[SIZ];
-       char targ[SIZ];
 
-       msgid = lbstr("msgid");
 
+void show_num_attachments(void) {
+       wc_printf("%d", GetCount(WC->attachments));
+}
 
-       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");
 
-       wprintf("<div id=\"content\" class=\"service\">\n");
+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);}
 
-       wprintf("<CENTER>");
 
-       wprintf(_("Move this message to:"));
-       wprintf("<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"));
+/* Output message list in JSON format */
+void jsonMessageList(void) {
+       StrBuf *View = NewStrBuf();
+       const StrBuf *room = sbstr("room");
+       long oper = (havebstr("query")) ? do_search : readnew;
+       StrBufPrintf(View, "%d", VIEW_JSON_LIST);
+       putbstr("view", View);; 
+       gotoroom(room);
+       readloop(oper, eUseDefault);
+}
 
-       wprintf("<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>");
-                       escputs(targ);
-                       wprintf("\n");
-               }
-       }
-       wprintf("</SELECT>\n");
-       wprintf("<br />\n");
+void RegisterReadLoopHandlerset(
+       int RoomType,
+       GetParamsGetServerCall_func GetParamsGetServerCall,
+       PrintViewHeader_func PrintPageHeader,
+       PrintViewHeader_func PrintViewHeader,
+       load_msg_ptrs_detailheaders LH,
+       LoadMsgFromServer_func LoadMsgFromServer,
+       RenderView_or_Tail_func RenderView_or_Tail,
+       View_Cleanup_func ViewCleanup
+       )
+{
+       RoomRenderer *Handler;
 
-       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");
+       Handler = (RoomRenderer*) malloc(sizeof(RoomRenderer));
 
-       wprintf("</CENTER>\n");
-       wDumpContent(1);
-}
+       Handler->RoomType = RoomType;
+       Handler->GetParamsGetServerCall = GetParamsGetServerCall;
+       Handler->PrintPageHeader = PrintPageHeader;
+       Handler->PrintViewHeader = PrintViewHeader;
+       Handler->LoadMsgFromServer = LoadMsgFromServer;
+       Handler->RenderView_or_Tail = RenderView_or_Tail;
+       Handler->ViewCleanup = ViewCleanup;
+       Handler->LHParse = LH;
 
-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");}
+       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, ANONYMOUS|NEED_URL);
+       WebcitAddUrlHandler(HKEY("readold"), "", 0, h_readold, ANONYMOUS|NEED_URL);
+       WebcitAddUrlHandler(HKEY("readfwd"), "", 0, h_readfwd, ANONYMOUS|NEED_URL);
+       WebcitAddUrlHandler(HKEY("headers"), "", 0, h_headers, NEED_URL);
+       WebcitAddUrlHandler(HKEY("readgt"), "", 0, h_readgt, ANONYMOUS|NEED_URL);
+       WebcitAddUrlHandler(HKEY("readlt"), "", 0, h_readlt, ANONYMOUS|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, PROHIBIT_STARTPAGE);
+       WebcitAddUrlHandler(HKEY("move_msg"), "", 0, move_msg, PROHIBIT_STARTPAGE);
+       WebcitAddUrlHandler(HKEY("delete_msg"), "", 0, delete_msg, PROHIBIT_STARTPAGE);
+       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("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|PROHIBIT_STARTPAGE);
+       WebcitAddUrlHandler(HKEY("postpart_download"), "", 0, download_postpart, NEED_URL|PROHIBIT_STARTPAGE);
+       WebcitAddUrlHandler(HKEY("upload_attachment"), "", 0, upload_attachment, AJAX);
+       WebcitAddUrlHandler(HKEY("remove_attachment"), "", 0, remove_attachment, AJAX);
+       WebcitAddUrlHandler(HKEY("show_num_attachments"), "", 0, show_num_attachments, AJAX);
+
+       /* json */
+       WebcitAddUrlHandler(HKEY("roommsgs"), "", 0, jsonMessageList,0);
+
+       l_subj = FourHash("subj", 4);
+       l_wefw = FourHash("wefw", 4);
+       l_msgn = FourHash("msgn", 4);
+       l_from = FourHash("from", 4);
+       l_rcpt = FourHash("rcpt", 4);
+       l_cccc = FourHash("cccc", 4);
+       l_node = FourHash("node", 4);
+       l_rfca = FourHash("rfca", 4);
+
        return ;
 }
+
+void
+SessionDetachModule_MSG
+(wcsession *sess)
+{
+       DeleteHash(&sess->summ);
+}