* typedef wcsession, so we don't always need to say gcc again its a struct.
[citadel.git] / webcit / messages.c
index 49dcbdde1b44c0abf9724eebc128353213fbde0e..9d14b3c38a293354c8983f7781e319964fd7387f 100644 (file)
 /*
  * $Id$
- */
-/**
- * \defgroup MsgDisp Functions which deal with the fetching and displaying of messages.
- * \ingroup WebcitDisplayItems
+ *
+ * Functions which deal with the fetching and displaying of messages.
  *
  */
-/*@{*/
+
 #include "webcit.h"
 #include "webserver.h"
 #include "groupdav.h"
 
+HashList *MsgHeaderHandler = NULL;
+HashList *MsgEvaluators = NULL;
+HashList *MimeRenderHandler = NULL;
+
 #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 */
 
-/**
- * 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
-
-/**
- * \brief      Wrapper around iconv_open()
- *             Our version adds aliases for non-standard Microsoft charsets
- *           such as 'MS950', aliasing them to names like 'CP950'
- *
- * \param      tocode          Target encoding
- * \param      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);
-}
-
-
-/**
- * \brief  Handle subjects with RFC2047 encoding
- *  such as:
- * =?koi8-r?B?78bP0s3Mxc7JxSDXz9rE1dvO2c3JINvB0sHNySDP?=
- * \param buf the stringbuffer to process
- */
-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) {
-               char default_header_charset[128];
-               get_preference("default_header_charset", default_header_charset, sizeof default_header_charset);
-               if ( (strcasecmp(default_header_charset, "UTF-8")) && (strcasecmp(default_header_charset, "us-ascii")) ) {
-                       ic = ctdl_iconv_open("UTF-8", 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 = strstr(start, "?=");
-
-       while ((start != NULL) && (end != NULL))
-       {
-               next = strstr(end, "=?");
-               if (next != NULL)
-                       nextend = strstr(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=strstr(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;
-       }
-
-}
-#endif
-
-
-
-
-/**
- * \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.
- */
-void webcit_rfc2047encode(char *target, int maxlen, char *source)
-{
-       int need_to_encode = 0;
-       int i, len;
-       unsigned char ch;
-
-       if (target == NULL) return;
-       len = strlen(source);
-       for (i=0; i<len; ++i) {
-               if ((source[i] < 32) || (source[i] > 126)) {
-                       need_to_encode = 1;
-                       i = len; ///< shortcut. won't become more than 1
-               }
-       }
-
-       if (!need_to_encode) {
-               safestrncpy(target, source, maxlen);
-               return;
-       }
-
-       strcpy(target, "=?UTF-8?Q?");
-       for (i=0; i<len; ++i) {
-               ch = (unsigned char) source[i];
-               if ((ch < 32) || (ch > 126) || (ch == 61)) {
-                       sprintf(&target[strlen(target)], "=%02X", ch);
-               }
-               else {
-                       sprintf(&target[strlen(target)], "%c", ch);
-               }
-       }
-       
-       strcat(target, "?=");
-}
-
-
-
-
-/**
- * \brief Look for URL's embedded in a buffer and make them linkable.  We use a
- * target window in order to keep the BBS session in its own window.
- * \param buf the message buffer
- */
-void url(char *buf)
-{
-       int len;
-       char *start, *end, *pos;
-       char urlbuf[SIZ];
-       char outbuf[1024];
-
-       start = NULL;
-       len = strlen(buf);
-       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;
-               }
-       }
-
-       strncpy(urlbuf, start, end - start);
-       urlbuf[end - start] = '\0';
-
-       if (start != buf)
-               strncpy(outbuf, buf, start - buf );
-       sprintf(&outbuf[start-buf], "%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);
-       strcat(outbuf, end);
-       if ( strlen(outbuf) < 250 )
-               strcpy(buf, outbuf);
-}
-
-
-/**
- * \brief Turn a vCard "n" (name) field into something displayable.
- * \param name the name field to convert
- */
-void vcard_n_prettyize(char *name)
-{
-       char *original_name;
-       int i, j, len;
-
-       original_name = strdup(name);
-       len = strlen(original_name);
-       for (i=0; i<5; ++i) {
-               if (len > 0) {
-                       if (original_name[len-1] == ' ') {
-                               original_name[--len] = 0;
-                       }
-                       if (original_name[len-1] == ';') {
-                               original_name[--len] = 0;
-                       }
-               }
-       }
-       strcpy(name, "");
-       j=0;
-       for (i=0; i<len; ++i) {
-               if (original_name[i] == ';') {
-                       name[j++] = ',';
-                       name[j++] = ' ';                        
-               }
-               else {
-                       name[j++] = original_name[i];
-               }
-       }
-       name[j] = '\0';
-       free(original_name);
-}
-
-
-
-
-/**
- * \brief preparse a vcard name
- * display_vcard() calls this after parsing the textual vCard into
- * our 'struct vCard' data object.
- * This gets called instead of display_parsed_vcard() if we are only looking
- * to extract the person's name instead of displaying the card.
- * \param v the vcard to retrieve the name from
- * \param storename where to put the name at
- */
-void fetchname_parsed_vcard(struct vCard *v, char *storename) {
-       char *name;
-
-       strcpy(storename, "");
-
-       name = vcard_get_prop(v, "n", 1, 0, 0);
-       if (name != NULL) {
-               strcpy(storename, name);
-               /* vcard_n_prettyize(storename); */
-       }
-
-}
-
-
-
-/**
- * \brief html print a vcard
- * display_vcard() calls this after parsing the textual vCard into
- * our 'struct vCard' data object.
- *
- * Set 'full' to nonzero to display the full card, otherwise it will only
- * show a summary line.
- *
- * This code is a bit ugly, so perhaps an explanation is due: we do this
- * in two passes through the vCard fields.  On the first pass, we process
- * fields we understand, and then render them in a pretty fashion at the
- * end.  Then we make a second pass, outputting all the fields we don't
- * understand in a simple two-column name/value format.
- * \param v the vCard to display
- * \param full display all items of the vcard?
- */
-void display_parsed_vcard(struct vCard *v, int full) {
-       int i, j;
-       char buf[SIZ];
-       char *name;
-       int is_qp = 0;
-       int is_b64 = 0;
-       char *thisname, *thisvalue;
-       char firsttoken[SIZ];
-       int pass;
-
-       char fullname[SIZ];
-       char title[SIZ];
-       char org[SIZ];
-       char phone[SIZ];
-       char mailto[SIZ];
-
-       strcpy(fullname, "");
-       strcpy(phone, "");
-       strcpy(mailto, "");
-       strcpy(title, "");
-       strcpy(org, "");
-
-       if (!full) {
-               wprintf("<TD>");
-               name = vcard_get_prop(v, "fn", 1, 0, 0);
-               if (name != NULL) {
-                       escputs(name);
-               }
-               else if (name = vcard_get_prop(v, "n", 1, 0, 0), name != NULL) {
-                       strcpy(fullname, name);
-                       vcard_n_prettyize(fullname);
-                       escputs(fullname);
-               }
-               else {
-                       wprintf("&nbsp;");
-               }
-               wprintf("</TD>");
-               return;
-       }
-
-       wprintf("<div align=center>"
-               "<table bgcolor=#aaaaaa width=50%%>");
-       for (pass=1; pass<=2; ++pass) {
-
-               if (v->numprops) for (i=0; i<(v->numprops); ++i) {
-                       int len;
-                       thisname = strdup(v->prop[i].name);
-                       extract_token(firsttoken, thisname, 0, ';', sizeof firsttoken);
-       
-                       for (j=0; j<num_tokens(thisname, ';'); ++j) {
-                               extract_token(buf, thisname, j, ';', sizeof buf);
-                               if (!strcasecmp(buf, "encoding=quoted-printable")) {
-                                       is_qp = 1;
-                                       remove_token(thisname, j, ';');
-                               }
-                               if (!strcasecmp(buf, "encoding=base64")) {
-                                       is_b64 = 1;
-                                       remove_token(thisname, j, ';');
-                               }
-                       }
-                       
-                       len = strlen(v->prop[i].value);
-       
-                       if (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,  fullname);
-                               len = strlen(mailto);
-                               urlesc(&mailto[len], SIZ - len, " <");
-                               len = strlen(mailto);
-                               urlesc(&mailto[len], SIZ - len, thisvalue);
-                               len = strlen(mailto);
-                               urlesc(&mailto[len], SIZ - len, ">");
-
-                               strcat(mailto, "\">");
-                               len = strlen(mailto);
-                               stresc(mailto+len, SIZ - len, thisvalue, 1, 1);
-                               strcat(mailto, "</A>");
-                       }
-                       else if (!strcasecmp(firsttoken, "tel")) {
-                               if (!IsEmptyStr(phone)) strcat(phone, "<br />");
-                               strcat(phone, thisvalue);
-                               for (j=0; j<num_tokens(thisname, ';'); ++j) {
-                                       extract_token(buf, thisname, j, ';', sizeof buf);
-                                       if (!strcasecmp(buf, "tel"))
-                                               strcat(phone, "");
-                                       else if (!strcasecmp(buf, "work"))
-                                               strcat(phone, _(" (work)"));
-                                       else if (!strcasecmp(buf, "home"))
-                                               strcat(phone, _(" (home)"));
-                                       else if (!strcasecmp(buf, "cell"))
-                                               strcat(phone, _(" (cell)"));
-                                       else {
-                                               strcat(phone, " (");
-                                               strcat(phone, buf);
-                                               strcat(phone, ")");
-                                       }
-                               }
-                       }
-                       else if (!strcasecmp(firsttoken, "adr")) {
-                               if (pass == 2) {
-                                       wprintf("<TR><TD>");
-                                       wprintf(_("Address:"));
-                                       wprintf("</TD><TD>");
-                                       for (j=0; j<num_tokens(thisvalue, ';'); ++j) {
-                                               extract_token(buf, thisvalue, j, ';', sizeof buf);
-                                               if (!IsEmptyStr(buf)) {
-                                                       escputs(buf);
-                                                       if (j<3) wprintf("<br />");
-                                                       else wprintf(" ");
-                                               }
-                                       }
-                                       wprintf("</TD></TR>\n");
-                               }
-                       }
-                       else if (!strcasecmp(firsttoken, "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");
-}
 
 
+void display_enter(void);
+int longcmp_r(const void *s1, const void *s2);
+int summcmp_subj(const void *s1, const void *s2);
+int summcmp_rsubj(const void *s1, const void *s2);
+int summcmp_sender(const void *s1, const void *s2);
+int summcmp_rsender(const void *s1, const void *s2);
+int summcmp_date(const void *s1, const void *s2);
+int summcmp_rdate(const void *s1, const void *s2);
 
-/**
- * \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???
- */
-void display_vcard(char *vcard_source, char alpha, int full, char *storename) {
-       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) {
-               strcpy(buf, name);
-               this_alpha = buf[0];
-       }
+typedef void (*MsgPartEvaluatorFunc)(message_summary *Sum, StrBuf *Buf);
 
-       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);
-       }
 
-       vcard_free(v);
-}
 
+/*----------------------------------------------------------------------------*/
 
-struct attach_link {
-       char partnum[32];
-       char html[1024];
-};
 
 
 /*
@@ -712,1957 +46,781 @@ struct attach_link {
  * 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) {
+int read_message(StrBuf *Target, const char *tmpl, long tmpllen, long msgnum, int printable_view, const StrBuf *PartNum) {
+       StrBuf *Buf;
+       StrBuf *HdrToken;
+       StrBuf *FoundCharset;
+       HashPos  *it;
+       void *vMime;
+       message_summary *Msg = NULL;
+       headereval *Hdr;
+       void *vHdr;
        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] = "";
-       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[256] = "";
-       char m_cc[1024] = "";
-       char from[256] = "";
-       char node[256] = "";
-       char rfca[256] = "";
-       char reply_to[512] = "";
-       char reply_all[4096] = "";
-       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;
+//     char mime_submessages[256] = "";
+       char reply_references[1024] = "";
+       int Done = 0;
+       int state=0;
+       long len;
+       const char *Key;
+
+       Buf = NewStrBuf();
+       lprintf(1, "----------%s---------MSG4 %ld|%s--------------\n", tmpl, msgnum, ChrPtr(PartNum));
+       serv_printf("MSG4 %ld|%s", msgnum, ChrPtr(PartNum));
+       StrBuf_ServGetln(Buf);
+       if (GetServerStatus(Buf, NULL) != 1) {
+               StrBufAppendPrintf(Target, "<strong>");
+               StrBufAppendPrintf(Target, _("ERROR:"));
+               StrBufAppendPrintf(Target, "</strong> %s<br />\n", &buf[4]);
+               FreeStrBuf(&Buf);
+               return 0;
        }
 
        /** 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=");
-#ifdef HAVE_ICONV
-                       utf8ify_rfc822_string(from);
-#endif
-                       urlescputs(from);
-                       wprintf("\">");
-                       escputs(from);
-                       wprintf("</a> ");
-               }
-               if (!strncasecmp(buf, "subj=", 5)) {
-                       safestrncpy(m_subject, &buf[5], sizeof m_subject);
-               }
-               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) );
-#ifdef HAVE_ICONV
-                       utf8ify_rfc822_string(&buf[5]);
-#endif
-                       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, "|");
+       HdrToken = NewStrBuf();
+       Msg = (message_summary *)malloc(sizeof(message_summary));
+       memset(Msg, 0, sizeof(message_summary));
+       Msg->msgnum = msgnum;
+       Msg->PartNum = PartNum;
+       Msg->MsgBody =  (wc_mime_attachment*) malloc(sizeof(wc_mime_attachment));
+       memset(Msg->MsgBody, 0, sizeof(wc_mime_attachment));
+       FoundCharset = NewStrBuf();
+       while ((StrBuf_ServGetln(Buf)>=0) && !Done) {
+               if ( (StrLength(Buf)==3) && 
+                   !strcmp(ChrPtr(Buf), "000")) 
+               {
+                       Done = 1;
+                       if (state < 2) {
+                               lprintf(1, _("unexpected end of message"));
+                               
+                               Msg->MsgBody->ContentType = NewStrBufPlain(HKEY("text/html"));
+                               StrBufAppendPrintf(Msg->MsgBody->Data, "<div><i>");
+                               StrBufAppendPrintf(Msg->MsgBody->Data, _("unexpected end of message"));
+                               StrBufAppendPrintf(Msg->MsgBody->Data, " (1)</i><br /><br />\n");
+                               StrBufAppendPrintf(Msg->MsgBody->Data, "</div>\n");
+                       }
+                       break;
+               }
+               switch (state) {
+               case 0:/* Citadel Message Headers */
+                       if (StrLength(Buf) == 0) {
+                               state ++;
+                               break;
+                       }
+                       StrBufExtract_token(HdrToken, Buf, 0, '=');
+                       StrBufCutLeft(Buf, StrLength(HdrToken) + 1);
+                       
+                       lprintf(1, ":: [%s] = [%s]\n", ChrPtr(HdrToken), ChrPtr(Buf));
+                       if (GetHash(MsgHeaderHandler, SKEY(HdrToken), &vHdr) &&
+                           (vHdr != NULL)) {
+                               Hdr = (headereval*)vHdr;
+                               Hdr->evaluator(Msg, Buf, FoundCharset);
+                               if (Hdr->Type == 1) {
+                                       state++;
                                }
-                               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);
-                               urlesc(escaped_mime_filename, 265, mime_filename);
-                               snprintf(attach_links[num_attach_links-1].html, 1024,
-                                       "<img src=\"static/diskette_24x.gif\" "
-                                       "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_filename,
-                                       mime_content_type, mime_length,
-                                       msgnum, mime_partnum, escaped_mime_filename,
-                                       msgnum, mime_partnum,
-                                       _("View"),
-                                       msgnum, mime_partnum, escaped_mime_filename,
-                                       _("Download")
-                               );
+                       else lprintf(1, "don't know how to handle message header[%s]\n", ChrPtr(HdrToken));
+                       break;
+               case 1:/* Message Mime Header */
+                       if (StrLength(Buf) == 0) {
+                               state++;
+                               if (Msg->MsgBody->ContentType == NULL)
+                                       /* 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);
+                                       lprintf(1, ":: [%s] = [%s]\n", ChrPtr(HdrToken), ChrPtr(Buf));
+                                       if (GetHash(MsgHeaderHandler, SKEY(HdrToken), &vHdr) &&
+                                           (vHdr != NULL)) {
+                                               Hdr = (headereval*)vHdr;
+                                               Hdr->evaluator(Msg, Buf, FoundCharset);
+                                       }
+                                       break;
+                               }
                        }
-
-                       /** 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_ServGetBLOB(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);
                        }
-
-                       /** end handler prep ***/
-
+                       break;
+               case 3:
+                       StrBufAppendBuf(Msg->MsgBody->Data, Buf, 0);
+                       break;
                }
-
        }
 
-       /** 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);
+       if (Msg->AllAttach == NULL)
+               Msg->AllAttach = NewHash(1,NULL);
+       Put(Msg->AllAttach, SKEY(Msg->MsgBody->PartNum), Msg->MsgBody, DestroyMime);
+       
+       /* strip the bare contenttype, so we ommit charset etc. */
+       StrBufExtract_token(Buf, Msg->MsgBody->ContentType, 0, ';');
+       StrBufTrim(Buf);
+       if (GetHash(MimeRenderHandler, SKEY(Buf), &vHdr) &&
+           (vHdr != NULL)) {
+               RenderMimeFunc Render;
+               Render = (RenderMimeFunc)vHdr;
+               Render(Msg->MsgBody, NULL, FoundCharset);
+       }
+
+       if (StrLength(Msg->reply_references)> 0) {
+               /* Trim down excessively long lists of thread references.  We eliminate the
+                * second one in the list so that the thread root remains intact.
+                */
+               int rrtok = num_tokens(ChrPtr(Msg->reply_references), '|');
+               int rrlen = StrLength(Msg->reply_references);
+               if ( ((rrtok >= 3) && (rrlen > 900)) || (rrtok > 10) ) {
+                       remove_token(reply_references, 1, '|');////todo
                }
        }
-       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);
+
+       /* Generate a reply-to address */
+       if (StrLength(Msg->Rfca) > 0) {
+               if (Msg->reply_to == NULL)
+                       Msg->reply_to = NewStrBuf();
+               if (StrLength(Msg->from) > 0) {
+                       StrBufPrintf(Msg->reply_to, "%s <%s>", ChrPtr(Msg->from), ChrPtr(Msg->Rfca));
                }
                else {
-                       snprintf(reply_to, sizeof(reply_to), "%s", from);
+                       FlushStrBuf(Msg->reply_to);
+                       StrBufAppendBuf(Msg->reply_to, Msg->Rfca, 0);
                }
        }
