Merge branch 'master' of https://github.com/hypermail-project/hypermail

Author: jkbzh

src/print.c

@@ -1238,10 +1238,12 @@ void printbody(FILE *fp, struct emailinfo *email, int maybe_reply, int is_reply)
 
     if (!set_showhtml) {
 	fprintf(fp, "<pre id=\"body\">\n");
-	fprintf(fp, "<a name=\"start%d\" accesskey=\"j\" id=\"start%d\"></a>", email->msgnum,email->msgnum);
 	pre = TRUE;
     }
 
+    /* tag the start of the message body */
+    fprintf(fp, "<a name=\"start%d\" accesskey=\"j\" id=\"start%d\"></a>", email->msgnum,email->msgnum);
+
     if (set_showhtml == 2)
       init_txt2html();
     inquote = 0;

src/string.c

@@ -217,6 +217,12 @@ struct i18n_alt_charset_table i18n_charsettable[] = {
   {"KS_C_5601-1987","CP949"},
   {"KS_C_5601-1989","CP949"},
 
+  /* Thai */
+  {"windows-874","CP874"},
+
+  /* Chinese */
+  {"x-gbk","GB18030"},
+
   /* Cyrillic */
   {"x-mac-cyrillic","MacCyrillic"},
   {"ibm866","CP866"}