X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fmessages.c;h=7676c9dd80ad04b0cc36e88043a596d0c7078fba;hb=76f23da782e9e80dad0a8ae1336230da5a6fa124;hp=d12d54e99130a81e1b19abf767c3ad7e61df04e7;hpb=cf934431c7c8c1091b38c0b374f6a3b9293841ca;p=citadel.git

diff --git a/webcit/messages.c b/webcit/messages.c
index d12d54e99..7676c9dd8 100644
--- a/webcit/messages.c
+++ b/webcit/messages.c
@@ -13,7 +13,7 @@
 #define SENDER_COL_WIDTH_PCT		30	/**< Mailbox view column width */
 #define DATE_PLUS_BUTTONS_WIDTH_PCT	20	/**< Mailbox view column width */
 
-/**
+/*
  * Address book entry (keep it short and sweet, it's just a quickie lookup
  * which we can use to get to the real meat and bones later)
  */
@@ -26,13 +26,13 @@ struct addrbookent {
 
 #ifdef HAVE_ICONV
 
-/**
- * \brief	Wrapper around iconv_open()
- *		Our version adds aliases for non-standard Microsoft charsets
- *	      such as 'MS950', aliasing them to names like 'CP950'
+/*
+ * Wrapper around iconv_open()
+ * Our version adds aliases for non-standard Microsoft charsets
+ * such as 'MS950', aliasing them to names like 'CP950'
  *
- * \param	tocode		Target encoding
- * \param	fromcode	Source encoding
+ * tocode	Target encoding
+ * fromcode	Source encoding
  */
 iconv_t ctdl_iconv_open(const char *tocode, const char *fromcode)
 {
@@ -51,11 +51,27 @@ iconv_t ctdl_iconv_open(const char *tocode, const char *fromcode)
 }
 
 
-/**
- * \brief  Handle subjects with RFC2047 encoding
- *  such as:
+
+inline char *FindNextEnd (char *bptr)
+{
+	char * end;
+	/* Find the next ?Q? */
+	end = strchr(bptr + 2, '?');
+	if (end == NULL) return NULL;
+	if (((*(end + 1) == 'B') || (*(end + 1) == 'Q')) && 
+	    (*(end + 2) == '?')) {
+		/* skip on to the end of the cluster, the next ?= */
+		end = strstr(end + 3, "?=");
+	}
+	else
+		/* sort of half valid encoding, try to find an end. */
+		end = strstr(bptr, "?=");
+	return end;
+}
+
+/*
+ * Handle subjects with RFC2047 encoding such as:
  * =?koi8-r?B?78bP0s3Mxc7JxSDXz9rE1dvO2c3JINvB0sHNySDP?=
- * \param buf the stringbuffer to process
  */
 void utf8ify_rfc822_string(char *buf) {
 	char *start, *end, *next, *nextend, *ptr;
@@ -74,7 +90,7 @@ void utf8ify_rfc822_string(char *buf) {
 	int i, len, delta;
 	int illegal_non_rfc2047_encoding = 0;
 
-	/** Sometimes, badly formed messages contain strings which were simply
+	/* Sometimes, badly formed messages contain strings which were simply
 	 *  written out directly in some foreign character set instead of
 	 *  using RFC2047 encoding.  This is illegal but we will attempt to
 	 *  handle it anyway by converting from a user-specified default
@@ -88,10 +104,11 @@ void utf8ify_rfc822_string(char *buf) {
 		}
 	}
 	if (illegal_non_rfc2047_encoding) {
-		char default_header_charset[128];
-		get_preference("default_header_charset", default_header_charset, sizeof default_header_charset);
-		if ( (strcasecmp(default_header_charset, "UTF-8")) && (strcasecmp(default_header_charset, "us-ascii")) ) {
-			ic = ctdl_iconv_open("UTF-8", default_header_charset);
+		StrBuf *default_header_charset;
+		get_preference("default_header_charset", &default_header_charset);
+		if ( (strcasecmp(ChrPtr(default_header_charset), "UTF-8")) && 
+		     (strcasecmp(ChrPtr(default_header_charset), "us-ascii")) ) {
+			ic = ctdl_iconv_open("UTF-8", ChrPtr(default_header_charset));
 			if (ic != (iconv_t)(-1) ) {
 				ibuf = malloc(1024);
 				isav = ibuf;
@@ -114,14 +131,14 @@ void utf8ify_rfc822_string(char *buf) {
 	nextend = end = NULL;
 	len = strlen(buf);
 	start = strstr(buf, "=?");
-	if (start != NULL)
-		end = strstr(start, "?=");
+	if (start != NULL) 
+		end = FindNextEnd (start);
 
 	while ((start != NULL) && (end != NULL))
 	{
 		next = strstr(end, "=?");
 		if (next != NULL)
-			nextend = strstr(next, "?=");
+			nextend = FindNextEnd(next);
 		if (nextend == NULL)
 			next = NULL;
 
@@ -158,10 +175,10 @@ void utf8ify_rfc822_string(char *buf) {
 		end = nextend;
 	}
 
-	/** Now we handle foreign character sets properly encoded
-	 *  in RFC2047 format.
+	/* Now we handle foreign character sets properly encoded
+	 * in RFC2047 format.
 	 */
-	while (start=strstr(buf, "=?"), end=strstr(buf, "?="),
+	while (start=strstr(buf, "=?"), end=FindNextEnd((start != NULL)? start : buf),
 		((start != NULL) && (end != NULL) && (end > start)) )
 	{
 		extract_token(charset, start, 1, '?', sizeof charset);
@@ -230,7 +247,7 @@ void utf8ify_rfc822_string(char *buf) {
 
 		free(isav);
 
-		/**
+		/*
 		 * Since spammers will go to all sorts of absurd lengths to get their
 		 * messages through, there are LOTS of corrupt headers out there.
 		 * So, prevent a really badly formed RFC2047 header from throwing
@@ -257,58 +274,82 @@ inline void utf8ify_rfc822_string(char *a){};
  * \param	target		Target buffer.
  * \param	maxlen		Maximum size of target buffer.
  * \param	source		Source string to be encoded.
+ * \param       SourceLen       Length of the source string
+ * \returns     encoded length; -1 if non success.
  */
-void webcit_rfc2047encode(char *target, int maxlen, char *source)
+int webcit_rfc2047encode(char *target, int maxlen, char *source, long SourceLen)
 {
+	const char headerStr[] = "=?UTF-8?Q?";
 	int need_to_encode = 0;
-	int i, len;
+	int i = 0;
+	int len;
 	unsigned char ch;
 
-	if (target == NULL) return;
-	len = strlen(source);
-	for (i=0; i<len; ++i) {
-		if ((source[i] < 32) || (source[i] > 126)) {
+	if ((source == NULL) || 
+	    (target == NULL) ||
+	    (SourceLen > maxlen)) return -1;
+
+	while ((!IsEmptyStr (&source[i])) && 
+	       (need_to_encode == 0) &&
+	       (i < SourceLen) ) {
+		if (((unsigned char) source[i] < 32) || 
+		    ((unsigned char) source[i] > 126)) {
 			need_to_encode = 1;
-			i = len; ///< shortcut. won't become more than 1
 		}
+		i++;
 	}
 
 	if (!need_to_encode) {
-		safestrncpy(target, source, maxlen);
-		return;
+		memcpy (target, source, SourceLen);
+		target[SourceLen] = '\0';
+		return SourceLen;
 	}
-
-	strcpy(target, "=?UTF-8?Q?");
-	for (i=0; i<len; ++i) {
+	
+	if (sizeof (headerStr + SourceLen + 2) > maxlen)
+		return -1;
+	memcpy (target, headerStr, sizeof (headerStr));
+	len = sizeof (headerStr) - 1;
+	for (i=0; (i < SourceLen) && (len + 3< maxlen) ; ++i) {
 		ch = (unsigned char) source[i];
 		if ((ch < 32) || (ch > 126) || (ch == 61)) {
-			sprintf(&target[strlen(target)], "=%02X", ch);
+			sprintf(&target[len], "=%02X", ch);
+			len += 3;
 		}
 		else {
-			sprintf(&target[strlen(target)], "%c", ch);
+			sprintf(&target[len], "%c", ch);
+			len ++;
 		}
 	}
 	
-	strcat(target, "?=");
+	if (len + 2 < maxlen) {
+		strcat(&target[len], "?=");
+		len +=2;
+		return len;
+	}
+	else
+		return -1;
 }
 
 
 
 
-/**
- * \brief Look for URL's embedded in a buffer and make them linkable.  We use a
- * target window in order to keep the BBS session in its own window.
- * \param buf the message buffer
+/*
+ * Look for URL's embedded in a buffer and make them linkable.  We use a
+ * target window in order to keep the Citadel session in its own window.
  */
-void url(char *buf)
+void url(char *buf, size_t bufsize)
 {
-	int len;
+	int len, UrlLen, Offset, TrailerLen, outpos;
 	char *start, *end, *pos;
 	char urlbuf[SIZ];
-	char outbuf[1024];
+	char outbuf[SIZ];
 
 	start = NULL;
 	len = strlen(buf);
+	if (len > bufsize) {
+		lprintf(1, "URL: content longer than buffer!");
+		return;
+	}
 	end = buf + len;
 	for (pos = buf; (pos < end) && (start == NULL); ++pos) {
 		if (!strncasecmp(pos, "http://", 7))
@@ -339,17 +380,35 @@ void url(char *buf)
 			end = pos;
 		}
 	}
+	
+	UrlLen = end - start;
+	if (UrlLen > sizeof(urlbuf)){
+		lprintf(1, "URL: content longer than buffer!");
+		return;
+	}
+	memcpy(urlbuf, start, UrlLen);
+	urlbuf[UrlLen] = '\0';
+
+	Offset = start - buf;
+	if ((Offset != 0) && (Offset < sizeof(outbuf)))
+		memcpy(outbuf, buf, Offset);
+	outpos = snprintf(&outbuf[Offset], sizeof(outbuf) - Offset,  
+			  "%ca href=%c%s%c TARGET=%c%s%c%c%s%c/A%c",
+			  LB, QU, urlbuf, QU, QU, TARGET, QU, RB, urlbuf, LB, RB);
+	if (outpos >= sizeof(outbuf) - Offset) {
+		lprintf(1, "URL: content longer than buffer!");
+		return;
+	}
 
-	strncpy(urlbuf, start, end - start);
-	urlbuf[end - start] = '\0';
-
-	if (start != buf)
-		strncpy(outbuf, buf, start - buf );
-	sprintf(&outbuf[start-buf], "%ca href=%c%s%c TARGET=%c%s%c%c%s%c/A%c",
-		LB, QU, urlbuf, QU, QU, TARGET, QU, RB, urlbuf, LB, RB);
-	strcat(outbuf, end);
-	if ( strlen(outbuf) < 250 )
-		strcpy(buf, outbuf);
+	TrailerLen = len - (end - start);
+	if (TrailerLen > 0)
+		memcpy(outbuf + Offset + outpos, end, TrailerLen);
+	if (Offset + outpos + TrailerLen > bufsize) {
+		lprintf(1, "URL: content longer than buffer!");
+		return;
+	}
+	memcpy (buf, outbuf, Offset + outpos + TrailerLen);
+	*(buf + Offset + outpos + TrailerLen) = '\0';
 }
 
 
@@ -431,8 +490,9 @@ void fetchname_parsed_vcard(struct vCard *v, char *storename) {
  * understand in a simple two-column name/value format.
  * \param v the vCard to display
  * \param full display all items of the vcard?
+ * \param msgnum Citadel message pointer
  */
-void display_parsed_vcard(struct vCard *v, int full) {
+void display_parsed_vcard(struct vCard *v, int full, long msgnum) {
 	int i, j;
 	char buf[SIZ];
 	char *name;
@@ -601,6 +661,14 @@ void display_parsed_vcard(struct vCard *v, int full) {
 					wprintf("</TD></TR>\n");
 				}
 			}
+			/* else if (!strcasecmp(firsttoken, "photo") && full && pass == 2) { 
+				// Only output on second pass
+				wprintf("<tr><td>");
+				wprintf(_("Photo:"));
+				wprintf("</td><td>");
+				wprintf("<img src=\"/vcardphoto/%ld/\" alt=\"Contact photo\"/>",msgnum);
+				wprintf("</td></tr>\n");
+			} */
 			else if (!strcasecmp(firsttoken, "version")) {
 				/* ignore */
 			}
@@ -675,8 +743,10 @@ void display_parsed_vcard(struct vCard *v, int full) {
  * \param alpha what???
  * \param full should we usse all lines?
  * \param storename where to store???
+ * \param msgnum Citadel message pointer
  */
-void display_vcard(char *vcard_source, char alpha, int full, char *storename) {
+void display_vcard(char *vcard_source, char alpha, int full, char *storename, 
+	long msgnum) {
 	struct vCard *v;
 	char *name;
 	char buf[SIZ];
@@ -699,7 +769,7 @@ void display_vcard(char *vcard_source, char alpha, int full, char *storename) {
 			|| ((isalpha(alpha)) && (tolower(alpha) == tolower(this_alpha)) )
 			|| ((!isalpha(alpha)) && (!isalpha(this_alpha)))
 		) {
-		display_parsed_vcard(v, full);
+		display_parsed_vcard(v, full,msgnum);
 	}
 
 	vcard_free(v);
@@ -740,6 +810,8 @@ void read_message(long msgnum, int printable_view, char *section) {
 	char rfca[256] = "";
 	char reply_to[512] = "";
 	char reply_all[4096] = "";
+	char reply_references[1024] = "";
+	char reply_inreplyto[256] = "";
 	char now[64] = "";
 	int format_type = 0;
 	int nhdr = 0;
@@ -811,6 +883,12 @@ void read_message(long msgnum, int printable_view, char *section) {
 		if (!strncasecmp(buf, "subj=", 5)) {
 			safestrncpy(m_subject, &buf[5], sizeof m_subject);
 		}
+		if (!strncasecmp(buf, "msgn=", 5)) {
+			safestrncpy(reply_inreplyto, &buf[5], sizeof reply_inreplyto);
+		}
+		if (!strncasecmp(buf, "wefw=", 5)) {
+			safestrncpy(reply_references, &buf[5], sizeof reply_references);
+		}
 		if (!strncasecmp(buf, "cccc=", 5)) {
 			int len;
 			safestrncpy(m_cc, &buf[5], sizeof m_cc);
@@ -952,7 +1030,16 @@ void read_message(long msgnum, int printable_view, char *section) {
 
 	}
 
-	/** Generate a reply-to address */
+	/* Trim down excessively long lists of thread references.  We eliminate the
+	 * second one in the list so that the thread root remains intact.
+	 */
+	int rrtok = num_tokens(reply_references, '|');
+	int rrlen = strlen(reply_references);
+	if ( ((rrtok >= 3) && (rrlen > 900)) || (rrtok > 10) ) {
+		remove_token(reply_references, 1, '|');
+	}
+
+	/* Generate a reply-to address */
 	if (!IsEmptyStr(rfca)) {
 		if (!IsEmptyStr(from)) {
 			snprintf(reply_to, sizeof(reply_to), "%s <%s>", from, rfca);
@@ -985,7 +1072,7 @@ void read_message(long msgnum, int printable_view, char *section) {
         if (!printable_view) {
                 wprintf("<p id=\"msg%ld\" class=\"msgbuttons\" >\n",msgnum);
 
-		/** Reply */
+		/* Reply */
 		if ( (WC->wc_view == VIEW_MAILBOX) || (WC->wc_view == VIEW_BBS) ) {
 			wprintf("<a href=\"display_enter");
 			if (WC->is_mailbox) {
@@ -995,13 +1082,19 @@ void read_message(long msgnum, int printable_view, char *section) {
 			urlescputs(reply_to);
 			if (!IsEmptyStr(m_subject)) {
 				wprintf("?subject=");
-				if (strncasecmp(m_subject, "Re:", 3)) wprintf("Re:%20");
+				if (strncasecmp(m_subject, "Re:", 3)) wprintf("Re:%%20");
 				urlescputs(m_subject);
 			}
+			wprintf("?references=");
+			if (!IsEmptyStr(reply_references)) {
+				urlescputs(reply_references);
+				urlescputs("|");
+			}
+			urlescputs(reply_inreplyto);
 			wprintf("\"><span>[</span>%s<span>]</span></a> ", _("Reply"));
 		}
 
-		/** ReplyQuoted */
+		/* ReplyQuoted */
 		if ( (WC->wc_view == VIEW_MAILBOX) || (WC->wc_view == VIEW_BBS) ) {
 			if (!WC->is_mailbox) {
 				wprintf("<a href=\"display_enter");
@@ -1010,14 +1103,20 @@ void read_message(long msgnum, int printable_view, char *section) {
 				urlescputs(reply_to);
 				if (!IsEmptyStr(m_subject)) {
 					wprintf("?subject=");
-					if (strncasecmp(m_subject, "Re:", 3)) wprintf("Re:%20");
+					if (strncasecmp(m_subject, "Re:", 3)) wprintf("Re:%%20");
 					urlescputs(m_subject);
 				}
+				wprintf("?references=");
+				if (!IsEmptyStr(reply_references)) {
+					urlescputs(reply_references);
+					urlescputs("|");
+				}
+				urlescputs(reply_inreplyto);
 				wprintf("\"><span>[</span>%s<span>]</span></a> ", _("ReplyQuoted"));
 			}
 		}
 
-		/** ReplyAll */
+		/* ReplyAll */
 		if (WC->wc_view == VIEW_MAILBOX) {
 			wprintf("<a href=\"display_enter");
 			wprintf("?replyquote=%ld", msgnum);
@@ -1027,21 +1126,27 @@ void read_message(long msgnum, int printable_view, char *section) {
 			urlescputs(reply_all);
 			if (!IsEmptyStr(m_subject)) {
 				wprintf("?subject=");
-				if (strncasecmp(m_subject, "Re:", 3)) wprintf("Re:%20");
+				if (strncasecmp(m_subject, "Re:", 3)) wprintf("Re:%%20");
 				urlescputs(m_subject);
 			}
+			wprintf("?references=");
+			if (!IsEmptyStr(reply_references)) {
+				urlescputs(reply_references);
+				urlescputs("|");
+			}
+			urlescputs(reply_inreplyto);
 			wprintf("\"><span>[</span>%s<span>]</span></a> ", _("ReplyAll"));
 		}
 
-		/** Forward */
+		/* Forward */
 		if (WC->wc_view == VIEW_MAILBOX) {
 			wprintf("<a href=\"display_enter?fwdquote=%ld?subject=", msgnum);
-			if (strncasecmp(m_subject, "Fwd:", 4)) wprintf("Fwd:%20");
+			if (strncasecmp(m_subject, "Fwd:", 4)) wprintf("Fwd:%%20");
 			urlescputs(m_subject);
 			wprintf("\"><span>[</span>%s<span>]</span></a> ", _("Forward"));
 		}
 
-		/** If this is one of my own rooms, or if I'm an Aide or Room Aide, I can move/delete */
+		/* If this is one of my own rooms, or if I'm an Aide or Room Aide, I can move/delete */
 		if ( (WC->is_room_aide) || (WC->is_mailbox) || (WC->room_flags2 & QR2_COLLABDEL) ) {
 			/** Move */
 			wprintf("<a href=\"confirm_move_msg?msgid=%ld\"><span>[</span>%s<span>]</span></a> ",
@@ -1055,12 +1160,12 @@ void read_message(long msgnum, int printable_view, char *section) {
 			);
 		}
 
-		/** Headers */
+		/* Headers */
 		wprintf("<a href=\"#\" onClick=\"window.open('msgheaders/%ld', 'headers%ld', 'toolbar=no,location=no,directories=no,copyhistory=no,status=yes,scrollbars=yes,resizable=yes,width=600,height=400'); \" >"
 			"<span>[</span>%s<span>]</span></a>", msgnum, msgnum, _("Headers"));
 
 
-		/** Print */
+		/* Print */
 		wprintf("<a href=\"#\" onClick=\"window.open('printmsg/%ld', 'print%ld', 'toolbar=no,location=no,directories=no,copyhistory=no,status=yes,scrollbars=yes,resizable=yes,width=600,height=400'); \" >"
 			"<span>[</span>%s<span>]</span></a>", msgnum, msgnum, _("Print"));
 
@@ -1085,10 +1190,10 @@ void read_message(long msgnum, int printable_view, char *section) {
 
 	wprintf("</div>");
 
-	/** Begin body */
+	/* Begin body */
 	wprintf("<div class=\"message_content\">");
 
-	/**
+	/*
 	 * Learn the content type
 	 */
 	strcpy(mime_content_type, "text/plain");
@@ -1128,7 +1233,7 @@ void read_message(long msgnum, int printable_view, char *section) {
 		}
 	}
 
-	/** Set up a character set conversion if we need to (and if we can) */
+	/* Set up a character set conversion if we need to (and if we can) */
 #ifdef HAVE_ICONV
 	if (strchr(mime_charset, ';')) strcpy(strchr(mime_charset, ';'), "");
 	if ( (strcasecmp(mime_charset, "us-ascii"))
@@ -1143,12 +1248,12 @@ void read_message(long msgnum, int printable_view, char *section) {
 	}
 #endif
 
-	/** Messages in legacy Citadel variformat get handled thusly... */
+	/* Messages in legacy Citadel variformat get handled thusly... */
 	if (!strcasecmp(mime_content_type, "text/x-citadel-variformat")) {
 		fmout("JUSTIFY");
 	}
 
-	/** Boring old 80-column fixed format text gets handled this way... */
+	/* Boring old 80-column fixed format text gets handled this way... */
 	else if ( (!strcasecmp(mime_content_type, "text/plain"))
 		|| (!strcasecmp(mime_content_type, "text")) ) {
 		buf [0] = '\0';
@@ -1185,22 +1290,22 @@ void read_message(long msgnum, int printable_view, char *section) {
 				bq = 0;
 			}
 			wprintf("<tt>");
-			url(buf);
+			url(buf, sizeof(buf));
 			escputs(buf);
 			wprintf("</tt><br />\n");
 		}
 		wprintf("</i><br />");
 	}
 
-	else /** HTML is fun, but we've got to strip it first */
-	if (!strcasecmp(mime_content_type, "text/html")) {
+	/* HTML is fun, but we've got to strip it first */
+	else if (!strcasecmp(mime_content_type, "text/html")) {
 		output_html(mime_charset, (WC->wc_view == VIEW_WIKI ? 1 : 0));
 	}
 
-	/** Unknown weirdness */
+	/* Unknown weirdness */
 	else {
 		wprintf(_("I don't know how to display %s"), mime_content_type);
-		wprintf("<br />\n", mime_content_type);
+		wprintf("<br />\n");
 		while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) { }
 	}
 
@@ -1217,7 +1322,7 @@ ENDBODY:	/* If there are attached submessages, display them now... */
 	}
 
 
-	/** Afterwards, offer links to download attachments 'n' such */
+	/* Afterwards, offer links to download attachments 'n' such */
 	if ( (num_attach_links > 0) && (!section[0]) ) {
 		for (i=0; i<num_attach_links; ++i) {
 			if (strcasecmp(attach_links[i].partnum, msg4_partnum)) {
@@ -1226,7 +1331,7 @@ ENDBODY:	/* If there are attached submessages, display them now... */
 		}
 	}
 
-	/** Handler for vCard parts */
+	/* Handler for vCard parts */
 	if (!IsEmptyStr(vcard_partnum)) {
 		part_source = load_mimepart(msgnum, vcard_partnum);
 		if (part_source != NULL) {
@@ -1236,23 +1341,21 @@ ENDBODY:	/* If there are attached submessages, display them now... */
 				|| (!strcasecmp(&WC->wc_roomname[11], USERCONFIGROOM))
 				|| (WC->wc_view == VIEW_ADDRESSBOOK)
 			) {
-				wprintf("<a href=\"edit_vcard?"
-					"msgnum=%ld?partnum=%s\">",
+				wprintf("<a href=\"edit_vcard?msgnum=%ld?partnum=%s\">",
 					msgnum, vcard_partnum);
 				wprintf("[%s]</a>", _("edit"));
 			}
 
-			/** In all cases, display the full card */
-			display_vcard(part_source, 0, 1, NULL);
+			/* In all cases, display the full card */
+			display_vcard(part_source, 0, 1, NULL,msgnum);
 		}
 	}
 
-	/** Handler for calendar parts */
+	/* Handler for calendar parts */
 	if (!IsEmptyStr(cal_partnum)) {
 		part_source = load_mimepart(msgnum, cal_partnum);
 		if (part_source != NULL) {
-			cal_process_attachment(part_source,
-						msgnum, cal_partnum);
+			cal_process_attachment(part_source, msgnum, cal_partnum);
 		}
 	}
 
@@ -1263,7 +1366,7 @@ ENDBODY:	/* If there are attached submessages, display them now... */
 
 	wprintf("</div>\n");
 
-	/** end everythingamundo table */
+	/* end everythingamundo table */
 	if (!printable_view) {
 		wprintf("</div>\n");
 	}
@@ -1281,31 +1384,29 @@ ENDBODY:	/* If there are attached submessages, display them now... */
 
 
 
-/**
- * \brief Unadorned HTML output of an individual message, suitable
+/*
+ * Unadorned HTML output of an individual message, suitable
  * for placing in a hidden iframe, for printing, or whatever
  *
- * \param msgnum_as_string Message number, as a string instead of as a long int
+ * msgnum_as_string == Message number, as a string instead of as a long int
  */
-void embed_message(char *msgnum_as_string) {
+void embed_message(void) {
 	long msgnum = 0L;
 
-	msgnum = atol(msgnum_as_string);
-	begin_ajax_response();
+	msgnum = StrTol(WC->UrlFragment1);
 	read_message(msgnum, 0, "");
-	end_ajax_response();
 }
 
 
-/**
- * \brief Printable view of a message
+/*
+ * Printable view of a message
  *
- * \param msgnum_as_string Message number, as a string instead of as a long int
+ * msgnum_as_string == Message number, as a string instead of as a long int
  */
-void print_message(char *msgnum_as_string) {
+void print_message(void) {
 	long msgnum = 0L;
 
-	msgnum = atol(msgnum_as_string);
+	msgnum = StrTol(WC->UrlFragment1);
 	output_headers(0, 0, 0, 0, 0, 0);
 
 	wprintf("Content-type: text/html\r\n"
@@ -1314,8 +1415,9 @@ void print_message(char *msgnum_as_string) {
 		PACKAGE_STRING);
 	begin_burst();
 
-	wprintf("\r\n\r\n<html>\n"
-		"<head><title>Printable view</title></head>\n"
+	wprintf("\r\n\r\n<html>\n<head><title>");
+	escputs(WC->wc_fullname);
+	wprintf("</title></head>\n"
 		"<body onLoad=\" window.print(); window.close(); \">\n"
 	);
 	
@@ -1332,11 +1434,11 @@ void print_message(char *msgnum_as_string) {
  *
  * \param msgnum_as_string Message number, as a string instead of as a long int
  */
-void display_headers(char *msgnum_as_string) {
+void display_headers(void) {
 	long msgnum = 0L;
 	char buf[1024];
 
-	msgnum = atol(msgnum_as_string);
+	msgnum = StrTol(WC->UrlFragment1);
 	output_headers(0, 0, 0, 0, 0, 0);
 
 	wprintf("Content-type: text/plain\r\n"
@@ -1381,7 +1483,7 @@ void pullquote_message(long msgnum, int forward_attachments, int include_headers
 	char *ptr = NULL;
 	int num_attachments = 0;
 	struct wc_attachment *att, *aptr;
-	char m_subject[256];
+	char m_subject[1024];
 	char from[256];
 	char node[256];
 	char rfca[256];
@@ -1455,7 +1557,6 @@ void pullquote_message(long msgnum, int forward_attachments, int include_headers
 				msgescputs(rfca);
 				wprintf("&gt; ");
 			}
-	
 			if (!strncasecmp(buf, "node=", 5)) {
 				strcpy(node, &buf[5]);
 				if ( ((WC->room_flags & QR_NETWORK)
@@ -1605,7 +1706,7 @@ void pullquote_message(long msgnum, int forward_attachments, int include_headers
 				bq = 0;
 			}
 			wprintf("<tt>");
-			url(buf);
+			url(buf, sizeof(buf));
 			msgescputs1(buf);
 			wprintf("</tt><br />");
 		}
@@ -1618,7 +1719,7 @@ void pullquote_message(long msgnum, int forward_attachments, int include_headers
 			strcat(buf, "\n");
 			msgescputs(buf);
 		}
-	}
+	}//// TODO: charset? utf8?
 
 	/** Unknown weirdness ... don't know how to handle this content type */
 	else {
@@ -1695,7 +1796,6 @@ ENDBODY:
  */
 void display_summarized(int num) {
 	char datebuf[64];
-
 	wprintf("<tr id=\"m%ld\" style=\"font-weight:%s;\" "
 		"onMouseDown=\"CtdlMoveMsgMouseDown(event,%ld)\">",
 		WC->summ[num].msgnum,
@@ -1719,8 +1819,26 @@ void display_summarized(int num) {
 
 	wprintf("</tr>\n");
 }
-
-
+/**
+ * \brief Output a message row for the mobile view
+ * \param The row number 
+ */
+void display_mobile_summary(int num) {
+	char datebuf[64];
+	wprintf("\n<div><div id=\"m%ld\" style=\"font-weight:%s;\" "
+		"onClick=\"CtdlLoadMsgMouseDown(event,%ld)\">",
+		WC->summ[num].msgnum,
+		(WC->summ[num].is_new ? "bold" : "normal"),
+		WC->summ[num].msgnum
+	);
+		wprintf("<span>%s</span>",WC->summ[num].from);
+		wprintf("<span style=\"float: right;\">");
+		webcit_fmt_date(datebuf, WC->summ[num].date, 1);	/* brief */
+	escputs(datebuf);
+		wprintf("</span><br/><span class=\"subject\">");
+		wprintf(WC->summ[num].subj);
+		wprintf("</span></div><div id=\"m_%ld\" class=\"msgview\" onMouseDown=\"\"></div></div>",WC->summ[num].msgnum);
+}
 
 /**
  * \brief display the adressbook overview
@@ -1767,7 +1885,7 @@ void display_addressbook(long msgnum, char alpha) {
 		if (vcard_source != NULL) {
 
 			/** Display the summary line */
-			display_vcard(vcard_source, alpha, 0, NULL);
+			display_vcard(vcard_source, alpha, 0, NULL,msgnum);
 
 			/** If it's my vCard I can edit it */
 			if (	(!strcasecmp(WC->wc_roomname, USERCONFIGROOM))
@@ -1858,7 +1976,7 @@ void fetch_ab_name(long msgnum, char *namebuf) {
 		if (vcard_source != NULL) {
 
 			/* Grab the name off the card */
-			display_vcard(vcard_source, 0, 0, namebuf);
+			display_vcard(vcard_source, 0, 0, namebuf,msgnum);
 
 			free(vcard_source);
 		}
@@ -2013,8 +2131,10 @@ int load_msg_ptrs(char *servcmd, int with_headers)
 	char fullname[128];
 	char nodename[128];
 	char inetaddr[128];
-	char subject[256];
+	char subject[1024];
+	char *ptr;
 	int nummsgs;
+	int sbjlen;
 	int maxload = 0;
 
 	int num_summ_alloc = 0;
@@ -2057,45 +2177,49 @@ int load_msg_ptrs(char *servcmd, int with_headers)
 				WC->summ[nummsgs-1].msgnum = WC->msgarr[nummsgs-1];
 				safestrncpy(WC->summ[nummsgs-1].subj,
 					_("(no subject)"), sizeof WC->summ[nummsgs-1].subj);
-				if (!IsEmptyStr(fullname)) {
-				/** Handle senders with RFC2047 encoding */
-					utf8ify_rfc822_string(fullname);
-					safestrncpy(WC->summ[nummsgs-1].from,
-						fullname, sizeof WC->summ[nummsgs-1].from);
-				}
 				if (!IsEmptyStr(subject)) {
 				/** Handle subjects with RFC2047 encoding */
 					utf8ify_rfc822_string(subject);
 					safestrncpy(WC->summ[nummsgs-1].subj, subject,
 						    sizeof WC->summ[nummsgs-1].subj);
 				}
-				if (strlen(WC->summ[nummsgs-1].subj) > 75) {
-					strcpy(&WC->summ[nummsgs-1].subj[72], "...");
-				}
+				sbjlen = Ctdl_Utf8StrLen(WC->summ[nummsgs-1].subj);
+				if (sbjlen > 75) {
+					ptr = Ctdl_Utf8StrCut(WC->summ[nummsgs-1].subj, 72);
 
-				if (!IsEmptyStr(nodename)) {
-					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);
-					}
+					strcpy(ptr, "...");
 				}
 
-				WC->summ[nummsgs-1].date = datestamp;
-	
+				if (!IsEmptyStr(fullname)) {
 				/** Handle senders with RFC2047 encoding */
-				utf8ify_rfc822_string(WC->summ[nummsgs-1].from);
-				if (strlen(WC->summ[nummsgs-1].from) > 25) {
-					strcpy(&WC->summ[nummsgs-1].from[22], "...");
+					utf8ify_rfc822_string(fullname);
+					safestrncpy(WC->summ[nummsgs-1].from,
+						fullname, sizeof WC->summ[nummsgs-1].from);
+				}
+				if ((!IsEmptyStr(nodename)) &&
+				    ( ((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);
+					
 				}
+				sbjlen = Ctdl_Utf8StrLen(WC->summ[nummsgs-1].from);
+				if (sbjlen > 25) {
+					ptr = Ctdl_Utf8StrCut(WC->summ[nummsgs-1].from, 23);
+					strcpy(ptr, "...");
+				}
+
+				WC->summ[nummsgs-1].date = datestamp;
 			}
 		}
 	}
 	return (nummsgs);
 }
 
+
+typedef int (*QSortFunction) (const void*, const void*);
 /**
  * \brief qsort() compatible function to compare two longs in descending order.
  *
@@ -2212,6 +2336,84 @@ int summcmp_rdate(const void *s1, const void *s2) {
 }
 
 
+enum {
+	eUp,
+	eDown,
+	eNone
+};
+
+const char* SortIcons[3] = {
+	"static/up_pointer.gif",
+	"static/down_pointer.gif",
+	"static/sort_none.gif"
+};
+
+ enum  {/// SortByEnum
+	eDate,
+	eRDate,
+	eSubject,
+	eRSubject,
+	eSender,
+	eRSender,
+	eReverse,
+	eUnSet
+}; 
+
+/** SortEnum to plain string representation */
+static const char* SortByStrings[] = {
+	"date",
+	"rdate",
+	"subject", 
+	"rsubject", 
+	"sender",
+	"rsender",
+	"reverse",
+	"unset"
+};
+
+/** SortEnum to sort-Function Table */
+const QSortFunction SortFuncs[eUnSet] = {
+	summcmp_date,
+	summcmp_rdate,
+	summcmp_subj,
+	summcmp_rsubj,
+	summcmp_sender,
+	summcmp_rsender,
+	summcmp_rdate
+};
+
+/** given a SortEnum, which icon should we choose? */
+const int SortDateToIcon[eUnSet] = { eUp, eDown, eNone, eNone, eNone, eNone, eNone};
+const int SortSubjectToIcon[eUnSet] = { eNone, eNone, eUp, eDown, eNone, eNone, eNone};
+const int SortSenderToIcon[eUnSet] = { eNone, eNone, eNone, eNone, eUp, eDown, eNone};
+
+/** given a SortEnum, which would be the "opposite" search option? */
+const int DateInvertSortString[eUnSet] =  { eRDate, eDate, eDate, eDate, eDate, eDate, eDate};
+const int SubjectInvertSortString[eUnSet] =  { eSubject, eSubject, eRSubject, eUnSet, eSubject, eSubject, eSubject};
+const int SenderInvertSortString[eUnSet] =  { eSender, eSender, eSender, eSender, eRSender, eUnSet, eSender};
+
+
+/**
+ * \Brief Translates sortoption String to its SortEnum representation 
+ * \param SortBy string to translate
+ * \return the enum matching the string; defaults to RDate
+ */
+//SortByEnum 
+int StrToESort (StrBuf *sortby)
+{
+	int result = eDate;
+
+	if (!IsEmptyStr(ChrPtr(sortby))) while (result < eUnSet){
+			if (!strcasecmp(ChrPtr(sortby), 
+					SortByStrings[result])) 
+				return result;
+			result ++;
+		}
+	return eRDate;
+}
+
+
+
 
 /**
  * \brief command loop for reading messages
@@ -2220,7 +2422,7 @@ int summcmp_rdate(const void *s1, const void *s2) {
  */
 void readloop(char *oper)
 {
-	char cmd[256];
+	char cmd[256] = "";
 	char buf[SIZ];
 	char old_msgs[SIZ];
 	int a, b;
@@ -2241,12 +2443,11 @@ void readloop(char *oper)
 	int highest_displayed = 0;
 	struct addrbookent *addrbook = NULL;
 	int num_ab = 0;
-	char *sortby = NULL;
-	char sortpref_name[128];
-	char sortpref_value[128];
-	char *subjsort_button;
-	char *sendsort_button;
-	char *datesort_button;
+	StrBuf *sortby = NULL;
+	//SortByEnum 
+	int SortBy = eRDate;
+	StrBuf *sortpref_name;
+	StrBuf *sortpref_value;
 	int bbs_reverse = 0;
 	struct wcsession *WCC = WC;     /* This is done to make it run faster; WC is a function */
 
@@ -2256,25 +2457,27 @@ void readloop(char *oper)
 		return;
 	}
 
-	startmsg = atol(bstr("startmsg"));
-	maxmsgs = atoi(bstr("maxmsgs"));
-	is_summary = atoi(bstr("is_summary"));
+	startmsg = lbstr("startmsg");
+	maxmsgs = ibstr("maxmsgs");
+	is_summary = (ibstr("is_summary") && !WCC->is_mobile);
 	if (maxmsgs == 0) maxmsgs = DEFAULT_MAXMSGS;
 
-	snprintf(sortpref_name, sizeof sortpref_name, "sort %s", WCC->wc_roomname);
-	get_preference(sortpref_name, sortpref_value, sizeof sortpref_value);
+	sortpref_name = NewStrBuf ();
+	StrBufPrintf(sortpref_name, "sort %s", WCC->wc_roomname);
+	get_pref(sortpref_name, &sortpref_value);
 
-	sortby = bstr("sortby");
-	if ( (!IsEmptyStr(sortby)) && (strcasecmp(sortby, sortpref_value)) ) {
-		set_preference(sortpref_name, sortby, 1);
+	sortby = NewStrBufPlain(bstr("sortby"), -1);
+	if ( (!IsEmptyStr(ChrPtr(sortby))) && 
+	     (strcasecmp(ChrPtr(sortby), ChrPtr(sortpref_value)) != 0)) {
+		set_pref(sortpref_name, sortby, 1);
+		sortpref_value = NULL;
+		sortpref_value = sortby;
 	}
-	if (IsEmptyStr(sortby)) sortby = sortpref_value;
-
-	/** mailbox sort */
-	if (IsEmptyStr(sortby)) sortby = "rdate";
-
+	
+	FreeStrBuf(&sortpref_name);
+	SortBy = StrToESort(sortpref_value);
 	/** message board sort */
-	if (!strcasecmp(sortby, "reverse")) {
+	if (SortBy == eReverse) {
 		bbs_reverse = 1;
 	}
 	else {
@@ -2294,16 +2497,16 @@ void readloop(char *oper)
 		strcpy(cmd, "MSGS OLD");
 	}
 	else if (!strcmp(oper, "do_search")) {
-		sprintf(cmd, "MSGS SEARCH|%s", bstr("query"));
+		snprintf(cmd, sizeof(cmd), "MSGS SEARCH|%s", bstr("query"));
 	}
 	else {
 		strcpy(cmd, "MSGS ALL");
 	}
 
-	if ((WCC->wc_view == VIEW_MAILBOX) && (maxmsgs > 1)) {
+	if ((WCC->wc_view == VIEW_MAILBOX) && (maxmsgs > 1) && !WCC->is_mobile) {
 		is_summary = 1;
 		if (!strcmp(oper, "do_search")) {
-			sprintf(cmd, "MSGS SEARCH|%s", bstr("query"));
+			snprintf(cmd, sizeof(cmd), "MSGS SEARCH|%s", bstr("query"));
 		}
 		else {
 			strcpy(cmd, "MSGS ALL");
@@ -2313,7 +2516,7 @@ void readloop(char *oper)
 	if ((WCC->wc_view == VIEW_ADDRESSBOOK) && (maxmsgs > 1)) {
 		is_addressbook = 1;
 		if (!strcmp(oper, "do_search")) {
-			sprintf(cmd, "MSGS SEARCH|%s", bstr("query"));
+			snprintf(cmd, sizeof(cmd), "MSGS SEARCH|%s", bstr("query"));
 		}
 		else {
 			strcpy(cmd, "MSGS ALL");
@@ -2321,13 +2524,17 @@ void readloop(char *oper)
 		maxmsgs = 9999999;
 	}
 
-	if (is_summary) {			/**< fetch header summary */
-		snprintf(cmd, sizeof cmd, "MSGS %s|%s||1",
+	if (is_summary || WCC->is_mobile) {			/**< fetch header summary */
+		snprintf(cmd, sizeof(cmd), "MSGS %s|%s||1",
 			(!strcmp(oper, "do_search") ? "SEARCH" : "ALL"),
 			(!strcmp(oper, "do_search") ? bstr("query") : "")
 		);
 		startmsg = 1;
 		maxmsgs = 9999999;
+	} 
+	if (WCC->is_mobile) {
+		maxmsgs = 20;
+		SortBy =  eRDate;
 	}
 
 	/**
@@ -2336,7 +2543,7 @@ void readloop(char *oper)
 	 * new messages.
 	 */
 	strcpy(old_msgs, "");
-	if ((is_summary) || (WCC->wc_default_view == VIEW_CALENDAR)){
+	if ((is_summary) || (WCC->wc_default_view == VIEW_CALENDAR) || WCC->is_mobile){
 		serv_puts("GTSN");
 		serv_getln(buf, sizeof buf);
 		if (buf[0] == '2') {
@@ -2344,7 +2551,7 @@ void readloop(char *oper)
 		}
 	}
 
-	is_singlecard = atoi(bstr("is_singlecard"));
+	is_singlecard = ibstr("is_singlecard");
 
 	if (WCC->wc_default_view == VIEW_CALENDAR) {		/**< calendar */
 		is_calendar = 1;
@@ -2363,11 +2570,10 @@ void readloop(char *oper)
 	}
 
 	if (is_notes) {
-		wprintf("<div align=center>%s</div>\n", _("Click on any note to edit it."));
 		wprintf("<div id=\"new_notes_here\"></div>\n");
 	}
 
-	nummsgs = load_msg_ptrs(cmd, is_summary);
+	nummsgs = load_msg_ptrs(cmd, (is_summary || WCC->is_mobile));
 	if (nummsgs == 0) {
 
 		if ((!is_tasks) && (!is_calendar) && (!is_notes) && (!is_addressbook)) {
@@ -2385,7 +2591,7 @@ void readloop(char *oper)
 		goto DONE;
 	}
 
-	if ((is_summary) || (WCC->wc_default_view == VIEW_CALENDAR)){
+	if ((is_summary) || (WCC->wc_default_view == VIEW_CALENDAR) || WCC->is_mobile){
 		for (a = 0; a < nummsgs; ++a) {
 			/** Are you a new message, or an old message? */
 			if (is_summary) {
@@ -2408,62 +2614,11 @@ void readloop(char *oper)
 		}
 	}
 
-	if (is_summary) {
-		if (!strcasecmp(sortby, "subject")) {
-			qsort(WCC->summ, WCC->num_summ,
-				sizeof(struct message_summary), summcmp_subj);
-		}
-		else if (!strcasecmp(sortby, "rsubject")) {
-			qsort(WCC->summ, WCC->num_summ,
-				sizeof(struct message_summary), summcmp_rsubj);
-		}
-		else if (!strcasecmp(sortby, "sender")) {
-			qsort(WCC->summ, WCC->num_summ,
-				sizeof(struct message_summary), summcmp_sender);
-		}
-		else if (!strcasecmp(sortby, "rsender")) {
-			qsort(WCC->summ, WCC->num_summ,
-				sizeof(struct message_summary), summcmp_rsender);
-		}
-		else if (!strcasecmp(sortby, "date")) {
-			qsort(WCC->summ, WCC->num_summ,
-				sizeof(struct message_summary), summcmp_date);
-		}
-		else if (!strcasecmp(sortby, "rdate")) {
-			qsort(WCC->summ, WCC->num_summ,
-				sizeof(struct message_summary), summcmp_rdate);
-		}
-	}
-
-	if (!strcasecmp(sortby, "subject")) {
-		subjsort_button = "<a href=\"readfwd?startmsg=1?maxmsgs=9999999?is_summary=1?sortby=rsubject\"><img border=\"0\" src=\"static/down_pointer.gif\" /></a>" ;
-	}
-	else if (!strcasecmp(sortby, "rsubject")) {
-		subjsort_button = "<a href=\"readfwd?startmsg=1?maxmsgs=9999999?is_summary=1?sortby=subject\"><img border=\"0\" src=\"static/up_pointer.gif\" /></a>" ;
-	}
-	else {
-		subjsort_button = "<a href=\"readfwd?startmsg=1?maxmsgs=9999999?is_summary=1?sortby=subject\"><img border=\"0\" src=\"static/sort_none.gif\" /></a>" ;
+	if (is_summary || WCC->is_mobile) {
+		qsort(WCC->summ, WCC->num_summ,
+		      sizeof(struct message_summary), SortFuncs[SortBy]);
 	}
 
-	if (!strcasecmp(sortby, "sender")) {
-		sendsort_button = "<a href=\"readfwd?startmsg=1?maxmsgs=9999999?is_summary=1?sortby=rsender\"><img border=\"0\" src=\"static/down_pointer.gif\" /></a>" ;
-	}
-	else if (!strcasecmp(sortby, "rsender")) {
-		sendsort_button = "<a href=\"readfwd?startmsg=1?maxmsgs=9999999?is_summary=1?sortby=sender\"><img border=\"0\" src=\"static/up_pointer.gif\" /></a>" ;
-	}
-	else {
-		sendsort_button = "<a href=\"readfwd?startmsg=1?maxmsgs=9999999?is_summary=1?sortby=sender\"><img border=\"0\" src=\"static/sort_none.gif\" /></a>" ;
-	}
-
-	if (!strcasecmp(sortby, "date")) {
-		datesort_button = "<a href=\"readfwd?startmsg=1?maxmsgs=9999999?is_summary=1?sortby=rdate\"><img border=\"0\" src=\"static/down_pointer.gif\" /></a>" ;
-	}
-	else if (!strcasecmp(sortby, "rdate")) {
-		datesort_button = "<a href=\"readfwd?startmsg=1?maxmsgs=9999999?is_summary=1?sortby=date\"><img border=\"0\" src=\"static/up_pointer.gif\" /></a>" ;
-	}
-	else {
-		datesort_button = "<a href=\"readfwd?startmsg=1?maxmsgs=9999999?is_summary=1?sortby=rdate\"><img border=\"0\" src=\"static/sort_none.gif\" /></a>" ;
-	}
 
 	if (is_summary) {
 
@@ -2481,9 +2636,9 @@ void readloop(char *oper)
 			"<table cellspacing=0 style=\"width:100%%\">"
 			"<tr>"
 		);
-		wprintf("<th width=%d%%>%s %s</th>"
-			"<th width=%d%%>%s %s</th>"
-			"<th width=%d%%>%s %s"
+		wprintf("<th width=%d%%>%s <a href=\"readfwd?startmsg=1?maxmsgs=9999999?is_summary=1?sortby=%s\"><img border=\"0\" src=\"%s\" /></a> </th>\n"
+			"<th width=%d%%>%s <a href=\"readfwd?startmsg=1?maxmsgs=9999999?is_summary=1?sortby=%s\"><img border=\"0\" src=\"%s\" /></a> </th>\n"
+			"<th width=%d%%>%s <a href=\"readfwd?startmsg=1?maxmsgs=9999999?is_summary=1?sortby=%s\"><img border=\"0\" src=\"%s\" /></a> \n"
 			"&nbsp;"
 			"<input type=\"submit\" name=\"delete_button\" id=\"delbutton\" "
 			" onClick=\"CtdlDeleteSelectedMessages(event)\" "
@@ -2492,22 +2647,28 @@ void readloop(char *oper)
 			"</tr>\n"
 			,
 			SUBJ_COL_WIDTH_PCT,
-			_("Subject"),	subjsort_button,
+			_("Subject"),
+			SortByStrings[SubjectInvertSortString[SortBy]],
+			SortIcons[SortSubjectToIcon[SortBy]],
 			SENDER_COL_WIDTH_PCT,
-			_("Sender"),	sendsort_button,
+			_("Sender"),
+			SortByStrings[SenderInvertSortString[SortBy]],
+			SortIcons[SortSenderToIcon[SortBy]],
 			DATE_PLUS_BUTTONS_WIDTH_PCT,
-			_("Date"),	datesort_button,
+			_("Date"),
+			SortByStrings[DateInvertSortString[SortBy]],
+			SortIcons[SortDateToIcon[SortBy]],
 			_("Delete")
 		);
 		wprintf("</table></div></div>\n");
-
 		wprintf("<div id=\"message_list\">"
 
 			"<div class=\"fix_scrollbar_bug\">\n"
-
 			"<table class=\"mailbox_summary\" id=\"summary_headers\" "
 			"cellspacing=0 style=\"width:100%%;-moz-user-select:none;\">"
 		);
+	} else if (WCC->is_mobile) {
+		wprintf("<div id=\"message_list\">");
 	}
 
 
@@ -2527,7 +2688,7 @@ void readloop(char *oper)
 	if (is_bbview) {
 		/** begin bbview scroller */
 		wprintf("<form name=\"msgomatictop\" class=\"selector_top\" > \n <p>");
-		wprintf(_("Reading #"), lowest_displayed, highest_displayed);
+		wprintf(_("Reading #"));//// TODO this isn't used, should it? : , lowest_displayed, highest_displayed);
 
 		wprintf("<select name=\"whichones\" size=\"1\" "
 			"OnChange=\"location.href=msgomatictop.whichones.options"
@@ -2603,14 +2764,6 @@ void readloop(char *oper)
 		wprintf("</p></form>\n");
 		/** end bbview scroller */
 	}
-
-	if (is_notes)
-	{
-		wprintf ("<script src=\"/static/dragdrop.js\" type=\"text/javascript\"></script>\n");
-	}
-
-
-
 	for (a = 0; a < nummsgs; ++a) {
 		if ((WCC->msgarr[a] >= startmsg) && (num_displayed < maxmsgs)) {
 
@@ -2635,6 +2788,8 @@ void readloop(char *oper)
 			}
 			else if (is_notes) {
 				display_note(WCC->msgarr[a], WCC->summ[a].is_new);
+			} else if (WCC->is_mobile) {
+				display_mobile_summary(a);
 			}
 			else {
 				if (displayed_msgs == NULL) {
@@ -2673,7 +2828,7 @@ void readloop(char *oper)
 		wprintf("</table>"
 			"</div>\n");			/**< end of 'fix_scrollbar_bug' div */
 		wprintf("</div>");			/**< end of 'message_list' div */
-
+		
 		/** Here's the grab-it-to-resize-the-message-list widget */
 		wprintf("<div id=\"resize_msglist\" "
 			"onMouseDown=\"CtdlResizeMsgListMouseDown(event)\">"
@@ -2682,6 +2837,8 @@ void readloop(char *oper)
 		);
 
 		wprintf("<div id=\"preview_pane\">");	/**< The preview pane will initially be empty */
+	} else if (WCC->is_mobile) {
+		wprintf("</div>");
 	}
 
 	/**
@@ -2698,7 +2855,7 @@ void readloop(char *oper)
 	if (is_bbview) {
 		/** begin bbview scroller */
 		wprintf("<form name=\"msgomatic\" class=\"selector_bottom\" > \n <p>");
-		wprintf(_("Reading #"), lowest_displayed, highest_displayed);
+		wprintf(_("Reading #")); /// TODO: this isn't used: , lowest_displayed, highest_displayed);
 
 		wprintf("<select name=\"whichones\" size=\"1\" "
 			"OnChange=\"location.href=msgomatic.whichones.options"
@@ -2774,40 +2931,6 @@ void readloop(char *oper)
 		/** end bbview scroller */
 	}
 	
-	if (is_notes)
-	{
-//		wprintf ("</div>\n");
-		wprintf ("<div id=\"wastebin\" align=middle>Drop notes here to remove them.</div>\n");
-		wprintf ("<script type=\"text/javascript\">\n");
-//		wprintf ("//<![CDATA[\n");
-		wprintf ("Droppables.add(\"wastebin\",\n");
-		wprintf ("\t{\n");
-		wprintf ("\t\taccept:'notes',\n");
-		wprintf ("\t\tonDrop:function(element)\n");
-		wprintf ("\t\t{\n");
-		wprintf ("\t\t\tElement.hide(element);\n");
-		wprintf ("\t\t\tnew Ajax.Updater('notes', 'delnote',\n");
-		wprintf ("\t\t\t{\n");
-		wprintf ("\t\t\t\tasynchronous:true,\n");
-		wprintf ("\t\t\t\tevalScripts:true,\n");
-		wprintf ("\t\t\t\tonComplete:function(request)\n");
-		wprintf ("\t\t\t\t{\n");
-		wprintf ("\t\t\t\t\tElement.hide('indicator')\n");
-		wprintf ("\t\t\t\t},\n");
-		wprintf ("\t\t\t\tonLoading:function(request)\n");
-		wprintf ("\t\t\t\t{\n");
-		wprintf ("\t\t\t\t\tElement.show('indicator')\n");
-		wprintf ("\t\t\t\t},\n");
-		wprintf ("\t\t\t\tparameters:'id=' + encodeURIComponent(element.id)\n");
-		wprintf ("\t\t\t})\n");
-		wprintf ("\t\t}\n");
-		wprintf ("\t})\n");
-//		wprintf ("//]]>\n");
-		wprintf ("</script>\n");
-	}
-
-
-
 DONE:
 	if (is_tasks) {
 		do_tasks_view();	/** Render the task list */
@@ -2835,8 +2958,8 @@ DONE:
 }
 
 
-/**
- * \brief Back end for post_message()
+/*
+ * Back end for post_message()
  * ... this is where the actual message gets transmitted to the server.
  */
 void post_mime_to_server(void) {
@@ -2861,25 +2984,22 @@ void post_mime_to_server(void) {
 		++seq
 	);
 
-	/** RFC2045 requires this, and some clients look for it... */
+	/* RFC2045 requires this, and some clients look for it... */
 	serv_puts("MIME-Version: 1.0");
 	serv_puts("X-Mailer: " PACKAGE_STRING);
 
-	/** If there are attachments, we have to do multipart/mixed */
+	/* If there are attachments, we have to do multipart/mixed */
 	if (WC->first_attachment != NULL) {
 		is_multipart = 1;
 	}
 
 	if (is_multipart) {
-		/** Remember, serv_printf() appends an extra newline */
-		serv_printf("Content-type: multipart/mixed; "
-			"boundary=\"%s\"\n", top_boundary);
+		/* Remember, serv_printf() appends an extra newline */
+		serv_printf("Content-type: multipart/mixed; boundary=\"%s\"\n", top_boundary);
 		serv_printf("This is a multipart message in MIME format.\n");
 		serv_printf("--%s", top_boundary);
 	}
 
-
-
 	/* Remember, serv_printf() appends an extra newline */
 	serv_printf("Content-type: multipart/alternative; "
 		"boundary=\"%s\"\n", alt_boundary);
@@ -2890,7 +3010,7 @@ void post_mime_to_server(void) {
 	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 */
+        text_to_server_qp(txtmail);     /* Transmit message in quoted-printable encoding */
         free(txtmail);
 
 	serv_printf("--%s", alt_boundary);
@@ -2899,19 +3019,14 @@ void post_mime_to_server(void) {
 	serv_puts("Content-Transfer-Encoding: quoted-printable");
 	serv_puts("");
 	serv_puts("<html><body>\r\n");
-	text_to_server_qp(bstr("msgtext"));	/** Transmit message in quoted-printable encoding */
+	text_to_server_qp(bstr("msgtext"));	/* Transmit message in quoted-printable encoding */
 	serv_puts("</body></html>\r\n");
 
-
 	serv_printf("--%s--", alt_boundary);
-
-
-
-
 	
 	if (is_multipart) {
 
-		/** Add in the attachments */
+		/* Add in the attachments */
 		for (att = WC->first_attachment; att!=NULL; att=att->next) {
 
 			encoded_length = ((att->length * 150) / 100);
@@ -2921,8 +3036,7 @@ void post_mime_to_server(void) {
 
 			serv_printf("--%s", top_boundary);
 			serv_printf("Content-type: %s", att->content_type);
-			serv_printf("Content-disposition: attachment; "
-				"filename=\"%s\"", att->filename);
+			serv_printf("Content-disposition: attachment; filename=\"%s\"", att->filename);
 			serv_puts("Content-transfer-encoding: base64");
 			serv_puts("");
 			serv_write(encoded, encoded_strlen);
@@ -2937,8 +3051,8 @@ void post_mime_to_server(void) {
 }
 
 
-/**
- * \brief Post message (or don't post message)
+/*
+ * Post message (or don't post message)
  *
  * Note regarding the "dont_post" variable:
  * A random value (actually, it's just a timestamp) is inserted as a hidden
@@ -2950,40 +3064,52 @@ void post_mime_to_server(void) {
  */
 void post_message(void)
 {
+	urlcontent *u;
+	void *U;
 	char buf[1024];
-	char encoded_subject[1024];
+	char *encoded_subject = NULL;
 	static long dont_post = (-1L);
 	struct wc_attachment *att, *aptr;
 	int is_anonymous = 0;
-	char *display_name;
+	const char *display_name;
+	long dpLen = 0;
+	struct wcsession *WCC = WC;
+	char *ptr = NULL;
 
-	if (!IsEmptyStr(bstr("force_room"))) {
+	if (havebstr("force_room")) {
 		gotoroom(bstr("force_room"));
 	}
 
-	display_name = bstr("display_name");
+	if (GetHash(WC->urlstrings, HKEY("display_name"), &U)) {
+		u = (urlcontent*) U;
+		display_name = u->url_data;
+		dpLen = u->url_data_size;
+	}
+	else {
+		display_name="";
+	}
 	if (!strcmp(display_name, "__ANONYMOUS__")) {
 		display_name = "";
 		is_anonymous = 1;
 	}
 
-	if (WC->upload_length > 0) {
+	if (WCC->upload_length > 0) {
 
-		lprintf(9, "%s:%d: we are uploading %d bytes\n", __FILE__, __LINE__, WC->upload_length);
+		lprintf(9, "%s:%d: we are uploading %d bytes\n", __FILE__, __LINE__, WCC->upload_length);
 		/** There's an attachment.  Save it to this struct... */
 		att = malloc(sizeof(struct wc_attachment));
 		memset(att, 0, sizeof(struct wc_attachment));
-		att->length = WC->upload_length;
-		strcpy(att->content_type, WC->upload_content_type);
-		strcpy(att->filename, WC->upload_filename);
+		att->length = WCC->upload_length;
+		strcpy(att->content_type, WCC->upload_content_type);
+		strcpy(att->filename, WCC->upload_filename);
 		att->next = NULL;
 
 		/** And add it to the list. */
-		if (WC->first_attachment == NULL) {
-			WC->first_attachment = att;
+		if (WCC->first_attachment == NULL) {
+			WCC->first_attachment = att;
 		}
 		else {
-			aptr = WC->first_attachment;
+			aptr = WCC->first_attachment;
 			while (aptr->next != NULL) aptr = aptr->next;
 			aptr->next = att;
 		}
@@ -3004,49 +3130,102 @@ void post_message(void)
 		 * Transfer control of this memory from the upload struct
 		 * to the attachment struct.
 		 */
-		att->data = WC->upload;
-		WC->upload_length = 0;
-		WC->upload = NULL;
+		att->data = WCC->upload;
+		WCC->upload_length = 0;
+		WCC->upload = NULL;
 		display_enter();
 		return;
 	}
 
-	if (!IsEmptyStr(bstr("cancel_button"))) {
-		sprintf(WC->ImportantMessage, 
+	if (havebstr("cancel_button")) {
+		sprintf(WCC->ImportantMessage, 
 			_("Cancelled.  Message was not posted."));
-	} else if (!IsEmptyStr(bstr("attach_button"))) {
+	} else if (havebstr("attach_button")) {
 		display_enter();
 		return;
-	} else if (atol(bstr("postseq")) == dont_post) {
-		sprintf(WC->ImportantMessage, 
+	} else if (lbstr("postseq") == dont_post) {
+		sprintf(WCC->ImportantMessage, 
 			_("Automatically cancelled because you have already "
 			"saved this message."));
 	} else {
-		webcit_rfc2047encode(encoded_subject, sizeof encoded_subject, bstr("subject"));
-		sprintf(buf, "ENT0 1|%s|%d|4|%s|%s||%s|%s|%s|%s",
-			bstr("recp"),
+		const char CMD[] = "ENT0 1|%s|%d|4|%s|%s||%s|%s|%s|%s|%s";
+		const char *Recp = ""; 
+		const char *Cc = "";
+		const char *Bcc = "";
+		const char *Wikipage = "";
+		const char *my_email_addr = "";
+		char *CmdBuf = NULL;;
+		long len = 0;
+		size_t nLen;
+		char references[SIZ] = "";
+		size_t references_len = 0;
+
+		safestrncpy(references, bstr("references"), sizeof references);
+		lprintf(9, "Converting: %s\n", references);
+		for (ptr=references; *ptr != 0; ++ptr) {
+			if (*ptr == '|') *ptr = '!';
+			++references_len;
+		} 
+		lprintf(9, "Converted: %s\n", references);
+
+		if (havebstr("subject")) {
+			char *Subj;
+			size_t SLen;
+			/*
+			 * make enough room for the encoded string; 
+			 * plus the QP header 
+			 */
+			Subj = xbstr("subject", &SLen);
+			len = SLen * 3 + 32;
+			encoded_subject = malloc (len);
+			len = webcit_rfc2047encode(encoded_subject, len, Subj, SLen);
+			if (len < 0) {
+				free (encoded_subject);
+				return;
+			}
+		}
+		len += sizeof (CMD) + dpLen;
+		Recp = xbstr("recp", &nLen);
+		len += nLen;
+		Cc = xbstr("cc", &nLen);
+		len += nLen;
+		Bcc = xbstr("bcc", &nLen);
+		len += nLen;
+		Wikipage = xbstr("wikipage", &nLen);
+		len += nLen;
+		my_email_addr = xbstr("my_email_addr", &nLen);
+		len += nLen;
+		len += references_len;
+
+		CmdBuf = (char*) malloc (len + 11);
+
+		snprintf(CmdBuf, len + 1, CMD,
+			Recp,
 			is_anonymous,
-			encoded_subject,
+			(encoded_subject ? encoded_subject : ""),
 			display_name,
-			bstr("cc"),
-			bstr("bcc"),
-			bstr("wikipage"),
-			bstr("my_email_addr")
-		);
-		serv_puts(buf);
+			Cc,
+			Bcc,
+			Wikipage,
+			my_email_addr,
+			references);
+		lprintf(9, "%s\n", CmdBuf);
+		serv_puts(CmdBuf);
 		serv_getln(buf, sizeof buf);
+		free (CmdBuf);
+		if (encoded_subject) free(encoded_subject);
 		if (buf[0] == '4') {
 			post_mime_to_server();
-			if (  (!IsEmptyStr(bstr("recp")))
-			   || (!IsEmptyStr(bstr("cc"  )))
-			   || (!IsEmptyStr(bstr("bcc" )))
+			if (  (havebstr("recp"))
+			   || (havebstr("cc"  ))
+			   || (havebstr("bcc" ))
 			) {
-				sprintf(WC->ImportantMessage, _("Message has been sent.\n"));
+				sprintf(WCC->ImportantMessage, _("Message has been sent.\n"));
 			}
 			else {
 				sprintf(WC->ImportantMessage, _("Message has been posted.\n"));
 			}
-			dont_post = atol(bstr("postseq"));
+			dont_post = lbstr("postseq");
 		} else {
 			lprintf(9, "%s:%d: server post error: %s\n", __FILE__, __LINE__, buf);
 			sprintf(WC->ImportantMessage, "%s", &buf[4]);
@@ -3055,19 +3234,19 @@ void post_message(void)
 		}
 	}
 
-	free_attachments(WC);
+	free_attachments(WCC);
 
 	/**
 	 *  We may have been supplied with instructions regarding the location
 	 *  to which we must return after posting.  If found, go there.
 	 */
-	if (!IsEmptyStr(bstr("return_to"))) {
+	if (havebstr("return_to")) {
 		http_redirect(bstr("return_to"));
 	}
 	/**
 	 *  If we were editing a page in a wiki room, go to that page now.
 	 */
-	else if (!IsEmptyStr(bstr("wikipage"))) {
+	else if (havebstr("wikipage")) {
 		snprintf(buf, sizeof buf, "wiki?page=%s", bstr("wikipage"));
 		http_redirect(buf);
 	}
@@ -3088,26 +3267,28 @@ void post_message(void)
 void display_enter(void)
 {
 	char buf[SIZ];
-	char ebuf[SIZ];
+	StrBuf *ebuf;
 	long now;
 	char *display_name;
 	struct wc_attachment *att;
 	int recipient_required = 0;
 	int subject_required = 0;
 	int recipient_bad = 0;
-	int i;
 	int is_anonymous = 0;
 	long existing_page = (-1L);
+	size_t dplen;
+	struct wcsession *WCC = WC;
 
 	now = time(NULL);
 
-	if (!IsEmptyStr(bstr("force_room"))) {
+	if (havebstr("force_room")) {
 		gotoroom(bstr("force_room"));
 	}
 
-	display_name = bstr("display_name");
+	display_name = xbstr("display_name", &dplen);
 	if (!strcmp(display_name, "__ANONYMOUS__")) {
 		display_name = "";
+		dplen = 0;
 		is_anonymous = 1;
 	}
 
@@ -3119,7 +3300,7 @@ void display_enter(void)
 		recipient_required = 1;
 	}
 	else if (buf[0] != '2') {		/** Any other error means that we cannot continue */
-		sprintf(WC->ImportantMessage, "%s", &buf[4]);
+		sprintf(WCC->ImportantMessage, "%s", &buf[4]);
 		readloop("readnew");
 		return;
 	}
@@ -3133,8 +3314,8 @@ void display_enter(void)
 	 * Are we perhaps in an address book view?  If so, then an "enter
 	 * message" command really means "add new entry."
 	 */
-	if (WC->wc_default_view == VIEW_ADDRESSBOOK) {
-		do_edit_vcard(-1, "", "", WC->wc_roomname);
+	if (WCC->wc_default_view == VIEW_ADDRESSBOOK) {
+		do_edit_vcard(-1, "", "", WCC->wc_roomname);
 		return;
 	}
 
@@ -3142,7 +3323,7 @@ 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 (WC->wc_default_view == VIEW_CALENDAR) {
+	if (WCC->wc_default_view == VIEW_CALENDAR) {
 		display_edit_event();
 		return;
 	}
@@ -3151,7 +3332,7 @@ void display_enter(void)
 	 * Are we perhaps in a tasks view?  If so, then an "enter
 	 * message" command really means "add new task."
 	 */
-	if (WC->wc_default_view == VIEW_TASKS) {
+	if (WCC->wc_default_view == VIEW_TASKS) {
 		display_edit_task();
 		return;
 	}
@@ -3167,20 +3348,41 @@ void display_enter(void)
 	wprintf("<div id=\"content\">\n"
 		"<div class=\"fix_scrollbar_bug message \">");
 
-	/** Now check our actual recipients if there are any */
+	/* Now check our actual recipients if there are any */
 	if (recipient_required) {
-		sprintf(buf, "ENT0 0|%s|%d|0||%s||%s|%s|%s",
-			bstr("recp"),
-			is_anonymous,
-			display_name,
-			bstr("cc"), bstr("bcc"), bstr("wikipage"));
-		serv_puts(buf);
+		const char *Recp = ""; 
+		const char *Cc = "";
+		const char *Bcc = "";
+		const char *Wikipage = "";
+		char *CmdBuf = NULL;;
+		size_t len = 0;
+		size_t nLen;
+		const char CMD[] = "ENT0 0|%s|%d|0||%s||%s|%s|%s";
+		
+		len = sizeof(CMD) + dplen;
+		Recp = xbstr("recp", &nLen);
+		len += nLen;
+		Cc = xbstr("cc", &nLen);
+		len += nLen;
+		Bcc = xbstr("bcc", &nLen);
+		len += nLen;
+		Wikipage = xbstr("wikipage", &nLen);
+		len += nLen;
+		
+
+		CmdBuf = (char*) malloc (len + 1);
+
+		snprintf(CmdBuf, len, CMD,
+			 Recp, is_anonymous,
+			 display_name,
+			 Cc, Bcc, Wikipage);
+		serv_puts(CmdBuf);
 		serv_getln(buf, sizeof buf);
 
 		if (!strncmp(buf, "570", 3)) {	/** 570 means we have an invalid recipient listed */
-			if (!IsEmptyStr(bstr("recp")) && 
-			    !IsEmptyStr(bstr("cc"  )) && 
-			    !IsEmptyStr(bstr("bcc" ))) {
+			if (havebstr("recp") && 
+			    havebstr("cc"  ) && 
+			    havebstr("bcc" )) {
 				recipient_bad = 1;
 			}
 		}
@@ -3192,7 +3394,7 @@ void display_enter(void)
 
 	/** If we got this far, we can display the message entry screen. */
 
-	/** begin message entry screen */
+	/* begin message entry screen */
 	wprintf("<form "
 		"enctype=\"multipart/form-data\" "
 		"method=\"POST\" "
@@ -3201,13 +3403,16 @@ void display_enter(void)
 		"name=\"enterform\""
 		">\n");
 	wprintf("<input type=\"hidden\" name=\"postseq\" value=\"%ld\">\n", now);
-	if (WC->wc_view == VIEW_WIKI) {
+	if (WCC->wc_view == VIEW_WIKI) {
 		wprintf("<input type=\"hidden\" name=\"wikipage\" value=\"%s\">\n", bstr("wikipage"));
 	}
 	wprintf("<input type=\"hidden\" name=\"return_to\" value=\"%s\">\n", bstr("return_to"));
-	wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%ld\">\n", WC->nonce);
+	wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WCC->nonce);
 	wprintf("<input type=\"hidden\" name=\"force_room\" value=\"");
-	escputs(WC->wc_roomname);
+	escputs(WCC->wc_roomname);
+	wprintf("\">\n");
+	wprintf("<input type=\"hidden\" name=\"references\" value=\"");
+	escputs(bstr("references"));
 	wprintf("\">\n");
 
 	/** submit or cancel buttons */
@@ -3256,9 +3461,9 @@ void display_enter(void)
 		}
 	}
 
-	if (WC->room_flags & QR_ANONOPT) {
+	if (WCC->room_flags & QR_ANONOPT) {
 		wprintf("<option %s value=\"__ANONYMOUS__\">%s</option>\n",
-			((!strcasecmp(bstr("__ANONYMOUS__"), WC->wc_fullname)) ? "selected" : ""),
+			((!strcasecmp(bstr("__ANONYMOUS__"), WCC->wc_fullname)) ? "selected" : ""),
 			_("Anonymous")
 		);
 	}
@@ -3285,7 +3490,7 @@ void display_enter(void)
 	}
 
 	wprintf(_(" <I>in</I> "));
-	escputs(WC->wc_roomname);
+	escputs(WCC->wc_roomname);
 
 	wprintf("</td></tr>");
 
@@ -3297,8 +3502,7 @@ void display_enter(void)
 		wprintf(_("To:"));
 		wprintf("</label></th>"
 			"<td><input autocomplete=\"off\" type=\"text\" name=\"recp\" id=\"recp_id\" value=\"");
-		ccraw = bstr("recp");
-		len = strlen(ccraw);
+		ccraw = xbstr("recp", &len);
 		copy = (char*) malloc(len * 2 + 1);
 		memcpy(copy, ccraw, len + 1); 
 		utf8ify_rfc822_string(copy);
@@ -3325,8 +3529,7 @@ void display_enter(void)
 		wprintf(_("CC:"));
 		wprintf("</label></th>"
 			"<td><input autocomplete=\"off\" type=\"text\" name=\"cc\" id=\"cc_id\" value=\"");
-		ccraw = bstr("cc");
-		len = strlen(ccraw);
+		ccraw = xbstr("cc", &len);
 		copy = (char*) malloc(len * 2 + 1);
 		memcpy(copy, ccraw, len + 1); 
 		utf8ify_rfc822_string(copy);
@@ -3340,8 +3543,7 @@ void display_enter(void)
 		wprintf(_("BCC:"));
 		wprintf("</label></th>"
 			"<td><input autocomplete=\"off\" type=\"text\" name=\"bcc\" id=\"bcc_id\" value=\"");
-		ccraw = bstr("bcc");
-		len = strlen(ccraw);
+		ccraw = xbstr("bcc", &len);
 		copy = (char*) malloc(len * 2 + 1);
 		memcpy(copy, ccraw, len + 1); 
 		utf8ify_rfc822_string(copy);
@@ -3381,23 +3583,23 @@ void display_enter(void)
 	msgescputs(bstr("msgtext"));
 
 	/* If we're forwarding a message, insert it here... */
-	if (atol(bstr("fwdquote")) > 0L) {
+	if (lbstr("fwdquote") > 0L) {
 		wprintf("<br><div align=center><i>");
 		wprintf(_("--- forwarded message ---"));
 		wprintf("</i></div><br>");
-		pullquote_message(atol(bstr("fwdquote")), 1, 1);
+		pullquote_message(lbstr("fwdquote"), 1, 1);
 	}
 
 	/** If we're replying quoted, insert the quote here... */
-	else if (atol(bstr("replyquote")) > 0L) {
+	else if (lbstr("replyquote") > 0L) {
 		wprintf("<br>"
 			"<blockquote>");
-		pullquote_message(atol(bstr("replyquote")), 0, 1);
+		pullquote_message(lbstr("replyquote"), 0, 1);
 		wprintf("</blockquote><br>");
 	}
 
 	/** If we're editing a wiki page, insert the existing page here... */
-	else if (WC->wc_view == VIEW_WIKI) {
+	else if (WCC->wc_view == VIEW_WIKI) {
 		safestrncpy(buf, bstr("wikipage"), sizeof buf);
 		str_wiki_index(buf);
 		existing_page = locate_message_by_uid(buf);
@@ -3407,36 +3609,42 @@ void display_enter(void)
 	}
 
 	/** Insert our signature if appropriate... */
-	if ( (WC->is_mailbox) && (strcmp(bstr("sig_inserted"), "yes")) ) {
-		get_preference("use_sig", buf, sizeof buf);
-		if (!strcasecmp(buf, "yes")) {
-			int len;
-			get_preference("signature", ebuf, sizeof ebuf);
-			euid_unescapize(buf, ebuf);
+	if ( (WCC->is_mailbox) && !yesbstr("sig_inserted") ) {
+		int UseSig;
+		get_pref_yesno("use_sig", &UseSig, 0);
+		if (UseSig) {
+			StrBuf *Sig;
+			const char *sig, *esig;
+
+			get_preference("signature", &ebuf);
+			Sig = NewStrBuf();
+			StrBufEUid_unescapize(Sig, ebuf);
+			sig = ChrPtr(Sig);
+			esig = sig + StrLength(Sig);
 			wprintf("<br>--<br>");
-			len = strlen(buf);
-			for (i=0; i<len; ++i) {
-				if (buf[i] == '\n') {
+			while (sig <= esig) {
+				if (*sig == '\n') {
 					wprintf("<br>");
 				}
-				else if (buf[i] == '<') {
+				else if (*sig == '<') {
 					wprintf("&lt;");
 				}
-				else if (buf[i] == '>') {
+				else if (*sig == '>') {
 					wprintf("&gt;");
 				}
-				else if (buf[i] == '&') {
+				else if (*sig == '&') {
 					wprintf("&amp;");
 				}
-				else if (buf[i] == '\"') {
+				else if (*sig == '\"') {
 					wprintf("&quot;");
 				}
-				else if (buf[i] == '\'') {
+				else if (*sig == '\'') {
 					wprintf("&#39;");
 				}
-				else if (isprint(buf[i])) {
-					wprintf("%c", buf[i]);
-				}
+				else /* since we're utf 8, is this a good idea? if (isprint(*sig))*/ {
+					wprintf("%c", *sig);
+				} 
+				sig ++;
 			}
 		}
 	}
@@ -3458,7 +3666,7 @@ void display_enter(void)
 	wprintf(_("Attachments:"));
 	wprintf(" ");
 	wprintf("<select name=\"which_attachment\" size=1>");
-	for (att = WC->first_attachment; att != NULL; att = att->next) {
+	for (att = WCC->first_attachment; att != NULL; att = att->next) {
 		wprintf("<option value=\"");
 		urlescputs(att->filename);
 		wprintf("\">");
@@ -3496,7 +3704,7 @@ void delete_msg(void)
 	long msgid;
 	char buf[SIZ];
 
-	msgid = atol(bstr("msgid"));
+	msgid = lbstr("msgid");
 
 	if (WC->wc_is_trash) {	/** Delete from Trash is a real delete */
 		serv_printf("DELE %ld", msgid);	
@@ -3520,9 +3728,9 @@ void move_msg(void)
 	long msgid;
 	char buf[SIZ];
 
-	msgid = atol(bstr("msgid"));
+	msgid = lbstr("msgid");
 
-	if (!IsEmptyStr(bstr("move_button"))) {
+	if (havebstr("move_button")) {
 		sprintf(buf, "MOVE %ld|%s", msgid, bstr("target_room"));
 		serv_puts(buf);
 		serv_getln(buf, sizeof buf);
@@ -3538,8 +3746,8 @@ void move_msg(void)
 
 
 
-/**
- * \brief Confirm move of a message
+/*
+ * Confirm move of a message
  */
 void confirm_move_msg(void)
 {
@@ -3547,7 +3755,7 @@ void confirm_move_msg(void)
 	char buf[SIZ];
 	char targ[SIZ];
 
-	msgid = atol(bstr("msgid"));
+	msgid = lbstr("msgid");
 
 
 	output_headers(1, 1, 2, 0, 0, 0);
@@ -3565,7 +3773,7 @@ void confirm_move_msg(void)
 	wprintf("<br />\n");
 
 	wprintf("<form METHOD=\"POST\" action=\"move_msg\">\n");
-	wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%ld\">\n", WC->nonce);
+	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");
@@ -3591,5 +3799,28 @@ void confirm_move_msg(void)
 	wDumpContent(1);
 }
 
+void readnew(void) { readloop("readnew");}
+void readold(void) { readloop("readold");}
+void readfwd(void) { readloop("readfwd");}
+void headers(void) { readloop("headers");}
+void do_search(void) { readloop("do_search");}
 
-/*@}*/
+void 
+InitModule_MSG
+(void)
+{
+	WebcitAddUrlHandler(HKEY("readnew"), readnew, 0);
+	WebcitAddUrlHandler(HKEY("readold"), readold, 0);
+	WebcitAddUrlHandler(HKEY("readfwd"), readfwd, 0);
+	WebcitAddUrlHandler(HKEY("headers"), headers, 0);
+	WebcitAddUrlHandler(HKEY("do_search"), do_search, 0);
+	WebcitAddUrlHandler(HKEY("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|AJAX);
+	WebcitAddUrlHandler(HKEY("printmsg"), print_message, NEED_URL);
+	WebcitAddUrlHandler(HKEY("msgheaders"), display_headers, NEED_URL);
+	return ;
+}