X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fmessages.c;h=5f11916181b900c4f152af3f1ff15acb803fef27;hb=523c1b0f7a3002c6aaa3eb833b55eb0cf07674ff;hp=5c713a0c13fd161219fc7abd2e5def6c062e371a;hpb=ece441dda935c3929956b2043a8f4c29c05d54db;p=citadel.git

diff --git a/webcit/messages.c b/webcit/messages.c
index 5c713a0c1..5f1191618 100644
--- a/webcit/messages.c
+++ b/webcit/messages.c
@@ -5,29 +5,6 @@
  *
  */
 
-#include <ctype.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/socket.h>
-#include <limits.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <string.h>
-#include <pwd.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <pthread.h>
-#include <signal.h>
-
-#ifdef HAVE_ICONV
-#include <iconv.h>
-#endif
-
 #include "webcit.h"
 #include "vcard.h"
 #include "webserver.h"
@@ -68,9 +45,9 @@ void utf8ify_rfc822_string(char *buf) {
 		extract_token(encoding, start, 2, '?', sizeof encoding);
 		extract_token(istr, start, 3, '?', sizeof istr);
 
-		strcpy(start, "");
-		++end;
+		/*strcpy(start, "");
 		++end;
+		++end;*/
 
 		ibuf = malloc(1024);
 		isav = ibuf;
@@ -93,6 +70,16 @@ void utf8ify_rfc822_string(char *buf) {
 			osav = obuf;
 			iconv(ic, &ibuf, &ibuflen, &obuf, &obuflen);
 			osav[1024-obuflen] = 0;
+
+			end = start;
+			end++;
+			strcpy(start, "");
+			remove_token(end, 0, '?');
+			remove_token(end, 0, '?');
+			remove_token(end, 0, '?');
+			remove_token(end, 0, '?');
+			strcpy(end, &end[1]);
+
 			snprintf(newbuf, sizeof newbuf, "%s%s%s", buf, osav, end);
 			strcpy(buf, newbuf);
 			free(osav);
@@ -351,11 +338,11 @@ void display_parsed_vcard(struct vCard *v, int full) {
 					if (!strcasecmp(buf, "tel"))
 						strcat(phone, "");
 					else if (!strcasecmp(buf, "work"))
-						strcat(phone, " (work)");
+						strcat(phone, _(" (work)"));
 					else if (!strcasecmp(buf, "home"))
-						strcat(phone, " (home)");
+						strcat(phone, _(" (home)"));
 					else if (!strcasecmp(buf, "cell"))
-						strcat(phone, " (cell)");
+						strcat(phone, _(" (cell)"));
 					else {
 						strcat(phone, " (");
 						strcat(phone, buf);
@@ -365,7 +352,9 @@ void display_parsed_vcard(struct vCard *v, int full) {
 			}
 			else if (!strcasecmp(firsttoken, "adr")) {
 				if (pass == 2) {
-					wprintf("<TR><TD>Address:</TD><TD>");
+					wprintf("<TR><TD>");
+					wprintf(_("Address:"));
+					wprintf("</TD><TD>");
 					for (j=0; j<num_tokens(thisvalue, ';'); ++j) {
 						extract_token(buf, thisvalue, j, ';', sizeof buf);
 						if (strlen(buf) > 0) {
@@ -423,9 +412,13 @@ void display_parsed_vcard(struct vCard *v, int full) {
 			wprintf("</TD></TR>\n");
 		
 			if (strlen(phone) > 0)
-				wprintf("<TR><TD>Telephone:</TD><TD>%s</TD></TR>\n", phone);
+				wprintf("<TR><TD>");
+				wprintf(_("Telephone:"));
+				wprintf("</TD><TD>%s</TD></TR>\n", phone);
 			if (strlen(mailto) > 0)
-				wprintf("<TR><TD>E-mail:</TD><TD>%s</TD></TR>\n", mailto);
+				wprintf("<TR><TD>");
+				wprintf(_("E-mail:"));
+				wprintf("</TD><TD>%s</TD></TR>\n", mailto);
 		}
 
 	}
@@ -471,8 +464,6 @@ void display_vcard(char *vcard_source, char alpha, int full, char *storename) {
 }
 
 
-
-
 /*
  * I wanna SEE that message!
  */
@@ -486,11 +477,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;
@@ -511,6 +504,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, "");
@@ -520,7 +514,9 @@ void read_message(long msgnum, int suppress_buttons) {
 	serv_printf("MSG4 %ld", msgnum);
 	serv_getln(buf, sizeof buf);
 	if (buf[0] != '1') {
-		wprintf("<STRONG>ERROR:</STRONG> %s<br />\n", &buf[4]);
+		wprintf("<STRONG>");
+		wprintf(_("ERROR:"));
+		wprintf("</STRONG> %s<br />\n", &buf[4]);
 		return;
 	}
 
@@ -535,10 +531,13 @@ 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")) {
-			wprintf("<I>unexpected end of message</I><br /><br />\n");
+			wprintf("<I>");
+			wprintf(_("unexpected end of message"));
+			wprintf("</I><br /><br />\n");
 			wprintf("</SPAN>\n");
 			return;
 		}
@@ -550,7 +549,8 @@ void read_message(long msgnum, int suppress_buttons) {
 			format_type = atoi(&buf[5]);
 		if (!strncasecmp(buf, "from=", 5)) {
 			strcpy(from, &buf[5]);
-			wprintf("from <A HREF=\"/showuser?who=");
+			wprintf(_("from "));
+			wprintf("<A HREF=\"/showuser?who=");
 #ifdef HAVE_ICONV
 			utf8ify_rfc822_string(from);
 #endif
@@ -559,15 +559,27 @@ void read_message(long msgnum, int suppress_buttons) {
 			escputs(from);
 			wprintf("</A> ");
 		}
-		if (!strncasecmp(buf, "subj=", 5))
-			strcpy(m_subject, &buf[5]);
+		if (!strncasecmp(buf, "subj=", 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)))
+		    && (strcasecmp(&buf[5], serv_info.serv_humannode))) {
 			wprintf("(%s) ", &buf[5]);
+		}
 		if ((!strncasecmp(buf, "room=", 5))
 		    && (strcasecmp(&buf[5], WC->wc_roomname))
-		    && (strlen(&buf[5])>0) )
-			wprintf("in %s> ", &buf[5]);
+		    && (strlen(&buf[5])>0) ) {
+			wprintf(_("in "));
+			wprintf("%s&gt; ", &buf[5]);
+		}
 		if (!strncasecmp(buf, "rfca=", 5)) {
 			strcpy(rfca, &buf[5]);
 			wprintf("&lt;");
@@ -585,8 +597,16 @@ void read_message(long msgnum, int suppress_buttons) {
 				wprintf("@%s ", &buf[5]);
 			}
 		}
-		if (!strncasecmp(buf, "rcpt=", 5))
-			wprintf("to %s ", &buf[5]);
+		if (!strncasecmp(buf, "rcpt=", 5)) {
+			wprintf(_("to "));
+			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);
 			wprintf("%s ", now);
@@ -660,14 +680,24 @@ 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\">"
-			"Subject: %s"
-			"</SPAN>", m_subject
-		);
+			"<SPAN CLASS=\"message_subject\">");
+		wprintf(_("Subject:"));
+		wprintf(" ");
+		escputs(m_subject);
+		wprintf("</SPAN>");
 	}
 	wprintf("</TD>\n");
 
@@ -681,23 +711,42 @@ void read_message(long msgnum, int suppress_buttons) {
 		wprintf("?subject=");
 		if (strncasecmp(m_subject, "Re:", 3)) wprintf("Re:%20");
 		urlescputs(m_subject);
-		wprintf("\">[Reply]</a> ");
+		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);
+			if (strncasecmp(m_subject, "Fwd:", 4)) wprintf("Fwd:%20");
+			urlescputs(m_subject);
+			wprintf("\">[%s]</a> ", _("Forward"));
+		}
 
 		if (WC->is_room_aide)  {
-		
 			/* Move */
-			wprintf("<a href=\"/confirm_move_msg?msgid=%ld\">[Move]</a> ",
-				msgnum);
+			wprintf("<a href=\"/confirm_move_msg?msgid=%ld\">[%s]</a> ",
+				msgnum, _("Move"));
 	
 			/* Delete */
 			wprintf("<a href=\"/delete_msg?msgid=%ld\" "
-				"onClick=\"return confirm('Delete this message?');\">"
-				"[Delete]</a> ", msgnum);
-				
+				"onClick=\"return confirm('%s');\">"
+				"[%s]</a> ", msgnum, _("Delete this message?"), _("Delete")
+			);
 		}
 
