X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fmessages.c;h=2a994617cab239cb102367cf3a76a30c2967bce3;hb=e0a58b553d4fea75678cf991ce74c8f216189135;hp=7db7b45a643c8c36cc47a38bfb01640141aba77b;hpb=4020369931fbaa03708026b3dd510a49d145d8b5;p=citadel.git

diff --git a/webcit/messages.c b/webcit/messages.c
index 7db7b45a6..2a994617c 100644
--- a/webcit/messages.c
+++ b/webcit/messages.c
@@ -656,6 +656,12 @@ void readloop(long oper)
 	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();
+	}
+
 	switch (WCC->wc_view) {
 	case VIEW_WIKI:
 		sprintf(buf, "wiki?room=%s&page=home", ChrPtr(WCC->wc_roomname));
@@ -731,11 +737,7 @@ void readloop(long oper)
 		}
 		
 	}
-	if (!WCC->is_ajax) {
-	output_headers(1, 1, 1, 0, 0, 0);
-	} else if (WCC->wc_view == VIEW_MAILBOX) {
-	  jsonMessageListHdr();
-	}
+
 	nummsgs = load_msg_ptrs(cmd, with_headers);
 	if (nummsgs == 0) {
 		if (care_for_empty_list) {
@@ -922,7 +924,6 @@ DONE:
 	/** Note: wDumpContent() will output one additional </div> tag. */
 	if (WCC->wc_view != VIEW_MAILBOX) {
 		/* We ought to move this out into template */
-		wprintf("</div>\n");		/** end of 'content' div */
 		wDumpContent(1);
 	} else {
 		end_burst();
@@ -1645,7 +1646,6 @@ void jsonMessageListHdr(void)
 }
 /* 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) {
-  output_headers(1,1,1,0,0,1);
   begin_burst();
   DoTemplate(HKEY("msg_listview"),NULL,&NoCtx);
   DoTemplate(HKEY("trailing"),NULL,&NoCtx);