]> code.citadel.org Git - citadel.git/blobdiff - webcit/messages.c
* Upgraded TinyMCE to version 2.0RC3. This fixes a conflict with
[citadel.git] / webcit / messages.c
index cfb4625dca836d92610a23c55599381129e65404..aa4b32561b0cb94b41868c5c66df9cb852224db0 100644 (file)
@@ -411,14 +411,16 @@ void display_parsed_vcard(struct vCard *v, int full) {
                        }
                        wprintf("</TD></TR>\n");
                
-                       if (strlen(phone) > 0)
-                               wprintf("<TR><TD>");
+                       if (strlen(phone) > 0) {
+                               wprintf("<tr><td>");
                                wprintf(_("Telephone:"));
-                               wprintf("</TD><TD>%s</TD></TR>\n", phone);
-                       if (strlen(mailto) > 0)
-                               wprintf("<TR><TD>");
+                               wprintf("</td><td>%s</td></tr>\n", phone);
+                       }
+                       if (strlen(mailto) > 0) {
+                               wprintf("<tr><td>");
                                wprintf(_("E-mail:"));
-                               wprintf("</TD><TD>%s</TD></TR>\n", mailto);
+                               wprintf("</td><td>%s</td></tr>\n", mailto);
+                       }
                }
 
        }