-		wprintf("<a href=\"/msg?msgnum=%ld?print_it=yes\" target=\"msgloader1\">"
-			"[Print]</a>", msgnum);
+		wprintf("<a href=\"/msg?msgnum=%ld?sourceiframe=msgloader1?print_it=yes\" target=\"msgloader1\">"
+			"[%s]</a>", msgnum, _("Print"));
 
 		wprintf("</td>");
 	}
@@ -714,7 +763,9 @@ void read_message(long msgnum, int suppress_buttons) {
 	strcpy(mime_content_type, "text/plain");
 	while (serv_getln(buf, sizeof buf), (strlen(buf) > 0)) {
 		if (!strcmp(buf, "000")) {
-			wprintf("<I>unexpected end of message</I><br /><br />\n");
+			wprintf("<I>");
+			wprintf(_("unexpected end of message"));
+			wprintf("</I><br /><br />\n");
 			goto ENDBODY;
 		}
 		if (!strncasecmp(buf, "Content-type: ", 14)) {
@@ -747,11 +798,12 @@ void read_message(long msgnum, int suppress_buttons) {
 
 	/* Messages in legacy Citadel variformat get handled thusly... */
 	if (!strcasecmp(mime_content_type, "text/x-citadel-variformat")) {
-		fmout(NULL, "JUSTIFY");
+		fmout("JUSTIFY");
 	}
 
 	/* Boring old 80-column fixed format text gets handled this way... */
-	else if (!strcasecmp(mime_content_type, "text/plain")) {
+	else if ( (!strcasecmp(mime_content_type, "text/plain"))
+	        || (!strcasecmp(mime_content_type, "text")) ) {
 		while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
 			if (buf[strlen(buf)-1] == '\n') buf[strlen(buf)-1] = 0;
 			if (buf[strlen(buf)-1] == '\r') buf[strlen(buf)-1] = 0;
@@ -796,8 +848,8 @@ void read_message(long msgnum, int suppress_buttons) {
 
 	/* Unknown weirdness */
 	else {
-		wprintf("I don't know how to display %s<br />\n",
-			mime_content_type);
+		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")) { }
 	}
 
@@ -819,7 +871,7 @@ void read_message(long msgnum, int suppress_buttons) {
 				wprintf("<A HREF=\"/edit_vcard?"
 					"msgnum=%ld?partnum=%s\">",
 					msgnum, vcard_partnum);
-				wprintf("[edit]</A>");
+				wprintf("[%s]</A>", _("edit"));
 			}
 
 			/* In all cases, display the full card */
@@ -872,7 +924,7 @@ void embed_message(void) {
 	targetdiv = bstr("targetdiv");
 	print_it = bstr("print_it");
 
-	output_headers(1, 0, 0, 0, 0, 1, 0);
+	output_headers(1, 0, 0, 0, 1, 0);
 	begin_burst();
 
 	wprintf("<html><head>");
@@ -885,19 +937,31 @@ void embed_message(void) {
 " <script type=\"text/javascript\">					\n"
 "	function loaded_now_copy_it() {					\n"
 "		parent.document.getElementById(\"%s\").innerHTML = parent.frames['%s'].document.body.innerHTML;	\n"
-"	}											\n"
+"	}								\n"
 "</script>\n",
 		targetdiv,
 		sourceiframe
 	);
 
+	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("</head>");
 	wprintf("<body");
 	if (strlen(targetdiv) > 0) {
 		wprintf(" onLoad='loaded_now_copy_it();'");
 	}
 	if (!strcasecmp(print_it, "yes")) {
-		wprintf(" onLoad='window.print();'");
+		wprintf(" onLoad='loaded_now_print_it();'");
 	}
 	wprintf(">\n");
 	read_message(msgnum, (!strcasecmp(print_it, "yes") ? 1 : 0) );
@@ -908,6 +972,309 @@ void embed_message(void) {
 
 
 
+/*
+ * 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.
+ */
+void pullquote_message(long msgnum, int forward_attachments) {
+	char buf[SIZ];
+	char mime_partnum[256];
+	char mime_filename[256];
+	char mime_content_type[256];
+	char mime_charset[256];
+	char mime_disposition[256];
+	int mime_length;
+	char mime_http[SIZ];
+	char *attachments = NULL;
+	int num_attachments = 0;
+	struct wc_attachment *att, *aptr;
+	char m_subject[256];
+	char from[256];
+	char node[256];
+	char rfca[256];
+	char reply_to[512];
+	char now[256];
+	int format_type = 0;
+	int nhdr = 0;
+	int bq = 0;
+	int i = 0;
+#ifdef HAVE_ICONV
+	iconv_t ic = (iconv_t)(-1) ;
+	char *ibuf;                   /* Buffer of characters to be converted */
+	char *obuf;                   /* Buffer for converted characters      */
+	size_t ibuflen;               /* Length of input buffer               */
+	size_t obuflen;               /* Length of output buffer              */
+	char *osav;                   /* Saved pointer to output buffer       */
+#endif
+
+	strcpy(from, "");
+	strcpy(node, "");
+	strcpy(rfca, "");
+	strcpy(reply_to, "");
+	strcpy(mime_http, "");
+	strcpy(mime_content_type, "text/plain");
+	strcpy(mime_charset, "us-ascii");
+
+	serv_printf("MSG4 %ld", msgnum);
+	serv_getln(buf, sizeof buf);
+	if (buf[0] != '1') {
+		wprintf(_("ERROR:"));
+		wprintf("%s<br />", &buf[4]);
+		return;
+	}
+
+	strcpy(m_subject, "");
+
+	while (serv_getln(buf, sizeof buf), strcasecmp(buf, "text")) {
+		if (!strcmp(buf, "000")) {
+			wprintf(_("unexpected end of message"));
+			return;
+		}
+		if (!strncasecmp(buf, "nhdr=yes", 8))
+			nhdr = 1;
+		if (nhdr == 1)
+			buf[0] = '_';
+		if (!strncasecmp(buf, "type=", 5))
+			format_type = atoi(&buf[5]);
+		if (!strncasecmp(buf, "from=", 5)) {
+			strcpy(from, &buf[5]);
+			wprintf(_("from "));
+#ifdef HAVE_ICONV
+			utf8ify_rfc822_string(from);
+#endif
+			msgescputs(from);
+		}
+		if (!strncasecmp(buf, "subj=", 5)) {
+			strcpy(m_subject, &buf[5]);
+		}
+		if ((!strncasecmp(buf, "hnod=", 5))
+		    && (strcasecmp(&buf[5], serv_info.serv_humannode))) {
+			wprintf("(%s) ", &buf[5]);
+		}
+		if ((!strncasecmp(buf, "room=", 5))
+		    && (strcasecmp(&buf[5], WC->wc_roomname))
+		    && (strlen(&buf[5])>0) ) {
+			wprintf(_("in "));
+			wprintf("%s&gt; ", &buf[5]);
+		}
+		if (!strncasecmp(buf, "rfca=", 5)) {
+			strcpy(rfca, &buf[5]);
+			wprintf("&lt;");
+			msgescputs(rfca);
+			wprintf("&gt; ");
+		}
+
+		if (!strncasecmp(buf, "node=", 5)) {
+			strcpy(node, &buf[5]);
+			if ( ((WC->room_flags & QR_NETWORK)
+			|| ((strcasecmp(&buf[5], serv_info.serv_nodename)
+			&& (strcasecmp(&buf[5], serv_info.serv_fqdn)))))
+			&& (strlen(rfca)==0)
+			) {
+				wprintf("@%s ", &buf[5]);
+			}
+		}
+		if (!strncasecmp(buf, "rcpt=", 5)) {
+			wprintf(_("to "));
+			wprintf("%s ", &buf[5]);
+		}
+		if (!strncasecmp(buf, "time=", 5)) {
+			fmt_date(now, atol(&buf[5]), 0);
+			wprintf("%s ", now);
+		}
+
+		/*
+		 * Save attachment info for later.  We can't start downloading them
+		 * yet because we're in the middle of a server transaction.
+		 */
+		if (!strncasecmp(buf, "part=", 5)) {
+			++num_attachments;
+			attachments = realloc(attachments, (num_attachments * 1024));
+			strcat(attachments, &buf[5]);
+			strcat(attachments, "\n");
+		}
+
+	}
+
+	wprintf("<br>");
+
+#ifdef HAVE_ICONV
+	utf8ify_rfc822_string(m_subject);
+#endif
+	if (strlen(m_subject) > 0) {
+		wprintf(_("Subject:"));
+		wprintf(" ");
+		msgescputs(m_subject);
+		wprintf("<br />");
+	}
+
+	/*
+	 * Begin body
+	 */
+	wprintf("<br>");
+
+	/* 
+	 * Learn the content type
+	 */
+	strcpy(mime_content_type, "text/plain");
+	while (serv_getln(buf, sizeof buf), (strlen(buf) > 0)) {
+		if (!strcmp(buf, "000")) {
+			wprintf(_("unexpected end of message"));
+			goto ENDBODY;
+		}
+		if (!strncasecmp(buf, "Content-type: ", 14)) {
+			safestrncpy(mime_content_type, &buf[14],
+				sizeof(mime_content_type));
+			for (i=0; i<strlen(mime_content_type); ++i) {
+				if (!strncasecmp(&mime_content_type[i], "charset=", 8)) {
+					safestrncpy(mime_charset, &mime_content_type[i+8],
+						sizeof mime_charset);
+				}
+			}
+			for (i=0; i<strlen(mime_content_type); ++i) {
+				if (mime_content_type[i] == ';') {
+					mime_content_type[i] = 0;
+				}
+			}
+		}
+	}
+
+	/* 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")) ) {
+		ic = iconv_open("UTF-8", mime_charset);
+		if (ic == (iconv_t)(-1) ) {
+			lprintf(5, "iconv_open() failed: %s\n", strerror(errno));
+		}
+	}
+#endif
+
+	/* Messages in legacy Citadel variformat get handled thusly... */
+	if (!strcasecmp(mime_content_type, "text/x-citadel-variformat")) {
+		pullquote_fmout();
+	}
+
+	/* Boring old 80-column fixed format text gets handled this way... */
+	else if (!strcasecmp(mime_content_type, "text/plain")) {
+		while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
+			if (buf[strlen(buf)-1] == '\n') buf[strlen(buf)-1] = 0;
+			if (buf[strlen(buf)-1] == '\r') buf[strlen(buf)-1] = 0;
+
+#ifdef HAVE_ICONV
+			if (ic != (iconv_t)(-1) ) {
+				ibuf = buf;
+				ibuflen = strlen(ibuf);
+				obuflen = SIZ;
+				obuf = (char *) malloc(obuflen);
+				osav = obuf;
+				iconv(ic, &ibuf, &ibuflen, &obuf, &obuflen);
+				osav[SIZ-obuflen] = 0;
+				safestrncpy(buf, osav, sizeof buf);
+				free(osav);
+			}
+#endif
+
+			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>");
+				bq = 1;
+			} else if ((bq == 1) &&
+			   	(strncmp(buf, ">", 1)) && (strncmp(buf, " >", 2)) && (strncmp(buf, " :-)", 4))) {
+				wprintf("</BLOCKQUOTE>");
+				bq = 0;
+			}
+			wprintf("<TT>");
+			url(buf);
+			msgescputs(buf);
+			wprintf("</TT><br />");
+		}
+		wprintf("</I><br />");
+	}
+
+	/* HTML just gets escaped and stuffed back into the editor */
+	else if (!strcasecmp(mime_content_type, "text/html")) {
+		while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
+			msgescputs(buf);
+		}
+	}
+
+	/* Unknown weirdness ... don't know how to handle this content type */
+	else {
+		while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) { }
+	}
+
+ENDBODY:
+	/* end of body handler */
+
+	/*
+	 * If there were attachments, we have to download them and insert them
+	 * into the attachment chain for the forwarded message we are composing.
+	 */
+	if (num_attachments) {
+		for (i=0; i<num_attachments; ++i) {
+			extract_token(buf, attachments, i, '\n', sizeof buf);
+                        extract_token(mime_filename, buf, 1, '|', sizeof mime_filename);
+                        extract_token(mime_partnum, buf, 2, '|', sizeof mime_partnum);
+                        extract_token(mime_disposition, buf, 3, '|', sizeof mime_disposition);
+                        extract_token(mime_content_type, buf, 4, '|', sizeof mime_content_type);
+                        mime_length = extract_int(buf, 5);
+
+			/*
+			 * tracing  ... uncomment if necessary
+			 *
+			lprintf(9, "fwd filename: %s\n", mime_filename);
+			lprintf(9, "fwd partnum : %s\n", mime_partnum);
+			lprintf(9, "fwd conttype: %s\n", mime_content_type);
+			lprintf(9, "fwd dispose : %s\n", mime_disposition);
+			lprintf(9, "fwd length  : %d\n", mime_length);
+			 */
+
+			if ( (!strcasecmp(mime_disposition, "inline"))
+			   || (!strcasecmp(mime_disposition, "attachment")) ) {
+		
+				/* Create an attachment struct from this mime part... */
+				att = malloc(sizeof(struct wc_attachment));
+				memset(att, 0, sizeof(struct wc_attachment));
+				att->length = mime_length;
+				strcpy(att->content_type, mime_content_type);
+				strcpy(att->filename, mime_filename);
+				att->next = NULL;
+				att->data = load_mimepart(msgnum, mime_partnum);
+		
+				/* And add it to the list. */
+				if (WC->first_attachment == NULL) {
+					WC->first_attachment = att;
+				}
+				else {
+					aptr = WC->first_attachment;
+					while (aptr->next != NULL) aptr = aptr->next;
+					aptr->next = att;
+				}
+			}
+
+		}
+		free(attachments);
+	}
+
+#ifdef HAVE_ICONV
+	if (ic != (iconv_t)(-1) ) {
+		iconv_close(ic);
+	}
+#endif
+}
+
+
+
+
+
+
 void display_summarized(int num) {
 	char datebuf[64];
 
@@ -936,65 +1303,6 @@ void display_summarized(int num) {
 }
 
 
-void summarize_message(int num, long msgnum, int is_new) {
-	char buf[SIZ];
-
-	memset(&WC->summ[num], 0, sizeof(struct message_summary));
-	safestrncpy(WC->summ[num].subj, "(no subject)", sizeof WC->summ[num].subj);
-	WC->summ[num].is_new = is_new;
-	WC->summ[num].msgnum = msgnum;
-
-	/* ask for headers only with no MIME */
-	sprintf(buf, "MSG0 %ld|3", msgnum);
-	serv_puts(buf);
-	serv_getln(buf, sizeof buf);
-	if (buf[0] != '1') return;
-
-	while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
-		if (!strncasecmp(buf, "from=", 5)) {
-			safestrncpy(WC->summ[num].from, &buf[5], sizeof WC->summ[num].from);
-		}
-		if (!strncasecmp(buf, "subj=", 5)) {
-			if (strlen(&buf[5]) > 0) {
-				safestrncpy(WC->summ[num].subj, &buf[5],
-					sizeof WC->summ[num].subj);
-#ifdef HAVE_ICONV
-				/* Handle subjects with RFC2047 encoding */
-				utf8ify_rfc822_string(WC->summ[num].subj);
-#endif
-				if (strlen(WC->summ[num].subj) > 75) {
-					strcpy(&WC->summ[num].subj[72], "...");
-				}
-			}
-		}
-
-		if (!strncasecmp(buf, "node=", 5)) {
-			if ( ((WC->room_flags & QR_NETWORK)
-			|| ((strcasecmp(&buf[5], serv_info.serv_nodename)
-			&& (strcasecmp(&buf[5], serv_info.serv_fqdn)))))
-			) {
-				strcat(WC->summ[num].from, " @ ");
-				strcat(WC->summ[num].from, &buf[5]);
-			}
-		}
-
-		if (!strncasecmp(buf, "rcpt=", 5)) {
-			safestrncpy(WC->summ[num].to, &buf[5], sizeof WC->summ[num].to);
-		}
-
-		if (!strncasecmp(buf, "time=", 5)) {
-			WC->summ[num].date = atol(&buf[5]);
-		}
-	}
-	
-#ifdef HAVE_ICONV
-	/* Handle senders with RFC2047 encoding */
-	utf8ify_rfc822_string(WC->summ[num].from);
-#endif
-	if (strlen(WC->summ[num].from) > 25) {
-		strcpy(&WC->summ[num].from[22], "...");
-	}
-}
 
 
 
@@ -1010,7 +1318,7 @@ void display_addressbook(long msgnum, char alpha) {
 	struct message_summary summ;
 
 	memset(&summ, 0, sizeof(summ));
-	safestrncpy(summ.subj, "(no subject)", sizeof summ.subj);
+	safestrncpy(summ.subj, _("(no subject)"), sizeof summ.subj);
 
 	sprintf(buf, "MSG0 %ld|1", msgnum);	/* ask for headers only */
 	serv_puts(buf);
@@ -1047,7 +1355,7 @@ void display_addressbook(long msgnum, char alpha) {
 				wprintf("<A HREF=\"/edit_vcard?"
 					"msgnum=%ld?partnum=%s\">",
 					msgnum, vcard_partnum);
-				wprintf("[edit]</A>");
+				wprintf("[%s]</A>", _("edit"));
 			}
 
 			free(vcard_source);
@@ -1133,7 +1441,7 @@ void fetch_ab_name(long msgnum, char *namebuf) {
 	for (i=0; i<strlen(namebuf); ++i) {
 		if (namebuf[i] != ';') return;
 	}
-	strcpy(namebuf, "(no name)");
+	strcpy(namebuf, _("(no name)"));
 }
 
 
@@ -1178,7 +1486,9 @@ void do_addrbook_view(struct addrbookent *addrbook, int num_ab) {
 	char tablast_label[SIZ];
 
 	if (num_ab == 0) {
-		wprintf("<I>This address book is empty.</I>\n");
+		wprintf("<br /><br /><br /><div align=\"center\"><i>");
+		wprintf(_("This address book is empty."));
+		wprintf("</i></div>\n");
 		return;
 	}
 
@@ -1253,12 +1563,29 @@ void do_addrbook_view(struct addrbookent *addrbook, int num_ab) {
 /* 
  * load message pointers from the server
  */
-int load_msg_ptrs(char *servcmd)
+int load_msg_ptrs(char *servcmd, int with_headers)
 {
-	char buf[SIZ];
+	char buf[1024];
+	time_t datestamp;
+	char displayname[128];
+	char nodename[128];
+	char inetaddr[128];
+	char subject[256];
 	int nummsgs;
 	int maxload = 0;
 
+	int num_summ_alloc = 0;
+
+	if (with_headers) {
+		if (WC->num_summ != 0) {
+			free(WC->summ);
+			WC->num_summ = 0;
+		}
+	}
+	num_summ_alloc = 100;
+	WC->num_summ = 0;
+	WC->summ = malloc(num_summ_alloc * sizeof(struct message_summary));
+
 	nummsgs = 0;
 	maxload = sizeof(WC->msgarr) / sizeof(long) ;
 	serv_puts(servcmd);
@@ -1269,8 +1596,59 @@ int load_msg_ptrs(char *servcmd)
 	}
 	while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
 		if (nummsgs < maxload) {
-			WC->msgarr[nummsgs] = atol(buf);
+			WC->msgarr[nummsgs] = extract_long(buf, 0);
+			datestamp = extract_long(buf, 1);
+			extract_token(displayname, buf, 2, '|', sizeof displayname);
+			extract_token(nodename, buf, 3, '|', sizeof nodename);
+			extract_token(inetaddr, buf, 4, '|', sizeof inetaddr);
+			extract_token(subject, buf, 5, '|', sizeof subject);
 			++nummsgs;
+
+			if (with_headers) {
+				if (nummsgs > num_summ_alloc) {
+					num_summ_alloc *= 2;
+					WC->summ = realloc(WC->summ, num_summ_alloc * sizeof(struct message_summary));
+				}
+				++WC->num_summ;
+
+				memset(&WC->summ[nummsgs-1], 0, sizeof(struct message_summary));
+				WC->summ[nummsgs-1].msgnum = WC->msgarr[nummsgs-1];
+				safestrncpy(WC->summ[nummsgs-1].subj, _("(no subject)"), sizeof WC->summ[nummsgs-1].subj);
+				if (strlen(displayname) > 0) {
+					safestrncpy(WC->summ[nummsgs-1].from, displayname, 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 */
+				utf8ify_rfc822_string(WC->summ[nummsgs-1].subj);
+#endif
+				if (strlen(WC->summ[nummsgs-1].subj) > 75) {
+					strcpy(&WC->summ[nummsgs-1].subj[72], "...");
+				}
+
+				if (strlen(nodename) > 0) {
+					if ( ((WC->room_flags & QR_NETWORK)
+					   || ((strcasecmp(nodename, serv_info.serv_nodename)
+					   && (strcasecmp(nodename, serv_info.serv_fqdn)))))
+					) {
+						strcat(WC->summ[nummsgs-1].from, " @ ");
+						strcat(WC->summ[nummsgs-1].from, nodename);
+					}
+				}
+
+				WC->summ[nummsgs-1].date = datestamp;
+	
+#ifdef HAVE_ICONV
+				/* Handle senders with RFC2047 encoding */
+				utf8ify_rfc822_string(WC->summ[nummsgs-1].from);
+#endif
+				if (strlen(WC->summ[nummsgs-1].from) > 25) {
+					strcpy(&WC->summ[nummsgs-1].from[22], "...");
+				}
+			}
 		}
 	}
 	return (nummsgs);
@@ -1345,7 +1723,6 @@ void readloop(char *oper)
 	char cmd[SIZ];
 	char buf[SIZ];
 	char old_msgs[SIZ];
-	int is_new = 0;
 	int a, b;
 	int nummsgs;
 	long startmsg;
@@ -1389,7 +1766,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.
@@ -1416,7 +1793,7 @@ void readloop(char *oper)
 	}
 
 	if (is_summary) {
-		strcpy(cmd, "MSGS ALL");
+		strcpy(cmd, "MSGS ALL|||1");	/* fetch header summary */
 		startmsg = 1;
 		maxmsgs = 9999999;
 	}
@@ -1452,33 +1829,26 @@ void readloop(char *oper)
 		maxmsgs = 32767;
 	}
 
-	nummsgs = load_msg_ptrs(cmd);
+	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("<EM>No new messages.</EM>\n");
+				wprintf(_("No new messages."));
 			} else if (!strcmp(oper, "readold")) {
-				wprintf("<EM>No old messages.</EM>\n");
+				wprintf(_("No old messages."));
 			} else {
-				wprintf("<EM>No messages here.</EM>\n");
+				wprintf(_("No messages here."));
 			}
+			wprintf("</em>\n");
 		}
 
 		goto DONE;
 	}
 
 	if (is_summary) {
-		if (WC->num_summ != 0) {
-			WC->num_summ = 0;
-			free(WC->summ);
-		}
-		WC->num_summ = nummsgs;
-		WC->summ = malloc(WC->num_summ*sizeof(struct message_summary));
 		for (a = 0; a < nummsgs; ++a) {
-			/* Gather summary information */
-			summarize_message(a, WC->msgarr[a], is_new);
-
 			/* Are you a new message, or an old message? */
 			if (is_summary) {
 				if (is_msg_in_mset(old_msgs, WC->msgarr[a])) {
@@ -1570,18 +1940,19 @@ void readloop(char *oper)
 			"<table border=0 cellspacing=0 "
 			"cellpadding=0 width=100%%>\n"
 			"<TR>"
-			"<TD align=center><b><i>Subject</i></b> %s</TD>"
-			"<TD align=center><b><i>Sender</i></b> %s</TD>"
-			"<TD align=center><b><i>Date</i></b> %s</TD>"
-			"<TD><INPUT TYPE=\"submit\" NAME=\"sc\" "
+			"<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=\"Delete\"></TD>"
+			"VALUE=\"%s\"></TD>"
 			"</TR>\n"
 			,
-			subjsort_button,
-			sendsort_button,
-			datesort_button
+			_("Subject"),	subjsort_button,
+			_("Sender"),	sendsort_button,
+			_("Date"),	datesort_button,
+			_("Delete")
 		);
 	}
 
@@ -1645,6 +2016,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 */
 	}
 
@@ -1659,19 +2032,19 @@ void readloop(char *oper)
 	   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>"
-			"Reading #%d of %d messages.</TD>\n"
-			"<TD ALIGN=RIGHT><FONT SIZE=+1>",
-			lowest_displayed, nummsgs);
+			"<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\">"
-				"Previous</A> \n",
+				"%s</A> \n",
 					oper,
-					pn_previous );
+					pn_previous,
+					_("Previous"));
 		}
 
 		if (pn_next > 0L) {
@@ -1679,18 +2052,20 @@ void readloop(char *oper)
 				"?startmsg=%ld"
 				"?maxmsgs=1"
 				"?summary=0\">"
-				"Next</A> \n",
+				"%s</A> \n",
 					oper,
-					pn_next );
+					pn_next,
+					_("Next"));
 		}
 
 		wprintf("<A HREF=\"/%s?startmsg=%ld"
 			"?maxmsgs=%d?summary=1\">"
-			"Summary"
+			"%s"
 			"</A>",
 			oper,
 			WC->msgarr[0],
-			DEFAULT_MAXMSGS
+			DEFAULT_MAXMSGS,
+			_("Summary")
 		);
 
 		wprintf("</td></tr></table></div>\n");
