more doxygen doku.
[citadel.git] / webcit / messages.c
index 94ea1a165cb5cb69612e58dfe3fd2b614a985a02..98837f1779841b4d5ea8492d65e6c9eb854b823f 100644 (file)
@@ -1,29 +1,37 @@
 /*
  * $Id$
- *
- * Functions which deal with the fetching and displaying of messages.
+ */
+/**
+ * \defgroup MsgDisp Functions which deal with the fetching and displaying of messages.
  *
  */
-
+/*@{*/
 #include "webcit.h"
 #include "vcard.h"
 #include "webserver.h"
 #include "groupdav.h"
 
+#define SUBJ_COL_WIDTH_PCT                 50 /**< ??? */
+#define SENDER_COL_WIDTH_PCT           30 /**< ??? */
+#define DATE_PLUS_BUTTONS_WIDTH_PCT    20 /**< ??? */
 
-/* Address book entry (keep it short and sweet, it's just a quickie lookup
+/**
+ * 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];
-       long ab_msgnum;
+       char ab_name[64]; /**< name string */
+       long ab_msgnum;   /**< number in the citadel???? */
 };
 
 
 
 #ifdef HAVE_ICONV
-/* Handle subjects with RFC2047 encoding, such as:
+/**
+ * \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;
@@ -32,12 +40,12 @@ void utf8ify_rfc822_string(char *buf) {
        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       */
