X-Git-Url: https://code.citadel.org/?p=citadel.git;a=blobdiff_plain;f=webcit%2Fmessages.c;h=f990c8700b09d1e358e502181194cccc5ec5c045;hp=ca9ea892bc6ef8a3fdc5de3de82960b212015ac0;hb=dca4414169da8ea7161d5b95fc9ccbefe5d39651;hpb=5946cba943523bb15c011223c14f15df2740c72d

diff --git a/webcit/messages.c b/webcit/messages.c
index ca9ea892b..f990c8700 100644
--- a/webcit/messages.c
+++ b/webcit/messages.c
@@ -1,22 +1,31 @@
 /*
- * $Id$
- *
  * Functions which deal with the fetching and displaying of messages.
  *
+ * Copyright (c) 1996-2012 by the citadel.org team
+ *
+ * This program is open source software.  You can redistribute it and/or
+ * modify it under the terms of the GNU General Public License, version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  */
 
 #include "webcit.h"
 #include "webserver.h"
-#include "groupdav.h"
+#include "dav.h"
+#include "calendar.h"
 
 HashList *MsgHeaderHandler = NULL;
 HashList *MsgEvaluators = NULL;
 HashList *MimeRenderHandler = NULL;
+HashList *ReadLoopHandler = NULL;
 int dbg_analyze_msg = 0;
 
-#define SUBJ_COL_WIDTH_PCT		50	/**< Mailbox view column width */
-#define SENDER_COL_WIDTH_PCT		30	/**< Mailbox view column width */
-#define DATE_PLUS_BUTTONS_WIDTH_PCT	20	/**< Mailbox view column width */
+#define SUBJ_COL_WIDTH_PCT		50	/* Mailbox view column width */
+#define SENDER_COL_WIDTH_PCT		30	/* Mailbox view column width */
+#define DATE_PLUS_BUTTONS_WIDTH_PCT	20	/* Mailbox view column width */
 
 void jsonMessageListHdr(void);
 