@@ -1708,7 +2083,7 @@ void readloop(char *oper)
 		wprintf("<form name=\"msgomatic\" "
 			"method=\"POST\" action=\"/do_stuff_to_msgs\">\n");
 
-		wprintf("Reading #", lowest_displayed, highest_displayed);
+		wprintf(_("Reading #"), lowest_displayed, highest_displayed);
 
 		wprintf("<select name=\"whichones\" size=\"1\" "
 			"OnChange=\"location.href=msgomatic.whichones.options"
@@ -1738,7 +2113,8 @@ void readloop(char *oper)
 			oper,
 			WC->msgarr[0], is_summary);
 
-		wprintf("</select> of %d messages.", nummsgs);
+		wprintf("</select> ");
+		wprintf(_("of %d messages."), nummsgs);
 		wprintf("</form>\n");
 	    }
 	}
@@ -1795,6 +2171,9 @@ void post_mime_to_server(void) {
 	char *encoded;
 	size_t encoded_length;
 
+	/* 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 (WC->first_attachment != NULL) {
 		is_multipart = 1;
@@ -1886,8 +2265,8 @@ void post_message(void)
 			aptr->next = att;
 		}
 
-		/* Netscape sends a simple filename, which is what we want,
-		 * but Satan's browser sends an entire pathname.  Reduce
+		/* Mozilla sends a simple filename, which is what we want,
+		 * but Satan's Browser sends an entire pathname.  Reduce
 		 * the path to just a filename if we need to.
 		 */
 		while (num_tokens(att->filename, '/') > 1) {
@@ -1907,34 +2286,41 @@ void post_message(void)
 		return;
 	}
 
-	if (!strcasecmp(bstr("sc"), "Cancel")) {
+	if (strlen(bstr("cancel_button")) > 0) {
 		sprintf(WC->ImportantMessage, 
-			"Cancelled.  Message was not posted.");
-	} else if (!strcasecmp(bstr("attach"), "Add")) {
+			_("Cancelled.  Message was not posted."));
+	} else if (strlen(bstr("attach_button")) > 0) {
 		display_enter();
 		return;
 	} else if (atol(bstr("postseq")) == dont_post) {
 		sprintf(WC->ImportantMessage, 
-			"Automatically cancelled because you have already "
-			"saved this message.");
+			_("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) {
-				sprintf(WC->ImportantMessage, "Message has been sent.\n");
+			if ( (strlen(bstr("recp")) > 0)
+			   || (strlen(bstr("cc")) > 0)
+			   || (strlen(bstr("bcc")) > 0)
+			) {
+				sprintf(WC->ImportantMessage, _("Message has been sent.\n"));
 			}
 			else {
-				sprintf(WC->ImportantMessage, "Message has been posted.\n");
+				sprintf(WC->ImportantMessage, _("Message has been posted.\n"));
 			}
 			dont_post = atol(bstr("postseq"));
 		} else {
-			sprintf(WC->ImportantMessage, 
-				"%s", &buf[4]);
+			sprintf(WC->ImportantMessage, "%s", &buf[4]);
+			display_enter();
+			return;
 		}
 	}
 
@@ -1953,6 +2339,8 @@ void display_enter(void)
 	char buf[SIZ];
 	long now;
 	struct wc_attachment *att;
+	int recipient_required = 0;
+	int recipient_bad = 0;
 
 	if (strlen(bstr("force_room")) > 0) {
 		gotoroom(bstr("force_room"));
@@ -1984,8 +2372,11 @@ void display_enter(void)
 	}
 #endif
 
-	/* Otherwise proceed normally.  Do a custom room banner with no navbar... */
-	output_headers(1, 1, 2, 0, 0, 0, 0);
+	/*
+	 * Otherwise proceed normally.
+	 * Do a custom room banner with no navbar...
+	 */
+	output_headers(1, 1, 2, 0, 0, 0);
 	wprintf("<div id=\"banner\">\n");
 	embed_room_banner(NULL, navbar_none);
 	wprintf("</div>\n");
@@ -1993,67 +2384,123 @@ 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 (strlen(bstr("recp")) > 0) {
-			svprintf("RECPERROR", WCS_STRING,
-				"<SPAN CLASS=\"errormsg\">%s</SPAN><br />\n",
-				&buf[4]
-			);
-		}
-		do_template("prompt_for_recipient");
-		goto DONE;
+	if (!strncmp(buf, "570", 3)) {		/* 570 means that we need a recipient here */
+		recipient_required = 1;
 	}
-	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> ");
+	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> ");
+		strcat(&buf[strlen(buf)], _(" <I>to</I> "));
 		stresc(&buf[strlen(buf)], bstr("recp"), 1, 1);
 	}