+       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;
 
        while (start=strstr(buf, "=?"), end=strstr(buf, "?="),
@@ -53,14 +61,14 @@ void utf8ify_rfc822_string(char *buf) {
 
                ibuf = malloc(1024);
                isav = ibuf;
-               if (!strcasecmp(encoding, "B")) {       /* base64 */
+               if (!strcasecmp(encoding, "B")) {       /**< base64 */
                        ibuflen = CtdlDecodeBase64(ibuf, istr, strlen(istr));
                }
-               else if (!strcasecmp(encoding, "Q")) {  /* quoted-printable */
+               else if (!strcasecmp(encoding, "Q")) {  /**< quoted-printable */
                        ibuflen = CtdlDecodeQuotedPrintable(ibuf, istr, strlen(istr));
                }
                else {
-                       strcpy(ibuf, istr);             /* huh? */
+                       strcpy(ibuf, istr);             /**< huh? */
                        ibuflen = strlen(istr);
                }
 
@@ -103,7 +111,8 @@ void utf8ify_rfc822_string(char *buf) {
 
                free(isav);
 
-               /* Since spammers will go to all sorts of absurd lengths to get their
+               /**
+                * 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.
@@ -116,9 +125,10 @@ void utf8ify_rfc822_string(char *buf) {
 #endif
 
 
-/*
- * Look for URL's embedded in a buffer and make them linkable.  We use a
+/**
+ * \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(buf)
 char buf[];
@@ -162,7 +172,7 @@ char buf[];
        urlbuf[end - start] = 0;
 
        strncpy(outbuf, buf, start);
-       sprintf(&outbuf[start], "%cA HREF=%c%s%c TARGET=%c%s%c%c%s%c/A%c",
+       sprintf(&outbuf[start], "%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, &buf[end]);
        if ( strlen(outbuf) < 250 )
@@ -170,8 +180,9 @@ char buf[];
 }
 
 
-/*
- * Turn a vCard "n" (name) field into something displayable.
+/**
+ * \brief Turn a vCard "n" (name) field into something displayable.
+ * \param name the name field to convert
  */
 void vcard_n_prettyize(char *name)
 {
@@ -205,10 +216,14 @@ void vcard_n_prettyize(char *name)
 
 
 
-/* display_vcard() calls this after parsing the textual vCard into
+/**
+ * \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;
@@ -225,7 +240,9 @@ void fetchname_parsed_vcard(struct vCard *v, char *storename) {
 
 
 
-/* display_vcard() calls this after parsing the textual vCard into
+/**
+ * \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
@@ -236,6 +253,8 @@ void fetchname_parsed_vcard(struct vCard *v, char *storename) {
  * 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;
@@ -247,13 +266,13 @@ void display_parsed_vcard(struct vCard *v, int full) {
        char firsttoken[SIZ];
        int pass;
 
-       char displayname[SIZ];
+       char fullname[SIZ];
        char title[SIZ];
        char org[SIZ];
        char phone[SIZ];
        char mailto[SIZ];
 
-       strcpy(displayname, "");
+       strcpy(fullname, "");
        strcpy(phone, "");
        strcpy(mailto, "");
        strcpy(title, "");
@@ -266,9 +285,9 @@ void display_parsed_vcard(struct vCard *v, int full) {
                        escputs(name);
                }
                else if (name = vcard_get_prop(v, "n", 1, 0, 0), name != NULL) {
-                       strcpy(displayname, name);
-                       vcard_n_prettyize(displayname);
-                       escputs(displayname);
+                       strcpy(fullname, name);
+                       vcard_n_prettyize(fullname);
+                       escputs(fullname);
                }
                else {
                        wprintf("&nbsp;");
@@ -314,27 +333,27 @@ void display_parsed_vcard(struct vCard *v, int full) {
                                thisvalue = strdup(v->prop[i].value);
                        }
        
-                       /*** Various fields we may encounter ***/
+                       /** Various fields we may encounter ***/
        
-                       /* N is name, but only if there's no FN already there */
+                       /** N is name, but only if there's no FN already there */
                        if (!strcasecmp(firsttoken, "n")) {
-                               if (strlen(displayname) == 0) {
-                                       strcpy(displayname, thisvalue);
-                                       vcard_n_prettyize(displayname);
+                               if (strlen(fullname) == 0) {
+                                       strcpy(fullname, thisvalue);
+                                       vcard_n_prettyize(fullname);
                                }
                        }
        
-                       /* FN (full name) is a true 'display name' field */
+                       /** FN (full name) is a true 'display name' field */
                        else if (!strcasecmp(firsttoken, "fn")) {
-                               strcpy(displayname, thisvalue);
+                               strcpy(fullname, thisvalue);
                        }
 
-                       /* title */
+                       /** title */
                        else if (!strcasecmp(firsttoken, "title")) {
                                strcpy(title, thisvalue);
                        }
        
-                       /* organization */
+                       /** organization */
                        else if (!strcasecmp(firsttoken, "org")) {
                                strcpy(org, thisvalue);
                        }
@@ -342,10 +361,10 @@ void display_parsed_vcard(struct vCard *v, int full) {
                        else if (!strcasecmp(firsttoken, "email")) {
                                if (strlen(mailto) > 0) strcat(mailto, "<br />");
                                strcat(mailto,
-                                       "<A HREF=\"/display_enter"
+                                       "<a href=\"display_enter"
                                        "?force_room=_MAIL_?recp=");
 
-                               urlesc(&mailto[strlen(mailto)], displayname);
+                               urlesc(&mailto[strlen(mailto)], fullname);
                                urlesc(&mailto[strlen(mailto)], " <");
                                urlesc(&mailto[strlen(mailto)], thisvalue);
                                urlesc(&mailto[strlen(mailto)], ">");
@@ -419,9 +438,9 @@ void display_parsed_vcard(struct vCard *v, int full) {
                if (pass == 1) {
                        wprintf("<TR BGCOLOR=\"#AAAAAA\">"
                        "<TD COLSPAN=2 BGCOLOR=\"#FFFFFF\">"
-                       "<IMG ALIGN=CENTER SRC=\"/static/viewcontacts_48x.gif\">"
+                       "<IMG ALIGN=CENTER src=\"static/viewcontacts_48x.gif\">"
                        "<FONT SIZE=+1><B>");
-                       escputs(displayname);
+                       escputs(fullname);
                        wprintf("</B></FONT>");
                        if (strlen(title) > 0) {
                                wprintf("<div align=right>");
@@ -454,12 +473,16 @@ void display_parsed_vcard(struct vCard *v, int full) {
 
 
 
-/*
- * Display a textual vCard
+/**
+ * \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;
@@ -490,8 +513,11 @@ void display_vcard(char *vcard_source, char alpha, int full, char *storename) {
 }
 
 
-/*
- * I wanna SEE that message!  (Optional 'section' for encapsulated message/rfc822 submessage)
+/**
+ * \brief I wanna SEE that message!  
+ * \param msgnum the citadel number of the message to display
+ * \param printable_view are we doing a print view?
+ * \param section Optional for encapsulated message/rfc822 submessage)
  */
 void read_message(long msgnum, int printable_view, char *section) {
        char buf[SIZ];
@@ -520,11 +546,11 @@ void read_message(long msgnum, int printable_view, char *section) {
        char *part_source = NULL;
 #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       */
+       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, "");
@@ -548,27 +574,27 @@ void read_message(long msgnum, int printable_view, char *section) {
                return;
        }
 
-       /* begin everythingamundo table */
+       /** begin everythingamundo table */
        if (!printable_view) {
-               wprintf("<div id=\"fix_scrollbar_bug\">\n");
+               wprintf("<div class=\"fix_scrollbar_bug\">\n");
                wprintf("<table width=100%% border=1 cellspacing=0 "
                        "cellpadding=0><TR><TD>\n");
        }
 
-       /* begin message header table */
-       wprintf("<TABLE WIDTH=100%% BORDER=0 CELLSPACING=0 "
-               "CELLPADDING=1 BGCOLOR=\"#CCCCCC\"><TR><TD>\n");
+       /** begin message header table */
+       wprintf("<table width=100%% border=0 cellspacing=0 "
+               "cellpadding=1 bgcolor=\"#CCCCCC\"><tr><td>\n");
 
-       wprintf("<SPAN CLASS=\"message_header\">");
+       wprintf("<span 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("<i>");
                        wprintf(_("unexpected end of message"));
-                       wprintf("</I><br /><br />\n");
-                       wprintf("</SPAN>\n");
+                       wprintf("</i><br /><br />\n");
+                       wprintf("</span>\n");
                        return;
                }
                if (!strncasecmp(buf, "nhdr=yes", 8))
@@ -580,14 +606,14 @@ void read_message(long msgnum, int printable_view, char *section) {
                if (!strncasecmp(buf, "from=", 5)) {
                        strcpy(from, &buf[5]);
                        wprintf(_("from "));
-                       wprintf("<A HREF=\"/showuser?who=");
+                       wprintf("<a href=\"showuser?who=");
 #ifdef HAVE_ICONV
                        utf8ify_rfc822_string(from);
 #endif
                        urlescputs(from);
                        wprintf("\">");
                        escputs(from);
-                       wprintf("</A> ");
+                       wprintf("</a> ");
                }
                if (!strncasecmp(buf, "subj=", 5)) {
                        safestrncpy(m_subject, &buf[5], sizeof m_subject);
@@ -599,7 +625,6 @@ void read_message(long msgnum, int printable_view, char *section) {
                        }
                        safestrncpy(&reply_all[strlen(reply_all)], &buf[5],
                                (sizeof reply_all - strlen(reply_all)) );
-                       lprintf(9, "REPLY_ALL: %s\n", reply_all);       // FIXME
                }
                if ((!strncasecmp(buf, "hnod=", 5))
                    && (strcasecmp(&buf[5], serv_info.serv_humannode))) {
@@ -660,18 +685,18 @@ void read_message(long msgnum, int printable_view, char *section) {
                           && (!strncasecmp(mime_content_type, "image/", 6)) ){
                                snprintf(&mime_http[strlen(mime_http)],
                                        (sizeof(mime_http) - strlen(mime_http) - 1),
-                                       "<IMG SRC=\"/mimepart/%ld/%s/%s\">",
+                                       "<img src=\"mimepart/%ld/%s/%s\">",
                                        msgnum, mime_partnum, mime_filename);
                        }
                        else if ( (!strcasecmp(mime_disposition, "attachment")) 
                             || (!strcasecmp(mime_disposition, "inline")) ) {
                                snprintf(&mime_http[strlen(mime_http)],
                                        (sizeof(mime_http) - strlen(mime_http) - 1),
-                                       "<A HREF=\"/mimepart/%ld/%s/%s\" "
-                                       "TARGET=\"wc.%ld.%s\">"
-                                       "<IMG SRC=\"/static/diskette_24x.gif\" "
-                                       "BORDER=0 ALIGN=MIDDLE>\n"
-                                       "%s (%s, %d bytes)</A><br />\n",
+                                       "<a href=\"mimepart/%ld/%s/%s\" "
+                                       "target=\"wc.%ld.%s\">"
+                                       "<img src=\"static/diskette_24x.gif\" "
+                                       "border=0 align=middle>\n"
+                                       "%s (%s, %d bytes)</a><br />\n",
                                        msgnum, mime_partnum, mime_filename,
                                        msgnum, mime_partnum,
                                        mime_filename,
@@ -679,7 +704,7 @@ void read_message(long msgnum, int printable_view, char *section) {
                                );
                        }
 
-                       /*** begin handler prep ***/
+                       /** begin handler prep ***/
                        if (!strcasecmp(mime_content_type, "text/x-vcard")) {
                                strcpy(vcard_partnum, mime_partnum);
                        }
@@ -688,13 +713,13 @@ void read_message(long msgnum, int printable_view, char *section) {
                                strcpy(cal_partnum, mime_partnum);
                        }
 
-                       /*** end handler prep ***/
+                       /** end handler prep ***/
 
                }
 
        }
 
-       /* Generate a reply-to address */
+       /** Generate a reply-to address */
        if (strlen(rfca) > 0) {
                strcpy(reply_to, rfca);
        }
@@ -714,64 +739,68 @@ void read_message(long msgnum, int printable_view, char *section) {
                wprintf("****");
        }
 
-       wprintf("</SPAN>");
+       wprintf("</span>");
 #ifdef HAVE_ICONV
        utf8ify_rfc822_string(m_cc);
        utf8ify_rfc822_string(m_subject);
 #endif
        if (strlen(m_cc) > 0) {
                wprintf("<br />"
-                       "<SPAN CLASS=\"message_subject\">");
+                       "<span class=\"message_subject\">");
                wprintf(_("CC:"));
                wprintf(" ");
                escputs(m_cc);
-               wprintf("</SPAN>");
+               wprintf("</span>");
        }
        if (strlen(m_subject) > 0) {
                wprintf("<br />"
-                       "<SPAN CLASS=\"message_subject\">");
+                       "<span class=\"message_subject\">");
                wprintf(_("Subject:"));
                wprintf(" ");
                escputs(m_subject);
-               wprintf("</SPAN>");
+               wprintf("</span>");
        }
-       wprintf("</TD>\n");
+       wprintf("</td>\n");
 
-       /* start msg buttons */
+       /** start msg buttons */
        if (!printable_view) {
-               wprintf("<td align=right>\n");
+               wprintf("<td align=right><span class=\"msgbuttons\">\n");
 
-               /* Reply */
+               /** Reply */
                if ( (WC->wc_view == VIEW_MAILBOX) || (WC->wc_view == VIEW_BBS) ) {
-                       wprintf("<a href=\"/display_enter");
+                       wprintf("<a href=\"display_enter");
                        if (WC->is_mailbox) {
                                wprintf("?replyquote=%ld", msgnum);
                        }
                        wprintf("?recp=");
                        urlescputs(reply_to);
-                       wprintf("?subject=");
-                       if (strncasecmp(m_subject, "Re:", 3)) wprintf("Re:%20");
-                       urlescputs(m_subject);
+                       if (strlen(m_subject) > 0) {
+                               wprintf("?subject=");
+                               if (strncasecmp(m_subject, "Re:", 3)) wprintf("Re:%20");
+                               urlescputs(m_subject);
+                       }
                        wprintf("\">[%s]</a> ", _("Reply"));
                }
 
-               /* ReplyQuoted */
+               /** ReplyQuoted */
                if ( (WC->wc_view == VIEW_MAILBOX) || (WC->wc_view == VIEW_BBS) ) {
                        if (!WC->is_mailbox) {
-                               wprintf("<a href=\"/display_enter");
+                               wprintf("<a href=\"display_enter");
                                wprintf("?replyquote=%ld", msgnum);
                                wprintf("?recp=");
                                urlescputs(reply_to);
-                               wprintf("?subject=");
-                               if (strncasecmp(m_subject, "Re:", 3)) wprintf("Re:%20");
-                               urlescputs(m_subject);
+                               if (strlen(m_subject) > 0) {
+                                       wprintf("?subject=");
+                                       if (strncasecmp(m_subject, "Re:", 3)) wprintf("Re:%20");
+                                       urlescputs(m_subject);
+                               }
                                wprintf("\">[%s]</a> ", _("ReplyQuoted"));
                        }
                }
 
-               /* ReplyAll */
+               /** ReplyAll */
                if (WC->wc_view == VIEW_MAILBOX) {
-                       wprintf("<a href=\"/display_enter");
+                       wprintf("<a href=\"display_enter");
                        wprintf("?replyquote=%ld", msgnum);
                        wprintf("?recp=");
                        urlescputs(reply_to);
@@ -785,48 +814,54 @@ void read_message(long msgnum, int printable_view, char *section) {
                        wprintf("\">[%s]</a> ", _("ReplyAll"));
                }
 
-               /* Forward */
+               /** Forward */
                if (WC->wc_view == VIEW_MAILBOX) {
-                       wprintf("<a href=\"/display_enter?fwdquote=%ld?subject=", msgnum);
+                       wprintf("<a href=\"display_enter?fwdquote=%ld?subject=", msgnum);
                        if (strncasecmp(m_subject, "Fwd:", 4)) wprintf("Fwd:%20");
                        urlescputs(m_subject);
                        wprintf("\">[%s]</a> ", _("Forward"));
                }
 
-               /* If this is one of my own rooms, or if I'm an Aide or Room Aide, I can move/delete */
+               /** 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) ) {
-                       /* Move */
-                       wprintf("<a href=\"/confirm_move_msg?msgid=%ld\">[%s]</a> ",
+                       /** Move */
+                       wprintf("<a href=\"confirm_move_msg?msgid=%ld\">[%s]</a> ",
                                msgnum, _("Move"));
        
-                       /* Delete */
-                       wprintf("<a href=\"/delete_msg?msgid=%ld\" "
+                       /** Delete */
+                       wprintf("<a href=\"delete_msg?msgid=%ld\" "
                                "onClick=\"return confirm('%s');\">"
                                "[%s]</a> ", msgnum, _("Delete this message?"), _("Delete")
                        );
                }
 
-               wprintf("<a href=\"#\" onClick=\"window.open('/printmsg?msgnum=%ld', 'print%ld', 'toolbar=no,location=no,directories=no,copyhistory=no,status=yes,scrollbars=yes,resizable=yes,width=600,height=400'); \" >"
+               /** 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'); \" >"
+                       "[%s]</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'); \" >"
                        "[%s]</a>", msgnum, msgnum, _("Print"));
 
-               wprintf("</td>");
+               wprintf("</span></td>");
        }
 
-       wprintf("</TR></TABLE>\n");
+       wprintf("</tr></table>\n");
 
-       /* Begin body */
-       wprintf("<TABLE BORDER=0 WIDTH=100%% BGCOLOR=#FFFFFF "
-               "CELLPADDING=1 CELLSPACING=0><TR><TD>");
+       /** Begin body */
+       wprintf("<table border=0 width=100%% bgcolor=\"#FFFFFF\" "
+               "cellpadding=1 cellspacing=0><tr><td>");
 
-       /* 
+       /**
         * Learn the content type
         */
        strcpy(mime_content_type, "text/plain");
        while (serv_getln(buf, sizeof buf), (strlen(buf) > 0)) {
                if (!strcmp(buf, "000")) {
-                       wprintf("<I>");
+                       wprintf("<i>");
                        wprintf(_("unexpected end of message"));
-                       wprintf("</I><br /><br />\n");
+                       wprintf("</i><br /><br />\n");
                        goto ENDBODY;
                }
                if (!strncasecmp(buf, "Content-type: ", 14)) {
@@ -846,7 +881,7 @@ void read_message(long msgnum, int printable_view, char *section) {
                }
        }
 
-       /* Set up a character set conversion if we need to (and if we can) */
+       /** 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"))
@@ -855,17 +890,18 @@ void read_message(long msgnum, int printable_view, char *section) {
        ) {
                ic = 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));
+                       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... */
+       /** 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... */
+       /** Boring old 80-column fixed format text gets handled this way... */
        else if ( (!strcasecmp(mime_content_type, "text/plain"))
                || (!strcasecmp(mime_content_type, "text")) ) {
                while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
@@ -889,39 +925,39 @@ void read_message(long msgnum, int printable_view, char *section) {
                        while ((strlen(buf) > 0) && (isspace(buf[strlen(buf) - 1])))
                                buf[strlen(buf) - 1] = 0;
                        if ((bq == 0) &&
-                       ((!strncmp(buf, ">", 1)) || (!strncmp(buf, " >", 2)) || (!strncmp(buf, " :-)", 4)))) {
-                               wprintf("<BLOCKQUOTE>");
+                       ((!strncmp(buf, ">", 1)) || (!strncmp(buf, " >", 2)) )) {
+                               wprintf("<blockquote>");
                                bq = 1;
                        } else if ((bq == 1) &&
-                               (strncmp(buf, ">", 1)) && (strncmp(buf, " >", 2)) && (strncmp(buf, " :-)", 4))) {
-                               wprintf("</BLOCKQUOTE>");
+                               (strncmp(buf, ">", 1)) && (strncmp(buf, " >", 2)) ) {
+                               wprintf("</blockquote>");
                                bq = 0;
                        }
-                       wprintf("<TT>");
+                       wprintf("<tt>");
                        url(buf);
                        escputs(buf);
-                       wprintf("</TT><br />\n");
+                       wprintf("</tt><br />\n");
                }
-               wprintf("</I><br />");
+               wprintf("</i><br />");
        }
 
-       else /* HTML is fun, but we've got to strip it first */
+       else /** HTML is fun, but we've got to strip it first */
        if (!strcasecmp(mime_content_type, "text/html")) {
                output_html(mime_charset);
        }
 
-       /* Unknown weirdness */
+       /** 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")) { }
        }
 
-       /* If there are attached submessages, display them now... */
+       /** If there are attached submessages, display them now... */
        if ( (strlen(mime_submessages) > 0) && (!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 */
+                       /** use printable_view to suppress buttons */
                        wprintf("<blockquote>");
                        read_message(msgnum, 1, buf);
                        wprintf("</blockquote>");
@@ -929,33 +965,33 @@ void read_message(long msgnum, int printable_view, char *section) {
        }
 
 
-       /* Afterwards, offer links to download attachments 'n' such */
+       /** Afterwards, offer links to download attachments 'n' such */
        if ( (strlen(mime_http) > 0) && (!section[0]) ) {
                wprintf("%s", mime_http);
        }
 
-       /* Handler for vCard parts */
+       /** Handler for vCard parts */
        if (strlen(vcard_partnum) > 0) {
                part_source = load_mimepart(msgnum, vcard_partnum);
                if (part_source != NULL) {
 
-                       /* If it's my vCard I can edit it */
+                       /** 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?"
+                               wprintf("<a href=\"edit_vcard?"
                                        "msgnum=%ld?partnum=%s\">",
                                        msgnum, vcard_partnum);
-                               wprintf("[%s]</A>", _("edit"));
+                               wprintf("[%s]</a>", _("edit"));
                        }
 
-                       /* In all cases, display the full card */
+                       /** In all cases, display the full card */
                        display_vcard(part_source, 0, 1, NULL);
                }
        }
 
-       /* Handler for calendar parts */
+       /** Handler for calendar parts */
        if (strlen(cal_partnum) > 0) {
                part_source = load_mimepart(msgnum, cal_partnum);
                if (part_source != NULL) {
@@ -970,11 +1006,11 @@ void read_message(long msgnum, int printable_view, char *section) {
        }
 
 ENDBODY:
-       wprintf("</TD></TR></TABLE>\n");
+       wprintf("</td></tr></table>\n");
 
-       /* end everythingamundo table */
+       /** end everythingamundo table */
        if (!printable_view) {
-               wprintf("</TD></TR></TABLE>\n");
+               wprintf("</td></tr></table>\n");
                wprintf("</div><br />\n");
        }
 
@@ -987,27 +1023,29 @@ ENDBODY:
 
 
 
-/*
- * Unadorned HTML output of an individual message, suitable
+/**
+ * \brief Unadorned HTML output of an individual message, suitable
  * for placing in a hidden iframe, for printing, or whatever
+ * \param msgnum_as_string the message to embed???
  */
-void embed_message(void) {
+void embed_message(char *msgnum_as_string) {
        long msgnum = 0L;
 
-       msgnum = atol(bstr("msgnum"));
+       msgnum = atol(msgnum_as_string);
        begin_ajax_response();
        read_message(msgnum, 0, "");
        end_ajax_response();
 }
 
 
-/*
- * Printable view of a message
+/**
+ * \brief Printable view of a message
+ * \param msgnum_as_string the message to print??? 
  */
-void print_message(void) {
+void print_message(char *msgnum_as_string) {
        long msgnum = 0L;
 
-       msgnum = atol(bstr("msgnum"));
+       msgnum = atol(msgnum_as_string);
        output_headers(0, 0, 0, 0, 0, 0);
 
        wprintf("Content-type: text/html\r\n"
@@ -1029,13 +1067,45 @@ void print_message(void) {
 
 
 
-/*
- * Read message in simple, JavaScript-embeddable form for 'forward'
+/**
+ * \brief Display a message's headers
+ * \param msgnum_as_string the message headers to print???
+ */
+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",
+               SERVER);
+       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 the citadel message number
+ * \param forward_attachments atachment to forward???
  */
 void pullquote_message(long msgnum, int forward_attachments) {
        char buf[SIZ];
@@ -1061,11 +1131,11 @@ void pullquote_message(long msgnum, int forward_attachments) {
        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       */
+       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, "");
@@ -1144,7 +1214,7 @@ void pullquote_message(long msgnum, int forward_attachments) {
                        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.
                 */
@@ -1169,12 +1239,12 @@ void pullquote_message(long msgnum, int forward_attachments) {
                wprintf("<br />");
        }
 
-       /*
+       /**
         * Begin body
         */
        wprintf("<br>");
 
-       /* 
+       /**
         * Learn the content type
         */
        strcpy(mime_content_type, "text/plain");
@@ -1200,7 +1270,7 @@ void pullquote_message(long msgnum, int forward_attachments) {
                }
        }
 
-       /* Set up a character set conversion if we need to (and if we can) */
+       /** 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"))
@@ -1208,12 +1278,13 @@ void pullquote_message(long msgnum, int forward_attachments) {
        ) {
                ic = iconv_open("UTF-8", mime_charset);
                if (ic == (iconv_t)(-1) ) {
-                       lprintf(5, "%s:%d iconv_open() failed: %s\n", __FILE__, __LINE__, strerror(errno));
+                       lprintf(5, "%s:%d iconv_open() failed: %s\n",
+                               __FILE__, __LINE__, strerror(errno));
                }
        }
 #endif
 
-       /* Messages in legacy Citadel variformat get handled thusly... */
+       /** Messages in legacy Citadel variformat get handled thusly... */
        if (!strcasecmp(mime_content_type, "text/x-citadel-variformat")) {
                pullquote_fmout();
        }
@@ -1241,36 +1312,36 @@ void pullquote_message(long msgnum, int forward_attachments) {
                        while ((strlen(buf) > 0) && (isspace(buf[strlen(buf) - 1])))
                                buf[strlen(buf) - 1] = 0;
                        if ((bq == 0) &&
-                       ((!strncmp(buf, ">", 1)) || (!strncmp(buf, " >", 2)) || (!strncmp(buf, " :-)", 4)))) {
-                               wprintf("<BLOCKQUOTE>");
+                       ((!strncmp(buf, ">", 1)) || (!strncmp(buf, " >", 2)) )) {
+                               wprintf("<blockquote>");
                                bq = 1;
                        } else if ((bq == 1) &&
-                               (strncmp(buf, ">", 1)) && (strncmp(buf, " >", 2)) && (strncmp(buf, " :-)", 4))) {
-                               wprintf("</BLOCKQUOTE>");
+                               (strncmp(buf, ">", 1)) && (strncmp(buf, " >", 2)) ) {
+                               wprintf("</blockquote>");
                                bq = 0;
                        }
-                       wprintf("<TT>");
+                       wprintf("<tt>");
                        url(buf);
                        msgescputs(buf);
-                       wprintf("</TT><br />");
+                       wprintf("</tt><br />");
                }
-               wprintf("</I><br />");
+               wprintf("</i><br />");
        }
 
-       /* HTML just gets escaped and stuffed back into the editor */
+       /** 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")) {
                        msgescputs(buf);
                }
        }
 
-       /* Unknown weirdness ... don't know how to handle this content type */
+       /** 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 */
+       /** end of body handler */
 
        /*
         * If there were attachments, we have to download them and insert them
@@ -1329,48 +1400,43 @@ ENDBODY:
 #endif
 }
 
-
-
-
-
-
+/**
+ * \brief display sumarized item???
+ * \param num hom many? which???
+ */
 void display_summarized(int num) {
        char datebuf[64];
 
-       wprintf("<tr bgcolor=\"#%s\" ",
-               ((num % 2) ? "DDDDDD" : "FFFFFF")
+       wprintf("<tr id=\"m%ld\" style=\"width:100%%;font-weight:%s;background-color:#ffffff\" "
+               "onMouseDown=\"CtdlMoveMsgMouseDown(event,%ld)\">",
+               WC->summ[num].msgnum,
+               (WC->summ[num].is_new ? "bold" : "normal"),
+               WC->summ[num].msgnum
        );
 
-       wprintf("onClick=\" new Ajax.Updater('preview_pane', '/msg', { method: 'get', parameters: 'msgnum=%ld' } ); \" ", WC->summ[num].msgnum);
-       wprintf(">");
-
-       wprintf("<TD>");
-       if (WC->summ[num].is_new) wprintf("<B>");
+       wprintf("<td width=%d%%>", SUBJ_COL_WIDTH_PCT);
        escputs(WC->summ[num].subj);
-       if (WC->summ[num].is_new) wprintf("</B>");
-       wprintf("</TD><TD>");
-       if (WC->summ[num].is_new) wprintf("<B>");
+       wprintf("</td>");
+
+       wprintf("<td width=%d%%>", SENDER_COL_WIDTH_PCT);
        escputs(WC->summ[num].from);
-       if (WC->summ[num].is_new) wprintf("</B>");
-       wprintf(" </TD><TD>");
-       if (WC->summ[num].is_new) wprintf("<B>");
+       wprintf("</td>");
+
+       wprintf("<td width=%d%%>", DATE_PLUS_BUTTONS_WIDTH_PCT);
        fmt_date(datebuf, WC->summ[num].date, 1);       /* brief */
        escputs(datebuf);
-       if (WC->summ[num].is_new) wprintf("</B>");
-       wprintf(" </TD>");
-       wprintf("<TD>"
-               "<INPUT TYPE=\"checkbox\" NAME=\"msg_%ld\" VALUE=\"yes\">"
-               "</TD>",
-               WC->summ[num].msgnum
-       );
+       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];
@@ -1409,18 +1475,18 @@ void display_addressbook(long msgnum, char alpha) {
                vcard_source = load_mimepart(msgnum, vcard_partnum);
                if (vcard_source != NULL) {
 
-                       /* Display the summary line */
+                       /** Display the summary line */
                        display_vcard(vcard_source, alpha, 0, NULL);
 
-                       /* If it's my vCard I can edit it */
+                       /** 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?"
+                               wprintf("<a href=\"edit_vcard?"
                                        "msgnum=%ld?partnum=%s\">",
                                        msgnum, vcard_partnum);
-                               wprintf("[%s]</A>", _("edit"));
+                               wprintf("[%s]</a>", _("edit"));
                        }
 
                        free(vcard_source);
@@ -1431,8 +1497,9 @@ void display_addressbook(long msgnum, char alpha) {
 
 
 
-/* If it's an old "Firstname Lastname" style record, try to
- * convert it.
+/**
+ * \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];
@@ -1451,7 +1518,11 @@ void lastfirst_firstlast(char *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];
@@ -1470,7 +1541,7 @@ void fetch_ab_name(long msgnum, char *namebuf) {
        memset(&summ, 0, sizeof(summ));
        safestrncpy(summ.subj, "(no subject)", sizeof summ.subj);
 
-       sprintf(buf, "MSG0 %ld|1", msgnum);     /* ask for headers only */
+       sprintf(buf, "MSG0 %ld|1", msgnum);     /** ask for headers only */
        serv_puts(buf);
        serv_getln(buf, sizeof buf);
        if (buf[0] != '1') return;
@@ -1511,8 +1582,10 @@ void fetch_ab_name(long msgnum, char *namebuf) {
 
 
 
-/*
- * Record compare function for sorting address book indices
+/**
+ * \brief Record compare function for sorting address book indices
+ * \param ab1 adressbook one
+ * \param ab2 adressbook two
  */
 int abcmp(const void *ab1, const void *ab2) {
        return(strcasecmp(
@@ -1522,9 +1595,11 @@ int abcmp(const void *ab1, const void *ab2) {
 }
 
 
-/*
- * Helper function for do_addrbook_view()
+/**
+ * \brief Helper function for do_addrbook_view()
  * Converts a name into a three-letter tab label
+ * \param tabbuf the tabbuffer to add name to
+ * \param name the name to add to the tabbuffer
  */
 void nametab(char *tabbuf, char *name) {
        stresc(tabbuf, name, 0, 0);
@@ -1535,8 +1610,10 @@ void nametab(char *tabbuf, char *name) {
 }
 
 
-/*
- * Render the address book using info we gathered during the scan
+/**
+ * \brief Render the address book using info we gathered during the scan
+ * \param addrbook the addressbook to render
+ * \param num_ab the number of the addressbook
  */
 void do_addrbook_view(struct addrbookent *addrbook, int num_ab) {
        int i = 0;
@@ -1568,7 +1645,7 @@ void do_addrbook_view(struct addrbookent *addrbook, int num_ab) {
        wprintf("Page: ");
        for (i=0; i<=num_pages; ++i) {
                if (i != page) {
-                       wprintf("<A HREF=\"/readfwd?page=%d\">", i);
+                       wprintf("<a href=\"readfwd?page=%d\">", i);
                }
                else {
                        wprintf("<B>");
@@ -1590,7 +1667,7 @@ void do_addrbook_view(struct addrbookent *addrbook, int num_ab) {
        }
        wprintf("<br />\n");
 
-       wprintf("<TABLE border=0 cellspacing=0 "
+       wprintf("<table border=0 cellspacing=0 "
                "cellpadding=3 width=100%%>\n"
        );
 
@@ -1600,39 +1677,41 @@ void do_addrbook_view(struct addrbookent *addrbook, int num_ab) {
 
                        if ((displayed % 4) == 0) {
                                if (displayed > 0) {
-                                       wprintf("</TR>\n");
+                                       wprintf("</tr>\n");
                                }
                                bg = 1 - bg;
-                               wprintf("<TR BGCOLOR=\"#%s\">",
+                               wprintf("<tr bgcolor=\"#%s\">",
                                        (bg ? "DDDDDD" : "FFFFFF")
                                );
                        }
        
-                       wprintf("<TD>");
+                       wprintf("<td>");
        
-                       wprintf("<A HREF=\"/readfwd?startmsg=%ld&is_singlecard=1",
+                       wprintf("<a href=\"readfwd?startmsg=%ld&is_singlecard=1",
                                addrbook[i].ab_msgnum);
                        wprintf("?maxmsgs=1?summary=0?alpha=%s\">", bstr("alpha"));
                        vcard_n_prettyize(addrbook[i].ab_name);
                        escputs(addrbook[i].ab_name);
-                       wprintf("</A></TD>\n");
+                       wprintf("</a></td>\n");
                        ++displayed;
                }
        }
 
-       wprintf("</TR></TABLE>\n");
+       wprintf("</tr></table>\n");
 }
 
 
 
-/* 
- * load message pointers from the server
+/**
+ * \brief load message pointers from the server
+ * \param servcmd the citadel command to send to the citserver
+ * \param with_headers what headers???
  */
 int load_msg_ptrs(char *servcmd, int with_headers)
 {
        char buf[1024];
        time_t datestamp;
-       char displayname[128];
+       char fullname[128];
        char nodename[128];
        char inetaddr[128];
        char subject[256];
@@ -1641,11 +1720,10 @@ int load_msg_ptrs(char *servcmd, int with_headers)
 
        int num_summ_alloc = 0;
 
-       if (with_headers) {
-               if (WC->num_summ != 0) {
-                       free(WC->summ);
-                       WC->num_summ = 0;
-               }
+       if (WC->summ != NULL) {
+               free(WC->summ);
+               WC->num_summ = 0;
+               WC->summ = NULL;
        }
        num_summ_alloc = 100;
        WC->num_summ = 0;
@@ -1663,7 +1741,7 @@ int load_msg_ptrs(char *servcmd, int with_headers)
                if (nummsgs < maxload) {
                        WC->msgarr[nummsgs] = extract_long(buf, 0);
                        datestamp = extract_long(buf, 1);
-                       extract_token(displayname, buf, 2, '|', sizeof displayname);
+                       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);
@@ -1672,22 +1750,25 @@ int load_msg_ptrs(char *servcmd, int with_headers)
                        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->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 (strlen(displayname) > 0) {
-                                       safestrncpy(WC->summ[nummsgs-1].from, displayname, sizeof WC->summ[nummsgs-1].from);
+                               safestrncpy(WC->summ[nummsgs-1].subj,
+                                       _("(no subject)"), sizeof WC->summ[nummsgs-1].subj);
+                               if (strlen(fullname) > 0) {
+                                       safestrncpy(WC->summ[nummsgs-1].from,
+                                               fullname, sizeof WC->summ[nummsgs-1].from);
                                }
                                if (strlen(subject) > 0) {
                                safestrncpy(WC->summ[nummsgs-1].subj, subject,
                                        sizeof WC->summ[nummsgs-1].subj);
                                }
 #ifdef HAVE_ICONV
-                               /* Handle subjects with RFC2047 encoding */
+                               /** Handle subjects with RFC2047 encoding */
                                utf8ify_rfc822_string(WC->summ[nummsgs-1].subj);
 #endif
                                if (strlen(WC->summ[nummsgs-1].subj) > 75) {
@@ -1707,7 +1788,7 @@ int load_msg_ptrs(char *servcmd, int with_headers)
                                WC->summ[nummsgs-1].date = datestamp;
        
 #ifdef HAVE_ICONV
-                               /* Handle senders with RFC2047 encoding */
+                               /** Handle senders with RFC2047 encoding */
                                utf8ify_rfc822_string(WC->summ[nummsgs-1].from);
 #endif
                                if (strlen(WC->summ[nummsgs-1].from) > 25) {
@@ -1719,7 +1800,29 @@ int load_msg_ptrs(char *servcmd, int with_headers)
        return (nummsgs);
 }
 
+/**
+ * \brief compare what????
+ * \param s1 first thing to compare 
+ * \param s2 second thing to compare
+ */
+int longcmp_r(const void *s1, const void *s2) {
+       long l1;
+       long l2;
+
+       l1 = *(long *)s1;
+       l2 = *(long *)s2;
+
+       if (l1 > l2) return(-1);
+       if (l1 < l2) return(+1);
+       return(0);
+}
+
  
+/**
+ * \brief compare what????
+ * \param s1 first thing to compare 
+ * \param s2 second thing to compare
+ */
 int summcmp_subj(const void *s1, const void *s2) {
        struct message_summary *summ1;
        struct message_summary *summ2;
@@ -1729,6 +1832,11 @@ int summcmp_subj(const void *s1, const void *s2) {
        return strcasecmp(summ1->subj, summ2->subj);
 }
 
+/**
+ * \brief compare what????
+ * \param s1 first thing to compare 
+ * \param s2 second thing to compare
+ */
 int summcmp_rsubj(const void *s1, const void *s2) {
        struct message_summary *summ1;
        struct message_summary *summ2;
@@ -1738,6 +1846,11 @@ int summcmp_rsubj(const void *s1, const void *s2) {
        return strcasecmp(summ2->subj, summ1->subj);
 }
 
+/**
+ * \brief compare what????
+ * \param s1 first thing to compare 
+ * \param s2 second thing to compare
+ */
 int summcmp_sender(const void *s1, const void *s2) {
        struct message_summary *summ1;
        struct message_summary *summ2;
@@ -1747,6 +1860,11 @@ int summcmp_sender(const void *s1, const void *s2) {
        return strcasecmp(summ1->from, summ2->from);
 }
 
+/**
+ * \brief compare what????
+ * \param s1 first thing to compare 
+ * \param s2 second thing to compare
+ */
 int summcmp_rsender(const void *s1, const void *s2) {
        struct message_summary *summ1;
        struct message_summary *summ2;
@@ -1756,6 +1874,11 @@ int summcmp_rsender(const void *s1, const void *s2) {
        return strcasecmp(summ2->from, summ1->from);
 }
 
+/**
+ * \brief compare what????
+ * \param s1 first thing to compare 
+ * \param s2 second thing to compare
+ */
 int summcmp_date(const void *s1, const void *s2) {
        struct message_summary *summ1;
        struct message_summary *summ2;
@@ -1768,6 +1891,11 @@ int summcmp_date(const void *s1, const void *s2) {
        else return 0;
 }
 
+/**
+ * \brief compare what????
+ * \param s1 first thing to compare 
+ * \param s2 second thing to compare
+ */
 int summcmp_rdate(const void *s1, const void *s2) {
        struct message_summary *summ1;
        struct message_summary *summ2;
@@ -1780,8 +1908,9 @@ int summcmp_rdate(const void *s1, const void *s2) {
        else return 0;
 }
 
-/*
- * command loop for reading messages
+/**
+ * \brief command loop for reading messages
+ * \param oper what???
  */
 void readloop(char *oper)
 {
@@ -1792,6 +1921,7 @@ void readloop(char *oper)
        int nummsgs;
        long startmsg;
        int maxmsgs;
+       long *displayed_msgs = NULL;
        int num_displayed = 0;
        int is_summary = 0;
        int is_addressbook = 0;
@@ -1799,13 +1929,10 @@ void readloop(char *oper)
        int is_calendar = 0;
        int is_tasks = 0;
        int is_notes = 0;
-       int remaining_messages;
+       int is_bbview = 0;
        int lo, hi;
        int lowest_displayed = (-1);
        int highest_displayed = 0;
-       long pn_previous = 0L;
-       long pn_current = 0L;
-       long pn_next = 0L;
        struct addrbookent *addrbook = NULL;
        int num_ab = 0;
        char *sortby = NULL;
@@ -1814,6 +1941,13 @@ void readloop(char *oper)
        char *subjsort_button;
        char *sendsort_button;
        char *datesort_button;
+       int bbs_reverse = 0;
+
+       if (WC->wc_view == VIEW_WIKI) {
+               sprintf(buf, "wiki?room=%s?page=home", WC->wc_roomname);
+               http_redirect(buf);
+               return;
+       }
 
        startmsg = atol(bstr("startmsg"));
        maxmsgs = atoi(bstr("maxmsgs"));
@@ -1828,11 +1962,22 @@ void readloop(char *oper)
                set_preference(sortpref_name, sortby, 1);
        }
        if (strlen(sortby) == 0) sortby = sortpref_value;
+
+       /** mailbox sort */
        if (strlen(sortby) == 0) 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
+       /**
+        * 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")) {
@@ -1857,12 +2002,13 @@ void readloop(char *oper)
        }
 
        if (is_summary) {
-               strcpy(cmd, "MSGS ALL|||1");    /* fetch header summary */
+               strcpy(cmd, "MSGS ALL|||1");    /**< fetch header summary */
                startmsg = 1;
                maxmsgs = 9999999;
        }
 
-       /* Are we doing a summary view?  If so, we need to know old messages
+       /**
+        * 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.
         */
@@ -1877,17 +2023,17 @@ void readloop(char *oper)
 
        is_singlecard = atoi(bstr("is_singlecard"));
 
-       if (WC->wc_view == VIEW_CALENDAR) {             /* calendar */
+       if (WC->wc_view == VIEW_CALENDAR) {             /**< calendar */
                is_calendar = 1;
                strcpy(cmd, "MSGS ALL");
                maxmsgs = 32767;
        }
-       if (WC->wc_view == VIEW_TASKS) {                /* tasks */
+       if (WC->wc_view == VIEW_TASKS) {                /**< tasks */
                is_tasks = 1;
                strcpy(cmd, "MSGS ALL");
                maxmsgs = 32767;
        }
-       if (WC->wc_view == VIEW_NOTES) {                /* notes */
+       if (WC->wc_view == VIEW_NOTES) {                /**< notes */
                is_notes = 1;
                strcpy(cmd, "MSGS ALL");
                maxmsgs = 32767;
@@ -1913,7 +2059,7 @@ void readloop(char *oper)
 
        if (is_summary) {
                for (a = 0; a < nummsgs; ++a) {
-                       /* Are you a new message, or an old message? */
+                       /** Are you a new message, or an old message? */
                        if (is_summary) {
                                if (is_msg_in_mset(old_msgs, WC->msgarr[a])) {
                                        WC->summ[a].is_new = 0;
@@ -1925,12 +2071,12 @@ void readloop(char *oper)
                }
        }
 
-       if (startmsg == 0L) startmsg = WC->msgarr[0];
-       remaining_messages = 0;
-
-       for (a = 0; a < nummsgs; ++a) {
-               if (WC->msgarr[a] >= startmsg) {
-                       ++remaining_messages;
+       if (startmsg == 0L) {
+               if (bbs_reverse) {
+                       startmsg = WC->msgarr[(nummsgs >= maxmsgs) ? (nummsgs - maxmsgs) : 0];
+               }
+               else {
+                       startmsg = WC->msgarr[0];
                }
        }
 
@@ -1962,74 +2108,85 @@ void readloop(char *oper)
        }
 
        if (!strcasecmp(sortby, "subject")) {
-               subjsort_button = "<a href=\"/readfwd?startmsg=1?maxmsgs=9999999?summary=1?sortby=rsubject\"><img border=\"0\" src=\"/static/down_pointer.gif\" /></a>" ;
+               subjsort_button = "<a href=\"readfwd?startmsg=1?maxmsgs=9999999?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?summary=1?sortby=subject\"><img border=\"0\" src=\"/static/up_pointer.gif\" /></a>" ;
+               subjsort_button = "<a href=\"readfwd?startmsg=1?maxmsgs=9999999?summary=1?sortby=subject\"><img border=\"0\" src=\"static/up_pointer.gif\" /></a>" ;
        }
        else {
-               subjsort_button = "<a href=\"/readfwd?startmsg=1?maxmsgs=9999999?summary=1?sortby=subject\"><img border=\"0\" src=\"/static/sort_none.gif\" /></a>" ;
+               subjsort_button = "<a href=\"readfwd?startmsg=1?maxmsgs=9999999?summary=1?sortby=subject\"><img border=\"0\" src=\"static/sort_none.gif\" /></a>" ;
        }
 
        if (!strcasecmp(sortby, "sender")) {
-               sendsort_button = "<a href=\"/readfwd?startmsg=1?maxmsgs=9999999?summary=1?sortby=rsender\"><img border=\"0\" src=\"/static/down_pointer.gif\" /></a>" ;
+               sendsort_button = "<a href=\"readfwd?startmsg=1?maxmsgs=9999999?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?summary=1?sortby=sender\"><img border=\"0\" src=\"/static/up_pointer.gif\" /></a>" ;
+               sendsort_button = "<a href=\"readfwd?startmsg=1?maxmsgs=9999999?summary=1?sortby=sender\"><img border=\"0\" src=\"static/up_pointer.gif\" /></a>" ;
        }
        else {
-               sendsort_button = "<a href=\"/readfwd?startmsg=1?maxmsgs=9999999?summary=1?sortby=sender\"><img border=\"0\" src=\"/static/sort_none.gif\" /></a>" ;
+               sendsort_button = "<a href=\"readfwd?startmsg=1?maxmsgs=9999999?summary=1?sortby=sender\"><img border=\"0\" src=\"static/sort_none.gif\" /></a>" ;
        }
 
        if (!strcasecmp(sortby, "date")) {
-               datesort_button = "<a href=\"/readfwd?startmsg=1?maxmsgs=9999999?summary=1?sortby=rdate\"><img border=\"0\" src=\"/static/down_pointer.gif\" /></a>" ;
+               datesort_button = "<a href=\"readfwd?startmsg=1?maxmsgs=9999999?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?summary=1?sortby=date\"><img border=\"0\" src=\"/static/up_pointer.gif\" /></a>" ;
+               datesort_button = "<a href=\"readfwd?startmsg=1?maxmsgs=9999999?summary=1?sortby=date\"><img border=\"0\" src=\"static/up_pointer.gif\" /></a>" ;
        }
        else {
-               datesort_button = "<a href=\"/readfwd?startmsg=1?maxmsgs=9999999?summary=1?sortby=rdate\"><img border=\"0\" src=\"/static/sort_none.gif\" /></a>" ;
+               datesort_button = "<a href=\"readfwd?startmsg=1?maxmsgs=9999999?summary=1?sortby=rdate\"><img border=\"0\" src=\"static/sort_none.gif\" /></a>" ;
        }
 
        if (is_summary) {
-               wprintf("</div>");              /* end of 'content' div */
-
-               wprintf("<div id=\"message_list\">"
+               wprintf("</div>\n");            /** end of 'content' div */
+
+               wprintf("<script language=\"javascript\" type=\"text/javascript\">"
+                       " document.onkeydown = CtdlMsgListKeyPress;     "
+                       " if (document.layers) {                        "
+                       "       document.captureEvents(Event.KEYPRESS); "
+                       " }                                             "
+                       "</script>\n"
+               );
 
-                       "<div id=\"fix_scrollbar_bug\">\n"
-
-                       "<form name=\"msgomatic\" "
-                       "method=\"POST\" action=\"/do_stuff_to_msgs\">\n"
-
-                       "<span class=\"mailbox_summary\">"
-                       "<table border=0 cellspacing=0 "
-                       "cellpadding=0 width=100%%>\n"
-                       "<TR>"
-                       "<TD align=center><b><i>%s</i></b> %s</TD>"
-                       "<TD align=center><b><i>%s</i></b> %s</TD>"
-                       "<TD align=center><b><i>%s</i></b> %s</TD>"
-                       "<TD><INPUT TYPE=\"submit\" NAME=\"delete_button\" "
-                       "STYLE=\"font-family: Bitstream Vera Sans,Arial,Helvetica,sans-serif;"
-                       " font-size: 6pt;\" "
-                       "VALUE=\"%s\"></TD>"
-                       "</TR>\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("<td width=%d%%><b><i>%s</i></b> %s</td>"
+                       "<td width=%d%%><b><i>%s</i></b> %s</td>"
+                       "<td width=%d%%><b><i>%s</i></b> %s"
+                       "&nbsp;"
+                       "<input type=\"submit\" name=\"delete_button\" style=\"font-size:6pt\" "
+                       " onClick=\"CtdlDeleteSelectedMessages(event)\" "
+                       " value=\"%s\">"
+                       "</td>"
+                       "</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\" rules=rows "
+                       "cellspacing=0 style=\"width:100%%;-moz-user-select:none;\">"
+               );
        }
 
        for (a = 0; a < nummsgs; ++a) {
                if ((WC->msgarr[a] >= startmsg) && (num_displayed < maxmsgs)) {
 
-                       /* Learn which msgs "Prev" & "Next" buttons go to */
-                       pn_current = WC->msgarr[a];
-                       if (a > 0) pn_previous = WC->msgarr[a-1];
-                       if (a < (nummsgs-1)) pn_next = WC->msgarr[a+1];
-
-                       /* Display the message */
+                       /** Display the message */
                        if (is_summary) {
                                display_summarized(a);
                        }
@@ -2052,123 +2209,125 @@ void readloop(char *oper)
                                display_note(WC->msgarr[a]);
                        }
                        else {
-                               read_message(WC->msgarr[a], 0, "");
+                               if (displayed_msgs == NULL) {
+                                       displayed_msgs = malloc(sizeof(long) *
+                                                               (maxmsgs<nummsgs ? maxmsgs : nummsgs));
+                               }
+                               displayed_msgs[num_displayed] = WC->msgarr[a];
                        }
 
                        if (lowest_displayed < 0) lowest_displayed = a;
                        highest_displayed = a;
 
                        ++num_displayed;
-                       --remaining_messages;
                }
        }
 
-       if (is_summary) {
-               wprintf("</table></span></form>"
-                       "</div>\n");                    /* end of 'fix_scrollbar_bug' div */
-               wprintf("</div>");                      /* end of 'message_list' div */
-
-               wprintf("<div id=\"ml_slider\"></div>");        /* slider */
-
-               wprintf("<div id=\"preview_pane\">");   /* The preview pane will initially be empty */
+       /**
+        * 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;
+       }
 
-               /* Now register each message (whose element ID is "m9999",
-                * where "9999" is the message number) as draggable.
-               wprintf("<script type=\"text/javascript\">\n");
-               for (a = 0; a < nummsgs; ++a) {
-                       wprintf("new Draggable('m%ld',{revert:true});\n",
-                               WC->summ[a].msgnum);
+       /** Output loop */
+       if (displayed_msgs != NULL) {
+               if (bbs_reverse) {
+                       qsort(displayed_msgs, num_displayed, sizeof(long), longcmp_r);
                }
-               wprintf("</script>\n");
-                */
-       }
 
-       /* Bump these because although we're thinking in zero base, the user
-        * is a drooling idiot and is thinking in one base.
-        */
-       ++lowest_displayed;
-       ++highest_displayed;
+               /** if we do a split bbview in the future, begin messages div here */
 
-       /* If we're only looking at one message, do a prev/next thing */
-       if (num_displayed == 1) {
-          if ((!is_tasks) && (!is_calendar) && (!is_addressbook) && (!is_notes) && (!is_singlecard)) {
-
-               wprintf("<div id=\"fix_scrollbar_bug\">"
-                       "<table border=0 width=100%% bgcolor=\"#dddddd\"><tr><td>");
-               wprintf(_("Reading #%d of %d messages."), lowest_displayed, nummsgs);
-               wprintf("</TD><TD ALIGN=RIGHT><FONT SIZE=+1>");
-
-               if (pn_previous > 0L) {
-                       wprintf("<A HREF=\"/%s"
-                               "?startmsg=%ld"
-                               "?maxmsgs=1"
-                               "?summary=0\">"
-                               "%s</A> \n",
-                                       oper,
-                                       pn_previous,
-                                       _("Previous"));
+               for (a=0; a<num_displayed; ++a) {
+                       read_message(displayed_msgs[a], 0, "");
                }
 
-               if (pn_next > 0L) {
-                       wprintf("<A HREF=\"/%s"
-                               "?startmsg=%ld"
-                               "?maxmsgs=1"
-                               "?summary=0\">"
-                               "%s</A> \n",
-                                       oper,
-                                       pn_next,
-                                       _("Next"));
-               }
+               /** if we do a split bbview in the future, end messages div here */
 
-               wprintf("<A HREF=\"/%s?startmsg=%ld"
-                       "?maxmsgs=%d?summary=1\">"
-                       "%s"
-                       "</A>",
-                       oper,
-                       WC->msgarr[0],
-                       DEFAULT_MAXMSGS,
-                       _("Summary")
+               free(displayed_msgs);
+               displayed_msgs = NULL;
+       }
+
+       if (is_summary) {
+               wprintf("</table>"
+                       "</div>\n");                    /**< end of 'fix_scrollbar_bug' div */
+               wprintf("</div>");                      /**< end of 'message_list' div */
+
+               /** Here's the grab-it-to-resize-the-message-list widget */
+               wprintf("<div id=\"resize_msglist\" "
+                       "onMouseDown=\"CtdlResizeMsgListMouseDown(event)\">"
+                       "<div class=\"fix_scrollbar_bug\">"
+                       "<table width=100%% border=3 cellspacing=0 "
+                       "bgcolor=\"#cccccc\" "
+                       "cellpadding=0><TR><TD> </td></tr></table>"
+                       "</div></div>\n"
                );
 
-               wprintf("</td></tr></table></div>\n");
-           }
+               wprintf("<div id=\"preview_pane\">");   /**< The preview pane will initially be empty */
        }
 
-       /*
+       /**
+        * Bump these because although we're thinking in zero base, the user
+        * is a drooling idiot and is thinking in one base.
+        */
+       ++lowest_displayed;
+       ++highest_displayed;
+
+       /**
         * If we're not currently looking at ALL requested
         * messages, then display the selector bar
         */
-       if (num_displayed > 1) {
-          if ((!is_tasks) && (!is_calendar) && (!is_addressbook)
-             && (!is_notes) && (!is_singlecard) && (!is_summary)) {
-
-               wprintf("<form name=\"msgomatic\" "
-                       "method=\"POST\" action=\"/do_stuff_to_msgs\">\n");
-
+       if (is_bbview) {
+               /** begin bbview scroller */
+               wprintf("<form name=\"msgomatic\">");
                wprintf(_("Reading #"), lowest_displayed, highest_displayed);
 
                wprintf("<select name=\"whichones\" size=\"1\" "
                        "OnChange=\"location.href=msgomatic.whichones.options"
                        "[selectedIndex].value\">\n");
 
-               for (b=0; b<nummsgs; b = b + maxmsgs) {
-               lo = b+1;
-               hi = b+maxmsgs;
-               if (hi > nummsgs) hi = nummsgs;
-                       wprintf("<option %s value="
-                               "\"/%s"
-                               "?startmsg=%ld"
-                               "?maxmsgs=%d"
-                               "?summary=%d\">"
-                               "%d-%d</option> \n",
-                               ((WC->msgarr[b] == startmsg) ? "selected" : ""),
-                               oper,
-                               WC->msgarr[b],
-                               maxmsgs,
-                               is_summary,
-                               lo, hi);
-               }
-               wprintf("<option value=\"/%s?startmsg=%ld"
+               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"
+                                       "?summary=%d\">"
+                                       "%d-%d</option> \n",
+                                       ((WC->msgarr[lo-1] == startmsg) ? "selected" : ""),
+                                       oper,
+                                       WC->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"
+                                       "?summary=%d\">"
+                                       "%d-%d</option> \n",
+                                       ((WC->msgarr[b] == startmsg) ? "selected" : ""),
+                                       oper,
+                                       WC->msgarr[lo-1],
+                                       maxmsgs,
+                                       is_summary,
+                                       lo, hi);
+                       }
+               }
+
+               wprintf("<option value=\"%s?startmsg=%ld"
                        "?maxmsgs=9999999?summary=%d\">"
                        "ALL"
                        "</option> ",
@@ -2177,53 +2336,56 @@ void readloop(char *oper)
 
                wprintf("</select> ");
                wprintf(_("of %d messages."), nummsgs);
-               wprintf("</form>\n");
-           }
+
+               /** forward/reverse */
+               wprintf("&nbsp;<select name=\"direction\" size=\"1\" "
+                       "OnChange=\"location.href=msgomatic.direction.options"
+                       "[selectedIndex].value\">\n"
+               );
+
+               wprintf("<option %s value=\"%s?sortby=forward\">oldest to newest</option>\n",
+                       (bbs_reverse ? "" : "selected"),
+                       oper
+               );
+       
+               wprintf("<option %s value=\"%s?sortby=reverse\">newest to oldest</option>\n",
+                       (bbs_reverse ? "selected" : ""),
+                       oper
+               );
+       
+               wprintf("</select></form>\n");
+               /** end bbview scroller */
        }
 
 DONE:
        if (is_tasks) {
-               do_tasks_view();        /* Render the task list */
+               do_tasks_view();        /** Render the task list */
        }
 
        if (is_calendar) {
-               do_calendar_view();     /* Render the calendar */
+               do_calendar_view();     /** Render the calendar */
        }
 
        if (is_addressbook) {
-               do_addrbook_view(addrbook, num_ab);     /* Render the address book */
+               do_addrbook_view(addrbook, num_ab);     /** Render the address book */
        }
 
-       /* Put the data transfer hidden iframe in a hidden div, to make it *really* hidden */
-       wprintf("</div>"
-               "<div display=\"hidden\">\n"
-               "<iframe name=\"msgloader1\" id=\"msgloader1\" width=\"1\"></iframe>\n"
-       );
-
-       /* Note: wDumpContent() will output one additional </div> tag. */
+       /** Note: wDumpContent() will output one additional </div> tag. */
        wDumpContent(1);
        if (addrbook != NULL) free(addrbook);
 
-       /* free the summary */
-       if (WC->num_summ != 0) {
-               WC->num_summ = 0;
+       /** free the summary */
+       if (WC->summ != NULL) {
                free(WC->summ);
-       }
-
-       /* If we got here via a mailbox view and are reading a single
-        * message, mark it as "seen." We do this after rendering the web page
-        * so it doesn't keep the user waiting.
-        */
-       if ( (maxmsgs == 1) && (WC->wc_view == VIEW_MAILBOX) ) {
-               serv_printf("SEEN %ld|1", startmsg);
-               serv_getln(buf, sizeof buf);
+               WC->num_summ = 0;
+               WC->summ = NULL;
        }
 }
 
 
-/*
- * Back end for post_message() ... this is where the actual message
- * gets transmitted to the server.
+/**
+ * \brief 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];
@@ -2233,10 +2395,10 @@ void post_mime_to_server(void) {
        char *encoded;
        size_t encoded_length;
 
-       /* RFC2045 requires this, and some clients look for it... */
+       /** RFC2045 requires this, and some clients look for it... */
        serv_puts("MIME-Version: 1.0");
 
-       /* If there are attachments, we have to do multipart/mixed */
+       /** If there are attachments, we have to do multipart/mixed */
        if (WC->first_attachment != NULL) {
                is_multipart = 1;
        }
@@ -2248,7 +2410,7 @@ void post_mime_to_server(void) {
                        ++seq
                );
 
-               /* Remember, serv_printf() appends an extra newline */
+               /** Remember, serv_printf() appends an extra newline */
                serv_printf("Content-type: multipart/mixed; "
                        "boundary=\"%s\"\n", boundary);
                serv_printf("This is a multipart message in MIME format.\n");
@@ -2257,14 +2419,14 @@ void post_mime_to_server(void) {
 
        serv_puts("Content-type: text/html; charset=utf-8");
        serv_puts("");
-       serv_puts("<HTML><BODY>\n");
+       serv_puts("<html><body>\n");            /** Future templates go here */
        text_to_server(bstr("msgtext"), 0);
-       serv_puts("</BODY></HTML>\n");
+       serv_puts("</body></html>\n");
        
 
        if (is_multipart) {
 
-               /* Add in the attachments */
+               /** Add in the attachments */
                for (att = WC->first_attachment; att!=NULL; att=att->next) {
 
                        encoded_length = ((att->length * 150) / 100);
@@ -2290,8 +2452,8 @@ void post_mime_to_server(void) {
 }
 
 
-/*
- * Post message (or don't post message)
+/**
+ * \brief 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
@@ -2306,10 +2468,15 @@ void post_message(void)
        char buf[SIZ];
        static long dont_post = (-1L);
        struct wc_attachment *att, *aptr;
+       int is_anonymous = 0;
+
+       if (!strcasecmp(bstr("is_anonymous"), "yes")) {
+               is_anonymous = 1;
+       }
 
        if (WC->upload_length > 0) {
 
-               /* There's an attachment.  Save it to this struct... */
+               /** 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;
@@ -2317,7 +2484,7 @@ void post_message(void)
                strcpy(att->filename, WC->upload_filename);
                att->next = NULL;
 
-               /* And add it to the list. */
+               /** And add it to the list. */
                if (WC->first_attachment == NULL) {
                        WC->first_attachment = att;
                }
@@ -2327,7 +2494,8 @@ void post_message(void)
                        aptr->next = att;
                }
 
-               /* Mozilla sends a simple filename, which is what we want,
+               /**
+                * 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.
                 */
@@ -2338,7 +2506,8 @@ void post_message(void)
                        remove_token(att->filename, 0, '\\');
                }
 
-               /* Transfer control of this memory from the upload struct
+               /**
+                * Transfer control of this memory from the upload struct
                 * to the attachment struct.
                 */
                att->data = WC->upload;
@@ -2359,8 +2528,9 @@ void post_message(void)
                        _("Automatically cancelled because you have already "
                        "saved this message."));
        } else {
-               sprintf(buf, "ENT0 1|%s|0|4|%s|||%s|%s",
+               sprintf(buf, "ENT0 1|%s|%d|4|%s|||%s|%s",
                        bstr("recp"),
+                       is_anonymous,
                        bstr("subject"),
                        bstr("cc"),
                        bstr("bcc")
@@ -2393,8 +2563,8 @@ void post_message(void)
 
 
 
-/*
- * display the message entry screen
+/**
+ * \brief display the message entry screen
  */
 void display_enter(void)
 {
@@ -2405,12 +2575,18 @@ void display_enter(void)
        int recipient_required = 0;
        int recipient_bad = 0;
        int i;
+       int is_anonymous = 0;
 
        if (strlen(bstr("force_room")) > 0) {
                gotoroom(bstr("force_room"));
        }
 
-       /* Are we perhaps in an address book view?  If so, then an "enter
+       if (!strcasecmp(bstr("is_anonymous"), "yes")) {
+               is_anonymous = 1;
+       }
+
+       /**
+        * Are we perhaps in an address book view?  If so, then an "enter
         * message" command really means "add new entry."
         */
        if (WC->wc_view == VIEW_ADDRESSBOOK) {
@@ -2419,7 +2595,8 @@ void display_enter(void)
        }
 
 #ifdef WEBCIT_WITH_CALENDAR_SERVICE
-       /* Are we perhaps in a calendar view?  If so, then an "enter
+       /**
+        * Are we perhaps in a calendar view?  If so, then an "enter
         * message" command really means "add new calendar item."
         */
        if (WC->wc_view == VIEW_CALENDAR) {
@@ -2427,7 +2604,8 @@ void display_enter(void)
                return;
        }
 
-       /* Are we perhaps in a tasks view?  If so, then an "enter
+       /**
+        * Are we perhaps in a tasks view?  If so, then an "enter
         * message" command really means "add new task."
         */
        if (WC->wc_view == VIEW_TASKS) {
@@ -2436,7 +2614,7 @@ void display_enter(void)
        }
 #endif
 
-       /*
+       /**
         * Otherwise proceed normally.
         * Do a custom room banner with no navbar...
         */
@@ -2445,43 +2623,43 @@ void display_enter(void)
        embed_room_banner(NULL, navbar_none);
        wprintf("</div>\n");
        wprintf("<div id=\"content\">\n"
-               "<div id=\"fix_scrollbar_bug\">"
+               "<div class=\"fix_scrollbar_bug\">"
                "<table width=100%% border=0 bgcolor=\"#ffffff\"><tr><td>");
 
-       /* First test to see whether this is a room that requires recipients to be entered */
+       /** First test to see whether this is a room that requires recipients to be entered */
        serv_puts("ENT0 0");
        serv_getln(buf, sizeof buf);
-       if (!strncmp(buf, "570", 3)) {          /* 570 means that we need a recipient here */
+       if (!strncmp(buf, "570", 3)) {          /** 570 means that we need a recipient here */
                recipient_required = 1;
        }
-       else if (buf[0] != '2') {               /* Any other error means that we cannot continue */
+       else if (buf[0] != '2') {               /** Any other error means that we cannot continue */
                wprintf("<EM>%s</EM><br />\n", &buf[4]);
                goto DONE;
        }
 
-       /* Now check our actual recipients if there are any */
+       /** Now check our actual recipients if there are any */
        if (recipient_required) {
-               sprintf(buf, "ENT0 0|%s|0|0||||%s|%s", bstr("recp"), bstr("cc"), bstr("bcc"));
+               sprintf(buf, "ENT0 0|%s|%d|0||||%s|%s", bstr("recp"), is_anonymous, bstr("cc"), bstr("bcc"));
                serv_puts(buf);
                serv_getln(buf, sizeof buf);
 
-               if (!strncmp(buf, "570", 3)) {  /* 570 means we have an invalid recipient listed */
+               if (!strncmp(buf, "570", 3)) {  /** 570 means we have an invalid recipient listed */
                        if (strlen(bstr("recp")) + strlen(bstr("cc")) + strlen(bstr("bcc")) > 0) {
                                recipient_bad = 1;
                        }
                }
-               else if (buf[0] != '2') {       /* Any other error means that we cannot continue */
+               else if (buf[0] != '2') {       /** Any other error means that we cannot continue */
                        wprintf("<EM>%s</EM><br />\n", &buf[4]);
                        goto DONE;
                }
        }
 
-       /* If we got this far, we can display the message entry screen. */
+       /** If we got this far, we can display the message entry screen. */
 
        now = time(NULL);
        fmt_date(buf, now, 0);
        strcat(&buf[strlen(buf)], _(" <I>from</I> "));
-       stresc(&buf[strlen(buf)], WC->wc_username, 1, 1);
+       stresc(&buf[strlen(buf)], WC->wc_fullname, 1, 1);
 
        /* Don't need this anymore, it's in the input box below
        if (strlen(bstr("recp")) > 0) {
@@ -2493,15 +2671,23 @@ void display_enter(void)
        strcat(&buf[strlen(buf)], _(" <I>in</I> "));
        stresc(&buf[strlen(buf)], WC->wc_roomname, 1, 1);
 
-       /* begin message entry screen */
+       /** begin message entry screen */
        wprintf("<form enctype=\"multipart/form-data\" "
-               "method=\"POST\" action=\"/post\" "
+               "method=\"POST\" action=\"post\" "
                "name=\"enterform\""
                ">\n");
        wprintf("<input type=\"hidden\" name=\"postseq\" value=\"%ld\">\n", now);
 
        wprintf("<img src=\"static/newmess3_24x.gif\" align=middle alt=\" \">");
-       wprintf("%s<br>\n", buf);       /* header bar */
+       wprintf("%s\n", buf);   /** header bar */
+       if (WC->room_flags & QR_ANONOPT) {
+               wprintf("&nbsp;"
+                       "<input type=\"checkbox\" name=\"is_anonymous\" value=\"yes\" %s>",
+                               (is_anonymous ? "checked" : "")
+               );
+               wprintf("Anonymous");
+       }
+       wprintf("<br>\n");      /** header bar */
 
        wprintf("<table border=\"0\" width=\"100%%\">\n");
        if (recipient_required) {
@@ -2539,7 +2725,7 @@ void display_enter(void)
                wprintf("<div class=\"auto_complete\" id=\"bcc_name_choices\"></div>");
                wprintf("</td><td></td></tr>\n");
 
-               /* Initialize the autocomplete ajax helpers (found in wclib.js) */
+               /** Initialize the autocomplete ajax helpers (found in wclib.js) */
                wprintf("<script type=\"text/javascript\">      \n"
                        " activate_entmsg_autocompleters();     \n"
                        "</script>                              \n"
@@ -2569,7 +2755,7 @@ void display_enter(void)
 
        wprintf("<textarea name=\"msgtext\" cols=\"80\" rows=\"15\">");
 
-       /* If we're continuing from a previous edit, put our partially-composed message back... */
+       /** 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... */
@@ -2580,15 +2766,15 @@ void display_enter(void)
                pullquote_message(atol(bstr("fwdquote")), 1);
        }
 
-       /* If we're replying quoted, insert the quote here... */
+       /** If we're replying quoted, insert the quote here... */
        else if (atol(bstr("replyquote")) > 0L) {
                wprintf("<br>"
                        "<blockquote>");
                pullquote_message(atol(bstr("replyquote")), 0);
-               wprintf("</blockquote>");
+               wprintf("</blockquote>\n\n");
        }
 
-       /* Insert our signature if appropriate... */
+       /** 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")) {
@@ -2624,7 +2810,7 @@ void display_enter(void)
        wprintf("</textarea>");
        wprintf("</center><br />\n");
 
-       /*
+       /**
         * The following script embeds the TinyMCE richedit control, and automatically
         * transforms the textarea into a richedit textarea.
         */
@@ -2632,14 +2818,21 @@ void display_enter(void)
                "<script language=\"javascript\" type=\"text/javascript\" src=\"tiny_mce/tiny_mce.js\"></script>\n"
                "<script language=\"javascript\" type=\"text/javascript\">"
                "tinyMCE.init({"
-               "       mode : \"textareas\", width : \"100%%\", browsers : \"msie,gecko\" "
+               "       mode : \"textareas\", width : \"100%%\", browsers : \"msie,gecko\", "
+               "       theme : \"advanced\", plugins : \"iespell\", "
+               "       theme_advanced_buttons1 : \"bold, italic, underline, strikethrough, justifyleft, justifycenter, justifyright, justifyfull, bullist, numlist, cut, copy, paste, link, image, help, forecolor, iespell, code\", "
+               "       theme_advanced_buttons2 : \"\", "
+               "       theme_advanced_buttons3 : \"\" "
                "});"
                "</script>\n"
        );
 
-       /* Enumerate any attachments which are already in place... */
-       wprintf("<img src=\"/static/diskette_24x.gif\" border=0 "
-               "align=middle height=16 width=16> Attachments: ");
+
+       /** Enumerate any attachments which are already in place... */
+       wprintf("<img src=\"static/diskette_24x.gif\" border=0 "
+               "align=middle height=16 width=16> ");
+       wprintf(_("Attachments:"));
+       wprintf(" ");
        wprintf("<select name=\"which_attachment\" size=1>");
        for (att = WC->first_attachment; att != NULL; att = att->next) {
                wprintf("<option value=\"");
@@ -2651,13 +2844,14 @@ void display_enter(void)
        }
        wprintf("</select>");
 
-       /* Now offer the ability to attach additional files... */
-       wprintf("&nbsp;&nbsp;&nbsp;"
-               "Attach file: <input NAME=\"attachfile\" "
+       /** Now offer the ability to attach additional files... */
+       wprintf("&nbsp;&nbsp;&nbsp;");
+       wprintf(_("Attach file:"));
+       wprintf(" <input NAME=\"attachfile\" "
                "SIZE=16 TYPE=\"file\">\n&nbsp;&nbsp;"
                "<input type=\"submit\" name=\"attach_button\" value=\"%s\">\n", _("Add"));
 
-       /* Seth asked for these to be at the top *and* bottom... */
+       /** Seth asked for these to be at the top *and* bottom... */
        wprintf("<input type=\"submit\" name=\"send_button\" value=\"");
        if (recipient_required) {
                wprintf(_("Send message"));
@@ -2667,7 +2861,7 @@ void display_enter(void)
        wprintf("\">&nbsp;"
                "<input type=\"submit\" name=\"cancel_button\" value=\"%s\">\n", _("Cancel"));
 
-       /* Make sure we only insert our signature once */
+       /** Make sure we only insert our signature once */
        if (strcmp(bstr("sig_inserted"), "yes")) {
                wprintf("<INPUT TYPE=\"hidden\" NAME=\"sig_inserted\" VALUE=\"yes\">\n");
        }
@@ -2680,11 +2874,9 @@ DONE:    wDumpContent(1);
 
 
 
-
-
-
-
-
+/**
+ * \brief delete a message
+ */
 void delete_msg(void)
 {
        long msgid;
@@ -2694,7 +2886,13 @@ void delete_msg(void)
 
        output_headers(1, 1, 1, 0, 0, 0);
 
-       serv_printf("MOVE %ld|_TRASH_|0", msgid);
+       if (WC->wc_is_trash) {  /** Delete from Trash is a real delete */
+               serv_printf("DELE %ld", msgid); 
+       }
+       else {                  /** Otherwise move it to Trash */
+               serv_printf("MOVE %ld|_TRASH_|0", msgid);
+       }
+
        serv_getln(buf, sizeof buf);
        wprintf("<EM>%s</EM><br />\n", &buf[4]);
 
@@ -2704,8 +2902,8 @@ void delete_msg(void)
 
 
 
-/*
- * Confirm move of a message
+/**
+ * \brief Confirm move of a message
  */
 void confirm_move_msg(void)
 {
@@ -2730,7 +2928,7 @@ void confirm_move_msg(void)
        wprintf(_("Move this message to:"));
        wprintf("<br />\n");
 
-       wprintf("<form METHOD=\"POST\" ACTION=\"/move_msg\">\n");
+       wprintf("<form METHOD=\"POST\" action=\"move_msg\">\n");
        wprintf("<INPUT TYPE=\"hidden\" NAME=\"msgid\" VALUE=\"%s\">\n", bstr("msgid"));
 
        wprintf("<SELECT NAME=\"target_room\" SIZE=5>\n");
@@ -2757,7 +2955,9 @@ void confirm_move_msg(void)
 }
 
 
-
+/**
+ * \brief move a message to another folder
+ */
 void move_msg(void)
 {
        long msgid;
@@ -2778,54 +2978,5 @@ void move_msg(void)
 
 }
 
-/*
- * This gets called when a user selects multiple messages in a summary
- * list and then clicks to perform a transformation of some sort on them
- * (such as deleting them).
- */
-void do_stuff_to_msgs(void) {
-       char buf[256];
 
-       struct stuff_t {
-               struct stuff_t *next;
-               long msgnum;
-       };
-
-       struct stuff_t *stuff = NULL;
-       struct stuff_t *ptr;
-       int delete_button_pressed = 0;
-
-
-       serv_puts("MSGS ALL");
-       serv_getln(buf, sizeof buf);
-
-       if (buf[0] == '1') while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
-               ptr = malloc(sizeof(struct stuff_t));
-               ptr->msgnum = atol(buf);
-               ptr->next = stuff;
-               stuff = ptr;
-       }
-
-       if (strlen(bstr("delete_button")) > 0) {
-               delete_button_pressed = 1;
-       }
-
-       while (stuff != NULL) {
-
-               sprintf(buf, "msg_%ld", stuff->msgnum);
-               if (!strcasecmp(bstr(buf), "yes")) {
-
-                       if (delete_button_pressed) {
-                               serv_printf("MOVE %ld|_TRASH_|0", stuff->msgnum);
-                               serv_getln(buf, sizeof buf);
-                       }
-
-               }
-
-               ptr = stuff->next;
-               free(stuff);
-               stuff = ptr;
-       }
-
-       readloop("readfwd");
-}
+/*@}*/