-
-       if (nhdr == 1) {
-               wprintf("****");
-       }
-
-#ifdef HAVE_ICONV
-       utf8ify_rfc822_string(m_cc);
-       utf8ify_rfc822_string(m_subject);
-#endif
-
-        /** start msg buttons */
-
-        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("?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("\"><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("\"><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("\"><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")
-                       );
+       else 
+       {
+               if ((StrLength(Msg->OtherNode)>0) && 
+                   (strcasecmp(ChrPtr(Msg->OtherNode), serv_info.serv_nodename)) &&
+                   (strcasecmp(ChrPtr(Msg->OtherNode), serv_info.serv_humannode)) ) 
+               {
+                       if (Msg->reply_to == NULL)
+                               Msg->reply_to = NewStrBuf();
+                       StrBufPrintf(Msg->reply_to, 
+                                    "%s @ %s",
+                                    ChrPtr(Msg->from), 
+                                    ChrPtr(Msg->OtherNode));
                }
-
-               /** 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);
-                       escputs(buf);
-                       wprintf("</tt><br />\n");
-               }
-               wprintf("</i><br />");
-       }
-
-       else /** HTML is fun, but we've got to strip it first */
-       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", mime_content_type);
-               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);
-               }
-       }
-
-       /** 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
-}
-
-
-
-/**
- * \brief Unadorned HTML output of an individual message, suitable
- * for placing in a hidden iframe, for printing, or whatever
- *
- * \param msgnum_as_string Message number, as a string instead of as a long int
- */
-void embed_message(char *msgnum_as_string) {
-       long msgnum = 0L;
-
-       msgnum = atol(msgnum_as_string);
-       begin_ajax_response();
-       read_message(msgnum, 0, "");
-       end_ajax_response();
-}
-
-
-/**
- * \brief Printable view of a message
- *
- * \param msgnum_as_string Message number, as a string instead of as a long int
- */
-void print_message(char *msgnum_as_string) {
-       long msgnum = 0L;
-
-       msgnum = atol(msgnum_as_string);
-       output_headers(0, 0, 0, 0, 0, 0);
-
-       wprintf("Content-type: text/html\r\n"
-               "Server: %s\r\n"
-               "Connection: close\r\n",
-               PACKAGE_STRING);
-       begin_burst();
-
-       wprintf("\r\n\r\n<html>\n"
-               "<head><title>Printable view</title></head>\n"
-               "<body onLoad=\" window.print(); window.close(); \">\n"
-       );
-       
-       read_message(msgnum, 1, "");
-
-       wprintf("\n</body></html>\n\n");
-       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(char *msgnum_as_string) {
-       long msgnum = 0L;
-       char buf[1024];
-
-       msgnum = atol(msgnum_as_string);
-       output_headers(0, 0, 0, 0, 0, 0);
-
-       wprintf("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[256];
-       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 "));
-#ifdef HAVE_ICONV
-                               utf8ify_rfc822_string(from);
-#endif
-                               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]);
-#ifdef HAVE_ICONV
-                               utf8ify_rfc822_string(to);
-#endif
-                               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>");
-
-#ifdef HAVE_ICONV
-               utf8ify_rfc822_string(m_subject);
-#endif
-               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 (buf[len-1] == '\n') buf[--len] = 0;
-                       if (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);
-                       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);
-               }
-       }
-
-       /** 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 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);
-
-                       /** 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);
-                       }
-
+               else {
+                       if (Msg->reply_to == NULL)
+                               Msg->reply_to = NewStrBuf();
+                       FlushStrBuf(Msg->reply_to);
+                       StrBufAppendBuf(Msg->reply_to, Msg->from, 0);
                }
        }
-
-       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);
-
-                       free(vcard_source);
-               }
+       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);
 
-       lastfirst_firstlast(namebuf);
-       striplt(namebuf);
-       len = strlen(namebuf);
-       for (i=0; i<len; ++i) {
-               if (namebuf[i] != ';') return;
-       }
-       strcpy(namebuf, _("(no name)"));
+       DoTemplate(tmpl, tmpllen, Target, Msg, CTX_MAILSUM);
+
+       DestroyMessageSummary(Msg);
+       FreeStrBuf(&FoundCharset);
+       FreeStrBuf(&HdrToken);
+       FreeStrBuf(&Buf);
+       return 1;
 }
 
 
 
-/**
- * \brief Record compare function for sorting address book indices
- * \param ab1 adressbook one
- * \param ab2 adressbook two
+/*
+ * 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
  */
-int abcmp(const void *ab1, const void *ab2) {
-       return(strcasecmp(
-               (((const struct addrbookent *)ab1)->ab_name),
-               (((const struct addrbookent *)ab2)->ab_name)
-       ));
+void embed_message(void) {
+       long msgnum = 0L;
+       const StrBuf *Tmpl = sbstr("template");
+
+       msgnum = StrTol(WC->UrlFragment2);
+       if (StrLength(Tmpl) > 0) 
+               read_message(WC->WBuf, SKEY(Tmpl), msgnum, 0, NULL);
+       else 
+               read_message(WC->WBuf, HKEY("view_message"), msgnum, 0, NULL);
 }
 
 
-/**
- * \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
+/*
+ * Printable view of a message
+ *
+ * msgnum_as_string == Message number, as a string instead of as a long int
  */
-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;
+void print_message(void) {
+       long msgnum = 0L;
+
+       msgnum = StrTol(WC->UrlFragment2);
+       output_headers(0, 0, 0, 0, 0, 0);
+
+       hprintf("Content-type: text/html\r\n"
+               "Server: " PACKAGE_STRING "\r\n"
+               "Connection: close\r\n");
+
+       begin_burst();
+
+       read_message(WC->WBuf, HKEY("view_message_print"), msgnum, 1, NULL);
+
+       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->UrlFragment2);
+  output_headers(1, 0, 0, 0, 0, 1);
+  begin_burst();
+  do_template("msgcontrols", NULL);
+  read_message(WC->WBuf, HKEY("view_message"), msgnum,1, NULL);
+  wDumpContent(0);
+}
 
 /**
- * \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
+ * \brief Display a message's headers
+ *
+ * \param msgnum_as_string Message number, as a string instead of as a long int
  */