@@ -32,7 +41,6 @@ int load_message(message_summary *Msg,
 		 StrBuf *FoundCharset,
 		 StrBuf **Error)
 {
-	wcsession *WCC = WC;
 	StrBuf *Buf;
 	StrBuf *HdrToken;
 	headereval *Hdr;
@@ -42,7 +50,6 @@ int load_message(message_summary *Msg,
 	int state=0;
 	
 	Buf = NewStrBuf();
-	lprintf(9, "MSG4 %ld|%s\n", Msg->msgnum, ChrPtr(Msg->PartNum));
 	if (Msg->PartNum != NULL) {
 		serv_printf("MSG4 %ld|%s", Msg->msgnum, ChrPtr(Msg->PartNum));
 	}
@@ -55,26 +62,25 @@ int load_message(message_summary *Msg,
 		*Error = NewStrBuf();
 		StrBufAppendPrintf(*Error, "<strong>");
 		StrBufAppendPrintf(*Error, _("ERROR:"));
-		StrBufAppendPrintf(*Error, "</strong> %s<br />\n", &buf[4]);
+		StrBufAppendPrintf(*Error, "</strong> %s<br>\n", &buf[4]);
 		FreeStrBuf(&Buf);
 		return 0;
 	}
 
-	/** begin everythingamundo table */
+	/* begin everythingamundo table */
 	HdrToken = NewStrBuf();
-	while ((StrBuf_ServGetln(Buf)>=0) && !Done) {
+	while (!Done && StrBuf_ServGetln(Buf)>=0) {
 		if ( (StrLength(Buf)==3) && 
 		    !strcmp(ChrPtr(Buf), "000")) 
 		{
 			Done = 1;
 			if (state < 2) {
-				lprintf(1, _("unexpected end of message"));
 				if (Msg->MsgBody->Data == NULL)
 					Msg->MsgBody->Data = NewStrBuf();
 				Msg->MsgBody->ContentType = NewStrBufPlain(HKEY("text/html"));
 				StrBufAppendPrintf(Msg->MsgBody->Data, "<div><i>");
-				StrBufAppendPrintf(Msg->MsgBody->Data, _("unexpected end of message"));
-				StrBufAppendPrintf(Msg->MsgBody->Data, " (1)</i><br /><br />\n");
+				StrBufAppendPrintf(Msg->MsgBody->Data, _("Empty message"));
+				StrBufAppendPrintf(Msg->MsgBody->Data, "</i><br><br>\n");
 				StrBufAppendPrintf(Msg->MsgBody->Data, "</div>\n");
 			}
 			break;
@@ -88,9 +94,6 @@ int load_message(message_summary *Msg,
 			StrBufExtract_token(HdrToken, Buf, 0, '=');
 			StrBufCutLeft(Buf, StrLength(HdrToken) + 1);
 			
-#ifdef TECH_PREVIEW
-			if (dbg_analyze_msg) lprintf(1, ":: [%s] = [%s]\n", ChrPtr(HdrToken), ChrPtr(Buf));
-#endif
 			/* look up one of the examine_* functions to parse the content */
 			if (GetHash(MsgHeaderHandler, SKEY(HdrToken), &vHdr) &&
 			    (vHdr != NULL)) {
@@ -119,9 +122,6 @@ int load_message(message_summary *Msg,
 				StrBufExtract_token(HdrToken, Buf, 0, ':');
 				if (StrLength(HdrToken) > 0) {
 					StrBufCutLeft(Buf, StrLength(HdrToken) + 1);
-#ifdef TECH_PREVIEW
-					if (dbg_analyze_msg) lprintf(1, ":: [%s] = [%s]\n", ChrPtr(HdrToken), ChrPtr(Buf));
-#endif
 					/* the examine*'s know how to do with mime headers too... */
 					if (GetHash(MsgHeaderHandler, SKEY(HdrToken), &vHdr) &&
 					    (vHdr != NULL)) {
@@ -155,38 +155,6 @@ int load_message(message_summary *Msg,
 	/* now we put the body mimepart we read above into the mimelist */
 	Put(Msg->AllAttach, SKEY(Msg->MsgBody->PartNum), Msg->MsgBody, DestroyMime);
 	
-	/* Generate a reply-to address */
-	if (StrLength(Msg->Rfca) > 0) {
-		if (Msg->reply_to == NULL)
-			Msg->reply_to = NewStrBuf();
-		if (StrLength(Msg->from) > 0) {
-			StrBufPrintf(Msg->reply_to, "%s <%s>", ChrPtr(Msg->from), ChrPtr(Msg->Rfca));
-		}
-		else {
-			FlushStrBuf(Msg->reply_to);
-			StrBufAppendBuf(Msg->reply_to, Msg->Rfca, 0);
-		}
-	}
-	else 
-	{
-		if ((StrLength(Msg->OtherNode)>0) && 
-		    (strcasecmp(ChrPtr(Msg->OtherNode), ChrPtr(WCC->serv_info->serv_nodename))) &&
-		    (strcasecmp(ChrPtr(Msg->OtherNode), ChrPtr(WCC->serv_info->serv_humannode)) ))
-		{
-			if (Msg->reply_to == NULL)
-				Msg->reply_to = NewStrBuf();
-			StrBufPrintf(Msg->reply_to, 
-				     "%s @ %s",
-				     ChrPtr(Msg->from), 
-				     ChrPtr(Msg->OtherNode));
-		}
-		else {
-			if (Msg->reply_to == NULL)
-				Msg->reply_to = NewStrBuf();
-			FlushStrBuf(Msg->reply_to);
-			StrBufAppendBuf(Msg->reply_to, Msg->from, 0);
-		}
-	}
 	FreeStrBuf(&Buf);
 	FreeStrBuf(&HdrToken);
 	return 1;
@@ -229,10 +197,12 @@ int read_message(StrBuf *Target, const char *tmpl, long tmpllen, long msgnum, co
 		FreeStrBuf(&Error);
 	}
 
-	/* strip the bare contenttype, so we ommit charset etc. */
+	/* Extract just the content-type (omit attributes such as "charset") */
 	StrBufExtract_token(Buf, Msg->MsgBody->ContentType, 0, ';');
 	StrBufTrim(Buf);
-	/* look up the renderer, that will convert this mimeitem into the htmlized form */
+	StrBufLowerCase(Buf);
+
+	/* Locate a renderer capable of converting this MIME part into HTML */
 	if (GetHash(MimeRenderHandler, SKEY(Buf), &vHdr) &&
 	    (vHdr != NULL)) {
 		RenderMimeFuncStruct *Render;
@@ -271,7 +241,7 @@ int read_message(StrBuf *Target, const char *tmpl, long tmpllen, long msgnum, co
 }
 
 
-void
+long
 HttpStatus(long CitadelStatus)
 {
 	long httpstatus = 502;
@@ -336,7 +306,7 @@ HttpStatus(long CitadelStatus)
 		break;
 	}
 
-
+	return httpstatus;
 }
 
 /*
@@ -379,16 +349,14 @@ void handle_one_message(void)
 		break;
 	case eDELETE:
 		CmdBuf = NewStrBuf ();
-		if (WCC->wc_is_trash) {	/** Delete from Trash is a real delete */
+		if ((WCC->CurRoom.RAFlags & UA_ISTRASH) != 0) {	/* Delete from Trash is a real delete */
 			serv_printf("DELE %ld", msgnum);	
 		}
-		else {			/** Otherwise move it to Trash */
+		else {			/* Otherwise move it to Trash */
 			serv_printf("MOVE %ld|_TRASH_|0", msgnum);
 		}
 		StrBuf_ServGetln(CmdBuf);
-		FlushStrBuf(WCC->ImportantMsg);
-		StrBufAppendBuf(WCC->ImportantMsg, CmdBuf, 4);
-		GetServerStatus(CmdBuf, &CitStatus);
+		GetServerStatusMsg(CmdBuf, &CitStatus, 1, 0);
 		HttpStatus(CitStatus);
 		break;
 	case eCOPY:
@@ -399,8 +367,7 @@ void handle_one_message(void)
 			Destination = (StrBuf*) vLine;
 			serv_printf("MOVE %ld|%s|%d", msgnum, ChrPtr(Destination), CopyMessage);
 			StrBuf_ServGetln(CmdBuf);
-			FlushStrBuf(WCC->ImportantMsg);
-			StrBufAppendBuf(WCC->ImportantMsg, CmdBuf, 4);
+			GetServerStatusMsg(CmdBuf, NULL, 1, 0);
 			GetServerStatus(CmdBuf, &CitStatus);
 			HttpStatus(CitStatus);
 		}
@@ -426,6 +393,8 @@ void embed_message(void) {
 	StrBuf *CmdBuf = NULL;
 
 	msgnum = StrBufExtract_long(WCC->Hdr->HR.ReqLine, 0, '/');
+	if (msgnum <= 0) return;
+
 	switch (WCC->Hdr->HR.eReqType)
 	{
 	case eGET:
@@ -439,15 +408,14 @@ void embed_message(void) {
 		break;
 	case eDELETE:
 		CmdBuf = NewStrBuf ();
-		if (WCC->wc_is_trash) {	/** Delete from Trash is a real delete */
+		if ((WCC->CurRoom.RAFlags & UA_ISTRASH) != 0) {	/* Delete from Trash is a real delete */
 			serv_printf("DELE %ld", msgnum);	
 		}
-		else {			/** Otherwise move it to Trash */
+		else {			/* Otherwise move it to Trash */
 			serv_printf("MOVE %ld|_TRASH_|0", msgnum);
 		}
 		StrBuf_ServGetln(CmdBuf);
-		FlushStrBuf(WCC->ImportantMsg);
-		StrBufAppendBuf(WCC->ImportantMsg, CmdBuf, 4);
+		GetServerStatusMsg(CmdBuf, NULL, 1, 0);
 		break;
 	default:
 		break;
@@ -477,22 +445,6 @@ void print_message(void) {
 	wDumpContent(0);
 }
 
-/* 
- * Mobile browser view of message
- */
-void mobile_message_view(void) 
-{
-	long msgnum = 0L;
-	const StrBuf *Mime;
-  
-	msgnum = StrBufExtract_long(WC->Hdr->HR.ReqLine, 0, '/');
-	output_headers(1, 0, 0, 0, 0, 1);
-	begin_burst();
-	do_template("msgcontrols", NULL);
-	read_message(WC->WBuf, HKEY("view_message"), msgnum, NULL, &Mime);
-	wDumpContent(0);
-}
-
 /*
  * Display a message's headers
  */
@@ -513,7 +465,7 @@ void display_headers(void) {
 	serv_getln(buf, sizeof buf);
 	if (buf[0] == '1') {
 		while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
-			wprintf("%s\n", buf);
+			wc_printf("%s\n", buf);
 		}
 	}
 
@@ -545,8 +497,10 @@ message_summary *ReadOneMessageSummary(StrBuf *RawMessage, const char *DefaultSu
 	Msg = (message_summary*)malloc(sizeof(message_summary));
 	memset(Msg, 0, sizeof(message_summary));
 	while (len = StrBuf_ServGetln(Buf),
+	       (len >= 0) && 
 	       ((len != 3)  ||
-		strcmp(ChrPtr(Buf), "000")== 0)){
+		strcmp(ChrPtr(Buf), "000")))
+	{
 		buf = ChrPtr(Buf);
 		ebuf = strchr(ChrPtr(Buf), '=');
 		nBuf = ebuf - buf;
@@ -555,7 +509,7 @@ message_summary *ReadOneMessageSummary(StrBuf *RawMessage, const char *DefaultSu
 			StrBufCutLeft(Buf, nBuf + 1);
 			Eval->f(Msg, Buf);
 		}
-		else lprintf(1, "Don't know how to handle Message Headerline [%s]", ChrPtr(Buf));
+		else syslog(1, "Don't know how to handle Message Headerline [%s]", ChrPtr(Buf));
 	}
 	return Msg;
 }
@@ -568,40 +522,57 @@ message_summary *ReadOneMessageSummary(StrBuf *RawMessage, const char *DefaultSu
  * load message pointers from the server for a "read messages" operation
  *
  * servcmd:		the citadel command to send to the citserver
- * with_headers:	also include some of the headers with the message numbers (more expensive)
  */
-int load_msg_ptrs(const char *servcmd, int with_headers)
+int load_msg_ptrs(const char *servcmd,
+		  const char *filter,
+		  SharedMessageStatus *Stat, 
+		  load_msg_ptrs_detailheaders LH)
 {
-	StrBuf* FoundCharset = NULL;
         wcsession *WCC = WC;
 	message_summary *Msg;
 	StrBuf *Buf, *Buf2;
-	int nummsgs = 0;
-	int maxload = 0;
 	long len;
 	int n;
 	int skipit;
 	const char *Ptr = NULL;
+	int StatMajor;
+
+	Stat->lowest_found = LONG_MAX;
+	Stat->highest_found = LONG_MIN;
 
 	if (WCC->summ != NULL) {
 		DeleteHash(&WCC->summ);
 	}
 	WCC->summ = NewHash(1, Flathash);
-	maxload = 10000;
 	
 	Buf = NewStrBuf();
 	serv_puts(servcmd);
 	StrBuf_ServGetln(Buf);
-	if (GetServerStatus(Buf, NULL) != 1) {
+	StatMajor = GetServerStatus(Buf, NULL);
+	switch (StatMajor) {
+	case 1:
+		break;
+	case 8:
+		if (filter != NULL) {
+			serv_puts(filter);
+                        serv_puts("000");
+			break;
+		}
+		/* fall back to empty filter in case of we were fooled... */
+		serv_puts("");
+		serv_puts("000");
+		break;
+	default:
 		FreeStrBuf(&Buf);
-		return (nummsgs);
+		return (Stat->nummsgs);
 	}
 	Buf2 = NewStrBuf();
-	while (len = StrBuf_ServGetln(Buf),
-	       ((len != 3)  ||
-		strcmp(ChrPtr(Buf), "000")!= 0))
+	while (len = StrBuf_ServGetln(Buf), 
+	       ((len >= 0) &&
+		((len != 3) || 
+		 strcmp(ChrPtr(Buf), "000")!= 0)))
 	{
-		if (nummsgs < maxload) {
+		if (Stat->nummsgs < Stat->maxload) {
 			skipit = 0;
 			Ptr = NULL;
 			Msg = (message_summary*)malloc(sizeof(message_summary));
@@ -609,178 +580,82 @@ int load_msg_ptrs(const char *servcmd, int with_headers)
 
 			Msg->msgnum = StrBufExtractNext_long(Buf, &Ptr, '|');
 			Msg->date = StrBufExtractNext_long(Buf, &Ptr, '|');
+
+			if (Stat->nummsgs == 0) {
+				if (Msg->msgnum < Stat->lowest_found) {
+					Stat->lowest_found = Msg->msgnum;
+				}
+				if (Msg->msgnum > Stat->highest_found) {
+					Stat->highest_found = Msg->msgnum;
+				}
+			}
+
+			if ((Msg->msgnum == 0) && (StrLength(Buf) < 32)) {
+				free(Msg);
+				continue;
+			}
+
 			/* 
 			 * as citserver probably gives us messages in forward date sorting
 			 * nummsgs should be the same order as the message date.
 			 */
 			if (Msg->date == 0) {
-				Msg->date = nummsgs;
+				Msg->date = Stat->nummsgs;
 				if (StrLength(Buf) < 32) 
 					skipit = 1;
 			}
-			if (!skipit) {
-				Msg->from = NewStrBufPlain(NULL, StrLength(Buf));
-				StrBufExtract_NextToken(Buf2, Buf, &Ptr, '|');
-				if (StrLength(Buf2) != 0) {
-					/** Handle senders with RFC2047 encoding */
-					StrBuf_RFC822_to_Utf8(Msg->from, Buf2, WCC->DefaultCharset, FoundCharset);
-				}
-			
-				/* node name */
-				StrBufExtract_NextToken(Buf2, Buf, &Ptr, '|');
-				if ((StrLength(Buf2) !=0 ) &&
-				    ( ((WCC->room_flags & QR_NETWORK)
-				       || ((strcasecmp(ChrPtr(Buf2), ChrPtr(WCC->serv_info->serv_nodename))
-					    && (strcasecmp(ChrPtr(Buf2), ChrPtr(WCC->serv_info->serv_fqdn))))))))
-				{
-					StrBufAppendBufPlain(Msg->from, HKEY(" @ "), 0);
-					StrBufAppendBuf(Msg->from, Buf2, 0);
-				}
-
-				/* Internet address (not used)
-				 *	StrBufExtract_token(Msg->inetaddr, Buf, 4, '|');
-				 */
-				StrBufSkip_NTokenS(Buf, &Ptr, '|', 1);
-				Msg->subj = NewStrBufPlain(NULL, StrLength(Buf));
-				StrBufExtract_NextToken(Buf2,  Buf, &Ptr, '|');
-				if (StrLength(Buf2) == 0)
-					StrBufAppendBufPlain(Msg->subj, _("(no subject)"), -1,0);
-				else {
-					StrBuf_RFC822_to_Utf8(Msg->subj, Buf2, WCC->DefaultCharset, FoundCharset);
-					if ((StrLength(Msg->subj) > 75) && 
-					    (StrBuf_Utf8StrLen(Msg->subj) > 75)) {
-						StrBuf_Utf8StrCut(Msg->subj, 72);
-						StrBufAppendBufPlain(Msg->subj, HKEY("..."), 0);
-					}
-				}
-
-				if ((StrLength(Msg->from) > 25) && 
-				    (StrBuf_Utf8StrLen(Msg->from) > 25)) {
-					StrBuf_Utf8StrCut(Msg->from, 23);
-					StrBufAppendBufPlain(Msg->from, HKEY("..."), 0);
-				}
+			if ((!skipit) && (LH != NULL)) {
+				if (!LH(Buf, &Ptr, Msg, Buf2)){
+					free(Msg);
+					continue;
+				}					
 			}
 			n = Msg->msgnum;
 			Put(WCC->summ, (const char *)&n, sizeof(n), Msg, DestroyMessageSummary);
 		}
-		nummsgs++;
+		Stat->nummsgs++;
 	}
 	FreeStrBuf(&Buf2);
 	FreeStrBuf(&Buf);
-	return (nummsgs);
+	return (Stat->nummsgs);
 }
 
 
-inline message_summary* GetMessagePtrAt(int n, HashList *Summ)
-{
-	const char *Key;
-	long HKLen;
-	void *vMsg;
-
-	if (Summ == NULL)
-		return NULL;
-	GetHashAt(Summ, n, &HKLen, &Key, &vMsg);
-	return (message_summary*) vMsg;
-}
-
 
-long DrawMessageDropdown(StrBuf *Selector, long maxmsgs, long startmsg, int nMessages)
+/**
+ * \brief sets FlagToSet for each of ScanMe that appears in MatchMSet
+ * \param ScanMe List of BasicMsgStruct to be searched it MatchSet
+ * \param MatchMSet MSet we want to flag
+ * \param FlagToSet Flag to set on each BasicMsgStruct->Flags if in MSet
+ */
+void SetFlagsFromMSet(HashList *ScanMe, MSet *MatchMSet, int FlagToSet, int Reverse)
 {
-	StrBuf *TmpBuf;
-	wcsession *WCC = WC;
+	const char *HashKey;
+	long HKLen;
+	HashPos *at;
 	void *vMsg;
-	int lo, hi;
-	long ret;
-	long hklen;
-	const char *key;
-	int done = 0;
-	int nItems;
-	HashPos *At;
-	long vector[16];
-	WCTemplputParams SubTP;
+	message_summary *Msg;
 
-	memset(&SubTP, 0, sizeof(WCTemplputParams));
-	SubTP.Filter.ContextType = CTX_LONGVECTOR;
-	SubTP.Context = &vector;
-	TmpBuf = NewStrBufPlain(NULL, SIZ);
-	At = GetNewHashPos(WCC->summ, nMessages);
-	nItems = GetCount(WCC->summ);
-	ret = nMessages;
-	vector[0] = 7;
-	vector[2] = 1;
-	vector[1] = startmsg;
-	vector[3] = 0;
-
-	while (!done) {
-		vector[3] = abs(nMessages);
-		lo = GetHashPosCounter(At);
-		if (nMessages > 0) {
-			if (lo + nMessages >= nItems) {
-				hi = nItems - 1;
-				vector[3] = nItems - lo;
-				if (startmsg == lo) 
-					ret = vector[3];
-			}
-			else {
-				hi = lo + nMessages - 1;
-			}
-		} else {
-			if (lo + nMessages < -1) {
-				hi = 0;
-			}
-			else {
-				if ((lo % abs(nMessages)) != 0) {
-					int offset = (lo % abs(nMessages) *
-						      (nMessages / abs(nMessages)));
-					hi = lo + offset;
-					vector[3] = abs(offset);
-					if (startmsg == lo)
-						 ret = offset;
-				}
-				else
-					hi = lo + nMessages;
-			}
+	at = GetNewHashPos(ScanMe, 0);
+	while (GetNextHashPos(ScanMe, at, &HKLen, &HashKey, &vMsg)) {
+		/* Are you a new message, or an old message? */
+		Msg = (message_summary*) vMsg;
+		if (Reverse && IsInMSetList(MatchMSet, Msg->msgnum)) {
+			Msg->Flags = Msg->Flags | FlagToSet;
 		}
-		done = !GetNextHashPos(WCC->summ, At, &hklen, &key, &vMsg);
-		
-		/*
-		 * Bump these because although we're thinking in zero base, the user
-		 * is a drooling idiot and is thinking in one base.
-		 */
-		vector[4] = lo + 1;
-		vector[5] = hi + 1;
-		vector[6] = lo;
-		FlushStrBuf(TmpBuf);
-		dbg_print_longvector(vector);
-		DoTemplate(HKEY("select_messageindex"), TmpBuf, &SubTP);
-		StrBufAppendBuf(Selector, TmpBuf, 0);
-	}
-	vector[6] = 0;
-	FlushStrBuf(TmpBuf);
-	if (maxmsgs == 9999999) {
-		vector[1] = 1;
-		ret = maxmsgs;
-	}
-	else
-		vector[1] = 0;		
-	vector[2] = 0;
-	dbg_print_longvector(vector);
-	DoTemplate(HKEY("select_messageindex_all"), TmpBuf, &SubTP);
-	StrBufAppendBuf(Selector, TmpBuf, 0);
-	FreeStrBuf(&TmpBuf);
-	DeleteHashPos(&At);
-	return ret;
+		else if (!Reverse && !IsInMSetList(MatchMSet, Msg->msgnum)) {
+			Msg->Flags = Msg->Flags | FlagToSet;
+		}
+	}
+	DeleteHashPos(&at);
 }
 
+
 void load_seen_flags(void)
 {
-	message_summary *Msg;
-	const char *HashKey;
-	long HKLen;
-	HashPos *at;
-	void *vMsg;
 	StrBuf *OldMsg;
 	wcsession *WCC = WC;
+	MSet *MatchMSet;
 
 	OldMsg = NewStrBuf();
 	serv_puts("GTSN");
@@ -792,350 +667,188 @@ void load_seen_flags(void)
 		FreeStrBuf(&OldMsg);
 		return;
 	}
-	at = GetNewHashPos(WCC->summ, 0);
-	while (GetNextHashPos(WCC->summ, at, &HKLen, &HashKey, &vMsg)) {
-		/** Are you a new message, or an old message? */
-		Msg = (message_summary*) vMsg;
-		if (is_msg_in_mset(ChrPtr(OldMsg), Msg->msgnum)) {
-			Msg->is_new = 0;
-		}
-		else {
-			Msg->is_new = 1;
-		}
+
+	if (ParseMSet(&MatchMSet, OldMsg))
+	{
+		SetFlagsFromMSet(WCC->summ, MatchMSet, MSGFLAG_READ, 0);
 	}
+	DeleteMSet(&MatchMSet);
 	FreeStrBuf(&OldMsg);
-	DeleteHashPos(&at);
 }
 
 extern readloop_struct rlid[];
 
+typedef struct _RoomRenderer{
+	int RoomType;
+
+	GetParamsGetServerCall_func GetParamsGetServerCall;
+	
+	PrintViewHeader_func PrintPageHeader;
+	PrintViewHeader_func PrintViewHeader;
+	LoadMsgFromServer_func LoadMsgFromServer;
+	RenderView_or_Tail_func RenderView_or_Tail;
+	View_Cleanup_func ViewCleanup;
+	load_msg_ptrs_detailheaders LHParse;
+} RoomRenderer;
+
+
 /*
  * command loop for reading messages
  *
- * Set oper to "readnew" or "readold" or "readfwd" or "headers"
+ * Set oper to "readnew" or "readold" or "readfwd" or "headers" or "readgt" or "readlt" or "do_search"
  */
-void readloop(long oper)
+void readloop(long oper, eCustomRoomRenderer ForceRenderer)
 {
-	StrBuf *MessageDropdown = NULL;
-	StrBuf *BBViewToolBar = NULL;
+	RoomRenderer *ViewMsg;
+	void *vViewMsg;
 	void *vMsg;
 	message_summary *Msg;
 	char cmd[256] = "";
-	char buf[SIZ];
-	int a = 0;
-	int with_headers = 0;
-	int nummsgs;
-	long startmsg = 0;
-	int maxmsgs = 0;
-	long *displayed_msgs = NULL;
-	int num_displayed = 0;
-	int is_singlecard = 0;
-	struct calview calv;
-	int i;
-	int lowest_displayed = (-1);
-	int highest_displayed = 0;
-	addrbookent *addrbook = NULL;
-	int num_ab = 0;
-	int bbs_reverse = 0;
+	char filter[256] = "";
+	int i, r;
 	wcsession *WCC = WC;
 	HashPos *at;
 	const char *HashKey;
 	long HKLen;
-	int care_for_empty_list = 0;
-	int load_seen = 0;
-	int sortit = 0;
-	int defaultsortorder = 0;
 	WCTemplputParams SubTP;
-	char *ab_name;
-	const StrBuf *Mime;
+	SharedMessageStatus Stat;
+	void *ViewSpecific;
 
-	if (havebstr("is_summary") && (1 == (ibstr("is_summary"))))
-		WCC->wc_view = VIEW_MAILBOX;
-
-	if (!WCC->is_ajax) {
-		output_headers(1, 1, 1, 0, 0, 0);
-	} else if (WCC->wc_view == VIEW_MAILBOX) {
-		jsonMessageListHdr();
+	if (havebstr("is_summary") && (1 == (ibstr("is_summary")))) {
+		WCC->CurRoom.view = VIEW_MAILBOX;
 	}
 
-	switch (WCC->wc_view) {
-	case VIEW_WIKI:
-		sprintf(buf, "wiki?room=%s&page=home", ChrPtr(WCC->wc_roomname));
-		http_redirect(buf);
-		return;
-	case VIEW_CALBRIEF:
-	case VIEW_CALENDAR:
-		load_seen = 1;
-		strcpy(cmd, "MSGS ALL");
-		maxmsgs = 32767;
-		parse_calendar_view_request(&calv);
-		break;
-	case VIEW_TASKS:
-		strcpy(cmd, "MSGS ALL");
-		maxmsgs = 32767;
-		break;
-	case VIEW_NOTES:
-		strcpy(cmd, "MSGS ALL");
-		maxmsgs = 32767;
-		wprintf("<div id=\"new_notes_here\"></div>\n");
-		break;
-	case VIEW_ADDRESSBOOK:
-		is_singlecard = ibstr("is_singlecard");
-		if (is_singlecard != 1) {
-			if (oper == do_search) {
-				snprintf(cmd, sizeof(cmd), "MSGS SEARCH|%s", bstr("query"));
-			}
-			else {
-				strcpy(cmd, "MSGS ALL");
-			}
-			maxmsgs = 9999999;
-			break;
-		}
-		break;
-	case VIEW_MAILBOX: 
-	  if (!WCC->is_ajax) {
-	    new_summary_view();
-	    return;
-	  } else {
-		defaultsortorder = 2;
-		sortit = 1;
-		load_seen = 1;
-		care_for_empty_list = 0;
-		with_headers = 1;
-		/* Generally using maxmsgs|startmsg is not required
-		   in mailbox view, but we have a 'safemode' for clients
-		   (*cough* Exploder) that simply can't handle too many */
-		if (havebstr("maxmsgs")) maxmsgs = ibstr("maxmsgs");
-		else maxmsgs = 9999999;
-		if (havebstr("startmsg")) startmsg = lbstr("startmsg");
-		snprintf(cmd, sizeof(cmd), "MSGS %s|%s||1",
-			 (oper == do_search) ? "SEARCH" : "ALL",
-			 (oper == do_search) ? bstr("query") : ""
-			);
-	  }
-		break;
-	case VIEW_BBS:
-	default:
-		defaultsortorder = 1;
-		startmsg = -1;
-		sortit = 1;
-		care_for_empty_list = 1;
-
-		rlid[oper].cmd(cmd, sizeof(cmd));
-		SetAccessCommand(oper);
+	if (havebstr("view")) {
+		WCC->CurRoom.view = ibstr("view");
+	}
 
-		if (havebstr("maxmsgs"))
-			maxmsgs = ibstr("maxmsgs");
-		if (maxmsgs == 0) maxmsgs = DEFAULT_MAXMSGS;
+	memset(&Stat, 0, sizeof(SharedMessageStatus));
+	Stat.maxload = 10000;
+	Stat.lowest_found = (-1);
+	Stat.highest_found = (-1);
+	if (ForceRenderer == eUseDefault)
+		GetHash(ReadLoopHandler, IKEY(WCC->CurRoom.view), &vViewMsg);
+	else 
+		GetHash(ReadLoopHandler, IKEY(ForceRenderer), &vViewMsg);
+	if (vViewMsg == NULL) {
+		WCC->CurRoom.view = VIEW_BBS;
+		GetHash(ReadLoopHandler, IKEY(WCC->CurRoom.view), &vViewMsg);
+	}
+	if (vViewMsg == NULL) {
+		return;			/* TODO: print message */
+	}
 
-		if (havebstr("startmsg")) {
-			startmsg = lbstr("startmsg");
-		}
-		
+	ViewMsg = (RoomRenderer*) vViewMsg;
+	if (ViewMsg->PrintPageHeader == NULL)
+		output_headers(1, 1, 1, 0, 0, 0);
+	else 
+		ViewMsg->PrintPageHeader(&Stat, ViewSpecific);
+
+	if (ViewMsg->GetParamsGetServerCall != NULL) {
+		r = ViewMsg->GetParamsGetServerCall(
+		       &Stat,
+		       &ViewSpecific,
+		       oper,
+		       cmd, sizeof(cmd),
+		       filter, sizeof(filter)
+		);
+	} else {
+		r = 0;
 	}
 
-	nummsgs = load_msg_ptrs(cmd, with_headers);
-	if (nummsgs == 0) {
-		if (care_for_empty_list) {
-			wprintf("<div class=\"nomsgs\"><br><em>");
-			switch (oper) {
-			case readnew:
-				wprintf(_("No new messages."));
-				break;
-			case readold:
-				wprintf(_("No old messages."));
-				break;
-			default:
-				wprintf(_("No messages here."));
-			}
-			wprintf("</em><br></div>\n");
-			goto DONE;
-		}
+	switch(r)
+	{
+	case 400:
+	case 404:
 
+		return;
+	case 300: /* the callback hook should do the work for us here, since he knows what to do. */
+		return;
+	case 200:
+	default:
+		break;
+	}
+	if (!IsEmptyStr(cmd)) {
+		const char *p = NULL;
+		if (!IsEmptyStr(filter))
+			p = filter;
+		Stat.nummsgs = load_msg_ptrs(cmd, p, &Stat, ViewMsg->LHParse);
 	}
 
-	if (sortit) {
+	if (Stat.sortit) {
 		CompareFunc SortIt;
 		memset(&SubTP, 0, sizeof(WCTemplputParams));
-		SubTP.Filter.ContextType = CTX_NONE;
+		SubTP.Filter.ContextType = CTX_MAILSUM;
 		SubTP.Context = NULL;
 		SortIt =  RetrieveSort(&SubTP, NULL, 0,
-				       HKEY("date"), defaultsortorder);
+				       HKEY("date"), Stat.defaultsortorder);
 		if (SortIt != NULL)
 			SortByPayload(WCC->summ, SortIt);
-		if (WCC->wc_view == VIEW_BBS) {
-			if (lbstr("SortOrder") == 2) {
-				bbs_reverse = 1;
-				num_displayed = -DEFAULT_MAXMSGS;
-			}
-			else {
-				bbs_reverse = 0;
-				num_displayed = DEFAULT_MAXMSGS;
-			}
-		}
 	}
-	if (startmsg < 0) startmsg = (bbs_reverse) ? nummsgs - 1 : 0;
+	if (Stat.startmsg < 0) {
+		Stat.startmsg =  0;
+	}
 
-	if (load_seen) load_seen_flags();
+	if (Stat.load_seen) load_seen_flags();
 	
         /*
 	 * Print any inforation above the message list...
 	 */
-	switch (WCC->wc_view) {
-	case VIEW_BBS:
-		BBViewToolBar = NewStrBufPlain(NULL, SIZ);
-		MessageDropdown = NewStrBufPlain(NULL, SIZ);
-
-		maxmsgs = DrawMessageDropdown(MessageDropdown, maxmsgs, startmsg, num_displayed);
-		if (num_displayed < 0) {
-			startmsg += maxmsgs;
-			if (num_displayed != maxmsgs)				
-				maxmsgs = abs(maxmsgs) + 1;
-			else
-				maxmsgs = abs(maxmsgs);
+	if (ViewMsg->PrintViewHeader != NULL)
+		ViewMsg->PrintViewHeader(&Stat, &ViewSpecific);
 
-		}
-		memset(&SubTP, 0, sizeof(WCTemplputParams));
-		SubTP.Filter.ContextType = CTX_STRBUF;
-		SubTP.Context = MessageDropdown;
-		DoTemplate(HKEY("msg_listselector_top"), BBViewToolBar, &SubTP);
-		StrBufAppendBuf(WCC->WBuf, BBViewToolBar, 0);
-		FlushStrBuf(BBViewToolBar);
-		break;
-	}
-	WCC->startmsg =  startmsg;
-	WCC->maxmsgs = maxmsgs;
+	WCC->startmsg =  Stat.startmsg;
+	WCC->maxmsgs = Stat.maxmsgs;
 	WCC->num_displayed = 0;
 
 	/* Put some helpful data in vars for mailsummary_json */
-	svputlong("READLOOP:TOTALMSGS", nummsgs);
-	svputlong("READLOOP:STARTMSG", startmsg);
-	svputlong("WCVIEW", WCC->wc_view);
+	{
+		StrBuf *Foo;
+		
+		Foo = NewStrBuf ();
+		StrBufPrintf(Foo, "%ld", Stat.nummsgs);
+		PutBstr(HKEY("__READLOOP:TOTALMSGS"), NewStrBufDup(Foo));
+		StrBufPrintf(Foo, "%ld", Stat.startmsg);
+		PutBstr(HKEY("__READLOOP:STARTMSG"), Foo);
+	}
 
 	/*
 	 * iterate over each message. if we need to load an attachment, do it here. 
 	 */
-	if (WCC->wc_view == VIEW_MAILBOX) goto NO_MSG_LOOP;
-	at = GetNewHashPos(WCC->summ, 0);
-	num_displayed = i = 0;
-	while (GetNextHashPos(WCC->summ, at, &HKLen, &HashKey, &vMsg)) {
-		Msg = (message_summary*) vMsg;		
-		if ((Msg->msgnum >= startmsg) && (num_displayed <= maxmsgs)) {			
-			switch (WCC->wc_view) {
-			case VIEW_WIKI:
-				break;
-			case VIEW_CALBRIEF: /* load the mime attachments for special tasks... */
-			case VIEW_CALENDAR:
-				load_calendar_item(Msg, Msg->is_new, &calv);
-				break;
-			case VIEW_TASKS:
-				display_task(Msg, Msg->is_new);
-				break;
-			case VIEW_NOTES:
-				display_note(Msg, Msg->is_new);
-				break;
-			case VIEW_ADDRESSBOOK:
-				ab_name = NULL;
-				fetch_ab_name(Msg, &ab_name);
-				if (ab_name == NULL) 
-					break;
-				++num_ab;
-				addrbook = realloc(addrbook,
-						   (sizeof(addrbookent) * num_ab) );
-				safestrncpy(addrbook[num_ab-1].ab_name, ab_name,
-					    sizeof(addrbook[num_ab-1].ab_name));
-				addrbook[num_ab-1].ab_msgnum = Msg->msgnum;
-				free(ab_name);
-				break;
-			case VIEW_BBS: /* Tag the mails we want to show in bbview... */
-			default:
-				if (displayed_msgs == NULL) {
-					displayed_msgs = malloc(sizeof(long) *
-								(maxmsgs<nummsgs ? maxmsgs + 1 : nummsgs + 1));
-				}
-				if ((i >= startmsg) && (i < startmsg + maxmsgs)) {
-					displayed_msgs[num_displayed] = Msg->msgnum;
-					if (lowest_displayed < 0) lowest_displayed = a;
-					highest_displayed = a;
-			
-					num_displayed++;
-				}
-			}
-		} 
-		i++;
+
+	if ((ViewMsg->LoadMsgFromServer != NULL) && 
+	    (!IsEmptyStr(cmd)))
+	{
+		at = GetNewHashPos(WCC->summ, 0);
+		Stat.num_displayed = i = 0;
+		while (	GetNextHashPos(WCC->summ, at, &HKLen, &HashKey, &vMsg)) {
+			Msg = (message_summary*) vMsg;		
+			if ((Msg->msgnum >= Stat.startmsg) && (Stat.num_displayed <= Stat.maxmsgs)) {
+				ViewMsg->LoadMsgFromServer(&Stat, 
+							   &ViewSpecific, 
+							   Msg, 
+							   (Msg->Flags & MSGFLAG_READ) != 0, 
+							   i);
+			} 
+			i++;
+		}
+		DeleteHashPos(&at);
 	}
-	DeleteHashPos(&at);
 
-NO_MSG_LOOP:
 	/*
 	 * Done iterating the message list. now tasks we want to do after.
 	 */
-	switch (WCC->wc_view) {
-	case VIEW_MAILBOX:
-	  DoTemplate(HKEY("mailsummary_json"),NULL, &SubTP);
-	  break;
-	case VIEW_BBS:
-		if (displayed_msgs != NULL) {
-			/** if we do a split bbview in the future, begin messages div here */
-			
-			for (a=0; a<num_displayed; ++a) {
-				read_message(WCC->WBuf, HKEY("view_message"), displayed_msgs[a], NULL, &Mime);
-			}
-			
-			/* if we do a split bbview in the future, end messages div here */
-			
-			free(displayed_msgs);
-			displayed_msgs = NULL;
-		}
-		memset(&SubTP, 0, sizeof(WCTemplputParams));
-		SubTP.Filter.ContextType = CTX_STRBUF;
-		SubTP.Context = MessageDropdown;
-		DoTemplate(HKEY("msg_listselector_bottom"), BBViewToolBar, &SubTP);
-		StrBufAppendBuf(WCC->WBuf, BBViewToolBar, 0);
+	if (ViewMsg->RenderView_or_Tail != NULL)
+		ViewMsg->RenderView_or_Tail(&Stat, &ViewSpecific, oper);
 
-		FreeStrBuf(&BBViewToolBar);
-		FreeStrBuf(&MessageDropdown);
-	}
+	if (ViewMsg->ViewCleanup != NULL)
+		ViewMsg->ViewCleanup(&ViewSpecific);
 
-	
-DONE:
-	switch (WCC->wc_view) {
-	case VIEW_WIKI:
-		break;
-	case VIEW_CALBRIEF:
-	case VIEW_CALENDAR:
-		render_calendar_view(&calv);
-		break;
-	case VIEW_TASKS:
-		do_tasks_view();	/** Render the task list */
-		break;
-	case VIEW_NOTES:
-		break;
-	case VIEW_ADDRESSBOOK:
-		if (is_singlecard)
-			read_message(WC->WBuf, HKEY("view_message"), lbstr("startmsg"), NULL, &Mime);
-		else
-			do_addrbook_view(addrbook, num_ab);	/* Render the address book */
-		break;
-	case VIEW_MAILBOX: 
-	case VIEW_BBS:
-	default:
-		break;
-	}
-	/** Note: wDumpContent() will output one additional </div> tag. */
-	if (WCC->wc_view != VIEW_MAILBOX) {
-		/* We ought to move this out into template */
-		wDumpContent(1);
-	} else {
-		end_burst();
-	}
 	WCC->startmsg = 0;
 	WCC->maxmsgs = 0;
 	if (WCC->summ != NULL) {
 		DeleteHash(&WCC->summ);
 	}
-	if (addrbook != NULL) free(addrbook);
-	FreeStrBuf(&BBViewToolBar);
 }
 
 
@@ -1154,6 +867,7 @@ void post_mime_to_server(void) {
 	size_t encoded_length;
 	size_t encoded_strlen;
 	char *txtmail = NULL;
+	int include_text_alt = 0;	/* Set to nonzero to include multipart/alternative text/plain */
 
 	sprintf(top_boundary, "Citadel--Multipart--%s--%04x--%04x",
 		ChrPtr(WCC->serv_info->serv_fqdn),
@@ -1175,6 +889,11 @@ void post_mime_to_server(void) {
 		is_multipart = 1;
 	}
 
+	/* Only do multipart/alternative for mailboxes.  BBS and Wiki rooms don't need it. */
+	if (WC->CurRoom.view == VIEW_MAILBOX) {
+		include_text_alt = 1;
+	}
+
 	if (is_multipart) {
 		/* Remember, serv_printf() appends an extra newline */
 		serv_printf("Content-type: multipart/mixed; boundary=\"%s\"\n", top_boundary);
@@ -1183,19 +902,21 @@ void post_mime_to_server(void) {
 	}
 
 	/* Remember, serv_printf() appends an extra newline */
-	serv_printf("Content-type: multipart/alternative; "
-		"boundary=\"%s\"\n", alt_boundary);
-	serv_printf("This is a multipart message in MIME format.\n");
-	serv_printf("--%s", alt_boundary);
+	if (include_text_alt) {
+		serv_printf("Content-type: multipart/alternative; "
+			"boundary=\"%s\"\n", alt_boundary);
+		serv_printf("This is a multipart message in MIME format.\n");
+		serv_printf("--%s", alt_boundary);
 
-	serv_puts("Content-type: text/plain; charset=utf-8");
-	serv_puts("Content-Transfer-Encoding: quoted-printable");
-	serv_puts("");
-	txtmail = html_to_ascii(bstr("msgtext"), 0, 80, 0);
-        text_to_server_qp(txtmail);     /* Transmit message in quoted-printable encoding */
-        free(txtmail);
+		serv_puts("Content-type: text/plain; charset=utf-8");
+		serv_puts("Content-Transfer-Encoding: quoted-printable");
+		serv_puts("");
+		txtmail = html_to_ascii(bstr("msgtext"), 0, 80, 0);
+        	text_to_server_qp(txtmail);     /* Transmit message in quoted-printable encoding */
+        	free(txtmail);
 
-	serv_printf("--%s", alt_boundary);
+		serv_printf("\n--%s", alt_boundary);
+	}
 
 	serv_puts("Content-type: text/html; charset=utf-8");
 	serv_puts("Content-Transfer-Encoding: quoted-printable");
@@ -1204,7 +925,9 @@ void post_mime_to_server(void) {
 	text_to_server_qp(bstr("msgtext"));	/* Transmit message in quoted-printable encoding */
 	serv_puts("</body></html>\r\n");
 
-	serv_printf("--%s--", alt_boundary);
+	if (include_text_alt) {
+		serv_printf("--%s--", alt_boundary);
+	}
 	
 	if (is_multipart) {
 		long len;
@@ -1216,6 +939,8 @@ void post_mime_to_server(void) {
 		it = GetNewHashPos(WCC->attachments, 0);
 		while (GetNextHashPos(WCC->attachments, it, &len, &Key, &vAtt)) {
 			att = (wc_mime_attachment *)vAtt;
+			if (att->length == 0)
+				continue;
 			encoded_length = ((att->length * 150) / 100);
 			encoded = malloc(encoded_length);
 			if (encoded == NULL) break;
@@ -1252,10 +977,12 @@ void post_mime_to_server(void) {
  */
 void post_message(void)
 {
+	StrBuf *UserName;
+	StrBuf *EmailAddress;
+	StrBuf *EncBuf;
 	char buf[1024];
 	StrBuf *encoded_subject = NULL;
 	static long dont_post = (-1L);
-	wc_mime_attachment  *att;
 	int is_anonymous = 0;
 	const StrBuf *display_name = NULL;
 	wcsession *WCC = WC;
@@ -1273,87 +1000,35 @@ void post_message(void)
 		}
 	}
 
-	if (WCC->upload_length > 0) {
-		const char *pch;
-		int n;
-		char N[64];
-
-		/* There's an attachment.  Save it to this struct... */
-		lprintf(9, "Client is uploading %d bytes\n", WCC->upload_length);
-		att = malloc(sizeof(wc_mime_attachment));
-		memset(att, 0, sizeof(wc_mime_attachment ));
-		att->length = WCC->upload_length;
-		att->ContentType = NewStrBufPlain(WCC->upload_content_type, -1);
-		att->FileName = NewStrBufPlain(WCC->upload_filename, -1);
-		
-		if (WCC->attachments == NULL) {
-			WCC->attachments = NewHash(1, NULL);
-		}
-
-		/* And add it to the list. */
-		n = snprintf(N, sizeof N, "%d", GetCount(WCC->attachments) + 1);
-		Put(WCC->attachments, N, n, att, DestroyMime);
-
-		/*
-		 * Mozilla sends a simple filename, which is what we want,
-		 * but Satan's Browser sends an entire pathname.  Reduce
-		 * the path to just a filename if we need to.
-		 */
-		pch = strrchr(ChrPtr(att->FileName), '/');
-		if (pch != NULL) {
-			StrBufCutLeft(att->FileName, pch - ChrPtr(att->FileName) + 1);
-		}
-		pch = strrchr(ChrPtr(att->FileName), '\\');
-		if (pch != NULL) {
-			StrBufCutLeft(att->FileName, pch - ChrPtr(att->FileName) + 1);
-		}
-
-		/*
-		 * Transfer control of this memory from the upload struct
-		 * to the attachment struct.
-		 */
-		att->Data = NewStrBufPlain(WCC->upload, WCC->upload_length);
-		free(WCC->upload);
-		WCC->upload_length = 0;
-		WCC->upload = NULL;
-		display_enter();
-		return;
-	}
-
-	if (havebstr("cancel_button")) {
-		sprintf(WCC->ImportantMessage, 
-			_("Cancelled.  Message was not posted."));
-	} else if (havebstr("attach_button")) {
-		display_enter();
-		return;
+	if (!strcasecmp(bstr("submit_action"), "cancel")) {
+		AppendImportantMessage(_("Cancelled.  Message was not posted."), -1);
 	} else if (lbstr("postseq") == dont_post) {
-		sprintf(WCC->ImportantMessage, 
+		AppendImportantMessage(
 			_("Automatically cancelled because you have already "
-			"saved this message."));
+			  "saved this message."), -1);
 	} else {
 		const char CMD[] = "ENT0 1|%s|%d|4|%s|%s||%s|%s|%s|%s|%s";
-		const StrBuf *Recp = NULL; 
-		const StrBuf *Cc = NULL;
-		const StrBuf *Bcc = NULL;
-		const StrBuf *Wikipage = NULL;
+		StrBuf *Recp = NULL; 
+		StrBuf *Cc = NULL;
+		StrBuf *Bcc = NULL;
+		char *wikipage = NULL;
 		const StrBuf *my_email_addr = NULL;
 		StrBuf *CmdBuf = NULL;
 		StrBuf *references = NULL;
-		int save_to_drafts;
+		int saving_to_drafts = 0;
+		long HeaderLen = 0;
 
-		save_to_drafts = havebstr("save_button");
+		saving_to_drafts = !strcasecmp(bstr("submit_action"), "draft");
 		Buf = NewStrBuf();
 
-		if (save_to_drafts) {
-		        /** temporarily change to the drafts room */
+		if (saving_to_drafts) {
+		        /* temporarily change to the drafts room */
 		        serv_puts("GOTO _DRAFTS_");
 			StrBuf_ServGetln(Buf);
-			if (GetServerStatus(Buf, NULL) != 2) {
+			if (GetServerStatusMsg(Buf, NULL, 1, 2) != 2) {
 				/* You probably don't even have a dumb Drafts folder */
-				StrBufCutLeft(Buf, 4);
-				lprintf(9, "%s:%d: server save to drafts error: %s\n", __FILE__, __LINE__, ChrPtr(Buf));
-				StrBufAppendBufPlain(WCC->ImportantMsg, _("Saved to Drafts failed: "), -1, 0);
-				StrBufAppendBuf(WCC->ImportantMsg, Buf, 0);
+				syslog(9, "%s:%d: server save to drafts error: %s\n", __FILE__, __LINE__, ChrPtr(Buf) + 4);
+				AppendImportantMessage(_("Saved to Drafts failed: "), -1);
 				display_enter();
 				FreeStrBuf(&Buf);
 				return;
@@ -1379,82 +1054,104 @@ void post_message(void)
 			
 			StrBufRFC2047encode(&encoded_subject, Subj);
 		}
-		Recp = sbstr("recp");
-		Cc = sbstr("cc");
-		Bcc = sbstr("bcc");
-		Wikipage = sbstr("wikipage");
+		UserName = NewStrBuf();
+		EmailAddress = NewStrBuf();
+		EncBuf = NewStrBuf();
+
+		Recp = StrBufSanitizeEmailRecipientVector(sbstr("recp"), UserName, EmailAddress, EncBuf);
+		Cc = StrBufSanitizeEmailRecipientVector(sbstr("cc"), UserName, EmailAddress, EncBuf);
+		Bcc = StrBufSanitizeEmailRecipientVector(sbstr("bcc"), UserName, EmailAddress, EncBuf);
+
+		FreeStrBuf(&UserName);
+		FreeStrBuf(&EmailAddress);
+		FreeStrBuf(&EncBuf);
+
+		wikipage = strdup(bstr("page"));
+		str_wiki_index(wikipage);
 		my_email_addr = sbstr("my_email_addr");
 		
-		CmdBuf = NewStrBufPlain(NULL, 
-					sizeof (CMD) + 
-					StrLength(Recp) + 
-					StrLength(encoded_subject) +
-					StrLength(Cc) +
-					StrLength(Bcc) + 
-					StrLength(Wikipage) +
-					StrLength(my_email_addr) + 
-					StrLength(references));
-
+		HeaderLen = StrLength(Recp) + 
+			StrLength(encoded_subject) +
+			StrLength(Cc) +
+			StrLength(Bcc) + 
+			strlen(wikipage) +
+			StrLength(my_email_addr) + 
+			StrLength(references);
+		CmdBuf = NewStrBufPlain(NULL, sizeof (CMD) + HeaderLen);
 		StrBufPrintf(CmdBuf, 
 			     CMD,
-			     save_to_drafts?"":ChrPtr(Recp),
+			     saving_to_drafts?"":ChrPtr(Recp),
 			     is_anonymous,
 			     ChrPtr(encoded_subject),
 			     ChrPtr(display_name),
-			     save_to_drafts?"":ChrPtr(Cc),
-			     save_to_drafts?"":ChrPtr(Bcc),
-			     ChrPtr(Wikipage),
+			     saving_to_drafts?"":ChrPtr(Cc),
+			     saving_to_drafts?"":ChrPtr(Bcc),
+			     wikipage,
 			     ChrPtr(my_email_addr),
 			     ChrPtr(references));
 		FreeStrBuf(&references);
 		FreeStrBuf(&encoded_subject);
+		free(wikipage);
 
-		lprintf(9, "%s\n", ChrPtr(CmdBuf));
-		serv_puts(ChrPtr(CmdBuf));
-		FreeStrBuf(&CmdBuf);
+		if ((HeaderLen + StrLength(sbstr("msgtext")) < 10) && 
+		    (GetCount(WCC->attachments) == 0)){
+			AppendImportantMessage(_("Refusing to post empty message.\n"), -1);
+			FreeStrBuf(&CmdBuf);
+				
+		}
+		else 
+		{
+			syslog(9, "%s\n", ChrPtr(CmdBuf));
+			serv_puts(ChrPtr(CmdBuf));
+			FreeStrBuf(&CmdBuf);
 
-		StrBuf_ServGetln(Buf);
-		if (GetServerStatus(Buf, NULL) == 4) {
-			if (save_to_drafts) {
-				if (  (havebstr("recp"))
-				    || (havebstr("cc"  ))
-				    || (havebstr("bcc" )) ) {
-					/* save recipient headers or room to post to */
-					serv_printf("To: %s", ChrPtr(Recp));
-					serv_printf("Cc: %s", ChrPtr(Cc));
-					serv_printf("Bcc: %s", ChrPtr(Bcc));
-				} else {
-					serv_printf("X-Citadel-Room: %s", ChrPtr(WC->wc_roomname));
+			StrBuf_ServGetln(Buf);
+			if (GetServerStatus(Buf, NULL) == 4) {
+				if (saving_to_drafts) {
+					if (  (havebstr("recp"))
+					      || (havebstr("cc"  ))
+					      || (havebstr("bcc" )) ) {
+						/* save recipient headers or room to post to */
+						serv_printf("To: %s", ChrPtr(Recp));
+						serv_printf("Cc: %s", ChrPtr(Cc));
+						serv_printf("Bcc: %s", ChrPtr(Bcc));
+					} else {
+						serv_printf("X-Citadel-Room: %s", ChrPtr(WC->CurRoom.name));
+					}
 				}
-			}
-			post_mime_to_server();
-			if (save_to_drafts) {
-				StrBufAppendBufPlain(WCC->ImportantMsg, _("Message has been saved to Drafts.\n"), -1, 0);
-				gotoroom(WCC->wc_roomname);
+				post_mime_to_server();
+				if (saving_to_drafts) {
+					AppendImportantMessage(_("Message has been saved to Drafts.\n"), -1);
+					gotoroom(WCC->CurRoom.name);
+					readloop(readnew, eUseDefault);
+					FreeStrBuf(&Buf);
+					return;
+				} else if (  (havebstr("recp"))
+					     || (havebstr("cc"  ))
+					     || (havebstr("bcc" ))
+					) {
+					AppendImportantMessage(_("Message has been sent.\n"), -1);
+				}
+				else {
+					AppendImportantMessage(_("Message has been posted.\n"), -1);
+				}
+				dont_post = lbstr("postseq");
+			} else {
+				syslog(9, "%s:%d: server post error: %s", __FILE__, __LINE__, ChrPtr(Buf) + 4);
+				AppendImportantMessage(ChrPtr(Buf) + 4, StrLength(Buf) - 4);
 				display_enter();
+				if (saving_to_drafts) gotoroom(WCC->CurRoom.name);
+				FreeStrBuf(&Recp);
 				FreeStrBuf(&Buf);
+				FreeStrBuf(&Cc);
+				FreeStrBuf(&Bcc);
 				return;
-			} else if (  (havebstr("recp"))
-			   || (havebstr("cc"  ))
-			   || (havebstr("bcc" ))
-			) {
-				StrBufAppendBufPlain(WCC->ImportantMsg, _("Message has been sent.\n"), -1, 0);
 			}
-			else {
-				StrBufAppendBufPlain(WCC->ImportantMsg, _("Message has been posted.\n"), -1, 0);
-			}
-			dont_post = lbstr("postseq");
-		} else {
-			StrBufCutLeft(Buf, 4);
-
-			lprintf(9, "%s:%d: server post error: %s\n", __FILE__, __LINE__, ChrPtr(Buf));
-			StrBufAppendBuf(WCC->ImportantMsg, Buf, 0);
-			if (save_to_drafts) gotoroom(WCC->wc_roomname);
-			display_enter();
-			FreeStrBuf(&Buf);
-			return;
 		}
+		FreeStrBuf(&Recp);
 		FreeStrBuf(&Buf);
+		FreeStrBuf(&Cc);
+		FreeStrBuf(&Bcc);
 	}
 
 	DeleteHash(&WCC->attachments);
@@ -1469,36 +1166,161 @@ void post_message(void)
 	/*
 	 *  If we were editing a page in a wiki room, go to that page now.
 	 */
-	else if (havebstr("wikipage")) {
-		snprintf(buf, sizeof buf, "wiki?page=%s", bstr("wikipage"));
+	else if (havebstr("page")) {
+		snprintf(buf, sizeof buf, "wiki?page=%s", bstr("page"));
 		http_redirect(buf);
 	}
 	/*
 	 *  Otherwise, just go to the "read messages" loop.
 	 */
 	else {
-		readloop(readnew);
+		readloop(readnew, eUseDefault);
 	}
 }
 
 
+/*
+ * Client is uploading an attachment
+ */
+void upload_attachment(void) {
+	wcsession *WCC = WC;
+	const char *pch;
+	int n;
+	const char *newn;
+	long newnlen;
+	void *v;
+	wc_mime_attachment *att;
+
+	syslog(9, "upload_attachment()\n");
+	wc_printf("upload_attachment()<br>\n");
+
+	if (WCC->upload_length <= 0) {
+		syslog(9, "ERROR no attachment was uploaded\n");
+		wc_printf("ERROR no attachment was uploaded<br>\n");
+		return;
+	}
+
+	syslog(9, "Client is uploading %d bytes\n", WCC->upload_length);
+	wc_printf("Client is uploading %d bytes<br>\n", WCC->upload_length);
+	att = malloc(sizeof(wc_mime_attachment));
+	memset(att, 0, sizeof(wc_mime_attachment ));
+	att->length = WCC->upload_length;
+	att->ContentType = NewStrBufPlain(WCC->upload_content_type, -1);
+	att->FileName = NewStrBufDup(WCC->upload_filename);
+	
+	if (WCC->attachments == NULL) {
+		WCC->attachments = NewHash(1, Flathash);
+	}
 
+	/* And add it to the list. */
+	n = 0;
+	if ((GetCount(WCC->attachments) > 0) && 
+	    GetHashAt(WCC->attachments, 
+		      GetCount(WCC->attachments) -1, 
+		      &newnlen, &newn, &v))
+	    n = *((int*) newn) + 1;
+	Put(WCC->attachments, IKEY(n), att, DestroyMime);
+
+	/*
+	 * Mozilla sends a simple filename, which is what we want,
+	 * but Satan's Browser sends an entire pathname.  Reduce
+	 * the path to just a filename if we need to.
+	 */
+	pch = strrchr(ChrPtr(att->FileName), '/');
+	if (pch != NULL) {
+		StrBufCutLeft(att->FileName, pch - ChrPtr(att->FileName) + 1);
+	}
+	pch = strrchr(ChrPtr(att->FileName), '\\');
+	if (pch != NULL) {
+		StrBufCutLeft(att->FileName, pch - ChrPtr(att->FileName) + 1);
+	}
+
+	/*
+	 * Transfer control of this memory from the upload struct
+	 * to the attachment struct.
+	 */
+	att->Data = WCC->upload;
+	WCC->upload = NULL;
+	WCC->upload_length = 0;
+}
+
+
+/*
+ * Remove an attachment from the message currently being composed.
+ *
+ * Currently we identify the attachment to be removed by its filename.
+ * There is probably a better way to do this.
+ */
+void remove_attachment(void) {
+	wcsession *WCC = WC;
+	wc_mime_attachment *att;
+	void *vAtt;
+	StrBuf *WhichAttachment;
+	HashPos *at;
+	long len;
+	const char *key;
+
+	WhichAttachment = NewStrBufDup(sbstr("which_attachment"));
+	StrBufUnescape(WhichAttachment, 0);
+	at = GetNewHashPos(WCC->attachments, 0);
+	do {
+		GetHashPos(WCC->attachments, at, &len, &key, &vAtt);
+	
+		att = (wc_mime_attachment*) vAtt;
+		if ((att != NULL) && 
+		    (strcmp(ChrPtr(WhichAttachment), 
+			    ChrPtr(att->FileName)   ) == 0))
+		{
+			DeleteEntryFromHash(WCC->attachments, at);
+			break;
+		}
+	}
+	while (NextHashPos(WCC->attachments, at));
+	FreeStrBuf(&WhichAttachment);
+	wc_printf("remove_attachment() completed\n");
+}
+
+
+long FourHash(const char *key, long length) 
+{
+        int i;
+        long ret = 0;
+        const unsigned char *ptr = (const unsigned char*)key;
+
+        for (i = 0; i < 4; i++, ptr ++) 
+                ret = (ret << 8) | 
+                        ( ((*ptr >= 'a') &&
+                           (*ptr <= 'z'))? 
+                          *ptr - 'a' + 'A': 
+                          *ptr);
+
+        return ret;
+}
+
+long l_subj;
+long l_wefw;
+long l_msgn;
+long l_from;
+long l_rcpt;
+long l_cccc;
+long l_node;
+long l_rfca;
 
 /*
  * display the message entry screen
  */
 void display_enter(void)
 {
-	char buf[SIZ];
-	long now;
+	StrBuf *Line;
+	long Result;
+	int rc;
 	const StrBuf *display_name = NULL;
 	int recipient_required = 0;
 	int subject_required = 0;
-	int recipient_bad = 0;
 	int is_anonymous = 0;
       	wcsession *WCC = WC;
-
-	now = time(NULL);
+	int i = 0;
+	long replying_to;
 
 	if (havebstr("force_room")) {
 		gotoroom(sbstr("force_room"));
@@ -1510,30 +1332,36 @@ void display_enter(void)
 		is_anonymous = 1;
 	}
 
-	/* First test to see whether this is a room that requires recipients to be entered */
+	/*
+	 * First, do we have permission to enter messages in this room at all?
+	 */
+	Line = NewStrBuf();
 	serv_puts("ENT0 0");
-	serv_getln(buf, sizeof buf);
+	StrBuf_ServGetln(Line);
+	rc = GetServerStatusMsg(Line, &Result, 0, 2);
 
-	if (!strncmp(buf, "570", 3)) {		/* 570 means that we need a recipient here */
+	if (Result == 570) {		/* 570 means that we need a recipient here */
 		recipient_required = 1;
 	}
-	else if (buf[0] != '2') {		/* Any other error means that we cannot continue */
-		sprintf(WCC->ImportantMessage, "%s", &buf[4]);
-		readloop(readnew);
+	else if (rc != 2) {		/* Any other error means that we cannot continue */
+		rc = GetServerStatusMsg(Line, &Result, 0, 2);
+		readloop(readnew, eUseDefault);
+		FreeStrBuf(&Line);
 		return;
 	}
 
 	/* Is the server strongly recommending that the user enter a message subject? */
-	if ((buf[3] != '\0') && (buf[4] != '\0')) {
-		subject_required = extract_int(&buf[4], 1);
+	if (StrLength(Line) > 4) {
+		subject_required = extract_int(ChrPtr(Line) + 4, 1);
 	}
 
-	/**
+	/*
 	 * Are we perhaps in an address book view?  If so, then an "enter
 	 * message" command really means "add new entry."
 	 */
-	if (WCC->wc_default_view == VIEW_ADDRESSBOOK) {
-		do_edit_vcard(-1, "", NULL, NULL, "",  ChrPtr(WCC->wc_roomname));
+	if (WCC->CurRoom.defview == VIEW_ADDRESSBOOK) {
+		do_edit_vcard(-1, "", NULL, NULL, "",  ChrPtr(WCC->CurRoom.name));
+		FreeStrBuf(&Line);
 		return;
 	}
 
@@ -1541,8 +1369,9 @@ void display_enter(void)
 	 * Are we perhaps in a calendar room?  If so, then an "enter
 	 * message" command really means "add new calendar item."
 	 */
-	if (WCC->wc_default_view == VIEW_CALENDAR) {
+	if (WCC->CurRoom.defview == VIEW_CALENDAR) {
 		display_edit_event();
+		FreeStrBuf(&Line);
 		return;
 	}
 
@@ -1550,11 +1379,193 @@ void display_enter(void)
 	 * Are we perhaps in a tasks view?  If so, then an "enter
 	 * message" command really means "add new task."
 	 */
-	if (WCC->wc_default_view == VIEW_TASKS) {
+	if (WCC->CurRoom.defview == VIEW_TASKS) {
 		display_edit_task();
+		FreeStrBuf(&Line);
 		return;
 	}
 
+
+	/*
+	 * If the "replying_to" variable is set, it refers to a message
+	 * number from which we must extract some header fields...
+	 */
+	replying_to = lbstr("replying_to");
+	if (replying_to > 0) {
+		long len;
+		StrBuf *wefw = NULL;
+		StrBuf *msgn = NULL;
+		StrBuf *from = NULL;
+		StrBuf *node = NULL;
+		StrBuf *rfca = NULL;
+		StrBuf *rcpt = NULL;
+		StrBuf *cccc = NULL;
+		serv_printf("MSG0 %ld|1", replying_to);	
+
+		StrBuf_ServGetln(Line);
+		if (GetServerStatusMsg(Line, NULL, 0, 0) == 1)
+			while (len = StrBuf_ServGetln(Line),
+			       (len >= 0) && 
+			       ((len != 3)  ||
+				strcmp(ChrPtr(Line), "000")))
+			{
+				long which = 0;
+				if ((StrLength(Line) > 4) && 
+				    (ChrPtr(Line)[4] == '='))
+					which = FourHash(ChrPtr(Line), 4);
+
+				if (which == l_subj)
+				{
+					StrBuf *subj = NewStrBuf();
+					StrBuf *FlatSubject;
+
+					if (!strcasecmp(bstr("replying_mode"), "forward")) {
+						if (strncasecmp(ChrPtr(Line) + 5, "Fw:", 3)) {
+							StrBufAppendBufPlain(subj, HKEY("Fw: "), 0);
+						}
+					}
+					else {
+						if (strncasecmp(ChrPtr(Line) + 5, "Re:", 3)) {
+							StrBufAppendBufPlain(subj, HKEY("Re: "), 0);
+						}
+					}
+					StrBufAppendBufPlain(subj, 
+							     ChrPtr(Line) + 5, 
+							     StrLength(Line) - 5, 0);
+					FlatSubject = NewStrBufPlain(NULL, StrLength(subj));
+					StrBuf_RFC822_to_Utf8(FlatSubject, subj, NULL, NULL);
+
+					PutBstr(HKEY("subject"), FlatSubject);
+				}
+
+				else if (which == l_wefw)
+				{
+					int rrtok;
+					int rrlen;
+
+					wefw = NewStrBufPlain(ChrPtr(Line) + 5, StrLength(Line) - 5);
+					
+					/* Trim down excessively long lists of thread references.  We eliminate the
+					 * second one in the list so that the thread root remains intact.
+					 */
+					rrtok = num_tokens(ChrPtr(wefw), '|');
+					rrlen = StrLength(wefw);
+					if ( ((rrtok >= 3) && (rrlen > 900)) || (rrtok > 10) ) {
+						StrBufRemove_token(wefw, 1, '|');
+					}
+				}
+
+				else if (which == l_msgn) {
+					msgn = NewStrBufPlain(ChrPtr(Line) + 5, StrLength(Line) - 5);
+				}
+
+				else if (which == l_from) {
+					StrBuf *FlatFrom;
+					from = NewStrBufPlain(ChrPtr(Line) + 5, StrLength(Line) - 5);
+					FlatFrom = NewStrBufPlain(NULL, StrLength(from));
+					StrBuf_RFC822_to_Utf8(FlatFrom, from, NULL, NULL);
+					FreeStrBuf(&from);
+					from = FlatFrom;
+					for (i=0; i<StrLength(from); ++i) {
+						if (ChrPtr(from)[i] == ',')
+							StrBufPeek(from, NULL, i, ' ');
+					}
+				}
+				
+				else if (which == l_rcpt) {
+					rcpt = NewStrBufPlain(ChrPtr(Line) + 5, StrLength(Line) - 5);
+				}
+				
+				else if (which == l_cccc) {
+					cccc = NewStrBufPlain(ChrPtr(Line) + 5, StrLength(Line) - 5);
+				}
+				
+				else if (which == l_node) {
+					node = NewStrBufPlain(ChrPtr(Line) + 5, StrLength(Line) - 5);
+				}
+				
+				else if (which == l_rfca) {
+					StrBuf *FlatRFCA;
+					rfca = NewStrBufPlain(ChrPtr(Line) + 5, StrLength(Line) - 5);
+					FlatRFCA = NewStrBufPlain(NULL, StrLength(rfca));
+					StrBuf_RFC822_to_Utf8(FlatRFCA, rfca, NULL, NULL);
+					FreeStrBuf(&rfca);
+					rfca = FlatRFCA;
+				}
+			}
+
+
+		if (StrLength(wefw) + StrLength(msgn) > 0) {
+			StrBuf *refs = NewStrBuf();
+			if (StrLength(wefw) > 0) {
+				StrBufAppendBuf(refs, wefw, 0);
+			}
+			if ( (StrLength(wefw) > 0) && 
+			     (StrLength(msgn) > 0) ) 
+			{
+				StrBufAppendBufPlain(refs, HKEY("|"), 0);
+			}
+			if (StrLength(msgn) > 0) {
+				StrBufAppendBuf(refs, msgn, 0);
+			}
+			PutBstr(HKEY("references"), refs);
+		}
+
+		/*
+		 * If this is a Reply or a ReplyAll, copy the sender's email into the To: field
+		 */
+		if (	(!strcasecmp(bstr("replying_mode"), "reply"))
+			|| (!strcasecmp(bstr("replying_mode"), "replyall"))
+		) {
+			StrBuf *to_rcpt;
+			if (StrLength(rfca) > 0) {
+				to_rcpt = NewStrBuf();
+				StrBufAppendBuf(to_rcpt, from, 0);
+				StrBufAppendBufPlain(to_rcpt, HKEY(" <"), 0);
+				StrBufAppendBuf(to_rcpt, rfca, 0);
+				StrBufAppendBufPlain(to_rcpt, HKEY(">"), 0);
+			}
+			else {
+				to_rcpt =  from;
+				from = NULL;
+				if (	(StrLength(node) > 0)
+					&& (strcasecmp(ChrPtr(node), ChrPtr(WC->serv_info->serv_nodename)))
+				) {
+					StrBufAppendBufPlain(to_rcpt, HKEY(" @ "), 0);
+					StrBufAppendBuf(to_rcpt, node, 0);
+				}
+			}
+			PutBstr(HKEY("recp"), to_rcpt);
+		}
+
+		/*
+		 * Only if this is a ReplyAll, copy all recipients into the Cc: field
+		 */
+		if (	(!strcasecmp(bstr("replying_mode"), "replyall"))
+		) {
+			StrBuf *cc_rcpt = rcpt;
+			rcpt = NULL;
+			if (StrLength(cccc) > 0) {
+				if (cc_rcpt != NULL)  {
+					StrBufAppendPrintf(cc_rcpt, ", ");
+					StrBufAppendBuf(cc_rcpt, cccc, 0);
+				} else {
+					cc_rcpt = cccc;
+					cccc = NULL;
+				}
+			}
+			if (cc_rcpt != NULL)
+				PutBstr(HKEY("cc"), cc_rcpt);
+		}
+		FreeStrBuf(&wefw);
+		FreeStrBuf(&msgn);
+		FreeStrBuf(&from);
+		FreeStrBuf(&node);
+		FreeStrBuf(&rfca);
+		FreeStrBuf(&rcpt);
+		FreeStrBuf(&cccc);
+	}
+	FreeStrBuf(&Line);
 	/*
 	 * Otherwise proceed normally.
 	 * Do a custom room banner with no navbar...
@@ -1564,14 +1575,15 @@ void display_enter(void)
 		const StrBuf *Recp = NULL; 
 		const StrBuf *Cc = NULL;
 		const StrBuf *Bcc = NULL;
-		const StrBuf *Wikipage = NULL;
+		char *wikipage = NULL;
 		StrBuf *CmdBuf = NULL;
 		const char CMD[] = "ENT0 0|%s|%d|0||%s||%s|%s|%s";
 		
 		Recp = sbstr("recp");
 		Cc = sbstr("cc");
 		Bcc = sbstr("bcc");
-		Wikipage = sbstr("wikipage");
+		wikipage = strdup(bstr("page"));
+		str_wiki_index(wikipage);
 		
 		CmdBuf = NewStrBufPlain(NULL, 
 					sizeof (CMD) + 
@@ -1579,7 +1591,7 @@ void display_enter(void)
 					StrLength(display_name) +
 					StrLength(Cc) +
 					StrLength(Bcc) + 
-					StrLength(Wikipage));
+					strlen(wikipage));
 
 		StrBufPrintf(CmdBuf, 
 			     CMD,
@@ -1588,25 +1600,31 @@ void display_enter(void)
 			     ChrPtr(display_name),
 			     ChrPtr(Cc), 
 			     ChrPtr(Bcc), 
-			     ChrPtr(Wikipage));
+			     wikipage
+		);
 		serv_puts(ChrPtr(CmdBuf));
-		serv_getln(buf, sizeof buf);
-		FreeStrBuf(&CmdBuf);
+		StrBuf_ServGetln(CmdBuf);
+		free(wikipage);
 
-		if (!strncmp(buf, "570", 3)) {	/* 570 means we have an invalid recipient listed */
-			if (havebstr("recp") && 
-			    havebstr("cc"  ) && 
-			    havebstr("bcc" )) {
-				recipient_bad = 1;
-			}
+		rc = GetServerStatusMsg(CmdBuf, &Result, 0, 0);
+
+		if (	(Result == 570)		/* invalid or missing recipient(s) */
+			|| (Result == 550)	/* higher access required to send Internet mail */
+		) {
+			/* These errors will have been displayed and are excusable */
 		}
-		else if (buf[0] != '2') {	/* Any other error means that we cannot continue */
-			wprintf("<em>%s</em><br />\n", &buf[4]);	/* TODO -> important message */
+		else if (rc != 2) {	/* Any other error means that we cannot continue */
+			AppendImportantMessage(ChrPtr(CmdBuf) + 4, StrLength(CmdBuf) - 4);
+			FreeStrBuf(&CmdBuf);
+			readloop(readnew, eUseDefault);
 			return;
 		}
+		FreeStrBuf(&CmdBuf);
 	}
-	svputlong("RCPTREQUIRED", recipient_required);
-	svputlong("SUBJREQUIRED", recipient_required || subject_required);
+	if (recipient_required)
+		PutBstr(HKEY("__RCPTREQUIRED"), NewStrBufPlain(HKEY("1")));
+	if (recipient_required || subject_required)
+		PutBstr(HKEY("__SUBJREQUIRED"), NewStrBufPlain(HKEY("1")));
 
 	begin_burst();
 	output_headers(1, 0, 0, 0, 1, 0);
@@ -1622,20 +1640,21 @@ void display_enter(void)
 void delete_msg(void)
 {
 	long msgid;
-	char buf[SIZ];
-
+	StrBuf *Line;
+	
 	msgid = lbstr("msgid");
-
-	if (WC->wc_is_trash) {	/* Delete from Trash is a real delete */
+	Line = NewStrBuf();
+	if ((WC->CurRoom.RAFlags & UA_ISTRASH) != 0) {	/* 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);
-	sprintf(WC->ImportantMessage, "%s", &buf[4]);
-	readloop(readnew);
+	StrBuf_ServGetln(Line);
+	GetServerStatusMsg(Line, NULL, 1, 0);
+
+	readloop(readnew, eUseDefault);
 }
 
 
@@ -1645,76 +1664,24 @@ void delete_msg(void)
 void move_msg(void)
 {
 	long msgid;
-	char buf[SIZ];
 
 	msgid = lbstr("msgid");
 
 	if (havebstr("move_button")) {
-		sprintf(buf, "MOVE %ld|%s", msgid, bstr("target_room"));
-		serv_puts(buf);
-		serv_getln(buf, sizeof buf);
-		sprintf(WC->ImportantMessage, "%s", &buf[4]);
+		StrBuf *Line;
+		serv_printf("MOVE %ld|%s", msgid, bstr("target_room"));
+		Line = NewStrBuf();
+		StrBuf_ServGetln(Line);
+		GetServerStatusMsg(Line, NULL, 1, 0);
+		FreeStrBuf(&Line);
 	} else {
-		sprintf(WC->ImportantMessage, (_("The message was not moved.")));
+		AppendImportantMessage(_("The message was not moved."), -1);
 	}
 
-	readloop(readnew);
+	readloop(readnew, eUseDefault);
 }
 
 
-/*
- * Confirm move of a message
- */
-void confirm_move_msg(void)
-{
-	long msgid;
-	char buf[SIZ];
-	char targ[SIZ];
-
-	msgid = lbstr("msgid");
-
-
-	output_headers(1, 1, 2, 0, 0, 0);
-	wprintf("<div id=\"banner\">\n");
-	wprintf("<h1>");
-	wprintf(_("Confirm move of message"));
-	wprintf("</h1>");
-	wprintf("</div>\n");
-
-	wprintf("<div id=\"content\" class=\"service\">\n");
-
-	wprintf("<CENTER>");
-
-	wprintf(_("Move this message to:"));
-	wprintf("<br />\n");
-
-	wprintf("<form METHOD=\"POST\" action=\"move_msg\">\n");
-	wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
-	wprintf("<INPUT TYPE=\"hidden\" NAME=\"msgid\" VALUE=\"%s\">\n", bstr("msgid"));
-
-	wprintf("<SELECT NAME=\"target_room\" SIZE=5>\n");
-	serv_puts("LKRA");
-	serv_getln(buf, sizeof buf);
-	if (buf[0] == '1') {
-		while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
-			extract_token(targ, buf, 0, '|', sizeof targ);
-			wprintf("<OPTION>");
-			escputs(targ);
-			wprintf("\n");
-		}
-	}
-	wprintf("</SELECT>\n");
-	wprintf("<br />\n");
-
-	wprintf("<INPUT TYPE=\"submit\" NAME=\"move_button\" VALUE=\"%s\">", _("Move"));
-	wprintf("&nbsp;");
-	wprintf("<INPUT TYPE=\"submit\" NAME=\"cancel_button\" VALUE=\"%s\">", _("Cancel"));
-	wprintf("</form></CENTER>\n");
-
-	wprintf("</CENTER>\n");
-	wDumpContent(1);
-}
-
 
 /*
  * Generic function to output an arbitrary MIME attachment from
@@ -1729,8 +1696,10 @@ void postpart(StrBuf *partnum, StrBuf *filename, int force_download)
 	void *vPart;
 	StrBuf *content_type;
 	wc_mime_attachment *part;
-	
-	if (GetHash(WC->attachments, SKEY(partnum), &vPart) &&
+	int i;
+
+	i = StrToi(partnum);
+	if (GetHash(WC->attachments, IKEY(i), &vPart) &&
 	    (vPart != NULL)) {
 		part = (wc_mime_attachment*) vPart;
 		if (force_download) {
@@ -1745,7 +1714,8 @@ void postpart(StrBuf *partnum, StrBuf *filename, int force_download)
 		hprintf("HTTP/1.1 404 %s\n", ChrPtr(partnum));
 		output_headers(0, 0, 0, 0, 0, 0);
 		hprintf("Content-Type: text/plain\r\n");
-		wprintf(_("An error occurred while retrieving this part: %s/%s\n"), 
+		begin_burst();
+		wc_printf(_("An error occurred while retrieving this part: %s/%s\n"), 
 			ChrPtr(partnum), ChrPtr(filename));
 		end_burst();
 	}
@@ -1764,6 +1734,7 @@ void postpart(StrBuf *partnum, StrBuf *filename, int force_download)
 void mimepart(int force_download)
 {
 	long msgnum;
+	long ErrorDetail;
 	StrBuf *att;
 	wcsession *WCC = WC;
 	StrBuf *Buf;
@@ -1777,14 +1748,14 @@ void mimepart(int force_download)
 
 	serv_printf("OPNA %ld|%s", msgnum, ChrPtr(att));
 	StrBuf_ServGetln(Buf);
-	if (GetServerStatus(Buf, NULL) == 2) {
+	if (GetServerStatus(Buf, &ErrorDetail) == 2) {
 		StrBufCutLeft(Buf, 4);
 		bytes = StrBufExtract_long(Buf, 0, '|');
 		if (!force_download) {
 			StrBufExtract_token(ContentType, Buf, 3, '|');
 		}
 
-		read_server_binary(WCC->WBuf, bytes, Buf);
+		serv_read_binary(WCC->WBuf, bytes, Buf);
 		serv_puts("CLOS");
 		StrBuf_ServGetln(Buf);
 		CT = ChrPtr(ContentType);
@@ -1801,10 +1772,27 @@ void mimepart(int force_download)
 		http_transmit_thing(CT, 0);
 	} else {
 		StrBufCutLeft(Buf, 4);
-		hprintf("HTTP/1.1 404 %s\n", ChrPtr(Buf));
+		switch (ErrorDetail) {
+		default:
+		case ERROR + MESSAGE_NOT_FOUND:
+			hprintf("HTTP/1.1 404 %s\n", ChrPtr(Buf));
+			break;
+		case ERROR + NOT_LOGGED_IN:
+			hprintf("HTTP/1.1 401 %s\n", ChrPtr(Buf));
+			break;
+
+		case ERROR + HIGHER_ACCESS_REQUIRED:
+			hprintf("HTTP/1.1 403 %s\n", ChrPtr(Buf));
+			break;
+		case ERROR + INTERNAL_ERROR:
+		case ERROR + TOO_BIG:
+			hprintf("HTTP/1.1 500 %s\n", ChrPtr(Buf));
+			break;
+		}
 		output_headers(0, 0, 0, 0, 0, 0);
 		hprintf("Content-Type: text/plain\r\n");
-		wprintf(_("An error occurred while retrieving this part: %s\n"), 
+		begin_burst();
+		wc_printf(_("An error occurred while retrieving this part: %s\n"), 
 			ChrPtr(Buf));
 		end_burst();
 	}
@@ -1844,14 +1832,20 @@ StrBuf *load_mimepart(long msgnum, char *partnum)
 void MimeLoadData(wc_mime_attachment *Mime)
 {
 	StrBuf *Buf;
+	const char *Ptr;
 	off_t bytes;
 	/* TODO: is there a chance the content type is different from the one we know? */
+
 	serv_printf("DLAT %ld|%s", Mime->msgnum, ChrPtr(Mime->PartNum));
 	Buf = NewStrBuf();
 	StrBuf_ServGetln(Buf);
 	if (GetServerStatus(Buf, NULL) == 6) {
-		bytes = extract_long(&(ChrPtr(Buf)[4]), 0);
-				     
+		Ptr = &(ChrPtr(Buf)[4]);
+		bytes = StrBufExtractNext_long(Buf, &Ptr, '|');
+		StrBufSkip_NTokenS(Buf, &Ptr, '|', 3);  /* filename, cbtype, mimetype */
+		if (Mime->Charset == NULL) Mime->Charset = NewStrBuf();
+		StrBufExtract_NextToken(Mime->Charset, Buf, &Ptr, '|');
+		
 		if (Mime->Data == NULL)
 			Mime->Data = NewStrBufPlain(NULL, bytes);
 		StrBuf_ServGetBLOBBuffered(Mime->Data, bytes);
@@ -1864,8 +1858,6 @@ void MimeLoadData(wc_mime_attachment *Mime)
 }
 
 
-
-
 void view_mimepart(void) {
 	mimepart(0);
 }
@@ -1900,39 +1892,59 @@ void download_postpart(void) {
 	FreeStrBuf(&partnum);
 }
 
-void h_readnew(void) { readloop(readnew);}
-void h_readold(void) { readloop(readold);}
-void h_readfwd(void) { readloop(readfwd);}
-void h_headers(void) { readloop(headers);}
-void h_do_search(void) { readloop(do_search);}
 
-void jsonMessageListHdr(void) 
-{
-	/* TODO: make a generic function */
-	hprintf("HTTP/1.1 200 OK\r\n");
-	hprintf("Content-type: application/json; charset=utf-8\r\n");
-	hprintf("Server: %s / %s\r\n", PACKAGE_STRING, ChrPtr(WC->serv_info->serv_software));
-	hprintf("Connection: close\r\n");
-	hprintf("Pragma: no-cache\r\nCache-Control: no-store\r\nExpires:-1\r\n");
-	begin_burst();
-}
 
-/* Spit out the new summary view. This is basically a static page, so clients can cache the layout, all the dirty work is javascript :) */
-void new_summary_view(void) {
-	begin_burst();
-	DoTemplate(HKEY("msg_listview"),NULL,&NoCtx);
-	DoTemplate(HKEY("trailing"),NULL,&NoCtx);
-	end_burst();
+void show_num_attachments(void) {
+	wc_printf("%d", GetCount(WC->attachments));
 }
 
+
+void h_readnew(void) { readloop(readnew, eUseDefault);}
+void h_readold(void) { readloop(readold, eUseDefault);}
+void h_readfwd(void) { readloop(readfwd, eUseDefault);}
+void h_headers(void) { readloop(headers, eUseDefault);}
+void h_do_search(void) { readloop(do_search, eUseDefault);}
+void h_readgt(void) { readloop(readgt, eUseDefault);}
+void h_readlt(void) { readloop(readlt, eUseDefault);}
+
+
+
 /* Output message list in JSON format */
 void jsonMessageList(void) {
+	StrBuf *View = NewStrBuf();
 	const StrBuf *room = sbstr("room");
 	long oper = (havebstr("query")) ? do_search : readnew;
-	WC->is_ajax = 1; 
+	StrBufPrintf(View, "%d", VIEW_JSON_LIST);
+	putbstr("view", View);; 
 	gotoroom(room);
-	readloop(oper);
-	WC->is_ajax = 0;
+	readloop(oper, eUseDefault);
+}
+
+void RegisterReadLoopHandlerset(
+	int RoomType,
+	GetParamsGetServerCall_func GetParamsGetServerCall,
+	PrintViewHeader_func PrintPageHeader,
+	PrintViewHeader_func PrintViewHeader,
+	load_msg_ptrs_detailheaders LH,
+	LoadMsgFromServer_func LoadMsgFromServer,
+	RenderView_or_Tail_func RenderView_or_Tail,
+	View_Cleanup_func ViewCleanup
+	)
+{
+	RoomRenderer *Handler;
+
+	Handler = (RoomRenderer*) malloc(sizeof(RoomRenderer));
+
+	Handler->RoomType = RoomType;
+	Handler->GetParamsGetServerCall = GetParamsGetServerCall;
+	Handler->PrintPageHeader = PrintPageHeader;
+	Handler->PrintViewHeader = PrintViewHeader;
+	Handler->LoadMsgFromServer = LoadMsgFromServer;
+	Handler->RenderView_or_Tail = RenderView_or_Tail;
+	Handler->ViewCleanup = ViewCleanup;
+	Handler->LHParse = LH;
+
+	Put(ReadLoopHandler, IKEY(RoomType), Handler, NULL);
 }
 
 void 
@@ -1959,29 +1971,42 @@ InitModule_MSG
 			   NULL);
 	RegisterPreference("mailbox",_("Mailbox view mode"), PRF_STRING, NULL);
 
-	WebcitAddUrlHandler(HKEY("readnew"), h_readnew, NEED_URL);
-	WebcitAddUrlHandler(HKEY("readold"), h_readold, NEED_URL);
-	WebcitAddUrlHandler(HKEY("readfwd"), h_readfwd, NEED_URL);
-	WebcitAddUrlHandler(HKEY("headers"), h_headers, NEED_URL);
-	WebcitAddUrlHandler(HKEY("do_search"), h_do_search, 0);
-	WebcitAddUrlHandler(HKEY("display_enter"), display_enter, 0);
-	WebcitAddUrlHandler(HKEY("post"), post_message, 0);
-	WebcitAddUrlHandler(HKEY("move_msg"), move_msg, 0);
-	WebcitAddUrlHandler(HKEY("delete_msg"), delete_msg, 0);
-	WebcitAddUrlHandler(HKEY("confirm_move_msg"), confirm_move_msg, 0);
-	WebcitAddUrlHandler(HKEY("msg"), embed_message, NEED_URL);
-	WebcitAddUrlHandler(HKEY("message"), handle_one_message, NEED_URL|XHTTP_COMMANDS|COOKIEUNNEEDED|FORCE_SESSIONCLOSE);
-	WebcitAddUrlHandler(HKEY("printmsg"), print_message, NEED_URL);
-	WebcitAddUrlHandler(HKEY("mobilemsg"), mobile_message_view, NEED_URL);
-	WebcitAddUrlHandler(HKEY("msgheaders"), display_headers, NEED_URL);
-
-	WebcitAddUrlHandler(HKEY("mimepart"), view_mimepart, NEED_URL);
-	WebcitAddUrlHandler(HKEY("mimepart_download"), download_mimepart, NEED_URL);
-	WebcitAddUrlHandler(HKEY("postpart"), view_postpart, NEED_URL);
-	WebcitAddUrlHandler(HKEY("postpart_download"), download_postpart, NEED_URL);
+	WebcitAddUrlHandler(HKEY("readnew"), "", 0, h_readnew, ANONYMOUS|NEED_URL);
+	WebcitAddUrlHandler(HKEY("readold"), "", 0, h_readold, ANONYMOUS|NEED_URL);
+	WebcitAddUrlHandler(HKEY("readfwd"), "", 0, h_readfwd, ANONYMOUS|NEED_URL);
+	WebcitAddUrlHandler(HKEY("headers"), "", 0, h_headers, NEED_URL);
+	WebcitAddUrlHandler(HKEY("readgt"), "", 0, h_readgt, ANONYMOUS|NEED_URL);
+	WebcitAddUrlHandler(HKEY("readlt"), "", 0, h_readlt, ANONYMOUS|NEED_URL);
+	WebcitAddUrlHandler(HKEY("do_search"), "", 0, h_do_search, 0);
+	WebcitAddUrlHandler(HKEY("display_enter"), "", 0, display_enter, 0);
+	WebcitAddUrlHandler(HKEY("post"), "", 0, post_message, PROHIBIT_STARTPAGE);
+	WebcitAddUrlHandler(HKEY("move_msg"), "", 0, move_msg, PROHIBIT_STARTPAGE);
+	WebcitAddUrlHandler(HKEY("delete_msg"), "", 0, delete_msg, PROHIBIT_STARTPAGE);
+	WebcitAddUrlHandler(HKEY("msg"), "", 0, embed_message, NEED_URL);
+	WebcitAddUrlHandler(HKEY("message"), "", 0, handle_one_message, NEED_URL|XHTTP_COMMANDS|COOKIEUNNEEDED|FORCE_SESSIONCLOSE);
+	WebcitAddUrlHandler(HKEY("printmsg"), "", 0, print_message, NEED_URL);
+	WebcitAddUrlHandler(HKEY("msgheaders"), "", 0, display_headers, NEED_URL);
+
+	WebcitAddUrlHandler(HKEY("mimepart"), "", 0, view_mimepart, NEED_URL);
+	WebcitAddUrlHandler(HKEY("mimepart_download"), "", 0, download_mimepart, NEED_URL);
+	WebcitAddUrlHandler(HKEY("postpart"), "", 0, view_postpart, NEED_URL|PROHIBIT_STARTPAGE);
+	WebcitAddUrlHandler(HKEY("postpart_download"), "", 0, download_postpart, NEED_URL|PROHIBIT_STARTPAGE);
+	WebcitAddUrlHandler(HKEY("upload_attachment"), "", 0, upload_attachment, AJAX);
+	WebcitAddUrlHandler(HKEY("remove_attachment"), "", 0, remove_attachment, AJAX);
+	WebcitAddUrlHandler(HKEY("show_num_attachments"), "", 0, show_num_attachments, AJAX);
 
 	/* json */
-	WebcitAddUrlHandler(HKEY("roommsgs"), jsonMessageList,0);
+	WebcitAddUrlHandler(HKEY("roommsgs"), "", 0, jsonMessageList,0);
+
+	l_subj = FourHash("subj", 4);
+	l_wefw = FourHash("wefw", 4);
+	l_msgn = FourHash("msgn", 4);
+	l_from = FourHash("from", 4);
+	l_rcpt = FourHash("rcpt", 4);
+	l_cccc = FourHash("cccc", 4);
+	l_node = FourHash("node", 4);
+	l_rfca = FourHash("rfca", 4);
+
 	return ;
 }