X-Git-Url: https://code.citadel.org/?p=citadel.git;a=blobdiff_plain;f=citadel%2Fmodules%2Fimap%2Fserv_imap.c;h=f09af1254ecb219d291d687e9d2e38a58d9be12a;hp=5c2e1589922805768cccbae88680f3a78f8d67ac;hb=d0a6f3a795db5fb278316acf068019d71845d1fa;hpb=e376f2f26c84111e1e06f2368a7111b818550456

diff --git a/citadel/modules/imap/serv_imap.c b/citadel/modules/imap/serv_imap.c
index 5c2e15899..f09af1254 100644
--- a/citadel/modules/imap/serv_imap.c
+++ b/citadel/modules/imap/serv_imap.c
@@ -1424,13 +1424,14 @@ void imap_command_loop(void)
 	}
 	
 	if (untagged_ok) {
-		imap_print_instant_messages();
-	
+
+		/* we can put any additional untagged stuff right here in the future */
+
 		/*
 		 * Before processing the command that was just entered... if we happen
 		 * to have a folder selected, we'd like to rescan that folder for new
 		 * messages, and for deletions/changes of existing messages.  This
-		 * could probably be optimized somehow, but IMAP sucks...
+		 * could probably be optimized better with some deep thought...
 		 */
 		if (IMAP->selected) {
 			imap_rescan_msgids();
@@ -1458,7 +1459,7 @@ void imap_command_loop(void)
 
 	else if (!strcasecmp(parms[1], "LOGOUT")) {
 		if (IMAP->selected) {
-			imap_do_expunge();	/* yes, we auto-expunge */
+			imap_do_expunge();	/* yes, we auto-expunge at logout */
 		}
 		cprintf("* BYE %s logging out\r\n", config.c_fqdn);
 		cprintf("%s OK Citadel IMAP session ended.\r\n",