-	strcat(&buf[strlen(buf)], " <I>in</I> ");
+	*/
+
+	strcat(&buf[strlen(buf)], _(" <I>in</I> "));
 	stresc(&buf[strlen(buf)], WC->wc_roomname, 1, 1);
 
 	/* begin message entry screen */
-	// wprintf("<div style=\"position:absolute; left:1%%; width:96%%; height:100%%\">\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("%s<br>\n", buf);	/* header bar */
 	wprintf("<img src=\"static/newmess3_24x.gif\" align=middle alt=\" \">");
-		/* "onLoad=\"document.enterform.msgtext.focus();\" " */
-	wprintf("<font size=-1>Subject (optional):</font>"
+	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_id\" value=\"");
+		escputs(bstr("recp"));
+		wprintf("\" size=50 maxlength=1000 />");
+		wprintf("<div class=\"auto_complete\" id=\"recp_name_choices\"></div>");
+		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>");
+	wprintf("<font size=-1>");
+	wprintf(_("Subject (optional):"));
+	wprintf("</font>");
+	wprintf("</td><td>"
 		"<input type=\"text\" name=\"subject\" value=\"");
 	escputs(bstr("subject"));
-	wprintf("\" size=40 maxlength=70>"
-		"&nbsp;"
-	);
+	wprintf("\" size=50 maxlength=70></td><td>\n");
 