-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);
-       }
+void display_headers(void) {
+       long msgnum = 0L;
+       char buf[1024];
 
-       num_pages = (num_ab / NAMESPERPAGE) + 1;
+       msgnum = StrTol(WC->UrlFragment2);
+       output_headers(0, 0, 0, 0, 0, 0);
 
-       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;
-       }
+       hprintf("Content-type: text/plain\r\n"
+               "Server: %s\r\n"
+               "Connection: close\r\n",
+               PACKAGE_STRING);
+       begin_burst();
 
-       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);
+       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);
+               }
        }
 
-       tabbed_dialog(num_pages, tablabels);
-       page = (-1);
+       wDumpContent(0);
+}
 
-       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;
-               }
+message_summary *ReadOneMessageSummary(StrBuf *RawMessage, const char *DefaultSubject, long MsgNum) 
+{
+       void                 *vEval;
+       MsgPartEvaluatorFunc  Eval;
+       message_summary      *Msg;
+       StrBuf *Buf;
+       const char *buf;
+       const char *ebuf;
+       int nBuf;
+       long len;
+       
+       Buf = NewStrBuf();
 
-               if ((displayed % 4) == 0) {
-                       if (displayed > 0) {
-                               wprintf("</tr>\n");
-                       }
-                       bg = 1 - bg;
-                       wprintf("<tr bgcolor=\"#%s\">",
-                               (bg ? "DDDDDD" : "FFFFFF")
-                       );
-               }
+       serv_printf("MSG0 %ld|1", MsgNum);      /* ask for headers only */
        
-               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;
-       }
+       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 != 3)  ||
+               strcmp(ChrPtr(Buf), "000")== 0)){
+               buf = ChrPtr(Buf);
+               ebuf = strchr(ChrPtr(Buf), '=');
+               nBuf = ebuf - buf;
+               if (GetHash(MsgEvaluators, buf, nBuf, &vEval) && vEval != NULL) {
+                       Eval = (MsgPartEvaluatorFunc) vEval;
+                       StrBufCutLeft(Buf, nBuf + 1);
+                       Eval(Msg, Buf);
+               }
+               else lprintf(1, "Don't know how to handle Message Headerline [%s]", ChrPtr(Buf));
+       }
+       return Msg;
+}
 
-       wprintf("</tr></table>\n");
-       end_tab((num_pages-1), num_pages);
 
-       for (i=0; i<num_pages; ++i) {
-               free(tablabels[i]);
-       }
-       free(tablabels);
-}
 
 
 
-/**
- * \brief load message pointers from the server
- * \param servcmd the citadel command to send to the citserver
- * \param with_headers what headers???
+/*
+ * 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[256];
+       StrBuf* FoundCharset = NULL;
+        wcsession *WCC = WC;
+       message_summary *Msg;
+       StrBuf *Buf, *Buf2;
+       ///char buf[1024];
+       ///time_t datestamp;
+       //char fullname[128];
+       //char nodename[128];
+       //char inetaddr[128];
+       //char subject[1024];
+       ///char *ptr;
        int nummsgs;
+       ////int sbjlen;
        int maxload = 0;
+       long len;
+       int n;
+       ////int num_summ_alloc = 0;
 
-       int num_summ_alloc = 0;
-
-       if (WC->summ != NULL) {
-               free(WC->summ);
-               WC->num_summ = 0;
-               WC->summ = NULL;
+       if (WCC->summ != NULL) {
+               if (WCC->summ != NULL)
+                       DeleteHash(&WCC->summ);
        }
-       num_summ_alloc = 100;
-       WC->num_summ = 0;
-       WC->summ = malloc(num_summ_alloc * sizeof(struct message_summary));
-
+       WCC->summ = NewHash(1, Flathash);
        nummsgs = 0;
-       maxload = sizeof(WC->msgarr) / sizeof(long) ;
+       maxload = 10000;
+       
+       Buf = NewStrBuf();
        serv_puts(servcmd);
-       serv_getln(buf, sizeof buf);
-       if (buf[0] != '1') {
+       StrBuf_ServGetln(Buf);
+       if (GetServerStatus(Buf, NULL) != 1) {
+               FreeStrBuf(&Buf);
                return (nummsgs);
        }
-       while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
+// TODO                        if (with_headers) { //// TODO: Have Attachments?
+       Buf2 = NewStrBuf();
+       while (len = StrBuf_ServGetln(Buf),
+              ((len != 3)  ||
+               strcmp(ChrPtr(Buf), "000")!= 0))
+       {
                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(fullname)) {
-#ifdef HAVE_ICONV
-                               /** Handle senders with RFC2047 encoding */
-                                       utf8ify_rfc822_string(fullname);
-#endif
-                                       safestrncpy(WC->summ[nummsgs-1].from,
-                                               fullname, sizeof WC->summ[nummsgs-1].from);
-                               }
-                               if (!IsEmptyStr(subject)) {
-#ifdef HAVE_ICONV
-                               /** Handle subjects with RFC2047 encoding */
-                                       utf8ify_rfc822_string(subject);
-#endif
-                                       safestrncpy(WC->summ[nummsgs-1].subj, subject,
-                                                   sizeof WC->summ[nummsgs-1].subj);
-                               }
-                               if (strlen(WC->summ[nummsgs-1].subj) > 75) {
-                                       strcpy(&WC->summ[nummsgs-1].subj[72], "...");
-                               }
+                       Msg = (message_summary*)malloc(sizeof(message_summary));
+                       memset(Msg, 0, sizeof(message_summary));
 
-                               if (!IsEmptyStr(nodename)) {
-                                       if ( ((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);
-                                       }
-                               }
+                       Msg->msgnum = StrBufExtract_long(Buf, 0, '|');
+                       Msg->date = StrBufExtract_long(Buf, 1, '|');
 
-                               WC->summ[nummsgs-1].date = datestamp;
-       
-#ifdef HAVE_ICONV
+                       Msg->from = NewStrBufPlain(NULL, StrLength(Buf));
+                       StrBufExtract_token(Buf2, Buf, 2, '|');
+                       if (StrLength(Buf2) != 0) {
                                /** Handle senders with RFC2047 encoding */
-                               utf8ify_rfc822_string(WC->summ[nummsgs-1].from);
-#endif
-                               if (strlen(WC->summ[nummsgs-1].from) > 25) {
-                                       strcpy(&WC->summ[nummsgs-1].from[22], "...");
-                               }
+                               StrBuf_RFC822_to_Utf8(Msg->from, Buf2, WCC->DefaultCharset, FoundCharset);
+                       }
+                       
+                       /** Nodename */
+                       StrBufExtract_token(Buf2, Buf, 3, '|');
+                       if ((StrLength(Buf2) !=0 ) &&
+                           ( ((WCC->room_flags & QR_NETWORK)
+                              || ((strcasecmp(ChrPtr(Buf2), serv_info.serv_nodename)
+                                   && (strcasecmp(ChrPtr(Buf2), serv_info.serv_fqdn)))))))
+                       {
+                               StrBufAppendBufPlain(Msg->from, HKEY(" @ "), 0);
+                               StrBufAppendBuf(Msg->from, Buf2, 0);
                        }
-               }
-       }
-       return (nummsgs);
-}
-
-/**
- * \brief qsort() compatible function to compare two longs in descending order.
- *
- * \param s1 first number to compare 
- * \param s2 second number to compare
- */
-int longcmp_r(const void *s1, const void *s2) {
-       long l1;
-       long l2;
 
-       l1 = *(long *)s1;
-       l2 = *(long *)s2;
+                       /** Not used:
+                       StrBufExtract_token(Msg->inetaddr, Buf, 4, '|');
+                       */
 
-       if (l1 > l2) return(-1);
-       if (l1 < l2) return(+1);
-       return(0);
-}
+                       Msg->subj = NewStrBufPlain(NULL, StrLength(Buf));
+                       StrBufExtract_token(Buf2,  Buf, 5, '|');
+                       if (StrLength(Buf2) == 0)
+                               StrBufAppendBufPlain(Msg->subj, _("(no subj)"), 0, -1);
+                       else {
+                               StrBuf_RFC822_to_Utf8(Msg->subj, Buf2, WCC->DefaultCharset, FoundCharset);
+                               if ((StrLength(Msg->subj) > 75) && 
+                                   (StrBuf_Utf8StrLen(Msg->subj) > 75)) {
+                                       StrBuf_Utf8StrCut(Msg->subj, 72);
+                                       StrBufAppendBufPlain(Msg->subj, HKEY("..."), 0);
+                               }
+                       }
 
-/**
- * \brief qsort() compatible function to compare two message summary structs by ascending subject.
- *
- * \param s1 first item to compare 
- * \param s2 second item to compare
- */
-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);
-}
 
-/**
- * \brief qsort() compatible function to compare two message summary structs by descending subject.
- *
- * \param s1 first item to compare 
- * \param s2 second item to compare
- */
-int summcmp_rsubj(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->subj, summ1->subj);
+                       if ((StrLength(Msg->from) > 25) && 
+                           (StrBuf_Utf8StrLen(Msg->from) > 25)) {
+                               StrBuf_Utf8StrCut(Msg->from, 23);
+                               StrBufAppendBufPlain(Msg->from, HKEY("..."), 0);
+                       }
+                       n = Msg->msgnum;
+                       Put(WCC->summ, (const char *)&n, sizeof(n), Msg, DestroyMessageSummary);
+               }
+               nummsgs++;
+       }
+       FreeStrBuf(&Buf2);
+       FreeStrBuf(&Buf);
+       return (nummsgs);
 }
 
-/**
- * \brief qsort() compatible function to compare two message summary structs by ascending sender.
- *
- * \param s1 first item to compare 
- * \param s2 second item to compare
- */
-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);
-}
 
-/**
- * \brief qsort() compatible function to compare two message summary structs by descending sender.
- *
- * \param s1 first item to compare 
- * \param s2 second item to compare
- */
-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);
+inline message_summary* GetMessagePtrAt(int n, HashList *Summ)
+{
+       const char *Key;
+       long HKLen;
+       void *vMsg;
+
+       if (Summ == NULL)
+               return NULL;
+       GetHashAt(Summ, n, &HKLen, &Key, &vMsg);
+       return (message_summary*) vMsg;
 }
 
-/**
- * \brief qsort() compatible function to compare two message summary structs by ascending date.
- *
- * \param s1 first item to compare 
- * \param s2 second item to compare
- */
-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;
-}
 
