* shortcut notation to tokens for hashkeys; TKEY(n) will make str,len for Hash access
[citadel.git] / webcit / messages.c
index 38f4a4b1919ee322392c647bb619ff949d6fa9fd..c159a055acf38399a4e693eafde6051224bf61ec 100644 (file)
@@ -56,8 +56,6 @@ int read_message(StrBuf *Target, const char *tmpl, long tmpllen, long msgnum, in
        headereval *Hdr;
        void *vHdr;
        char buf[SIZ];
-//     char mime_submessages[256] = "";
-       char reply_references[1024] = "";
        int Done = 0;
        int state=0;
        long len;
@@ -112,6 +110,7 @@ int read_message(StrBuf *Target, const char *tmpl, long tmpllen, long msgnum, in
                        StrBufCutLeft(Buf, StrLength(HdrToken) + 1);
                        
                        lprintf(1, ":: [%s] = [%s]\n", ChrPtr(HdrToken), ChrPtr(Buf));
+                       /* look up one of the examine_* functions to parse the content */
                        if (GetHash(MsgHeaderHandler, SKEY(HdrToken), &vHdr) &&
                            (vHdr != NULL)) {
                                Hdr = (headereval*)vHdr;
@@ -136,6 +135,7 @@ int read_message(StrBuf *Target, const char *tmpl, long tmpllen, long msgnum, in
                                if (StrLength(HdrToken) > 0) {
                                        StrBufCutLeft(Buf, StrLength(HdrToken) + 1);
                                        lprintf(1, ":: [%s] = [%s]\n", ChrPtr(HdrToken), ChrPtr(Buf));
+                                       /* the examine*'s know how to do with mime headers too... */
                                        if (GetHash(MsgHeaderHandler, SKEY(HdrToken), &vHdr) &&
                                            (vHdr != NULL)) {
                                                Hdr = (headereval*)vHdr;
@@ -165,11 +165,13 @@ int read_message(StrBuf *Target, const char *tmpl, long tmpllen, long msgnum, in
 
        if (Msg->AllAttach == NULL)
                Msg->AllAttach = NewHash(1,NULL);
+       /* now we put the body mimepart we read above into the mimelist */
        Put(Msg->AllAttach, SKEY(Msg->MsgBody->PartNum), Msg->MsgBody, DestroyMime);
        
        /* strip the bare contenttype, so we ommit charset etc. */
        StrBufExtract_token(Buf, Msg->MsgBody->ContentType, 0, ';');
        StrBufTrim(Buf);
+       /* look up the renderer, that will convert this mimeitem into the htmlized form */
        if (GetHash(MimeRenderHandler, SKEY(Buf), &vHdr) &&
            (vHdr != NULL)) {
                RenderMimeFunc Render;
@@ -184,7 +186,7 @@ int read_message(StrBuf *Target, const char *tmpl, long tmpllen, long msgnum, in
                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
+                       StrBufRemove_token(Msg->reply_references, 1, '|');
                }
        }
 
@@ -220,7 +222,9 @@ int read_message(StrBuf *Target, const char *tmpl, long tmpllen, long msgnum, in
                        StrBufAppendBuf(Msg->reply_to, Msg->from, 0);
                }
        }
-       it = GetNewHashPos();
+
+       /* now check if we need to translate some mimeparts, and remove the duplicate */
+       it = GetNewHashPos(Msg->AllAttach, 0);
        while (GetNextHashPos(Msg->AllAttach, it, &len, &Key, &vMime) && 
               (vMime != NULL)) {
                wc_mime_attachment *Mime = (wc_mime_attachment*) vMime;
@@ -249,7 +253,7 @@ void embed_message(void) {
        long msgnum = 0L;
        const StrBuf *Tmpl = sbstr("template");
 
-       msgnum = StrTol(WC->UrlFragment1);
+       msgnum = StrTol(WC->UrlFragment2);
        if (StrLength(Tmpl) > 0) 
                read_message(WC->WBuf, SKEY(Tmpl), msgnum, 0, NULL);
        else 
@@ -265,7 +269,7 @@ void embed_message(void) {
 void print_message(void) {
        long msgnum = 0L;
 
-       msgnum = StrTol(WC->UrlFragment1);
+       msgnum = StrTol(WC->UrlFragment2);
        output_headers(0, 0, 0, 0, 0, 0);
 
        hprintf("Content-type: text/html\r\n"
@@ -286,7 +290,7 @@ void print_message(void) {
  */
 void mobile_message_view(void) {
   long msgnum = 0L;
-  msgnum = StrTol(WC->UrlFragment1);
+  msgnum = StrTol(WC->UrlFragment2);
   output_headers(1, 0, 0, 0, 0, 1);
   begin_burst();
   do_template("msgcontrols", NULL);
@@ -303,7 +307,7 @@ void display_headers(void) {
        long msgnum = 0L;
        char buf[1024];
 
-       msgnum = StrTol(WC->UrlFragment1);
+       msgnum = StrTol(WC->UrlFragment2);
        output_headers(0, 0, 0, 0, 0, 0);
 
        hprintf("Content-type: text/plain\r\n"
@@ -324,337 +328,6 @@ void display_headers(void) {
 }
 
 
-
-/**
- * \brief Read message in simple, JavaScript-embeddable form for 'forward'
- *     or 'reply quoted' operations.
- *
- * NOTE: it is VITALLY IMPORTANT that we output no single-quotes or linebreaks
- *       in this function.  Doing so would throw a JavaScript error in the
- *       'supplied text' argument to the editor.
- *
- * \param msgnum Message number of the message we want to quote
- * \param forward_attachments Nonzero if we want attachments to be forwarded
- */
-void pullquote_message(long msgnum, int forward_attachments, int include_headers) {
-       struct wcsession *WCC = WC;
-       char buf[SIZ];
-       char mime_partnum[256];
-       char mime_filename[256];
-       char mime_content_type[256];
-       char mime_charset[256];
-       char mime_disposition[256];
-       int mime_length;
-       char *attachments = NULL;
-       char *ptr = NULL;
-       int num_attachments = 0;
-       wc_attachment *att;
-       char m_subject[1024];
-       char from[256];
-       char node[256];
-       char rfca[256];
-       char to[256];
-       char reply_to[512];
-       char now[256];
-       int format_type = 0;
-       int nhdr = 0;
-       int bq = 0;
-       int i = 0;
-#ifdef HAVE_ICONV
-       iconv_t ic = (iconv_t)(-1) ;
-       char *ibuf;                /**< Buffer of characters to be converted */
-       char *obuf;                /**< Buffer for converted characters      */
-       size_t ibuflen;    /**< Length of input buffer         */
-       size_t obuflen;    /**< Length of output buffer       */
-       char *osav;                /**< Saved pointer to output buffer       */
-#endif
-
-       strcpy(from, "");
-       strcpy(node, "");
-       strcpy(rfca, "");
-       strcpy(reply_to, "");
-       strcpy(mime_content_type, "text/plain");
-       strcpy(mime_charset, "us-ascii");
-
-       serv_printf("MSG4 %ld", msgnum);
-       serv_getln(buf, sizeof buf);
-       if (buf[0] != '1') {
-               wprintf(_("ERROR:"));
-               wprintf("%s<br />", &buf[4]);
-               return;
-       }
-
-       strcpy(m_subject, "");
-
-       while (serv_getln(buf, sizeof buf), strcasecmp(buf, "text")) {
-               if (!strcmp(buf, "000")) {
-                       wprintf("%s (3)", _("unexpected end of message"));
-                       return;
-               }
-               if (include_headers) {
-                       if (!strncasecmp(buf, "nhdr=yes", 8))
-                               nhdr = 1;
-                       if (nhdr == 1)
-                               buf[0] = '_';
-                       if (!strncasecmp(buf, "type=", 5))
-                               format_type = atoi(&buf[5]);
-                       if (!strncasecmp(buf, "from=", 5)) {
-                               strcpy(from, &buf[5]);
-                               wprintf(_("from "));
-                               utf8ify_rfc822_string(from);
-                               msgescputs(from);
-                       }
-                       if (!strncasecmp(buf, "subj=", 5)) {
-                               strcpy(m_subject, &buf[5]);
-                       }
-                       if ((!strncasecmp(buf, "hnod=", 5))
-                           && (strcasecmp(&buf[5], serv_info.serv_humannode))) {
-                               wprintf("(%s) ", &buf[5]);
-                       }
-                       if ((!strncasecmp(buf, "room=", 5))
-                           && (strcasecmp(&buf[5], WC->wc_roomname))
-                           && (!IsEmptyStr(&buf[5])) ) {
-                               wprintf(_("in "));
-                               wprintf("%s&gt; ", &buf[5]);
-                       }
-                       if (!strncasecmp(buf, "rfca=", 5)) {
-                               strcpy(rfca, &buf[5]);
-                               wprintf("&lt;");
-                               msgescputs(rfca);
-                               wprintf("&gt; ");
-                       }
-                       if (!strncasecmp(buf, "node=", 5)) {
-                               strcpy(node, &buf[5]);
-                               if ( ((WC->room_flags & QR_NETWORK)
-                               || ((strcasecmp(&buf[5], serv_info.serv_nodename)
-                               && (strcasecmp(&buf[5], serv_info.serv_fqdn)))))
-                               && (IsEmptyStr(rfca))
-                               ) {
-                                       wprintf("@%s ", &buf[5]);
-                               }
-                       }
-                       if (!strncasecmp(buf, "rcpt=", 5)) {
-                               wprintf(_("to "));
-                               strcpy(to, &buf[5]);
-                               utf8ify_rfc822_string(to);
-                               wprintf("%s ", to);
-                       }
-                       if (!strncasecmp(buf, "time=", 5)) {
-                               webcit_fmt_date(now, atol(&buf[5]), 0);
-                               wprintf("%s ", now);
-                       }
-               }
-
-               /**
-                * Save attachment info for later.  We can't start downloading them
-                * yet because we're in the middle of a server transaction.
-                */
-               if (!strncasecmp(buf, "part=", 5)) {
-                       ptr = malloc( (strlen(buf) + ((attachments != NULL) ? strlen(attachments) : 0)) ) ;
-                       if (ptr != NULL) {
-                               ++num_attachments;
-                               sprintf(ptr, "%s%s\n",
-                                       ((attachments != NULL) ? attachments : ""),
-                                       &buf[5]
-                               );
-                               free(attachments);
-                               attachments = ptr;
-                               lprintf(9, "attachments=<%s>\n", attachments);
-                       }
-               }
-
-       }
-
-       if (include_headers) {
-               wprintf("<br>");
-
-               utf8ify_rfc822_string(m_subject);
-               if (!IsEmptyStr(m_subject)) {
-                       wprintf(_("Subject:"));
-                       wprintf(" ");
-                       msgescputs(m_subject);
-                       wprintf("<br />");
-               }
-
-               /**
-                * Begin body
-                */
-               wprintf("<br />");
-       }
-
-       /**
-        * Learn the content type
-        */
-       strcpy(mime_content_type, "text/plain");
-       while (serv_getln(buf, sizeof buf), (!IsEmptyStr(buf))) {
-               if (!strcmp(buf, "000")) {
-                       wprintf("%s (4)", _("unexpected end of message"));
-                       goto ENDBODY;
-               }
-               if (!strncasecmp(buf, "Content-type: ", 14)) {
-                       int len;
-                       safestrncpy(mime_content_type, &buf[14],
-                               sizeof(mime_content_type));
-                       for (i=0; i<strlen(mime_content_type); ++i) {
-                               if (!strncasecmp(&mime_content_type[i], "charset=", 8)) {
-                                       safestrncpy(mime_charset, &mime_content_type[i+8],
-                                               sizeof mime_charset);
-                               }
-                       }
-                       len = strlen(mime_content_type);
-                       for (i=0; i<len; ++i) {
-                               if (mime_content_type[i] == ';') {
-                                       mime_content_type[i] = 0;
-                                       len = i - 1;
-                               }
-                       }
-                       len = strlen(mime_charset);
-                       for (i=0; i<len; ++i) {
-                               if (mime_charset[i] == ';') {
-                                       mime_charset[i] = 0;
-                                       len = i - 1;
-                               }
-                       }
-               }
-       }
-
-       /** Set up a character set conversion if we need to (and if we can) */
-#ifdef HAVE_ICONV
-       if ( (strcasecmp(mime_charset, "us-ascii"))
-          && (strcasecmp(mime_charset, "UTF-8"))
-          && (strcasecmp(mime_charset, ""))
-       ) {
-               ctdl_iconv_open("UTF-8", mime_charset, &ic);
-               if (ic == (iconv_t)(-1) ) {
-                       lprintf(5, "%s:%d iconv_open(%s, %s) failed: %s\n",
-                               __FILE__, __LINE__, "UTF-8", mime_charset, strerror(errno));
-               }
-       }
-#endif
-
-       /** Messages in legacy Citadel variformat get handled thusly... */
-       if (!strcasecmp(mime_content_type, "text/x-citadel-variformat")) {
-               pullquote_fmout();
-       }
-
-       /* Boring old 80-column fixed format text gets handled this way... */
-       else if (!strcasecmp(mime_content_type, "text/plain")) {
-               while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
-                       int len;
-                       len = strlen(buf);
-                       if ((len > 0) && (buf[len-1] == '\n')) buf[--len] = 0;
-                       if ((len > 0) && (buf[len-1] == '\r')) buf[--len] = 0;
-
-#ifdef HAVE_ICONV
-                       if (ic != (iconv_t)(-1) ) {
-                               ibuf = buf;
-                               ibuflen = len;
-                               obuflen = SIZ;
-                               obuf = (char *) malloc(obuflen);
-                               osav = obuf;
-                               iconv(ic, &ibuf, &ibuflen, &obuf, &obuflen);
-                               osav[SIZ-obuflen] = 0;
-                               safestrncpy(buf, osav, sizeof buf);
-                               free(osav);
-                       }
-#endif
-
-                       len = strlen(buf);
-                       while ((!IsEmptyStr(buf)) && (isspace(buf[len - 1]))) 
-                               buf[--len] = 0;
-                       if ((bq == 0) &&
-                       ((!strncmp(buf, ">", 1)) || (!strncmp(buf, " >", 2)) )) {
-                               wprintf("<blockquote>");
-                               bq = 1;
-                       } else if ((bq == 1) &&
-                               (strncmp(buf, ">", 1)) && (strncmp(buf, " >", 2)) ) {
-                               wprintf("</blockquote>");
-                               bq = 0;
-                       }
-                       wprintf("<tt>");
-                       url(buf, sizeof(buf));
-                       msgescputs1(buf);
-                       wprintf("</tt><br />");
-               }
-               wprintf("</i><br />");
-       }
-
-       /** HTML just gets escaped and stuffed back into the editor */
-       else if (!strcasecmp(mime_content_type, "text/html")) {
-               while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
-                       strcat(buf, "\n");
-                       msgescputs(buf);
-               }
-       }//// TODO: charset? utf8?
-
-       /** Unknown weirdness ... don't know how to handle this content type */
-       else {
-               while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) { }
-       }
-
-ENDBODY:
-       /** end of body handler */
-
-       /*
-        * If there were attachments, we have to download them and insert them
-        * into the attachment chain for the forwarded message we are composing.
-        */
-       if ( (forward_attachments) && (num_attachments) ) {
-               for (i=0; i<num_attachments; ++i) {
-                       extract_token(buf, attachments, i, '\n', sizeof buf);
-                       extract_token(mime_filename, buf, 1, '|', sizeof mime_filename);
-                       extract_token(mime_partnum, buf, 2, '|', sizeof mime_partnum);
-                       extract_token(mime_disposition, buf, 3, '|', sizeof mime_disposition);
-                       extract_token(mime_content_type, buf, 4, '|', sizeof mime_content_type);
-                       mime_length = extract_int(buf, 5);
-
-                       /*
-                        * tracing  ... uncomment if necessary
-                        *
-                        */
-                       lprintf(9, "fwd filename: %s\n", mime_filename);
-                       lprintf(9, "fwd partnum : %s\n", mime_partnum);
-                       lprintf(9, "fwd conttype: %s\n", mime_content_type);
-                       lprintf(9, "fwd dispose : %s\n", mime_disposition);
-                       lprintf(9, "fwd length  : %d\n", mime_length);
-
-                       if ( (!strcasecmp(mime_disposition, "inline"))
-                          || (!strcasecmp(mime_disposition, "attachment")) ) {
-               
-                               int n;
-                               char N[64];
-                               /* Create an attachment struct from this mime part... */
-                               att = malloc(sizeof(wc_attachment));
-                               memset(att, 0, sizeof(wc_attachment));
-                               att->length = mime_length;
-                               att->content_type = NewStrBufPlain(mime_content_type, -1);
-                               att->filename = NewStrBufPlain(mime_filename, -1);
-                               att->data = load_mimepart(msgnum, mime_partnum);
-               
-                               if (WCC->attachments == NULL)
-                                       WCC->attachments = NewHash(1, NULL);
-                               /* And add it to the list. */
-                               n = snprintf(N, sizeof N, "%d", GetCount(WCC->attachments) + 1);
-                               Put(WCC->attachments, N, n, att, free_attachment);
-                       }
-
-               }
-       }
-
-#ifdef HAVE_ICONV
-       if (ic != (iconv_t)(-1) ) {
-               iconv_close(ic);
-       }
-#endif
-
-       if (attachments != NULL) {
-               free(attachments);
-       }
-}
-
-
-
-
 message_summary *ReadOneMessageSummary(StrBuf *RawMessage, const char *DefaultSubject, long MsgNum) 
 {
        void                 *vEval;
@@ -695,138 +368,6 @@ message_summary *ReadOneMessageSummary(StrBuf *RawMessage, const char *DefaultSu
 }
 
 
-/**
- * \brief display the adressbook overview
- * \param msgnum the citadel message number
- * \param alpha what????
- */
-void display_addressbook(long msgnum, char alpha) {
-       //char buf[SIZ];
-       /* char mime_partnum[SIZ]; */
-/*     char mime_filename[SIZ]; */
-/*     char mime_content_type[SIZ]; */
-       ///char mime_disposition[SIZ];
-       //int mime_length;
-       char vcard_partnum[SIZ];
-       char *vcard_source = NULL;
-       message_summary summ;////TODO: this will leak
-
-       memset(&summ, 0, sizeof(summ));
-       ///safestrncpy(summ.subj, _("(no subject)"), sizeof summ.subj);
-///Load Message headers
-//     Msg = 
-       if (!IsEmptyStr(vcard_partnum)) {
-               vcard_source = load_mimepart(msgnum, vcard_partnum);
-               if (vcard_source != NULL) {
-
-                       /** Display the summary line */
-                       display_vcard(WC->WBuf, vcard_source, alpha, 0, NULL,msgnum);
-
-                       /** If it's my vCard I can edit it */
-                       if (    (!strcasecmp(WC->wc_roomname, USERCONFIGROOM))
-                               || (!strcasecmp(&WC->wc_roomname[11], USERCONFIGROOM))
-                               || (WC->wc_view == VIEW_ADDRESSBOOK)
-                       ) {
-                               wprintf("<a href=\"edit_vcard?"
-                                       "msgnum=%ld&partnum=%s\">",
-                                       msgnum, vcard_partnum);
-                               wprintf("[%s]</a>", _("edit"));
-                       }
-
-                       free(vcard_source);
-               }
-       }
-
-}
-
-
-
-/**
- * \brief  If it's an old "Firstname Lastname" style record, try to convert it.
- * \param namebuf name to analyze, reverse if nescessary
- */
-void lastfirst_firstlast(char *namebuf) {
-       char firstname[SIZ];
-       char lastname[SIZ];
-       int i;
-
-       if (namebuf == NULL) return;
-       if (strchr(namebuf, ';') != NULL) return;
-
-       i = num_tokens(namebuf, ' ');
-       if (i < 2) return;
-
-       extract_token(lastname, namebuf, i-1, ' ', sizeof lastname);
-       remove_token(namebuf, i-1, ' ');
-       strcpy(firstname, namebuf);
-       sprintf(namebuf, "%s; %s", lastname, firstname);
-}
-
-/**
- * \brief fetch what??? name
- * \param msgnum the citadel message number
- * \param namebuf where to put the name in???
- */
-void fetch_ab_name(message_summary *Msg, char *namebuf) {
-       char buf[SIZ];
-       char mime_partnum[SIZ];
-       char mime_filename[SIZ];
-       char mime_content_type[SIZ];
-       char mime_disposition[SIZ];
-       int mime_length;
-       char vcard_partnum[SIZ];
-       char *vcard_source = NULL;
-       int i, len;
-       message_summary summ;/// TODO this will lak
-
-       if (namebuf == NULL) return;
-       strcpy(namebuf, "");
-
-       memset(&summ, 0, sizeof(summ));
-       //////safestrncpy(summ.subj, "(no subject)", sizeof summ.subj);
-
-       sprintf(buf, "MSG0 %ld|0", Msg->msgnum);        /** unfortunately we need the mime info now */
-       serv_puts(buf);
-       serv_getln(buf, sizeof buf);
-       if (buf[0] != '1') return;
-
-       while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
-               if (!strncasecmp(buf, "part=", 5)) {
-                       extract_token(mime_filename, &buf[5], 1, '|', sizeof mime_filename);
-                       extract_token(mime_partnum, &buf[5], 2, '|', sizeof mime_partnum);
-                       extract_token(mime_disposition, &buf[5], 3, '|', sizeof mime_disposition);
-                       extract_token(mime_content_type, &buf[5], 4, '|', sizeof mime_content_type);
-                       mime_length = extract_int(&buf[5], 5);
-
-                       if (  (!strcasecmp(mime_content_type, "text/x-vcard"))
-                          || (!strcasecmp(mime_content_type, "text/vcard")) ) {
-                               strcpy(vcard_partnum, mime_partnum);
-                       }
-
-               }
-       }
-
-       if (!IsEmptyStr(vcard_partnum)) {
-               vcard_source = load_mimepart(Msg->msgnum, vcard_partnum);
-               if (vcard_source != NULL) {
-
-                       /* Grab the name off the card */
-                       display_vcard(WC->WBuf, vcard_source, 0, 0, namebuf, Msg->msgnum);
-
-                       free(vcard_source);
-               }
-       }
-
-       lastfirst_firstlast(namebuf);
-       striplt(namebuf);
-       len = strlen(namebuf);
-       for (i=0; i<len; ++i) {
-               if (namebuf[i] != ';') return;
-       }
-       strcpy(namebuf, _("(no name)"));
-}
-
-
 
 
 
@@ -839,29 +380,19 @@ void fetch_ab_name(message_summary *Msg, char *namebuf) {
 int load_msg_ptrs(char *servcmd, int with_headers)
 {
        StrBuf* FoundCharset = NULL;
-        struct wcsession *WCC = WC;
+        wcsession *WCC = WC;
        message_summary *Msg;
        StrBuf *Buf, *Buf2;
-       ///char buf[1024];
-       ///time_t datestamp;
-       //char fullname[128];
-       //char nodename[128];
-       //char inetaddr[128];
-       //char subject[1024];
-       ///char *ptr;
-       int nummsgs;
-       ////int sbjlen;
+       int nummsgs = 0;
        int maxload = 0;
        long len;
        int n;
-       ////int num_summ_alloc = 0;
 
        if (WCC->summ != NULL) {
                if (WCC->summ != NULL)
                        DeleteHash(&WCC->summ);
        }
        WCC->summ = NewHash(1, Flathash);
-       nummsgs = 0;
        maxload = 10000;
        
        Buf = NewStrBuf();
@@ -909,7 +440,7 @@ int load_msg_ptrs(char *servcmd, int with_headers)
                        Msg->subj = NewStrBufPlain(NULL, StrLength(Buf));
                        StrBufExtract_token(Buf2,  Buf, 5, '|');
                        if (StrLength(Buf2) == 0)
-                               StrBufAppendBufPlain(Msg->subj, _("(no subj)"), 0, -1);
+                               StrBufAppendBufPlain(Msg->subj, _("(no subj)"), -1,0);
                        else {
                                StrBuf_RFC822_to_Utf8(Msg->subj, Buf2, WCC->DefaultCharset, FoundCharset);
                                if ((StrLength(Msg->subj) > 75) && 
@@ -938,50 +469,141 @@ int load_msg_ptrs(char *servcmd, int with_headers)
 
 inline message_summary* GetMessagePtrAt(int n, HashList *Summ)
 {
+       const char *Key;
+       long HKLen;
        void *vMsg;
+
        if (Summ == NULL)
                return NULL;
-       GetHash(Summ, (const char*)&n, sizeof(n), &vMsg);
+       GetHashAt(Summ, n, &HKLen, &Key, &vMsg);
        return (message_summary*) vMsg;
 }
 
 
+void DrawMessageDropdown(StrBuf *Selector, long maxmsgs, long startmsg)
+{
+       StrBuf *TmpBuf;
+       wcsession *WCC = WC;
+       message_summary* Msg;
+       int lo, hi, n;
+       int i = 0;
+       long StartMsg = 0;
+       void *vMsg;
+       long hklen;
+       const char *key;
+       int done = 0;
+       int nItems;
+       HashPos *At;
+       long vector[16];
+       int nMessages = DEFAULT_MAXMSGS;
+
+       TmpBuf = NewStrBuf();
+       At = GetNewHashPos(WCC->summ, (lbstr("SortOrder") == 1)? -nMessages : nMessages);
+       nItems = GetCount(WCC->summ);
+       
+       vector[0] = 7;
+       vector[1] = startmsg;
+       vector[2] = maxmsgs;
+       vector[3] = 0;
+       vector[4] = 1;
+
+       while (!done) {
+               lo = GetHashPosCounter(At);
+               if (lo + nMessages > nItems) {
+                       hi = nItems;
+               }
+               else {
+                       hi = lo + nMessages;
+               }
+               done = !GetNextHashPos(WCC->summ, At, &hklen, &key, &vMsg);
+               Msg = (message_summary*) vMsg;
+               n = (Msg==NULL)? 0 : Msg->msgnum;
+               if (i == 0)
+                       StartMsg = n;
+               vector[4] = lo;
+               vector[5] = hi;
+               vector[6] = n;
+               FlushStrBuf(TmpBuf);
+               DoTemplate(HKEY("select_messageindex"), TmpBuf, &vector, CTX_LONGVECTOR);
+               StrBufAppendBuf(Selector, TmpBuf, 0);
+               i++;
+       }
+       vector[6] = StartMsg;
+       FlushStrBuf(TmpBuf);
+       vector[1] = lbstr("maxmsgs") == 9999999;
+       vector[2] = 0;
+       DoTemplate(HKEY("select_messageindex_all"), TmpBuf, &vector, CTX_LONGVECTOR);
+       StrBufAppendBuf(Selector, TmpBuf, 0);
+       FreeStrBuf(&TmpBuf);
+       DeleteHashPos(&At);
+}
+
+void load_seen_flags(void)
+{
+       message_summary *Msg;
+       const char *HashKey;
+       long HKLen;
+       StrBuf *OldMsg = NewStrBuf();;
+       wcsession *WCC = WC;
+       HashPos *at;
+       void *vMsg;
+
+       serv_puts("GTSN");
+       StrBuf_ServGetln(OldMsg);
+       if (ChrPtr(OldMsg)[0] == '2') {
+               StrBufCutLeft(OldMsg, 4);
+       }
+       else {
+               FreeStrBuf(&OldMsg);
+               return;
+       }
+       at = GetNewHashPos(WCC->summ, 0);
+       while (GetNextHashPos(WCC->summ, at, &HKLen, &HashKey, &vMsg)) {
+               /** Are you a new message, or an old message? */
+               Msg = (message_summary*) vMsg;
+               if (is_msg_in_mset(ChrPtr(OldMsg), Msg->msgnum)) {
+                       Msg->is_new = 0;
+               }
+               else {
+                       Msg->is_new = 1;
+               }
+       }
+       FreeStrBuf(&OldMsg);
+       DeleteHashPos(&at);
+}
+
+extern readloop_struct rlid[];
+
 /*
  * command loop for reading messages
  *
  * Set oper to "readnew" or "readold" or "readfwd" or "headers"
  */
-void readloop(char *oper)
+void readloop(long oper)
 {
+       StrBuf *MessageDropdown = NULL;
        StrBuf *BBViewToolBar = NULL;
        void *vMsg;
        message_summary *Msg;
        char cmd[256] = "";
        char buf[SIZ];
-       char old_msgs[SIZ];
        int a = 0;
-       int b = 0;
-       int n;
        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;
        addrbookent *addrbook = NULL;
        int num_ab = 0;
        int bbs_reverse = 0;
-       struct wcsession *WCC = WC;     /* This is done to make it run faster; WC is a function */
+       wcsession *WCC = WC;
        HashPos *at;
        const char *HashKey;
        long HKLen;
@@ -996,24 +618,23 @@ void readloop(char *oper)
                return;
        case VIEW_CALENDAR:
                load_seen = 1;
-               is_calendar = 1;
                strcpy(cmd, "MSGS ALL|||1");
                maxmsgs = 32767;
                parse_calendar_view_request(&calv);
+               break;
        case VIEW_TASKS:
-               is_tasks = 1;
                strcpy(cmd, "MSGS ALL");
                maxmsgs = 32767;
+               break;
        case VIEW_NOTES:
-               is_notes = 1;
                strcpy(cmd, "MSGS ALL");
                maxmsgs = 32767;
                wprintf("<div id=\"new_notes_here\"></div>\n");
+               break;
        case VIEW_ADDRESSBOOK:
                is_singlecard = ibstr("is_singlecard");
-               if (maxmsgs > 1) {
-                       is_addressbook = 1;
-                       if (!strcmp(oper, "do_search")) {
+               if (is_singlecard != 1) {
+                       if (oper == do_search) {
                                snprintf(cmd, sizeof(cmd), "MSGS SEARCH|%s", bstr("query"));
                        }
                        else {
@@ -1022,11 +643,12 @@ void readloop(char *oper)
                        maxmsgs = 9999999;
                        break;
                }
-
+               break;
        default:
                care_for_empty_list = 1;
                startmsg = lbstr("startmsg");
-               maxmsgs = ibstr("maxmsgs");
+               if (havebstr("maxmsgs"))
+                       maxmsgs = ibstr("maxmsgs");
                is_summary = (ibstr("is_summary") && !WCC->is_mobile);
                if (maxmsgs == 0) maxmsgs = DEFAULT_MAXMSGS;
                
@@ -1036,25 +658,11 @@ void readloop(char *oper)
                 * When in summary mode, always show ALL messages instead of just
                 * new or old.  Otherwise, show what the user asked for.
                 */
-               if (!strcmp(oper, "readnew")) {
-                       strcpy(cmd, "MSGS NEW");
-               }
-               else if (!strcmp(oper, "readold")) {
-                       strcpy(cmd, "MSGS OLD");
-               }
-               else if (!strcmp(oper, "do_search")) {
-                       snprintf(cmd, sizeof(cmd), "MSGS SEARCH|%s", bstr("query"));
-               }
-               else {
-                       strcpy(cmd, "MSGS ALL");
-               }
+               rlid[oper].cmd(cmd, sizeof(cmd));
                
                if ((WCC->wc_view == VIEW_MAILBOX) && (maxmsgs > 1) && !WCC->is_mobile) {
                        is_summary = 1;
-                       if (!strcmp(oper, "do_search")) {
-                               snprintf(cmd, sizeof(cmd), "MSGS SEARCH|%s", bstr("query"));
-                       }
-                       else {
+                       if (oper != do_search) {
                                strcpy(cmd, "MSGS ALL");
                        }
                }
@@ -1063,59 +671,48 @@ void readloop(char *oper)
                if (is_summary) {                       /**< fetch header summary */
                        load_seen = 1;
                        snprintf(cmd, sizeof(cmd), "MSGS %s|%s||1",
-                                (!strcmp(oper, "do_search") ? "SEARCH" : "ALL"),
-                                (!strcmp(oper, "do_search") ? bstr("query") : "")
+                                (oper == do_search) ? "SEARCH" : "ALL",
+                                (oper == do_search) ? bstr("query") : ""
                                );
                        startmsg = 1;
                        maxmsgs = 9999999;
                } 
-               if (startmsg == 0L) {
-                       if (bbs_reverse) {
-                               Msg = GetMessagePtrAt((nummsgs >= maxmsgs) ? (nummsgs - maxmsgs) : 0, WCC->summ);
-                               startmsg = (Msg==NULL)? 0 : Msg->msgnum;
+
+               if (is_bbview) {
+                       if (havebstr("SortOrder")) {
+                               bbs_reverse = lbstr("SortOrder") == 2;
                        }
                        else {
-                               Msg = GetMessagePtrAt(0, WCC->summ);
-                               startmsg = (Msg==NULL)? 0 : Msg->msgnum;
+                               StrBuf *Buf = NewStrBufPlain(HKEY("1"));
+                               putbstr("SortOrder", Buf);
+                               Buf = NewStrBufPlain(HKEY("date"));
+                               putbstr("SortBy", Buf);
+                               bbs_reverse = 0;
                        }
                }
                sortit = is_summary || WCC->is_mobile;
+               if (WCC->is_mobile) {
+                       maxmsgs = 20;
+                       snprintf(cmd, sizeof(cmd), "MSGS %s|%s||1",
+                                ((oper == do_search) ? "SEARCH" : "ALL"),
+                                ((oper == do_search) ? bstr("query") : "")
+                               );
+               }
        }
-
-
-
-
-
-
-
        output_headers(1, 1, 1, 0, 0, 0);
 
-       /*
-       if (WCC->is_mobile) {
-               maxmsgs = 20;
-               snprintf(cmd, sizeof(cmd), "MSGS %s|%s||1",
-                       (!strcmp(oper, "do_search") ? "SEARCH" : "ALL"),
-                       (!strcmp(oper, "do_search") ? bstr("query") : "")
-               );
-               SortBy =  eRDate;
-       }
-
-       /*
-        * 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.
-        */
-
-
        nummsgs = load_msg_ptrs(cmd, (is_summary || WCC->is_mobile));
        if (nummsgs == 0) {
                if (care_for_empty_list) {
                        wprintf("<div align=\"center\"><br /><em>");
-                       if (!strcmp(oper, "readnew")) {
+                       switch (oper) {
+                       case readnew:
                                wprintf(_("No new messages."));
-                       } else if (!strcmp(oper, "readold")) {
+                               break;
+                       case readold:
                                wprintf(_("No old messages."));
-                       } else {
+                               break;
+                       default:
                                wprintf(_("No messages here."));
                        }
                        wprintf("</em><br /></div>\n");
@@ -1124,31 +721,6 @@ void readloop(char *oper)
                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();
-               while (GetNextHashPos(WCC->summ, at, &HKLen, &HashKey, &vMsg)) {
-                       /** Are you a new message, or an old message? */
-                       Msg = (message_summary*) vMsg;
-                       if (is_summary) {
-                               if (is_msg_in_mset(old_msgs, Msg->msgnum)) {
-                                       Msg->is_new = 0;
-                               }
-                               else {
-                                       Msg->is_new = 1;
-                               }
-                       }
-               }
-               DeleteHashPos(&at);
-       }
-
        if (sortit) {
                CompareFunc SortIt;
                SortIt =  RetrieveSort(CTX_MAILSUM, NULL, 
@@ -1157,130 +729,53 @@ void readloop(char *oper)
                        SortByPayload(WCC->summ, SortIt);
        }
 
-       if (is_summary) {
-               do_template("summary_header", NULL);
-       } else if (WCC->is_mobile) {
-               wprintf("<div id=\"message_list\">");
+       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;
+               }
        }
 
+       if (load_seen) load_seen_flags();
+       if (is_summary) do_template("summary_header", NULL);
+       
 
-       /**
+        /**
         * If we're not currently looking at ALL requested
         * messages, then display the selector bar
         */
-       if (is_bbview) {
-               const char *selected;
-               StrBuf *Selector = NewStrBuf();
+       if (is_bbview)  {
                BBViewToolBar = NewStrBuf();
-/////          DoTemplate("bbview_scrollbar");
-               /** begin bbview scroller */
-               StrBufAppendPrintf(BBViewToolBar, "<form name=\"msgomatictop\" class=\"selector_top\" > \n <p>");
-               StrBufAppendPrintf(BBViewToolBar, _("Reading #"));//// TODO this isn't used, should it? : , lowest_displayed, highest_displayed);
-
-               StrBufAppendPrintf(BBViewToolBar, "<select name=\"whichones\" size=\"1\" "
-                                  "OnChange=\"location.href=msgomatictop.whichones.options"
-                                  "[selectedIndex].value\">\n");
-
-               if (bbs_reverse) {
-                       for (b=nummsgs-1; b>=0; b = b - maxmsgs) {
-                               hi = b + 1;
-                               lo = b - maxmsgs + 2;
-                               if (lo < 1) lo = 1;
-                               
-                               Msg = GetMessagePtrAt(lo-1, WCC->summ);
-                               n = (Msg==NULL)? 0 : Msg->msgnum;
-                               selected = ((n == startmsg) ? "selected" : "");
-                               
-                               StrBufAppendPrintf(Selector, 
-                                                  "<option %s value="
-                                                  "\"%s"
-                                                  "&startmsg=%ld"
-                                                  "&maxmsgs=%d"
-                                                  "&is_summary=%d\">"
-                                                  "%d-%d</option> \n",
-                                                  selected,
-                                                  oper,
-
-
-                                                  maxmsgs,
-                                                  is_summary,
-                                                  hi, lo);
-                       }
-               }
-               else {
-                       for (b=0; b<nummsgs; b = b + maxmsgs) {
-                               lo = b + 1;
-                               hi = b + maxmsgs + 1;
-                               if (hi > nummsgs) hi = nummsgs;
-
-                               Msg = GetMessagePtrAt(b, WCC->summ);
-                               n = (Msg==NULL)? 0 : Msg->msgnum;
-                               selected = ((n == startmsg) ? "selected" : "");
-                               Msg = GetMessagePtrAt(lo-1,  WCC->summ);
-                               StrBufAppendPrintf(Selector, 
-                                                  "<option %s value="
-                                                  "\"%s"
-                                                  "&startmsg=%ld"
-                                                  "&maxmsgs=%d"
-                                                  "&is_summary=%d\">"
-                                                  "%d-%d</option> \n",
-                                                  selected,
-                                                  oper,
-                                                  (Msg==NULL)? 0 : Msg->msgnum,
-                                                  maxmsgs,
-                                                  is_summary,
-                                                  lo, hi);
-                       }
-               }
+               MessageDropdown = NewStrBuf();
 
-               StrBufAppendBuf(BBViewToolBar, Selector, 0);
-
-               Msg = GetMessagePtrAt(0,  WCC->summ);
-
-               StrBufAppendPrintf(BBViewToolBar, "<option value=\"%s?startmsg=%ld"
-                       "&maxmsgs=9999999&is_summary=0\">",
-                       oper,
-                       (Msg==NULL)? 0 : Msg->msgnum);
-               StrBufAppendPrintf(BBViewToolBar, _("All"));
-
-               StrBufAppendPrintf(BBViewToolBar, "</option>");
-               StrBufAppendPrintf(BBViewToolBar, "</select> ");
-               StrBufAppendPrintf(BBViewToolBar, _("of %d messages."), nummsgs);
-
-               /** forward/reverse */
-               StrBufAppendPrintf(BBViewToolBar, "<input type=\"radio\" %s name=\"direction\" value=\"\""
-                       "OnChange=\"location.href='%s?sortby=forward'\"",  
-                       (bbs_reverse ? "" : "checked"),
-                       oper
-               );
-               StrBufAppendPrintf(BBViewToolBar, ">");
-               StrBufAppendPrintf(BBViewToolBar, _("oldest to newest"));
-               StrBufAppendPrintf(BBViewToolBar, "&nbsp;&nbsp;&nbsp;&nbsp;");
-
-               StrBufAppendPrintf(BBViewToolBar, "<input type=\"radio\" %s name=\"direction\" value=\"\""
-                       "OnChange=\"location.href='%s?sortby=reverse'\"", 
-                       (bbs_reverse ? "checked" : ""),
-                       oper
-               );
-               StrBufAppendPrintf(BBViewToolBar, ">");
-               StrBufAppendPrintf(BBViewToolBar, _("newest to oldest"));
-               StrBufAppendPrintf(BBViewToolBar, "\n");
-       
-               StrBufAppendPrintf(BBViewToolBar, "</p></form>\n");
+               DrawMessageDropdown(MessageDropdown, maxmsgs, startmsg);
+               
+               DoTemplate(HKEY("msg_listselector_top"), BBViewToolBar, MessageDropdown, CTX_STRBUF);
                StrBufAppendBuf(WCC->WBuf, BBViewToolBar, 0);
-               /** end bbview scroller */
+               FlushStrBuf(BBViewToolBar);
        }
                        
-       at = GetNewHashPos();
+       at = GetNewHashPos(WCC->summ, 0);
        while (GetNextHashPos(WCC->summ, at, &HKLen, &HashKey, &vMsg)) {
                Msg = (message_summary*) vMsg;          
-               if ((Msg->msgnum >= startmsg) && (num_displayed < maxmsgs)) {
-                               
-                       /** Display the message */
-                       if (is_summary) {
-                               DoTemplate(HKEY("section_mailsummary"), NULL, Msg, CTX_MAILSUM);
-                       }
-                       else if (is_addressbook) {
+               if ((Msg->msgnum >= startmsg) && (num_displayed < maxmsgs)) {                   
+                       switch (WCC->wc_view) {
+                       case VIEW_WIKI:
+                               break;
+                       case VIEW_CALENDAR:
+                               load_calendar_item(Msg, Msg->is_new, &calv);
+                               break;
+                       case VIEW_TASKS:
+                               display_task(Msg, Msg->is_new);
+                               break;
+                       case VIEW_NOTES:
+                               display_note(Msg, Msg->is_new);
+                               break;
+                       case VIEW_ADDRESSBOOK:
                                fetch_ab_name(Msg, buf);
                                ++num_ab;
                                addrbook = realloc(addrbook,
@@ -1288,30 +783,25 @@ void readloop(char *oper)
                                safestrncpy(addrbook[num_ab-1].ab_name, buf,
                                            sizeof(addrbook[num_ab-1].ab_name));
                                addrbook[num_ab-1].ab_msgnum = Msg->msgnum;
-                       }
-                       else if (is_calendar) {
-                               load_calendar_item(Msg, Msg->is_new, &calv);
-                       }
-                       else if (is_tasks) {
-                               display_task(Msg, Msg->is_new);
-                       }
-                       else if (is_notes) {
-                               display_note(Msg, Msg->is_new);
-                       } else if (WCC->is_mobile) {
-                               DoTemplate(HKEY("section_mailsummary"), NULL, Msg, CTX_MAILSUM);
-                       }
-                       else {
-                               if (displayed_msgs == NULL) {
-                                       displayed_msgs = malloc(sizeof(long) *
-                                                               (maxmsgs<nummsgs ? maxmsgs : nummsgs));
+                               break;
+                       default:
+                               /** Display the message */
+                               if (is_summary) {
+                                       DoTemplate(HKEY("section_mailsummary"), NULL, Msg, CTX_MAILSUM);
+                               }
+                               else {
+                                       if (displayed_msgs == NULL) {
+                                               displayed_msgs = malloc(sizeof(long) *
+                                                                       (maxmsgs<nummsgs ? maxmsgs : nummsgs));
+                                       }
+                                       displayed_msgs[num_displayed] = Msg->msgnum;
                                }
-                               displayed_msgs[num_displayed] = Msg->msgnum;
-                       }
                        
-                       if (lowest_displayed < 0) lowest_displayed = a;
-                       highest_displayed = a;
+                               if (lowest_displayed < 0) lowest_displayed = a;
+                               highest_displayed = a;
                        
-                       ++num_displayed;
+                               ++num_displayed;
+                       }
                }
        }
        DeleteHashPos(&at);
@@ -1325,7 +815,7 @@ void readloop(char *oper)
                /** if we do a split bbview in the future, begin messages div here */
 
                for (a=0; a<num_displayed; ++a) {
-                       read_message(WC->WBuf, HKEY("view_message"), displayed_msgs[a], 0, NULL);
+                       read_message(WCC->WBuf, HKEY("view_message"), displayed_msgs[a], 0, NULL);
                }
 
                /** if we do a split bbview in the future, end messages div here */
@@ -1335,20 +825,7 @@ void readloop(char *oper)
        }
 
        if (is_summary) {
-               wprintf("</table>"
-                       "</div>\n");                    /**< end of 'fix_scrollbar_bug' div */
-               wprintf("</div>");                      /**< end of 'message_list' div */
-               
-               /** Here's the grab-it-to-resize-the-message-list widget */
-               wprintf("<div id=\"resize_msglist\" "
-                       "onMouseDown=\"CtdlResizeMsgListMouseDown(event)\">"
-                       "<div class=\"fix_scrollbar_bug\"> <hr>"
-                       "</div></div>\n"
-               );
-
-               wprintf("<div id=\"preview_pane\">");   /**< The preview pane will initially be empty */
-       } else if (WCC->is_mobile) {
-               wprintf("</div>");
+               do_template("summary_trailer", NULL);
        }
 
        /**
@@ -1363,23 +840,31 @@ void readloop(char *oper)
         * messages, then display the selector bar
         */
        if (is_bbview) {
-               /** begin bbview scroller */
+               DoTemplate(HKEY("msg_listselector_bottom"), BBViewToolBar, MessageDropdown, CTX_STRBUF);
                StrBufAppendBuf(WCC->WBuf, BBViewToolBar, 0);
+
+               FreeStrBuf(&BBViewToolBar);
+               FreeStrBuf(&MessageDropdown);
        }
        
 DONE:
-       if (is_tasks) {
-               do_tasks_view();        /** Render the task list */
-       }
-
-       if (is_calendar) {
+       switch (WCC->wc_view) {
+       case VIEW_WIKI:
+               break;
+       case VIEW_CALENDAR:
                render_calendar_view(&calv);
-       }
-
-       if (is_addressbook) {
+               break;
+       case VIEW_TASKS:
+               do_tasks_view();        /** Render the task list */
+               break;
+       case VIEW_NOTES:
+               break;
+       case VIEW_ADDRESSBOOK:
                do_addrbook_view(addrbook, num_ab);     /** Render the address book */
+               break;
+       default:
+               break;
        }
-
        /** Note: wDumpContent() will output one additional </div> tag. */
        wprintf("</div>\n");            /** end of 'content' div */
        wDumpContent(1);
@@ -1389,6 +874,7 @@ DONE:
                DeleteHash(&WCC->summ);
        }
        if (addrbook != NULL) free(addrbook);
+       FreeStrBuf(&BBViewToolBar);
 }
 
 
@@ -1397,12 +883,12 @@ DONE:
  * ... this is where the actual message gets transmitted to the server.
  */
 void post_mime_to_server(void) {
-       struct wcsession *WCC = WC;
+       wcsession *WCC = WC;
        char top_boundary[SIZ];
        char alt_boundary[SIZ];
        int is_multipart = 0;
        static int seq = 0;
-       wc_attachment *att;
+       wc_mime_attachment *att;
        char *encoded;
        size_t encoded_length;
        size_t encoded_strlen;
@@ -1466,17 +952,17 @@ void post_mime_to_server(void) {
                HashPos  *it;
 
                /* Add in the attachments */
-               it = GetNewHashPos();
+               it = GetNewHashPos(WCC->attachments, 0);
                while (GetNextHashPos(WCC->attachments, it, &len, &Key, &vAtt)) {
-                       att = (wc_attachment*)vAtt;
+                       att = (wc_mime_attachment *)vAtt;
                        encoded_length = ((att->length * 150) / 100);
                        encoded = malloc(encoded_length);
                        if (encoded == NULL) break;
-                       encoded_strlen = CtdlEncodeBase64(encoded, att->data, att->length, 1);
+                       encoded_strlen = CtdlEncodeBase64(encoded, ChrPtr(att->Data), StrLength(att->Data), 1);
 
                        serv_printf("--%s", top_boundary);
-                       serv_printf("Content-type: %s", ChrPtr(att->content_type));
-                       serv_printf("Content-disposition: attachment; filename=\"%s\"", ChrPtr(att->filename));
+                       serv_printf("Content-type: %s", ChrPtr(att->ContentType));
+                       serv_printf("Content-disposition: attachment; filename=\"%s\"", ChrPtr(att->FileName));
                        serv_puts("Content-transfer-encoding: base64");
                        serv_puts("");
                        serv_write(encoded, encoded_strlen);
@@ -1508,10 +994,10 @@ void post_message(void)
        char buf[1024];
        StrBuf *encoded_subject = NULL;
        static long dont_post = (-1L);
-       wc_attachment *att;
+       wc_mime_attachment  *att;
        int is_anonymous = 0;
        const StrBuf *display_name = NULL;
-       struct wcsession *WCC = WC;
+       wcsession *WCC = WC;
        
        if (havebstr("force_room")) {
                gotoroom(bstr("force_room"));
@@ -1532,38 +1018,39 @@ void post_message(void)
 
                lprintf(9, "%s:%d: we are uploading %d bytes\n", __FILE__, __LINE__, WCC->upload_length);
                /** There's an attachment.  Save it to this struct... */
-               att = malloc(sizeof(wc_attachment));
-               memset(att, 0, sizeof(wc_attachment));
+               att = malloc(sizeof(wc_mime_attachment));
+               memset(att, 0, sizeof(wc_mime_attachment ));
                att->length = WCC->upload_length;
-               att->content_type = NewStrBufPlain(WCC->upload_content_type, -1);
-               att->filename = NewStrBufPlain(WCC->upload_filename, -1);
+               att->ContentType = NewStrBufPlain(WCC->upload_content_type, -1);
+               att->FileName = NewStrBufPlain(WCC->upload_filename, -1);
                
                
                if (WCC->attachments == NULL)
                        WCC->attachments = NewHash(1, NULL);
                /* And add it to the list. */
                n = snprintf(N, sizeof N, "%d", GetCount(WCC->attachments) + 1);
-               Put(WCC->attachments, N, n, att, free_attachment);
+               Put(WCC->attachments, N, n, att, DestroyMime);
 
                /**
                 * Mozilla sends a simple filename, which is what we want,
                 * but Satan's Browser sends an entire pathname.  Reduce
                 * the path to just a filename if we need to.
                 */
-               pch = strrchr(ChrPtr(att->filename), '/');
+               pch = strrchr(ChrPtr(att->FileName), '/');
                if (pch != NULL) {
-                       StrBufCutLeft(att->filename, pch - ChrPtr(att->filename));
+                       StrBufCutLeft(att->FileName, pch - ChrPtr(att->FileName));
                }
-               pch = strrchr(ChrPtr(att->filename), '\\');
+               pch = strrchr(ChrPtr(att->FileName), '\\');
                if (pch != NULL) {
-                       StrBufCutLeft(att->filename, pch - ChrPtr(att->filename));
+                       StrBufCutLeft(att->FileName, pch - ChrPtr(att->FileName));
                }
 
                /**
                 * Transfer control of this memory from the upload struct
                 * to the attachment struct.
                 */
-               att->data = WCC->upload;
+               att->Data = NewStrBufPlain(WCC->upload, WCC->upload_length);
+               free(WCC->upload);
                WCC->upload_length = 0;
                WCC->upload = NULL;
                display_enter();
@@ -1637,7 +1124,7 @@ void post_message(void)
                             ChrPtr(references));
                FreeStrBuf(&references);
 
-               lprintf(9, "%s\n", CmdBuf);
+               lprintf(9, "%s\n", ChrPtr(CmdBuf));
                serv_puts(ChrPtr(CmdBuf));
                serv_getln(buf, sizeof buf);
                FreeStrBuf(&CmdBuf);
@@ -1682,7 +1169,7 @@ void post_message(void)
         *  Otherwise, just go to the "read messages" loop.
         */
        else {
-               readloop("readnew");
+               readloop(readnew);
        }
 }
 
@@ -1697,13 +1184,11 @@ void display_enter(void)
        char buf[SIZ];
        long now;
        const StrBuf *display_name = NULL;
-       /////wc_attachment *att;
        int recipient_required = 0;
        int subject_required = 0;
        int recipient_bad = 0;
        int is_anonymous = 0;
-
-       struct wcsession *WCC = WC;
+       wcsession *WCC = WC;
 
        now = time(NULL);
 
@@ -1726,7 +1211,7 @@ void display_enter(void)
        }
        else if (buf[0] != '2') {               /** Any other error means that we cannot continue */
                sprintf(WCC->ImportantMessage, "%s", &buf[4]);
-               readloop("readnew");
+               readloop(readnew);
                return;
        }
 
@@ -1843,7 +1328,7 @@ void delete_msg(void)
        serv_getln(buf, sizeof buf);
        sprintf(WC->ImportantMessage, "%s", &buf[4]);
 
-       readloop("readnew");
+       readloop(readnew);
 }
 
 
@@ -1866,7 +1351,7 @@ void move_msg(void)
                sprintf(WC->ImportantMessage, (_("The message was not moved.")));
        }
 
-       readloop("readnew");
+       readloop(readnew);
 }
 
 
@@ -1926,26 +1411,178 @@ void confirm_move_msg(void)
        wDumpContent(1);
 }
 
-void readnew(void) { readloop("readnew");}
-void readold(void) { readloop("readold");}
-void readfwd(void) { readloop("readfwd");}
-void headers(void) { readloop("headers");}
-void do_search(void) { readloop("do_search");}
+
+/*
+ * Generic function to output an arbitrary MIME attachment from
+ * message being composed
+ *
+ * partnum             The MIME part to be output
+ * filename            Fake filename to give
+ * force_download      Nonzero to force set the Content-Type: header to "application/octet-stream"
+ */
+void postpart(StrBuf *partnum, StrBuf *filename, int force_download)
+{
+       void *vPart;
+       StrBuf *content_type;
+       wc_mime_attachment *part;
+       
+       if (GetHash(WC->attachments, SKEY(partnum), &vPart) &&
+           (vPart != NULL)) {
+               part = (wc_mime_attachment*) vPart;
+               if (force_download) {
+                       content_type = NewStrBufPlain(HKEY("application/octet-stream"));
+               }
+               else {
+                       content_type = NewStrBufDup(part->ContentType);
+               }
+               output_headers(0, 0, 0, 0, 0, 0);
+               StrBufAppendBuf(WC->WBuf, part->Data, 0);
+               http_transmit_thing(ChrPtr(content_type), 0);
+       } else {
+               hprintf("HTTP/1.1 404 %s\n", ChrPtr(partnum));
+               output_headers(0, 0, 0, 0, 0, 0);
+               hprintf("Content-Type: text/plain\r\n");
+               wprintf(_("An error occurred while retrieving this part: %s/%s\n"), 
+                       ChrPtr(partnum), ChrPtr(filename));
+               end_burst();
+       }
+       FreeStrBuf(&content_type);
+}
+
+
+/*
+ * Generic function to output an arbitrary MIME part from an arbitrary
+ * message number on the server.
+ *
+ * msgnum              Number of the item on the citadel server
+ * partnum             The MIME part to be output
+ * force_download      Nonzero to force set the Content-Type: header to "application/octet-stream"
+ */
+void mimepart(const char *msgnum, const char *partnum, int force_download)
+{
+       char buf[256];
+       off_t bytes;
+       char content_type[256];
+       
+       serv_printf("OPNA %s|%s", msgnum, partnum);
+       serv_getln(buf, sizeof buf);
+       if (buf[0] == '2') {
+               bytes = extract_long(&buf[4], 0);
+               if (force_download) {
+                       strcpy(content_type, "application/octet-stream");
+               }
+               else {
+                       extract_token(content_type, &buf[4], 3, '|', sizeof content_type);
+               }
+               output_headers(0, 0, 0, 0, 0, 0);
+
+               read_server_binary(WC->WBuf, bytes);
+               serv_puts("CLOS");
+               serv_getln(buf, sizeof buf);
+               http_transmit_thing(content_type, 0);
+       } else {
+               hprintf("HTTP/1.1 404 %s\n", &buf[4]);
+               output_headers(0, 0, 0, 0, 0, 0);
+               hprintf("Content-Type: text/plain\r\n");
+               wprintf(_("An error occurred while retrieving this part: %s\n"), &buf[4]);
+               end_burst();
+       }
+}
+
+
+/*
+ * Read any MIME part of a message, from the server, into memory.
+ */
+char *load_mimepart(long msgnum, char *partnum)
+{
+       char buf[SIZ];
+       off_t bytes;
+       char content_type[SIZ];
+       char *content;
+       
+       serv_printf("DLAT %ld|%s", msgnum, partnum);
+       serv_getln(buf, sizeof buf);
+       if (buf[0] == '6') {
+               bytes = extract_long(&buf[4], 0);
+               extract_token(content_type, &buf[4], 3, '|', sizeof content_type);
+
+               content = malloc(bytes + 2);
+               serv_read(content, bytes);
+
+               content[bytes] = 0;     /* null terminate for good measure */
+               return(content);
+       }
+       else {
+               return(NULL);
+       }
+}
+
+/*
+ * Read any MIME part of a message, from the server, into memory.
+ */
+void MimeLoadData(wc_mime_attachment *Mime)
+{
+       char buf[SIZ];
+       off_t bytes;
+//// TODO: is there a chance the contenttype is different  to the one we know? 
+       serv_printf("DLAT %ld|%s", Mime->msgnum, ChrPtr(Mime->PartNum));
+       serv_getln(buf, sizeof buf);
+       if (buf[0] == '6') {
+               bytes = extract_long(&buf[4], 0);
+
+               if (Mime->Data == NULL)
+                       Mime->Data = NewStrBufPlain(NULL, bytes);
+               StrBuf_ServGetBLOB(Mime->Data, bytes);
+
+       }
+       else {
+               FlushStrBuf(Mime->Data);
+               /// TODO XImportant message
+       }
+}
+
+
 
 
+void view_mimepart(void) {
+       mimepart(ChrPtr(WC->UrlFragment2),
+                ChrPtr(WC->UrlFragment3),
+                0);
+}
 
+void download_mimepart(void) {
+       mimepart(ChrPtr(WC->UrlFragment2),
+                ChrPtr(WC->UrlFragment3),
+                1);
+}
 
+void view_postpart(void) {
+       postpart(WC->UrlFragment2,
+                WC->UrlFragment3,
+                0);
+}
+
+void download_postpart(void) {
+       postpart(WC->UrlFragment2,
+                WC->UrlFragment3,
+                1);
+}
 
+void h_readnew(void) { readloop(readnew);}
+void h_readold(void) { readloop(readold);}
+void h_readfwd(void) { readloop(readfwd);}
+void h_headers(void) { readloop(headers);}
+void h_do_search(void) { readloop(do_search);}
 
 void 
 InitModule_MSG
 (void)
 {
-       WebcitAddUrlHandler(HKEY("readnew"), readnew, 0);
-       WebcitAddUrlHandler(HKEY("readold"), readold, 0);
-       WebcitAddUrlHandler(HKEY("readfwd"), readfwd, 0);
-       WebcitAddUrlHandler(HKEY("headers"), headers, 0);
-       WebcitAddUrlHandler(HKEY("do_search"), do_search, 0);
+       WebcitAddUrlHandler(HKEY("readnew"), h_readnew, NEED_URL);
+       WebcitAddUrlHandler(HKEY("readold"), h_readold, NEED_URL);
+       WebcitAddUrlHandler(HKEY("readfwd"), h_readfwd, NEED_URL);
+       WebcitAddUrlHandler(HKEY("headers"), h_headers, NEED_URL);
+       WebcitAddUrlHandler(HKEY("do_search"), h_do_search, 0);
        WebcitAddUrlHandler(HKEY("display_enter"), display_enter, 0);
        WebcitAddUrlHandler(HKEY("post"), post_message, 0);
        WebcitAddUrlHandler(HKEY("move_msg"), move_msg, 0);
@@ -1956,6 +1593,10 @@ InitModule_MSG
        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 ;
 }