-	wprintf("<input type=\"submit\" name=\"sc\" value=\"");
-	if (strlen(bstr("recp")) > 0) {
-		wprintf("Send message");
+	wprintf("<input type=\"submit\" name=\"send_button\" value=\"");
+	if (recipient_required) {
+		wprintf(_("Send message"));
 	} else {
-		wprintf("Post message");
+		wprintf(_("Post message"));
 	}
 	wprintf("\">&nbsp;"
-		"<input type=\"submit\" name=\"sc\" value=\"Cancel\">\n");
+		"<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"
@@ -2069,6 +2516,12 @@ void display_enter(void)
 		"<script type=\"text/javascript\"> \n"
 		"writeRichText('msgtext', '");
 	msgescputs(bstr("msgtext"));
+	if (atol(bstr("pullquote")) > 0L) {
+		wprintf("<br><div align=center><i>");
+		wprintf(_("--- forwarded message ---"));
+		wprintf("</i></div><br>");
+		pullquote_message(atol(bstr("pullquote")), 1);
+	}
 	wprintf("', '96%%', '200', true, false); \n"
 		"</script></center><br />\n");
 
@@ -2090,7 +2543,17 @@ void display_enter(void)
 	wprintf("&nbsp;&nbsp;&nbsp;"
 		"Attach file: <input NAME=\"attachfile\" "
 		"SIZE=16 TYPE=\"file\">\n&nbsp;&nbsp;"
-		"<input type=\"submit\" name=\"attach\" value=\"Add\">\n");
+		"<input type=\"submit\" name=\"attach_button\" value=\"%s\">\n", _("Add"));
+
+	/* 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"));
+	} else {
+		wprintf(_("Post message"));
+	}
+	wprintf("\">&nbsp;"
+		"<input type=\"submit\" name=\"cancel_button\" value=\"%s\">\n", _("Cancel"));
 
 	wprintf("</form>\n");
 
@@ -2112,7 +2575,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);
@@ -2136,17 +2599,20 @@ 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>");
 	wprintf("<font size=+1 color=\"#ffffff\"");
-	wprintf("<b>Confirm move of message</b>\n");
+	wprintf("<b>");
+	wprintf(_("Confirm move of message"));
+	wprintf("</b>\n");
 	wprintf("</font></td></tr></table></div>\n");
 
 	wprintf("<CENTER>");
 
-	wprintf("Move this message to:<br />\n");
+	wprintf(_("Move this message to:"));
+	wprintf("<br />\n");
 
 	wprintf("<form METHOD=\"POST\" ACTION=\"/move_msg\">\n");
 	wprintf("<INPUT TYPE=\"hidden\" NAME=\"msgid\" VALUE=\"%s\">\n",
@@ -2167,9 +2633,9 @@ void confirm_move_msg(void)
 	wprintf("</SELECT>\n");
 	wprintf("<br />\n");
 
-	wprintf("<INPUT TYPE=\"submit\" NAME=\"yesno\" VALUE=\"Move\">");
+	wprintf("<INPUT TYPE=\"submit\" NAME=\"move_button\" VALUE=\"%s\">", _("Move"));
 	wprintf("&nbsp;");
-	wprintf("<INPUT TYPE=\"submit\" NAME=\"yesno\" VALUE=\"Cancel\">");
+	wprintf("<INPUT TYPE=\"submit\" NAME=\"cancel_button\" VALUE=\"%s\">", _("Cancel"));
 	wprintf("</form></CENTER>\n");
 
 	wprintf("</CENTER>\n");
@@ -2185,15 +2651,17 @@ 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 (!strcasecmp(bstr("yesno"), "Move")) {
+	if (strlen(bstr("move_button")) > 0) {
 		sprintf(buf, "MOVE %ld|%s", msgid, bstr("target_room"));
 		serv_puts(buf);
 		serv_getln(buf, sizeof buf);
 		wprintf("<EM>%s</EM><br />\n", &buf[4]);
 	} else {
-		wprintf("<EM>Message not moved.</EM><br />\n");
+		wprintf("<EM>");
+		wprintf(_("The message was not moved."));
+		wprintf("</EM><br />\n");
 	}
 
 	wDumpContent(1);
@@ -2205,8 +2673,7 @@ void move_msg(void)
  * (such as deleting them).
  */
 void do_stuff_to_msgs(void) {
-	char buf[SIZ];
-	char sc[SIZ];
+	char buf[256];
 
 	struct stuff_t {
 		struct stuff_t *next;
@@ -2215,6 +2682,7 @@ void do_stuff_to_msgs(void) {
 
 	struct stuff_t *stuff = NULL;
 	struct stuff_t *ptr;
+	int delete_button_pressed = 0;
 
 
 	serv_puts("MSGS ALL");
@@ -2227,14 +2695,16 @@ void do_stuff_to_msgs(void) {
 		stuff = ptr;
 	}
 
-	strcpy(sc, bstr("sc"));
+	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 (!strcasecmp(sc, "Delete")) {
+			if (delete_button_pressed) {
 				serv_printf("DELE %ld", stuff->msgnum);
 				serv_getln(buf, sizeof buf);
 			}