-/**
- * \brief qsort() compatible function to compare two message summary structs by descending date.
- *
- * \param s1 first item to compare 
- * \param s2 second item to compare
- */
-int summcmp_rdate(const void *s1, const void *s2) {
-       struct message_summary *summ1;
-       struct message_summary *summ2;
+void DrawMessageDropdown(StrBuf *Selector, long maxmsgs, long startmsg)
+{
+       StrBuf *TmpBuf;
+       wcsession *WCC = WC;
+       message_summary* Msg;
+       int lo, hi, n;
+       int i = 0;
+       long StartMsg;
+       void *vMsg;
+       long hklen;
+       const char *key;
+       int done = 0;
+       int nItems;
+       HashPos *At;
+       long vector[16];
+       int nMessages = DEFAULT_MAXMSGS;
+
+       TmpBuf = NewStrBuf();
+       At = GetNewHashPos(WCC->summ, (lbstr("SortOrder") == 1)? -nMessages : nMessages);
+       nItems = GetCount(WCC->summ);
        
-       summ1 = (struct message_summary *)s1;
-       summ2 = (struct message_summary *)s2;
+       vector[0] = 7;
+       vector[1] = startmsg;
+       vector[2] = maxmsgs;
+       vector[3] = 0;
+       vector[4] = 1;
 
-       if (summ1->date < summ2->date) return +1;
-       else if (summ1->date > summ2->date) return -1;
-       else return 0;
+       while (!done) {
+               lo = GetHashPosCounter(At);
+               if (lo + nMessages > nItems) {
+                       hi = nItems;
+               }
+               else {
+                       hi = lo + nMessages;
+               }
+               done = !GetNextHashPos(WCC->summ, At, &hklen, &key, &vMsg);
+               Msg = (message_summary*) vMsg;
+               n = (Msg==NULL)? 0 : Msg->msgnum;
+               if (i == 0)
+                       StartMsg = n;
+               vector[4] = lo;
+               vector[5] = hi;
+               vector[6] = n;
+               FlushStrBuf(TmpBuf);
+               DoTemplate(HKEY("select_messageindex"), TmpBuf, &vector, CTX_LONGVECTOR);
+               StrBufAppendBuf(Selector, TmpBuf, 0);
+               i++;
+       }
+       vector[6] = StartMsg;
+       FlushStrBuf(TmpBuf);
+       DoTemplate(HKEY("select_messageindex_all"), TmpBuf, &vector, CTX_LONGVECTOR);
+       StrBufAppendBuf(Selector, TmpBuf, 0);
+       FreeStrBuf(&TmpBuf);
+       DeleteHashPos(&At);
 }
 
 
+extern readloop_struct rlid[];
 
-/**
- * \brief command loop for reading messages
+/*
+ * command loop for reading messages
  *
- * \param oper Set to "readnew" or "readold" or "readfwd" or "headers"
+ * Set oper to "readnew" or "readold" or "readfwd" or "headers"
  */
-void readloop(char *oper)
+void readloop(long oper)
 {
-       char cmd[256];
+       StrBuf *MessageDropdown = NULL;
+       StrBuf *BBViewToolBar = NULL;
+       void *vMsg;
+       message_summary *Msg;
+       char cmd[256] = "";
        char buf[SIZ];
        char old_msgs[SIZ];
-       int a, b;
+       int a = 0;
+       ///int b = 0;
        int nummsgs;
-       long startmsg;
-       int maxmsgs;
+       long startmsg = 0;
+       int maxmsgs = 0;
        long *displayed_msgs = NULL;
        int num_displayed = 0;
        int is_summary = 0;
        int is_addressbook = 0;
        int is_singlecard = 0;
        int is_calendar = 0;
+       struct calview calv;
        int is_tasks = 0;
        int is_notes = 0;
        int is_bbview = 0;
-       int lo, hi;
        int lowest_displayed = (-1);
        int highest_displayed = 0;
-       struct addrbookent *addrbook = NULL;
+       addrbookent *addrbook = NULL;
        int num_ab = 0;
-       char *sortby = NULL;
-       char sortpref_name[128];
-       char sortpref_value[128];
-       char *subjsort_button;
-       char *sendsort_button;
-       char *datesort_button;
        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);
+       wcsession *WCC = WC;
+       HashPos *at;
+       const char *HashKey;
+       long HKLen;
+       int care_for_empty_list = 0;
+       int load_seen = 0;
+       int sortit = 0;
+
+       switch (WCC->wc_view) {
+       case VIEW_WIKI:
+               sprintf(buf, "wiki?room=%s&page=home", WCC->wc_roomname);
                http_redirect(buf);
                return;
-       }
-
-       startmsg = atol(bstr("startmsg"));
-       maxmsgs = atoi(bstr("maxmsgs"));
-       is_summary = atoi(bstr("is_summary"));
-       if (maxmsgs == 0) maxmsgs = DEFAULT_MAXMSGS;
-
-       snprintf(sortpref_name, sizeof sortpref_name, "sort %s", WCC->wc_roomname);
-       get_preference(sortpref_name, sortpref_value, sizeof sortpref_value);
-
-       sortby = bstr("sortby");
-       if ( (!IsEmptyStr(sortby)) && (strcasecmp(sortby, sortpref_value)) ) {
-               set_preference(sortpref_name, sortby, 1);
-       }
-       if (IsEmptyStr(sortby)) sortby = sortpref_value;
-
-       /** mailbox sort */
-       if (IsEmptyStr(sortby)) sortby = "rdate";
-
-       /** message board sort */
-       if (!strcasecmp(sortby, "reverse")) {
-               bbs_reverse = 1;
-       }
-       else {
-               bbs_reverse = 0;
-       }
-
-       output_headers(1, 1, 1, 0, 0, 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")) {
-               sprintf(cmd, "MSGS SEARCH|%s", bstr("query"));
-       }
-       else {
-               strcpy(cmd, "MSGS ALL");
-       }
-
-       if ((WCC->wc_view == VIEW_MAILBOX) && (maxmsgs > 1)) {
-               is_summary = 1;
-               if (!strcmp(oper, "do_search")) {
-                       sprintf(cmd, "MSGS SEARCH|%s", bstr("query"));
-               }
-               else {
-                       strcpy(cmd, "MSGS ALL");
-               }
-       }
-
-       if ((WCC->wc_view == VIEW_ADDRESSBOOK) && (maxmsgs > 1)) {
-               is_addressbook = 1;
-               if (!strcmp(oper, "do_search")) {
-                       sprintf(cmd, "MSGS SEARCH|%s", bstr("query"));
-               }
-               else {
-                       strcpy(cmd, "MSGS ALL");
-               }
-               maxmsgs = 9999999;
-       }
-
-       if (is_summary) {                       /**< fetch header summary */
-               snprintf(cmd, sizeof cmd, "MSGS %s|%s||1",
-                       (!strcmp(oper, "do_search") ? "SEARCH" : "ALL"),
-                       (!strcmp(oper, "do_search") ? bstr("query") : "")
-               );
-               startmsg = 1;
-               maxmsgs = 9999999;
-       }
-
-       /**
-        * 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) {
-               serv_puts("GTSN");
-               serv_getln(buf, sizeof buf);
-               if (buf[0] == '2') {
-                       strcpy(old_msgs, &buf[4]);
-               }
-       }
-
-       is_singlecard = atoi(bstr("is_singlecard"));
-
-       if (WCC->wc_default_view == VIEW_CALENDAR) {            /**< calendar */
+       case VIEW_CALENDAR:
+               load_seen = 1;
                is_calendar = 1;
-               strcpy(cmd, "MSGS ALL");
+               strcpy(cmd, "MSGS ALL|||1");
                maxmsgs = 32767;
-       }
-       if (WCC->wc_default_view == VIEW_TASKS) {               /**< tasks */
+               parse_calendar_view_request(&calv);
+               break;
+       case VIEW_TASKS:
                is_tasks = 1;
                strcpy(cmd, "MSGS ALL");
                maxmsgs = 32767;
-       }
-       if (WCC->wc_default_view == VIEW_NOTES) {               /**< notes */
+               break;
+       case VIEW_NOTES:
                is_notes = 1;
                strcpy(cmd, "MSGS ALL");
                maxmsgs = 32767;
-       }
-
-       if (is_notes) {
-               wprintf("<div align=center>%s</div>\n", _("Click on any note to edit it."));
                wprintf("<div id=\"new_notes_here\"></div>\n");
-       }
-
-       nummsgs = load_msg_ptrs(cmd, is_summary);
-       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."));
+               break;
+       case VIEW_ADDRESSBOOK:
+               is_singlecard = ibstr("is_singlecard");
+               if (maxmsgs > 1) {
+                       is_addressbook = 1;
+                       if (oper == do_search) {
+                               snprintf(cmd, sizeof(cmd), "MSGS SEARCH|%s", bstr("query"));
                        }
-                       wprintf("</em><br /></div>\n");
-               }
-
-               goto DONE;
-       }
-
-       if (is_summary) {
-               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;
-                               }
-                               else {
-                                       WCC->summ[a].is_new = 1;
-                               }
+                       else {
+                               strcpy(cmd, "MSGS ALL");
                        }
+                       maxmsgs = 9999999;
+                       break;
                }
-       }
 
-       if (startmsg == 0L) {
-               if (bbs_reverse) {
-                       startmsg = WCC->msgarr[(nummsgs >= maxmsgs) ? (nummsgs - maxmsgs) : 0];
-               }
-               else {
-                       startmsg = WCC->msgarr[0];
-               }
-       }
+       default:
+               care_for_empty_list = 1;
+               startmsg = lbstr("startmsg");
+               if (havebstr("maxmsgs"))
+                       maxmsgs = ibstr("maxmsgs");
+               is_summary = (ibstr("is_summary") && !WCC->is_mobile);
+               if (maxmsgs == 0) maxmsgs = DEFAULT_MAXMSGS;
+               
 