@@ -467,7 +469,7 @@ void display_vcard(char *vcard_source, char alpha, int full, char *storename) {
 /*
  * I wanna SEE that message!
  */
-void read_message(long msgnum, int suppress_buttons) {
+void read_message(long msgnum, int printable_view) {
        char buf[SIZ];
        char mime_partnum[256];
        char mime_filename[256];
@@ -477,11 +479,13 @@ void read_message(long msgnum, int suppress_buttons) {
        int mime_length;
        char mime_http[SIZ];
        char m_subject[256];
+       char m_cc[1024];
        char from[256];
        char node[256];
        char rfca[256];
        char reply_to[512];
-       char now[256];
+       char reply_all[4096];
+       char now[64];
        int format_type = 0;
        int nhdr = 0;
        int bq = 0;
@@ -502,6 +506,7 @@ void read_message(long msgnum, int suppress_buttons) {
        strcpy(node, "");
        strcpy(rfca, "");
        strcpy(reply_to, "");
+       strcpy(reply_all, "");
        strcpy(vcard_partnum, "");
        strcpy(cal_partnum, "");
        strcpy(mime_http, "");
@@ -518,9 +523,11 @@ void read_message(long msgnum, int suppress_buttons) {
        }
 
        /* begin everythingamundo table */
-       wprintf("<div id=\"fix_scrollbar_bug\">\n");
-       wprintf("<table width=100%% border=1 cellspacing=0 "
-               "cellpadding=0><TR><TD>\n");
+       if (!printable_view) {
+               wprintf("<div id=\"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 "
@@ -528,6 +535,7 @@ void read_message(long msgnum, int suppress_buttons) {
 
        wprintf("<SPAN CLASS=\"message_header\">");
        strcpy(m_subject, "");
+       strcpy(m_cc, "");
 
        while (serv_getln(buf, sizeof buf), strcasecmp(buf, "text")) {
                if (!strcmp(buf, "000")) {
@@ -556,7 +564,15 @@ void read_message(long msgnum, int suppress_buttons) {
                        wprintf("</A> ");
                }
                if (!strncasecmp(buf, "subj=", 5)) {
-                       strcpy(m_subject, &buf[5]);
+                       safestrncpy(m_subject, &buf[5], sizeof m_subject);
+               }
+               if (!strncasecmp(buf, "cccc=", 5)) {
+                       safestrncpy(m_cc, &buf[5], sizeof m_cc);
+                       if (strlen(reply_all) > 0) {
+                               strcat(reply_all, ", ");
+                       }
+                       safestrncpy(&reply_all[strlen(reply_all)], &buf[5],
+                               (sizeof reply_all - strlen(reply_all)) );
                }
                if ((!strncasecmp(buf, "hnod=", 5))
                    && (strcasecmp(&buf[5], serv_info.serv_humannode))) {
@@ -587,7 +603,13 @@ void read_message(long msgnum, int suppress_buttons) {
                }
                if (!strncasecmp(buf, "rcpt=", 5)) {
                        wprintf(_("to "));
-                       wprintf("%s ", &buf[5]);
+                       escputs(&buf[5]);
+                       wprintf(" ");
+                       if (strlen(reply_all) > 0) {
+                               strcat(reply_all, ", ");
+                       }
+                       safestrncpy(&reply_all[strlen(reply_all)], &buf[5],
+                               (sizeof reply_all - strlen(reply_all)) );
                }
                if (!strncasecmp(buf, "time=", 5)) {
                        fmt_date(now, atol(&buf[5]), 0);
@@ -601,30 +623,28 @@ void read_message(long msgnum, int suppress_buttons) {
                        extract_token(mime_content_type, &buf[5], 4, '|', sizeof mime_content_type);
                        mime_length = extract_int(&buf[5], 5);
 
-                       if (!strcasecmp(mime_disposition, "attachment")) {
+                       if ((!strcasecmp(mime_disposition, "inline"))
+                          && (!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\">",
+                                       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=\"/output_mimepart?"
-                                       "msgnum=%ld?partnum=%s\" "
+                                       "<A HREF=\"/mimepart/%ld/%s/%s\" "
                                        "TARGET=\"wc.%ld.%s\">"
                                        "<IMG SRC=\"/static/diskette_24x.gif\" "
                                        "BORDER=0 ALIGN=MIDDLE>\n"
                                        "Part %s: %s (%s, %d bytes)</A><br />\n",
-                                       msgnum, mime_partnum,
+                                       msgnum, mime_partnum, mime_filename,
                                        msgnum, mime_partnum,
                                        mime_partnum, mime_filename,
                                        mime_content_type, mime_length);
                        }
 
-                       if ((!strcasecmp(mime_disposition, "inline"))
-                          && (!strncasecmp(mime_content_type, "image/", 6)) ){
-                               snprintf(&mime_http[strlen(mime_http)],
-                                       (sizeof(mime_http) - strlen(mime_http) - 1),
-                                       "<IMG SRC=\"/output_mimepart?"
-                                       "msgnum=%ld?partnum=%s\">",
-                                       msgnum, mime_partnum);
-                       }
-
                        /*** begin handler prep ***/
                        if (!strcasecmp(mime_content_type, "text/x-vcard")) {
                                strcpy(vcard_partnum, mime_partnum);
@@ -662,19 +682,29 @@ void read_message(long msgnum, int suppress_buttons) {
 
        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\">");
+               wprintf(_("CC:"));
+               wprintf(" ");
+               escputs(m_cc);
+               wprintf("</SPAN>");
+       }
        if (strlen(m_subject) > 0) {
                wprintf("<br />"
                        "<SPAN CLASS=\"message_subject\">");
                wprintf(_("Subject:"));
-               wprintf(" %s</SPAN>", m_subject
-               );
+               wprintf(" ");
+               escputs(m_subject);
+               wprintf("</SPAN>");
        }
        wprintf("</TD>\n");
 
        /* start msg buttons */
-       if (!suppress_buttons) {
+       if (!printable_view) {
                wprintf("<td align=right>\n");
 
                /* Reply */
@@ -685,6 +715,18 @@ void read_message(long msgnum, int suppress_buttons) {
                urlescputs(m_subject);
                wprintf("\">[%s]</a> ", _("Reply"));
 
+               /* ReplyAll */
+               if (WC->wc_view == VIEW_MAILBOX) {
+                       wprintf("<a href=\"/display_enter?recp=");
+                       urlescputs(reply_to);
+                       wprintf("?cc=");
+                       urlescputs(reply_all);
+                       wprintf("?subject=");
+                       if (strncasecmp(m_subject, "Re:", 3)) wprintf("Re:%20");
+                       urlescputs(m_subject);
+                       wprintf("\">[%s]</a> ", _("ReplyAll"));
+               }
+
                /* Forward */
                if (WC->wc_view == VIEW_MAILBOX) {
                        wprintf("<a href=\"/display_enter?pullquote=%ld?subject=", msgnum);
@@ -705,8 +747,8 @@ void read_message(long msgnum, int suppress_buttons) {
                        );
                }
 
-               wprintf("<a href=\"/msg?msgnum=%ld?sourceiframe=msgloader1?print_it=yes\" target=\"msgloader1\">"
-                       "[%s]</a>", msgnum, _("Print"));
+               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'); \" >"
+                       "[%s]</a>", msgnum, msgnum, _("Print"));
 
                wprintf("</td>");
        }
@@ -857,8 +899,10 @@ ENDBODY:
        wprintf("</TD></TR></TABLE>\n");
 
        /* end everythingamundo table */
-       wprintf("</TD></TR></TABLE>\n");
-       wprintf("</div><br />\n");
+       if (!printable_view) {
+               wprintf("</TD></TR></TABLE>\n");
+               wprintf("</div><br />\n");
+       }
 
 #ifdef HAVE_ICONV
        if (ic != (iconv_t)(-1) ) {
@@ -875,63 +919,42 @@ ENDBODY:
  */
 void embed_message(void) {
        long msgnum = 0L;
-       char *sourceiframe;
-       char *targetdiv;
-       char *print_it;
 
        msgnum = atol(bstr("msgnum"));
-       sourceiframe = bstr("sourceiframe");
-       targetdiv = bstr("targetdiv");
-       print_it = bstr("print_it");
+       begin_ajax_response();
+       read_message(msgnum, 0);
+       end_ajax_response();
+}
+
 
-       output_headers(1, 0, 0, 0, 0, 1, 0);
-       begin_burst();
+/*
+ * Printable view of a message
+ */
+void print_message(void) {
+       long msgnum = 0L;
 
-       wprintf("<html><head>");
+       msgnum = atol(bstr("msgnum"));
+        output_headers(0, 0, 0, 0, 0, 0);
 
-       /* If we're loading into a hidden iframe, chances are the caller told us
-        * about a target div somewhere that we need to copy into when we're done.
-        */
-       if (strlen(targetdiv) > 0) wprintf(
-"                                                                      \n"
-" <script type=\"text/javascript\">                                    \n"
-"      function loaded_now_copy_it() {                                 \n"
-"              parent.document.getElementById(\"%s\").innerHTML = parent.frames['%s'].document.body.innerHTML; \n"
-"      }                                                               \n"
-"</script>\n",
-               targetdiv,
-               sourceiframe
-       );
+        wprintf("Content-type: text/html\r\n"
+                "Server: %s\r\n"
+                "Connection: close\r\n",
+                SERVER);
+        begin_burst();
 
-       if (!strcasecmp(print_it, "yes")) wprintf(
-"                                                                      \n"
-" <script type=\"text/javascript\">                                    \n"
-"      function loaded_now_print_it() {                                \n"
-"              parent.frames['%s'].focus();                            \n"
-"              parent.frames['%s'].print();                            \n"
-"      }                                                               \n"
-"</script>\n",
-               sourceiframe,
-               sourceiframe
+       wprintf("\r\n\r\n<html>\n"
+               "<head><title>Printable view</title></head>\n"
+               "<body onLoad=\" window.print(); window.close(); \">\n"
        );
+       
+       read_message(msgnum, 1);
 
-       wprintf("</head>");
-       wprintf("<body");
-       if (strlen(targetdiv) > 0) {
-               wprintf(" onLoad='loaded_now_copy_it();'");
-       }
-       if (!strcasecmp(print_it, "yes")) {
-               wprintf(" onLoad='loaded_now_print_it();'");
-       }
-       wprintf(">\n");
-       read_message(msgnum, (!strcasecmp(print_it, "yes") ? 1 : 0) );
-       wprintf("</body></html>\n");
+       wprintf("\n</body></html>\n\n");
        wDumpContent(0);
 }
 
 
 
-
 /*
  * Read message in simple, JavaScript-embeddable form for 'forward'
  * or 'reply quoted' operations.
@@ -1240,10 +1263,7 @@ void display_summarized(int num) {
 
        wprintf("<TD>");
        if (WC->summ[num].is_new) wprintf("<B>");
-       wprintf("<A HREF=\"/msg?msgnum=%ld?sourceiframe=msgloader1?targetdiv=preview_pane\" target=\"msgloader1\">",
-               WC->summ[num].msgnum);
        escputs(WC->summ[num].subj);
-       wprintf("</A>");
        if (WC->summ[num].is_new) wprintf("</B>");
        wprintf("</TD><TD>");
        if (WC->summ[num].is_new) wprintf("<B>");
@@ -1446,9 +1466,9 @@ void do_addrbook_view(struct addrbookent *addrbook, int num_ab) {
        char tablast_label[SIZ];
 
        if (num_ab == 0) {
-               wprintf("<I>");
+               wprintf("<br /><br /><br /><div align=\"center\"><i>");
                wprintf(_("This address book is empty."));
-               wprintf("</I>\n");
+               wprintf("</i></div>\n");
                return;
        }
 
@@ -1726,7 +1746,7 @@ void readloop(char *oper)
        if (strlen(sortby) == 0) sortby = sortpref_value;
        if (strlen(sortby) == 0) sortby = "msgid";
 
-       output_headers(1, 1, 1, 0, 0, 0, 0);
+       output_headers(1, 1, 1, 0, 0, 0);
 
        /* When in summary mode, always show ALL messages instead of just
         * new or old.  Otherwise, show what the user asked for.
@@ -1792,7 +1812,7 @@ void readloop(char *oper)
        nummsgs = load_msg_ptrs(cmd, is_summary);
        if (nummsgs == 0) {
 
-               if ((!is_tasks) && (!is_calendar) && (!is_notes)) {
+               if ((!is_tasks) && (!is_calendar) && (!is_notes) && (!is_addressbook)) {
                        wprintf("<em>");
                        if (!strcmp(oper, "readnew")) {
                                wprintf(_("No new messages."));
@@ -1927,9 +1947,13 @@ void readloop(char *oper)
                        /* If a tabular view, set up the line */
                        if (is_summary) {
                                bg = 1 - bg;
-                               wprintf("<TR BGCOLOR=\"#%s\">",
+                               wprintf("<tr bgcolor=\"#%s\" ",
                                        (bg ? "DDDDDD" : "FFFFFF")
                                );
+
+                               wprintf("onClick=\" new Ajax.Updater('preview_pane', '/msg', { method: 'get', parameters: 'msgnum=%ld' } ); \" ", WC->summ[a].msgnum);
+
+                               wprintf(">");
                        }
 
                        /* Display the message */
@@ -1976,6 +2000,8 @@ void readloop(char *oper)
                        "</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 */
        }
 
@@ -2255,14 +2281,20 @@ void post_message(void)
                        _("Automatically cancelled because you have already "
                        "saved this message."));
        } else {
-               sprintf(buf, "ENT0 1|%s|0|4|%s",
+               sprintf(buf, "ENT0 1|%s|0|4|%s|||%s|%s",
                        bstr("recp"),
-                       bstr("subject") );
+                       bstr("subject"),
+                       bstr("cc"),
+                       bstr("bcc")
+               );
                serv_puts(buf);
                serv_getln(buf, sizeof buf);
                if (buf[0] == '4') {
                        post_mime_to_server();
-                       if (strlen(bstr("recp")) > 0) {
+                       if ( (strlen(bstr("recp")) > 0)
+                          || (strlen(bstr("cc")) > 0)
+                          || (strlen(bstr("bcc")) > 0)
+                       ) {
                                sprintf(WC->ImportantMessage, _("Message has been sent.\n"));
                        }
                        else {
@@ -2326,9 +2358,9 @@ void display_enter(void)
 
        /*
         * Otherwise proceed normally.
-`       * Do a custom room banner with no navbar...
+        * Do a custom room banner with no navbar...
         */
-       output_headers(1, 1, 2, 0, 0, 0, 0);
+       output_headers(1, 1, 2, 0, 0, 0);
        wprintf("<div id=\"banner\">\n");
        embed_room_banner(NULL, navbar_none);
        wprintf("</div>\n");
@@ -2336,72 +2368,102 @@ void display_enter(void)
                "<div id=\"fix_scrollbar_bug\">"
                "<table width=100%% border=0 bgcolor=\"#ffffff\"><tr><td>");
 
-       sprintf(buf, "ENT0 0|%s|0|0", bstr("recp"));
-       serv_puts(buf);
+       /* 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)) {
+       if (!strncmp(buf, "570", 3)) {          /* 570 means that we need a recipient here */
                recipient_required = 1;
-               if (strlen(bstr("recp")) > 0) {
-                       recipient_bad = 1;
-               }
        }
-       else if (buf[0] != '2') {
+       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 */
+       if (recipient_required) {
+               sprintf(buf, "ENT0 0|%s|0|0||||%s|%s", bstr("recp"), 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 (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 */
+                       wprintf("<EM>%s</EM><br />\n", &buf[4]);
+                       goto DONE;
+               }
+       }
+
+       /* 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);
+
+       /* Don't need this anymore, it's in the input box below
        if (strlen(bstr("recp")) > 0) {
                strcat(&buf[strlen(buf)], _(" <I>to</I> "));
                stresc(&buf[strlen(buf)], bstr("recp"), 1, 1);
        }
+       */
+
        strcat(&buf[strlen(buf)], _(" <I>in</I> "));
        stresc(&buf[strlen(buf)], WC->wc_roomname, 1, 1);
 
        /* begin message entry screen */
-
-
-       wprintf(
-       "<style> div.auto_complete { width: 350px; background: #fff; } div.auto_complete ul { border:1px solid #888; margin:0; padding:0; width:100%; list-style-type:none; } div.auto_complete ul li { margin:0; padding:3px; } div.auto_complete ul li.selected { background-color: #ffc; } div.auto_complete ul strong.highlight { color: #800; margin:0; padding:0; } </style> \n "
-       );
-
        wprintf("<form enctype=\"multipart/form-data\" "
                "method=\"POST\" action=\"/post\" "
                "name=\"enterform\""
-               "onSubmit=\"return submitForm();\""
                ">\n");
-       wprintf("<input type=\"hidden\" name=\"recp\" value=\"%s\">\n",
-               bstr("recp"));
-       wprintf("<input type=\"hidden\" name=\"postseq\" value=\"%ld\">\n",
-               now);
+       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("<table border=\"0\" width=\"100%%\">\n");
        if (recipient_required) {
+
                wprintf("<tr><td>");
                wprintf("<font size=-1>");
                wprintf(_("To:"));
                wprintf("</font>");
                wprintf("</td><td>"
-                       "<input autocomplete=\"off\" type=\"text\" name=\"recp\" id=\"recp_name\" value=\"");
+                       "<input autocomplete=\"off\" type=\"text\" name=\"recp\" id=\"recp_id\" value=\"");
                escputs(bstr("recp"));
-               wprintf("\" size=50 maxlength=70>");
-       
+               wprintf("\" size=50 maxlength=1000 />");
                wprintf("<div class=\"auto_complete\" id=\"recp_name_choices\"></div>");
-       
-               wprintf("<script type=\"text/javascript\">                                      "
-                       " new Ajax.Autocompleter('recp_name', 'recp_name_choices',              "
-                       "       '/recp_autocomplete', {} );                             "
-                       "</script>\n                                                            "
-               );
+               wprintf("</td><td></td></tr>\n");
+
+               wprintf("<tr><td>");
+               wprintf("<font size=-1>");
+               wprintf(_("CC:"));
+               wprintf("</font>");
+               wprintf("</td><td>"
+                       "<input autocomplete=\"off\" type=\"text\" name=\"cc\" id=\"cc_id\" value=\"");
+               escputs(bstr("cc"));
+               wprintf("\" size=50 maxlength=1000 />");
+               wprintf("<div class=\"auto_complete\" id=\"cc_name_choices\"></div>");
+               wprintf("</td><td></td></tr>\n");
 
+               wprintf("<tr><td>");
+               wprintf("<font size=-1>");
+               wprintf(_("BCC:"));
+               wprintf("</font>");
+               wprintf("</td><td>"
+                       "<input autocomplete=\"off\" type=\"text\" name=\"bcc\" id=\"bcc_id\" value=\"");
+               escputs(bstr("bcc"));
+               wprintf("\" size=50 maxlength=1000 />");
+               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) */
+               wprintf("<script type=\"text/javascript\">      \n"
+                       " activate_entmsg_autocompleters();     \n"
+                       "</script>                              \n"
+               );
        }
 
        wprintf("<tr><td>");
@@ -2423,19 +2485,10 @@ void display_enter(void)
                "<input type=\"submit\" name=\"cancel_button\" value=\"%s\">\n", _("Cancel"));
        wprintf("</td></tr></table>\n");
 
-       wprintf("<center><script type=\"text/javascript\" "
-               "src=\"static/richtext.js\"></script>\n"
-               "<script type=\"text/javascript\">\n"
-               "function submitForm() { \n"
-               "  updateRTE('msgtext'); \n"
-               "  return true; \n"
-               "} \n"
-               "  \n"
-               "initRTE(\"static/\", \"static/\", \"\"); \n"
-               "</script> \n"
-               "<noscript>JavaScript must be enabled.</noscript> \n"
-               "<script type=\"text/javascript\"> \n"
-               "writeRichText('msgtext', '");
+       wprintf("<center>");
+
+       wprintf("<textarea name=\"msgtext\" cols=\"80\" rows=\"15\">");
+
        msgescputs(bstr("msgtext"));
        if (atol(bstr("pullquote")) > 0L) {
                wprintf("<br><div align=center><i>");
@@ -2443,8 +2496,21 @@ void display_enter(void)
                wprintf("</i></div><br>");
                pullquote_message(atol(bstr("pullquote")), 1);
        }
-       wprintf("', '96%%', '200', true, false); \n"
-               "</script></center><br />\n");
+       wprintf("</textarea>");
+       wprintf("</center><br />\n");
+
+       /*
+        * The following script embeds the TinyMCE richedit control, and automatically
+        * transforms the textarea into a richedit textarea.
+        */
+       wprintf(
+               "<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%%\" "
+               "});"
+               "</script>\n"
+       );
 
        /* Enumerate any attachments which are already in place... */
        wprintf("<img src=\"/static/diskette_24x.gif\" border=0 "
@@ -2496,7 +2562,7 @@ void delete_msg(void)
 
        msgid = atol(bstr("msgid"));
 
-       output_headers(1, 1, 1, 0, 0, 0, 0);
+       output_headers(1, 1, 1, 0, 0, 0);
 
        sprintf(buf, "DELE %ld", msgid);
        serv_puts(buf);
@@ -2520,7 +2586,7 @@ void confirm_move_msg(void)
 
        msgid = atol(bstr("msgid"));
 
-       output_headers(1, 1, 1, 0, 0, 0, 0);
+       output_headers(1, 1, 1, 0, 0, 0);
 
        wprintf("<div id=\"fix_scrollbar_bug\">"
                "<table width=100%% border=0 bgcolor=\"#444455\"><tr><td>");
@@ -2572,7 +2638,7 @@ void move_msg(void)
 
        msgid = atol(bstr("msgid"));
 
-       output_headers(1, 1, 1, 0, 0, 0, 0);
+       output_headers(1, 1, 1, 0, 0, 0);
 
        if (strlen(bstr("move_button")) > 0) {
                sprintf(buf, "MOVE %ld|%s", msgid, bstr("target_room"));