-       if (is_summary) {
-               if (!strcasecmp(sortby, "subject")) {
-                       qsort(WCC->summ, WCC->num_summ,
-                               sizeof(struct message_summary), summcmp_subj);
-               }
-               else if (!strcasecmp(sortby, "rsubject")) {
-                       qsort(WCC->summ, WCC->num_summ,
-                               sizeof(struct message_summary), summcmp_rsubj);
-               }
-               else if (!strcasecmp(sortby, "sender")) {
-                       qsort(WCC->summ, WCC->num_summ,
-                               sizeof(struct message_summary), summcmp_sender);
-               }
-               else if (!strcasecmp(sortby, "rsender")) {
-                       qsort(WCC->summ, WCC->num_summ,
-                               sizeof(struct message_summary), summcmp_rsender);
-               }
-               else if (!strcasecmp(sortby, "date")) {
-                       qsort(WCC->summ, WCC->num_summ,
-                               sizeof(struct message_summary), summcmp_date);
-               }
-               else if (!strcasecmp(sortby, "rdate")) {
-                       qsort(WCC->summ, WCC->num_summ,
-                               sizeof(struct message_summary), summcmp_rdate);
+               
+                /*
+                * When in summary mode, always show ALL messages instead of just
+                * new or old.  Otherwise, show what the user asked for.
+                */
+               rlid[oper].cmd(cmd, sizeof(cmd));
+               
+               if ((WCC->wc_view == VIEW_MAILBOX) && (maxmsgs > 1) && !WCC->is_mobile) {
+                       is_summary = 1;
+                       if (oper != do_search) {
+                               strcpy(cmd, "MSGS ALL");
+                       }
                }
-       }
 
-       if (!strcasecmp(sortby, "subject")) {
-               subjsort_button = "<a href=\"readfwd?startmsg=1?maxmsgs=9999999?is_summary=1?sortby=rsubject\"><img border=\"0\" src=\"static/down_pointer.gif\" /></a>" ;
-       }
-       else if (!strcasecmp(sortby, "rsubject")) {
-               subjsort_button = "<a href=\"readfwd?startmsg=1?maxmsgs=9999999?is_summary=1?sortby=subject\"><img border=\"0\" src=\"static/up_pointer.gif\" /></a>" ;
-       }
-       else {
-               subjsort_button = "<a href=\"readfwd?startmsg=1?maxmsgs=9999999?is_summary=1?sortby=subject\"><img border=\"0\" src=\"static/sort_none.gif\" /></a>" ;
-       }
+               is_bbview = !is_summary;
+               if (is_summary) {                       /**< fetch header summary */
+                       load_seen = 1;
+                       snprintf(cmd, sizeof(cmd), "MSGS %s|%s||1",
+                                (oper == do_search) ? "SEARCH" : "ALL",
+                                (oper == do_search) ? bstr("query") : ""
+                               );
+                       startmsg = 1;
+                       maxmsgs = 9999999;
+               } 
 
-       if (!strcasecmp(sortby, "sender")) {
-               sendsort_button = "<a href=\"readfwd?startmsg=1?maxmsgs=9999999?is_summary=1?sortby=rsender\"><img border=\"0\" src=\"static/down_pointer.gif\" /></a>" ;
-       }
-       else if (!strcasecmp(sortby, "rsender")) {
-               sendsort_button = "<a href=\"readfwd?startmsg=1?maxmsgs=9999999?is_summary=1?sortby=sender\"><img border=\"0\" src=\"static/up_pointer.gif\" /></a>" ;
-       }
-       else {
-               sendsort_button = "<a href=\"readfwd?startmsg=1?maxmsgs=9999999?is_summary=1?sortby=sender\"><img border=\"0\" src=\"static/sort_none.gif\" /></a>" ;
-       }
+               bbs_reverse = is_bbview && (lbstr("SortOrder") == 2);
 
-       if (!strcasecmp(sortby, "date")) {
-               datesort_button = "<a href=\"readfwd?startmsg=1?maxmsgs=9999999?is_summary=1?sortby=rdate\"><img border=\"0\" src=\"static/down_pointer.gif\" /></a>" ;
-       }
-       else if (!strcasecmp(sortby, "rdate")) {
-               datesort_button = "<a href=\"readfwd?startmsg=1?maxmsgs=9999999?is_summary=1?sortby=date\"><img border=\"0\" src=\"static/up_pointer.gif\" /></a>" ;
-       }
-       else {
-               datesort_button = "<a href=\"readfwd?startmsg=1?maxmsgs=9999999?is_summary=1?sortby=rdate\"><img border=\"0\" src=\"static/sort_none.gif\" /></a>" ;
+               if (is_bbview && (startmsg == 0L)) {
+                       if (bbs_reverse) {
+                               Msg = GetMessagePtrAt((nummsgs >= maxmsgs) ? (nummsgs - maxmsgs) : 0, WCC->summ);
+                               startmsg = (Msg==NULL)? 0 : Msg->msgnum;
+                       }
+                       else {
+                               Msg = GetMessagePtrAt(0, WCC->summ);
+                               startmsg = (Msg==NULL)? 0 : Msg->msgnum;
+                       }
+               }
+               sortit = is_summary || WCC->is_mobile;
        }
 
-       if (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 %s</th>"
-                       "<th width=%d%%>%s %s</th>"
-                       "<th width=%d%%>%s %s"
-                       "&nbsp;"
-                       "<input type=\"submit\" name=\"delete_button\" id=\"delbutton\" "
-                       " onClick=\"CtdlDeleteSelectedMessages(event)\" "
-                       " value=\"%s\">"
-                       "</th>"
-                       "</tr>\n"
-                       ,
-                       SUBJ_COL_WIDTH_PCT,
-                       _("Subject"),   subjsort_button,
-                       SENDER_COL_WIDTH_PCT,
-                       _("Sender"),    sendsort_button,
-                       DATE_PLUS_BUTTONS_WIDTH_PCT,
-                       _("Date"),      datesort_button,
-                       _("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;\">"
-               );
-       }
 
+       output_headers(1, 1, 1, 0, 0, 0);
 
-       /**
-        * Set the "is_bbview" variable if it appears that we are looking at
-        * a classic bulletin board view.
-        */
-       if ((!is_tasks) && (!is_calendar) && (!is_addressbook)
-             && (!is_notes) && (!is_singlecard) && (!is_summary)) {
-               is_bbview = 1;
+       /*
+       if (WCC->is_mobile) {
+               maxmsgs = 20;
+               snprintf(cmd, sizeof(cmd), "MSGS %s|%s||1",
+                       (!strcmp(oper, "do_search") ? "SEARCH" : "ALL"),
+                       (!strcmp(oper, "do_search") ? bstr("query") : "")
+               );
+               SortBy =  eRDate;
        }
 
-       /**
-        * If we're not currently looking at ALL requested
-        * messages, then display the selector bar
+       /*
+        * Are we doing a summary view?  If so, we need to know old messages
+        * and new messages, so we can do that pretty boldface thing for the
+        * new messages.
         */
-       if (is_bbview) {
-               /** begin bbview scroller */
-               wprintf("<form name=\"msgomatictop\" class=\"selector_top\" > \n <p>");
-               wprintf(_("Reading #"), 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);
+       nummsgs = load_msg_ptrs(cmd, (is_summary || WCC->is_mobile));
+       if (nummsgs == 0) {
+               if (care_for_empty_list) {
+                       wprintf("<div align=\"center\"><br /><em>");
+                       switch (oper) {
+                       case readnew:
+                               wprintf(_("No new messages."));
+                               break;
+                       case readold:
+                               wprintf(_("No old messages."));
+                               break;
+                       default:
+                               wprintf(_("No messages here."));
                        }
+                       wprintf("</em><br /></div>\n");
                }
-               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);
+
+               goto DONE;
+       }
+
+       if (load_seen){
+               void *vMsg;
+
+               strcpy(old_msgs, "");
+               serv_puts("GTSN");
+               serv_getln(buf, sizeof buf);
+               if (buf[0] == '2') {
+                       strcpy(old_msgs, &buf[4]);
+               }
+               at = GetNewHashPos(WCC->summ, 0);
+               while (GetNextHashPos(WCC->summ, at, &HKLen, &HashKey, &vMsg)) {
+                       /** Are you a new message, or an old message? */
+                       Msg = (message_summary*) vMsg;
+                       if (is_msg_in_mset(old_msgs, Msg->msgnum)) {
+                               Msg->is_new = 0;
+                       }
+                       else {
+                               Msg->is_new = 1;
                        }
                }
-
-               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 */
+               DeleteHashPos(&at);
        }
 
-       if (is_notes)
-       {
-               wprintf ("<script src=\"/static/dragdrop.js\" type=\"text/javascript\"></script>\n");
+       if (sortit) {
+               CompareFunc SortIt;
+               SortIt =  RetrieveSort(CTX_MAILSUM, NULL, 
+                                      HKEY("date"), 2);
+               if (SortIt != NULL)
+                       SortByPayload(WCC->summ, SortIt);
        }
 
+       if (is_summary) {
+               do_template("summary_header", NULL);
+       } else if (WCC->is_mobile) {
+               wprintf("<div id=\"message_list\">");
+       }
 
 
-       for (a = 0; a < nummsgs; ++a) {
-               if ((WCC->msgarr[a] >= startmsg) && (num_displayed < maxmsgs)) {
+       /**
+        * If we're not currently looking at ALL requested
+        * messages, then display the selector bar
+        */
+       if (is_bbview)  {
+               BBViewToolBar = NewStrBuf();
+               MessageDropdown = NewStrBuf();
 
+               DrawMessageDropdown(MessageDropdown, maxmsgs, startmsg);
+               
+               DoTemplate(HKEY("msg_listselector_top"), BBViewToolBar, MessageDropdown, CTX_STRBUF);
+               StrBufAppendBuf(WCC->WBuf, BBViewToolBar, 0);
+               FlushStrBuf(BBViewToolBar);
+       }
+                       
+       at = GetNewHashPos(WCC->summ, 0);
+       while (GetNextHashPos(WCC->summ, at, &HKLen, &HashKey, &vMsg)) {
+               Msg = (message_summary*) vMsg;          
+               if ((Msg->msgnum >= startmsg) && (num_displayed < maxmsgs)) {
+                               
                        /** Display the message */
                        if (is_summary) {
-                               display_summarized(a);
+                               DoTemplate(HKEY("section_mailsummary"), NULL, Msg, CTX_MAILSUM);
                        }
                        else if (is_addressbook) {
-                               fetch_ab_name(WCC->msgarr[a], buf);
+                               fetch_ab_name(Msg, buf);
                                ++num_ab;
                                addrbook = realloc(addrbook,
-                                       (sizeof(struct addrbookent) * num_ab) );
+                                                  (sizeof(addrbookent) * num_ab) );
                                safestrncpy(addrbook[num_ab-1].ab_name, buf,
-                                       sizeof(addrbook[num_ab-1].ab_name));
-                               addrbook[num_ab-1].ab_msgnum = WCC->msgarr[a];
+                                           sizeof(addrbook[num_ab-1].ab_name));
+                               addrbook[num_ab-1].ab_msgnum = Msg->msgnum;
                        }
                        else if (is_calendar) {
-                               display_calendar(WCC->msgarr[a]);
+                               load_calendar_item(Msg, Msg->is_new, &calv);
                        }
                        else if (is_tasks) {
-                               display_task(WCC->msgarr[a]);
+                               display_task(Msg, Msg->is_new);
                        }
                        else if (is_notes) {
-                               display_note(WCC->msgarr[a]);
+                               display_note(Msg, Msg->is_new);
+                       } else if (WCC->is_mobile) {
+                               DoTemplate(HKEY("section_mailsummary"), NULL, Msg, CTX_MAILSUM);
                        }
                        else {
                                if (displayed_msgs == NULL) {
                                        displayed_msgs = malloc(sizeof(long) *
                                                                (maxmsgs<nummsgs ? maxmsgs : nummsgs));
                                }
-                               displayed_msgs[num_displayed] = WCC->msgarr[a];
+                               displayed_msgs[num_displayed] = Msg->msgnum;
                        }
-
+                       
                        if (lowest_displayed < 0) lowest_displayed = a;
                        highest_displayed = a;
-
+                       
                        ++num_displayed;
                }
        }
+       DeleteHashPos(&at);
 
        /** Output loop */
        if (displayed_msgs != NULL) {
                if (bbs_reverse) {
-                       qsort(displayed_msgs, num_displayed, sizeof(long), longcmp_r);
+                       ////TODOqsort(displayed_msgs, num_displayed, sizeof(long), qlongcmp_r);
                }
 
                /** if we do a split bbview in the future, begin messages div here */
 
                for (a=0; a<num_displayed; ++a) {
-                       read_message(displayed_msgs[a], 0, "");
+                       read_message(WC->WBuf, HKEY("view_message"), displayed_msgs[a], 0, NULL);
                }
 
                /** if we do a split bbview in the future, end messages div here */
@@ -2672,18 +830,9 @@ void readloop(char *oper)
        }
 
        if (is_summary) {
-               wprintf("</table>"
-                       "</div>\n");                    /**< end of 'fix_scrollbar_bug' div */
-               wprintf("</div>");                      /**< end of 'message_list' div */
-
-               /** Here's the grab-it-to-resize-the-message-list widget */
-               wprintf("<div id=\"resize_msglist\" "
-                       "onMouseDown=\"CtdlResizeMsgListMouseDown(event)\">"
-                       "<div class=\"fix_scrollbar_bug\"> <hr>"
-                       "</div></div>\n"
-               );
-
-               wprintf("<div id=\"preview_pane\">");   /**< The preview pane will initially be empty */
+               do_template("summary_trailer", NULL);
+       } else if (WCC->is_mobile) {
+               wprintf("</div>");
        }
 
        /**
@@ -2699,124 +848,21 @@ void readloop(char *oper)
         */
        if (is_bbview) {
                /** begin bbview scroller */
-               wprintf("<form name=\"msgomatic\" class=\"selector_bottom\" > \n <p>");
-               wprintf(_("Reading #"), lowest_displayed, highest_displayed);
-
-               wprintf("<select name=\"whichones\" size=\"1\" "
-                       "OnChange=\"location.href=msgomatic.whichones.options"
-                       "[selectedIndex].value\">\n");
-
-               if (bbs_reverse) {
-                       for (b=nummsgs-1; b>=0; b = b - maxmsgs) {
-                               hi = b + 1;
-                               lo = b - maxmsgs + 2;
-                               if (lo < 1) lo = 1;
-                               wprintf("<option %s value="
-                                       "\"%s"
-                                       "?startmsg=%ld"
-                                       "?maxmsgs=%d"
-                                       "?is_summary=%d\">"
-                                       "%d-%d</option> \n",
-                                       ((WCC->msgarr[lo-1] == startmsg) ? "selected" : ""),
-                                       oper,
-                                       WCC->msgarr[lo-1],
-                                       maxmsgs,
-                                       is_summary,
-                                       hi, lo);
-                       }
-               }
-               else {
-                       for (b=0; b<nummsgs; b = b + maxmsgs) {
-                               lo = b + 1;
-                               hi = b + maxmsgs + 1;
-                               if (hi > nummsgs) hi = nummsgs;
-                               wprintf("<option %s value="
-                                       "\"%s"
-                                       "?startmsg=%ld"
-                                       "?maxmsgs=%d"
-                                       "?is_summary=%d\">"
-                                       "%d-%d</option> \n",
-                                       ((WCC->msgarr[b] == startmsg) ? "selected" : ""),
-                                       oper,
-                                       WCC->msgarr[lo-1],
-                                       maxmsgs,
-                                       is_summary,
-                                       lo, hi);
-                       }
-               }
 
-               wprintf("<option value=\"%s?startmsg=%ld"
-                       "?maxmsgs=9999999?is_summary=%d\">",
-                       oper,
-                       WCC->msgarr[0], is_summary);
-               wprintf(_("All"));
-               wprintf("</option>");
-               wprintf("</select> ");
-               wprintf(_("of %d messages."), nummsgs);
-
-               /** forward/reverse */
-               wprintf("<input type=\"radio\" %s name=\"direction\" value=\"\""
-                       "OnChange=\"location.href='%s?sortby=forward'\"",  
-                       (bbs_reverse ? "" : "checked"),
-                       oper
-               );
-               wprintf(">");
-               wprintf(_("oldest to newest"));
-               wprintf("&nbsp;&nbsp;&nbsp;&nbsp;");
-               wprintf("<input type=\"radio\" %s name=\"direction\" value=\"\""
-                       "OnChange=\"location.href='%s?sortby=reverse'\"", 
-                       (bbs_reverse ? "checked" : ""),
-                       oper
-               );
-               wprintf(">");
-               wprintf(_("newest to oldest"));
-               wprintf("\n");
+               DoTemplate(HKEY("msg_listselector_bottom"), BBViewToolBar, MessageDropdown, CTX_STRBUF);
+               StrBufAppendBuf(WCC->WBuf, BBViewToolBar, 0);
 
-               wprintf("</p></form>\n");
-               /** end bbview scroller */
+               FreeStrBuf(&BBViewToolBar);
+               FreeStrBuf(&MessageDropdown);
        }
        
-       if (is_notes)
-       {
-//             wprintf ("</div>\n");
-               wprintf ("<div id=\"wastebin\" align=middle>Drop notes here to remove them.</div>\n");
-               wprintf ("<script type=\"text/javascript\">\n");
-//             wprintf ("//<![CDATA[\n");
-               wprintf ("Droppables.add(\"wastebin\",\n");
-               wprintf ("\t{\n");
-               wprintf ("\t\taccept:'notes',\n");
-               wprintf ("\t\tonDrop:function(element)\n");
-               wprintf ("\t\t{\n");
-               wprintf ("\t\t\tElement.hide(element);\n");
-               wprintf ("\t\t\tnew Ajax.Updater('notes', 'delnote',\n");
-               wprintf ("\t\t\t{\n");
-               wprintf ("\t\t\t\tasynchronous:true,\n");
-               wprintf ("\t\t\t\tevalScripts:true,\n");
-               wprintf ("\t\t\t\tonComplete:function(request)\n");
-               wprintf ("\t\t\t\t{\n");
-               wprintf ("\t\t\t\t\tElement.hide('indicator')\n");
-               wprintf ("\t\t\t\t},\n");
-               wprintf ("\t\t\t\tonLoading:function(request)\n");
-               wprintf ("\t\t\t\t{\n");
-               wprintf ("\t\t\t\t\tElement.show('indicator')\n");
-               wprintf ("\t\t\t\t},\n");
-               wprintf ("\t\t\t\tparameters:'id=' + encodeURIComponent(element.id)\n");
-               wprintf ("\t\t\t})\n");
-               wprintf ("\t\t}\n");
-               wprintf ("\t})\n");
-//             wprintf ("//]]>\n");
-               wprintf ("</script>\n");
-       }
-
-
-
 DONE:
        if (is_tasks) {
                do_tasks_view();        /** Render the task list */
        }
 
        if (is_calendar) {
-               do_calendar_view();     /** Render the calendar */
+               render_calendar_view(&calv);
        }
 
        if (is_addressbook) {
@@ -2829,71 +875,98 @@ DONE:
 
        /** free the summary */
        if (WCC->summ != NULL) {
-               free(WCC->summ);
-               WCC->num_summ = 0;
-               WCC->summ = NULL;
+               DeleteHash(&WCC->summ);
        }
        if (addrbook != NULL) free(addrbook);
+       FreeStrBuf(&BBViewToolBar);
 }
 
 
-/**
- * \brief Back end for post_message()
+/*
+ * Back end for post_message()
  * ... this is where the actual message gets transmitted to the server.
  */
 void post_mime_to_server(void) {
-       char boundary[SIZ];
+       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;
+
+       sprintf(top_boundary, "Citadel--Multipart--%s--%04x--%04x",
+               serv_info.serv_fqdn,
+               getpid(),
+               ++seq
+       );
+       sprintf(alt_boundary, "Citadel--Multipart--%s--%04x--%04x",
+               serv_info.serv_fqdn,
+               getpid(),
+               ++seq
+       );
 
-       /** RFC2045 requires this, and some clients look for it... */
+       /* RFC2045 requires this, and some clients look for it... */
        serv_puts("MIME-Version: 1.0");
        serv_puts("X-Mailer: " PACKAGE_STRING);
 
-       /** If there are attachments, we have to do multipart/mixed */
-       if (WC->first_attachment != NULL) {
+       /* If there are attachments, we have to do multipart/mixed */
+       if (GetCount(WCC->attachments) > 0) {
                is_multipart = 1;
        }
 
        if (is_multipart) {
-               sprintf(boundary, "Citadel--Multipart--%s--%04x--%04x",
-                       serv_info.serv_fqdn,
-                       getpid(),
-                       ++seq
-               );
-
-               /** Remember, serv_printf() appends an extra newline */
-               serv_printf("Content-type: multipart/mixed; "
-                       "boundary=\"%s\"\n", boundary);
+               /* Remember, serv_printf() appends an extra newline */
+               serv_printf("Content-type: multipart/mixed; boundary=\"%s\"\n", top_boundary);
                serv_printf("This is a multipart message in MIME format.\n");
-               serv_printf("--%s", boundary);
+               serv_printf("--%s", top_boundary);
        }
 
+       /* 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);
+
+       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_puts("Content-type: text/html; charset=utf-8");
        serv_puts("Content-Transfer-Encoding: quoted-printable");
        serv_puts("");
        serv_puts("<html><body>\r\n");
-       text_to_server_qp(bstr("msgtext"));     /** Transmit message in quoted-printable encoding */
+       text_to_server_qp(bstr("msgtext"));     /* Transmit message in quoted-printable encoding */
        serv_puts("</body></html>\r\n");
+
+       serv_printf("--%s--", alt_boundary);
        
        if (is_multipart) {
-
-               /** Add in the attachments */
-               for (att = WC->first_attachment; att!=NULL; att=att->next) {
-
+               long len;
+               const char *Key; 
+               void *vAtt;
+               HashPos  *it;
+
+               /* Add in the attachments */
+               it = GetNewHashPos(WCC->attachments, 0);
+               while (GetNextHashPos(WCC->attachments, it, &len, &Key, &vAtt)) {
+                       att = (wc_mime_attachment *)vAtt;
                        encoded_length = ((att->length * 150) / 100);
                        encoded = malloc(encoded_length);
                        if (encoded == NULL) break;
-                       encoded_strlen = CtdlEncodeBase64(encoded, att->data, att->length, 1);
+                       encoded_strlen = CtdlEncodeBase64(encoded, ChrPtr(att->Data), StrLength(att->Data), 1);
 
-                       serv_printf("--%s", boundary);
-                       serv_printf("Content-type: %s", att->content_type);
-                       serv_printf("Content-disposition: attachment; "
-                               "filename=\"%s\"", att->filename);
+                       serv_printf("--%s", top_boundary);
+                       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);
@@ -2901,15 +974,16 @@ void post_mime_to_server(void) {
                        serv_puts("");
                        free(encoded);
                }
-               serv_printf("--%s--", boundary);
+               serv_printf("--%s--", top_boundary);
+               DeleteHashPos(&it);
        }
 
        serv_puts("000");
 }
 
 
-/**
- * \brief Post message (or don't post message)
+/*
+ * Post message (or don't post message)
  *
  * Note regarding the "dont_post" variable:
  * A random value (actually, it's just a timestamp) is inserted as a hidden
@@ -2922,102 +996,155 @@ void post_mime_to_server(void) {
 void post_message(void)
 {
        char buf[1024];
-       char encoded_subject[1024];
+       StrBuf *encoded_subject = NULL;
        static long dont_post = (-1L);
-       struct wc_attachment *att, *aptr;
+       wc_mime_attachment  *att;
        int is_anonymous = 0;
-       char *display_name;
-
-       if (!IsEmptyStr(bstr("force_room"))) {
+       const StrBuf *display_name = NULL;
+       wcsession *WCC = WC;
+       
+       if (havebstr("force_room")) {
                gotoroom(bstr("force_room"));
        }
 
-       display_name = bstr("display_name");
-       if (!strcmp(display_name, "__ANONYMOUS__")) {
-               display_name = "";
-               is_anonymous = 1;
+       if (havebstr("display_name")) {
+               display_name = sbstr("display_name");
+               if (!strcmp(ChrPtr(display_name), "__ANONYMOUS__")) {
+                       display_name = NULL;
+                       is_anonymous = 1;
+               }
        }
 
-       if (WC->upload_length > 0) {
+       if (WCC->upload_length > 0) {
+               const char *pch;
+               int n;
+               char N[64];
 
-               lprintf(9, "%s:%d: we are uploading %d bytes\n", __FILE__, __LINE__, WC->upload_length);
+               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 = WC->upload_length;
-               strcpy(att->content_type, WC->upload_content_type);
-               strcpy(att->filename, WC->upload_filename);
-               att->next = NULL;
-
-               /** 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;
-               }
+               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 = NewStrBufPlain(WCC->upload_filename, -1);
+               
+               
+               if (WCC->attachments == NULL)
+                       WCC->attachments = NewHash(1, NULL);
+               /* And add it to the list. */
+               n = snprintf(N, sizeof N, "%d", GetCount(WCC->attachments) + 1);
+               Put(WCC->attachments, N, n, att, DestroyMime);
 
                /**
                 * Mozilla sends a simple filename, which is what we want,
                 * but Satan's Browser sends an entire pathname.  Reduce
                 * the path to just a filename if we need to.
                 */
-               while (num_tokens(att->filename, '/') > 1) {
-                       remove_token(att->filename, 0, '/');
+               pch = strrchr(ChrPtr(att->FileName), '/');
+               if (pch != NULL) {
+                       StrBufCutLeft(att->FileName, pch - ChrPtr(att->FileName));
                }
-               while (num_tokens(att->filename, '\\') > 1) {
-                       remove_token(att->filename, 0, '\\');
+               pch = strrchr(ChrPtr(att->FileName), '\\');
+               if (pch != NULL) {
+                       StrBufCutLeft(att->FileName, pch - ChrPtr(att->FileName));
                }
 
                /**
                 * Transfer control of this memory from the upload struct
                 * to the attachment struct.
                 */
-               att->data = WC->upload;
-               WC->upload_length = 0;
-               WC->upload = NULL;
+               att->Data = NewStrBufPlain(WCC->upload, WCC->upload_length);
+               free(WCC->upload);
+               WCC->upload_length = 0;
+               WCC->upload = NULL;
                display_enter();
                return;
        }
 
-       if (!IsEmptyStr(bstr("cancel_button"))) {
-               sprintf(WC->ImportantMessage, 
+       if (havebstr("cancel_button")) {
+               sprintf(WCC->ImportantMessage, 
                        _("Cancelled.  Message was not posted."));
-       } else if (!IsEmptyStr(bstr("attach_button"))) {
+       } else if (havebstr("attach_button")) {
                display_enter();
                return;
-       } else if (atol(bstr("postseq")) == dont_post) {
-               sprintf(WC->ImportantMessage, 
+       } else if (lbstr("postseq") == dont_post) {
+               sprintf(WCC->ImportantMessage, 
                        _("Automatically cancelled because you have already "
                        "saved this message."));
        } else {
-               webcit_rfc2047encode(encoded_subject, sizeof encoded_subject, bstr("subject"));
-               sprintf(buf, "ENT0 1|%s|%d|4|%s|%s||%s|%s|%s|%s",
-                       bstr("recp"),
-                       is_anonymous,
-                       encoded_subject,
-                       display_name,
-                       bstr("cc"),
-                       bstr("bcc"),
-                       bstr("wikipage"),
-                       bstr("my_email_addr")
-               );
-               serv_puts(buf);
+               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;
+               const StrBuf *my_email_addr = NULL;
+               StrBuf *CmdBuf = NULL;;
+               StrBuf *references = NULL;
+
+               if (havebstr("references"))
+               {
+                       const StrBuf *ref = sbstr("references");
+                       references = NewStrBufPlain(ChrPtr(ref), StrLength(ref));
+                       lprintf(9, "Converting: %s\n", ChrPtr(references));
+                       StrBufReplaceChars(references, '|', '!');
+                       lprintf(9, "Converted: %s\n", ChrPtr(references));
+               }
+               if (havebstr("subject")) {
+                       const StrBuf *Subj;
+                       /*
+                        * make enough room for the encoded string; 
+                        * plus the QP header 
+                        */
+                       Subj = sbstr("subject");
+                       
+                       StrBufRFC2047encode(&encoded_subject, Subj);
+               }
+               Recp = sbstr("recp");
+               Cc = sbstr("cc");
+               Bcc = sbstr("bcc");
+               Wikipage = sbstr("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));
+
+               StrBufPrintf(CmdBuf, 
+                            CMD,
+                            ChrPtr(Recp),
+                            is_anonymous,
+                            ChrPtr(encoded_subject),
+                            ChrPtr(display_name),
+                            ChrPtr(Cc),
+                            ChrPtr(Bcc),
+                            ChrPtr(Wikipage),
+                            ChrPtr(my_email_addr),
+                            ChrPtr(references));
+               FreeStrBuf(&references);
+
+               lprintf(9, "%s\n", ChrPtr(CmdBuf));
+               serv_puts(ChrPtr(CmdBuf));
                serv_getln(buf, sizeof buf);
+               FreeStrBuf(&CmdBuf);
+               FreeStrBuf(&encoded_subject);
                if (buf[0] == '4') {
                        post_mime_to_server();
-                       if (  (!IsEmptyStr(bstr("recp")))
-                          || (!IsEmptyStr(bstr("cc"  )))
-                          || (!IsEmptyStr(bstr("bcc" )))
+                       if (  (havebstr("recp"))
+                          || (havebstr("cc"  ))
+                          || (havebstr("bcc" ))
                        ) {
-                               sprintf(WC->ImportantMessage, _("Message has been sent.\n"));
+                               sprintf(WCC->ImportantMessage, _("Message has been sent.\n"));
                        }
                        else {
                                sprintf(WC->ImportantMessage, _("Message has been posted.\n"));
                        }
-                       dont_post = atol(bstr("postseq"));
+                       dont_post = lbstr("postseq");
                } else {
                        lprintf(9, "%s:%d: server post error: %s\n", __FILE__, __LINE__, buf);
                        sprintf(WC->ImportantMessage, "%s", &buf[4]);
@@ -3026,19 +1153,19 @@ void post_message(void)
                }
        }
 
-       free_attachments(WC);
+       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 (!IsEmptyStr(bstr("return_to"))) {
+       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 (!IsEmptyStr(bstr("wikipage"))) {
+       else if (havebstr("wikipage")) {
                snprintf(buf, sizeof buf, "wiki?page=%s", bstr("wikipage"));
                http_redirect(buf);
        }
@@ -3046,7 +1173,7 @@ void post_message(void)
         *  Otherwise, just go to the "read messages" loop.
         */
        else {
-               readloop("readnew");
+               readloop(readnew);
        }
 }
 
@@ -3059,26 +1186,25 @@ void post_message(void)
 void display_enter(void)
 {
        char buf[SIZ];
-       char ebuf[SIZ];
        long now;
-       char *display_name;
-       struct wc_attachment *att;
+       const StrBuf *display_name = NULL;
+       /////wc_attachment *att;
        int recipient_required = 0;
        int subject_required = 0;
        int recipient_bad = 0;
-       int i;
        int is_anonymous = 0;
-       long existing_page = (-1L);
+
+       wcsession *WCC = WC;
 
        now = time(NULL);
 
-       if (!IsEmptyStr(bstr("force_room"))) {
+       if (havebstr("force_room")) {
                gotoroom(bstr("force_room"));
        }
 
-       display_name = bstr("display_name");
-       if (!strcmp(display_name, "__ANONYMOUS__")) {
-               display_name = "";
+       display_name = sbstr("display_name");
+       if (!strcmp(ChrPtr(display_name), "__ANONYMOUS__")) {
+               display_name = NULL;
                is_anonymous = 1;
        }
 
@@ -3090,8 +1216,8 @@ void display_enter(void)
                recipient_required = 1;
        }
        else if (buf[0] != '2') {               /** Any other error means that we cannot continue */
-               sprintf(WC->ImportantMessage, "%s", &buf[4]);
-               readloop("readnew");
+               sprintf(WCC->ImportantMessage, "%s", &buf[4]);
+               readloop(readnew);
                return;
        }
 
@@ -3104,369 +1230,90 @@ void display_enter(void)
         * Are we perhaps in an address book view?  If so, then an "enter
         * message" command really means "add new entry."
         */
-       if (WC->wc_default_view == VIEW_ADDRESSBOOK) {
-               do_edit_vcard(-1, "", "", WC->wc_roomname);
+       if (WCC->wc_default_view == VIEW_ADDRESSBOOK) {
+               do_edit_vcard(-1, "", "", WCC->wc_roomname);
                return;
        }
 
-#ifdef WEBCIT_WITH_CALENDAR_SERVICE
-       /**
+       /*
         * Are we perhaps in a calendar room?  If so, then an "enter
         * message" command really means "add new calendar item."
         */
-       if (WC->wc_default_view == VIEW_CALENDAR) {
+       if (WCC->wc_default_view == VIEW_CALENDAR) {
                display_edit_event();
                return;
        }
 
-       /**
+       /*
         * Are we perhaps in a tasks view?  If so, then an "enter
         * message" command really means "add new task."
         */
-       if (WC->wc_default_view == VIEW_TASKS) {
+       if (WCC->wc_default_view == VIEW_TASKS) {
                display_edit_task();
                return;
        }
-#endif
 
-       /**
+       /*
         * 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) {
-               sprintf(buf, "ENT0 0|%s|%d|0||%s||%s|%s|%s",
-                       bstr("recp"),
-                       is_anonymous,
-                       display_name,
-                       bstr("cc"), bstr("bcc"), bstr("wikipage"));
-               serv_puts(buf);
+               const StrBuf *Recp = NULL; 
+               const StrBuf *Cc = NULL;
+               const StrBuf *Bcc = NULL;
+               const StrBuf *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");
+               
+               CmdBuf = NewStrBufPlain(NULL, 
+                                       sizeof (CMD) + 
+                                       StrLength(Recp) + 
+                                       StrLength(display_name) +
+                                       StrLength(Cc) +
+                                       StrLength(Bcc) + 
+                                       StrLength(Wikipage));
+
+               StrBufPrintf(CmdBuf, 
+                            CMD,
+                            ChrPtr(Recp), 
+                            is_anonymous,
+                            ChrPtr(display_name),
+                            ChrPtr(Cc), 
+                            ChrPtr(Bcc), 
+                            ChrPtr(Wikipage));
+               serv_puts(ChrPtr(CmdBuf));
                serv_getln(buf, sizeof buf);
+               FreeStrBuf(&CmdBuf);
 
                if (!strncmp(buf, "570", 3)) {  /** 570 means we have an invalid recipient listed */
-                       if (!IsEmptyStr(bstr("recp")) && 
-                           !IsEmptyStr(bstr("cc"  )) && 
-                           !IsEmptyStr(bstr("bcc" ))) {
+                       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;
-               }
-       }
-
-       /** 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 (WC->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=\"%ld\">\n", WC->nonce);
-       wprintf("<input type=\"hidden\" name=\"force_room\" value=\"");
-       escputs(WC->wc_roomname);
-       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 (WC->room_flags & QR_ANONOPT) {
-               wprintf("<option %s value=\"__ANONYMOUS__\">%s</option>\n",
-                       ((!strcasecmp(bstr("__ANONYMOUS__"), WC->wc_fullname)) ? "selected" : ""),
-                       _("Anonymous")
-               );
-       }
-
-       wprintf("</select>\n");
-
-       /* If this is an email (not a post), allow the user to select any of his
-        * valid email addresses.
-        */
-       if (recipient_required) {
-               serv_puts("GVEA");
-               serv_getln(buf, sizeof buf);
-               if (buf[0] == '1') {
-                       wprintf("<select name=\"my_email_addr\" size=1>\n");
-                       while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
-                               wprintf("<option value=\"");
-                               escputs(buf);
-                               wprintf("\">&lt;");
-                               escputs(buf);
-                               wprintf("&gt;</option>\n");
-                       }
-                       wprintf("</select>\n");
-               }
-       }
-
-       wprintf(_(" <I>in</I> "));
-       escputs(WC->wc_roomname);
-
-       wprintf("</td></tr>");
-
-       if (recipient_required) {
-               char *ccraw;
-               char *copy;
-               size_t len;
-               wprintf("<tr><th><label for=\"recp_id\"> ");
-               wprintf(_("To:"));
-               wprintf("</label></th>"
-                       "<td><input autocomplete=\"off\" type=\"text\" name=\"recp\" id=\"recp_id\" value=\"");
-               ccraw = bstr("recp");
-               len = strlen(ccraw);
-               copy = (char*) malloc(len * 2 + 1);
-               memcpy(copy, ccraw, len + 1); 
-#ifdef HAVE_ICONV
-               utf8ify_rfc822_string(copy);
-#endif
-               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 = bstr("cc");
-               len = strlen(ccraw);
-               copy = (char*) malloc(len * 2 + 1);
-               memcpy(copy, ccraw, len + 1); 
-#ifdef HAVE_ICONV
-               utf8ify_rfc822_string(copy);
-#endif
-               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 = bstr("bcc");
-               len = strlen(ccraw);
-               copy = (char*) malloc(len * 2 + 1);
-               memcpy(copy, ccraw, len + 1); 
-#ifdef HAVE_ICONV
-               utf8ify_rfc822_string(copy);
-#endif
-               escputs(copy);
-               free(copy);
-               wprintf("\" size=45 maxlength=1000 />");
-               wprintf("<div class=\"auto_complete\" id=\"bcc_name_choices\"></div>");
-               wprintf("</td></tr>");
-
-               /** Initialize the autocomplete ajax helpers (found in wclib.js) */
-               wprintf("<script type=\"text/javascript\">      \n"
-                       " activate_entmsg_autocompleters();     \n"
-                       "</script>                              \n"
-               );
-
-       }
-
-       wprintf("<tr><th><label for=\"subject_id\" > ");
-       if (recipient_required || subject_required) {
-               wprintf(_("Subject:"));
-       }
-       else {
-               wprintf(_("Subject (optional):"));
-       }
-       wprintf("</label></th>"
-               "<td colspan=\"2\">"
-               "<input type=\"text\" name=\"subject\" id=\"subject_id\" value=\"");
-       escputs(bstr("subject"));
-       wprintf("\" size=45 maxlength=70>\n");
-       wprintf("</td></tr>");
-
-       wprintf("<tr><td colspan=\"3\">\n");
-
-       wprintf("<textarea name=\"msgtext\" cols=\"80\" rows=\"15\">");
-
-       /** If we're continuing from a previous edit, put our partially-composed message back... */
-       msgescputs(bstr("msgtext"));
-
-       /* If we're forwarding a message, insert it here... */
-       if (atol(bstr("fwdquote")) > 0L) {
-               wprintf("<br><div align=center><i>");
-               wprintf(_("--- forwarded message ---"));
-               wprintf("</i></div><br>");
-               pullquote_message(atol(bstr("fwdquote")), 1, 1);
-       }
-
-       /** If we're replying quoted, insert the quote here... */
-       else if (atol(bstr("replyquote")) > 0L) {
-               wprintf("<br>"
-                       "<blockquote>");
-               pullquote_message(atol(bstr("replyquote")), 0, 1);
-               wprintf("</blockquote><br>");
-       }
-
-       /** If we're editing a wiki page, insert the existing page here... */
-       else if (WC->wc_view == VIEW_WIKI) {
-               safestrncpy(buf, bstr("wikipage"), sizeof buf);
-               str_wiki_index(buf);
-               existing_page = locate_message_by_uid(buf);
-               if (existing_page >= 0L) {
-                       pullquote_message(existing_page, 1, 0);
-               }
-       }
-
-       /** Insert our signature if appropriate... */
-       if ( (WC->is_mailbox) && (strcmp(bstr("sig_inserted"), "yes")) ) {
-               get_preference("use_sig", buf, sizeof buf);
-               if (!strcasecmp(buf, "yes")) {
-                       int len;
-                       get_preference("signature", ebuf, sizeof ebuf);
-                       euid_unescapize(buf, ebuf);
-                       wprintf("<br>--<br>");
-                       len = strlen(buf);
-                       for (i=0; i<len; ++i) {
-                               if (buf[i] == '\n') {
-                                       wprintf("<br>");
-                               }
-                               else if (buf[i] == '<') {
-                                       wprintf("&lt;");
-                               }
-                               else if (buf[i] == '>') {
-                                       wprintf("&gt;");
-                               }
-                               else if (buf[i] == '&') {
-                                       wprintf("&amp;");
-                               }
-                               else if (buf[i] == '\"') {
-                                       wprintf("&quot;");
-                               }
-                               else if (buf[i] == '\'') {
-                                       wprintf("&#39;");
-                               }
-                               else if (isprint(buf[i])) {
-                                       wprintf("%c", buf[i]);
-                               }
-                       }
+                       wprintf("<em>%s</em><br />\n", &buf[4]);/// -> important message
+                       return;
                }
        }
+       svputlong("RCPTREQUIRED", recipient_required);
+       svputlong("SUBJREQUIRED", recipient_required || subject_required);
 
-       wprintf("</textarea>\n");
-
-       /** Make sure we only insert our signature once */
-       /** We don't care if it was there or not before, it needs to be there now. */
-       wprintf("<input type=\"hidden\" name=\"sig_inserted\" value=\"yes\">\n");
-       
-       /**
-        * The following template embeds the TinyMCE richedit control, and automatically
-        * transforms the textarea into a richedit textarea.
-        */
-       do_template("richedit");
-
-       /** 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 = WC->first_attachment; att != NULL; att = att->next) {
-               wprintf("<option value=\"");
-               urlescputs(att->filename);
-               wprintf("\">");
-               escputs(att->filename);
-               /* wprintf(" (%s, %d bytes)",att->content_type,att->length); */
-               wprintf("</option>\n");
-       }
-       wprintf("</select>");
-
-       /** Now offer the ability to attach additional files... */
-       wprintf("&nbsp;&nbsp;&nbsp;");
-       wprintf(_("Attach file:"));
-       wprintf(" <input name=\"attachfile\" class=\"attachfile\" "
-               "size=16 type=\"file\">\n&nbsp;&nbsp;"
-               "<input type=\"submit\" name=\"attach_button\" value=\"%s\">\n", _("Add"));
-       wprintf("</div>");      /* End of "attachment buttons" div */
-
-
-       wprintf("</td></tr></table>");
-       
-       wprintf("</form>\n");
-       wprintf("</div>\n");    /* end of "fix_scrollbar_bug" div */
+       begin_burst();
+       output_headers(1, 0, 0, 0, 1, 0);
+       DoTemplate(HKEY("edit_message"), NULL, NULL, CTX_NONE);
+       end_burst();
 
-       /* NOTE: address_book_popup() will close the "content" div.  Don't close it here. */
-DONE:  address_book_popup();
-       wDumpContent(1);
+       return;
 }
 
-
 /**
  * \brief delete a message
  */
@@ -3475,7 +1322,7 @@ void delete_msg(void)
        long msgid;
        char buf[SIZ];
 
-       msgid = atol(bstr("msgid"));
+       msgid = lbstr("msgid");
 
        if (WC->wc_is_trash) {  /** Delete from Trash is a real delete */
                serv_printf("DELE %ld", msgid); 
@@ -3487,7 +1334,7 @@ void delete_msg(void)
        serv_getln(buf, sizeof buf);
        sprintf(WC->ImportantMessage, "%s", &buf[4]);
 
-       readloop("readnew");
+       readloop(readnew);
 }
 
 
@@ -3499,9 +1346,9 @@ void move_msg(void)
        long msgid;
        char buf[SIZ];
 
-       msgid = atol(bstr("msgid"));
+       msgid = lbstr("msgid");
 
-       if (!IsEmptyStr(bstr("move_button"))) {
+       if (havebstr("move_button")) {
                sprintf(buf, "MOVE %ld|%s", msgid, bstr("target_room"));
                serv_puts(buf);
                serv_getln(buf, sizeof buf);
@@ -3510,15 +1357,15 @@ void move_msg(void)
                sprintf(WC->ImportantMessage, (_("The message was not moved.")));
        }
 
-       readloop("readnew");
+       readloop(readnew);
 }
 
 
 
 
 
-/**
- * \brief Confirm move of a message
+/*
+ * Confirm move of a message
  */
 void confirm_move_msg(void)
 {
@@ -3526,7 +1373,7 @@ void confirm_move_msg(void)
        char buf[SIZ];
        char targ[SIZ];
 
-       msgid = atol(bstr("msgid"));
+       msgid = lbstr("msgid");
 
 
        output_headers(1, 1, 2, 0, 0, 0);
@@ -3544,7 +1391,7 @@ void confirm_move_msg(void)
        wprintf("<br />\n");
 
        wprintf("<form METHOD=\"POST\" action=\"move_msg\">\n");
-       wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%ld\">\n", WC->nonce);
+       wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
        wprintf("<INPUT TYPE=\"hidden\" NAME=\"msgid\" VALUE=\"%s\">\n", bstr("msgid"));
 
        wprintf("<SELECT NAME=\"target_room\" SIZE=5>\n");
@@ -3571,4 +1418,198 @@ void confirm_move_msg(void)
 }
 
 
-/*@}*/
+/*
+ * Generic function to output an arbitrary MIME attachment from
+ * message being composed
+ *
+ * partnum             The MIME part to be output
+ * filename            Fake filename to give
+ * force_download      Nonzero to force set the Content-Type: header to "application/octet-stream"
+ */
+void postpart(StrBuf *partnum, StrBuf *filename, int force_download)
+{
+       void *vPart;
+       StrBuf *content_type;
+       wc_mime_attachment *part;
+       
+       if (GetHash(WC->attachments, SKEY(partnum), &vPart) &&
+           (vPart != NULL)) {
+               part = (wc_mime_attachment*) vPart;
+               if (force_download) {
+                       content_type = NewStrBufPlain(HKEY("application/octet-stream"));
+               }
+               else {
+                       content_type = NewStrBufDup(part->ContentType);
+               }
+               output_headers(0, 0, 0, 0, 0, 0);
+               StrBufAppendBuf(WC->WBuf, part->Data, 0);
+               http_transmit_thing(ChrPtr(content_type), 0);
+       } else {
+               hprintf("HTTP/1.1 404 %s\n", ChrPtr(partnum));
+               output_headers(0, 0, 0, 0, 0, 0);
+               hprintf("Content-Type: text/plain\r\n");
+               wprintf(_("An error occurred while retrieving this part: %s/%s\n"), 
+                       ChrPtr(partnum), ChrPtr(filename));
+               end_burst();
+       }
+       FreeStrBuf(&content_type);
+}
+
+
+/*
+ * Generic function to output an arbitrary MIME part from an arbitrary
+ * message number on the server.
+ *
+ * msgnum              Number of the item on the citadel server
+ * partnum             The MIME part to be output
+ * force_download      Nonzero to force set the Content-Type: header to "application/octet-stream"
+ */
+void mimepart(const char *msgnum, const char *partnum, int force_download)
+{
+       char buf[256];
+       off_t bytes;
+       char content_type[256];
+       
+       serv_printf("OPNA %s|%s", msgnum, partnum);
+       serv_getln(buf, sizeof buf);
+       if (buf[0] == '2') {
+               bytes = extract_long(&buf[4], 0);
+               if (force_download) {
+                       strcpy(content_type, "application/octet-stream");
+               }
+               else {
+                       extract_token(content_type, &buf[4], 3, '|', sizeof content_type);
+               }
+               output_headers(0, 0, 0, 0, 0, 0);
+
+               read_server_binary(WC->WBuf, bytes);
+               serv_puts("CLOS");
+               serv_getln(buf, sizeof buf);
+               http_transmit_thing(content_type, 0);
+       } else {
+               hprintf("HTTP/1.1 404 %s\n", &buf[4]);
+               output_headers(0, 0, 0, 0, 0, 0);
+               hprintf("Content-Type: text/plain\r\n");
+               wprintf(_("An error occurred while retrieving this part: %s\n"), &buf[4]);
+               end_burst();
+       }
+}
+
+
+/*
+ * Read any MIME part of a message, from the server, into memory.
+ */
+char *load_mimepart(long msgnum, char *partnum)
+{
+       char buf[SIZ];
+       off_t bytes;
+       char content_type[SIZ];
+       char *content;
+       
+       serv_printf("DLAT %ld|%s", msgnum, partnum);
+       serv_getln(buf, sizeof buf);
+       if (buf[0] == '6') {
+               bytes = extract_long(&buf[4], 0);
+               extract_token(content_type, &buf[4], 3, '|', sizeof content_type);
+
+               content = malloc(bytes + 2);
+               serv_read(content, bytes);
+
+               content[bytes] = 0;     /* null terminate for good measure */
+               return(content);
+       }
+       else {
+               return(NULL);
+       }
+}
+
+/*
+ * Read any MIME part of a message, from the server, into memory.
+ */
+void MimeLoadData(wc_mime_attachment *Mime)
+{
+       char buf[SIZ];
+       off_t bytes;
+//// TODO: is there a chance the contenttype is different  to the one we know? 
+       serv_printf("DLAT %ld|%s", Mime->msgnum, ChrPtr(Mime->PartNum));
+       serv_getln(buf, sizeof buf);
+       if (buf[0] == '6') {
+               bytes = extract_long(&buf[4], 0);
+
+               if (Mime->Data == NULL)
+                       Mime->Data = NewStrBufPlain(NULL, bytes);
+               StrBuf_ServGetBLOB(Mime->Data, bytes);
+
+       }
+       else {
+               FlushStrBuf(Mime->Data);
+               /// TODO XImportant message
+       }
+}
+
+
+
+
+void view_mimepart(void) {
+       mimepart(ChrPtr(WC->UrlFragment2),
+                ChrPtr(WC->UrlFragment3),
+                0);
+}
+
+void download_mimepart(void) {
+       mimepart(ChrPtr(WC->UrlFragment2),
+                ChrPtr(WC->UrlFragment3),
+                1);
+}
+
+void view_postpart(void) {
+       postpart(WC->UrlFragment2,
+                WC->UrlFragment3,
+                0);
+}
+
+void download_postpart(void) {
+       postpart(WC->UrlFragment2,
+                WC->UrlFragment3,
+                1);
+}
+
+
+
+void h_readnew(void) { readloop(readnew);}
+void h_readold(void) { readloop(readold);}
+void h_readfwd(void) { readloop(readfwd);}
+void h_headers(void) { readloop(headers);}
+void h_do_search(void) { readloop(do_search);}
+
+
+
+
+
+
+void 
+InitModule_MSG
+(void)
+{
+       WebcitAddUrlHandler(HKEY("readnew"), h_readnew, NEED_URL);
+       WebcitAddUrlHandler(HKEY("readold"), h_readold, NEED_URL);
+       WebcitAddUrlHandler(HKEY("readfwd"), h_readfwd, NEED_URL);
+       WebcitAddUrlHandler(HKEY("headers"), h_headers, NEED_URL);
+       WebcitAddUrlHandler(HKEY("do_search"), h_do_search, 0);
+       WebcitAddUrlHandler(HKEY("display_enter"), display_enter, 0);
+       WebcitAddUrlHandler(HKEY("post"), post_message, 0);
+       WebcitAddUrlHandler(HKEY("move_msg"), move_msg, 0);
+       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);
+
+       WebcitAddUrlHandler(HKEY("mimepart"), view_mimepart, NEED_URL);
+       WebcitAddUrlHandler(HKEY("mimepart_download"), download_mimepart, NEED_URL);
+       WebcitAddUrlHandler(HKEY("postpart"), view_postpart, NEED_URL);
+       WebcitAddUrlHandler(HKEY("postpart_download"), download_postpart, NEED_URL);
+
+       return ;
+}