X-Git-Url: https://code.citadel.org/?p=citadel.git;a=blobdiff_plain;f=citadel%2Fmodules%2Fimap%2Fimap_list.c;fp=citadel%2Fmodules%2Fimap%2Fimap_list.c;h=14cd0476ecee1f613b20fe537bf9a7e08e4c258e;hp=5640ec5db854d8e09af2a545a0882f45388711bd;hb=2b80e75820618944e1c75b9c01aeeefc8b6b0c81;hpb=beb1318d129b2d470b6e0d138e2b302953e66dd3

diff --git a/citadel/modules/imap/imap_list.c b/citadel/modules/imap/imap_list.c
index 5640ec5db..14cd0476e 100644
--- a/citadel/modules/imap/imap_list.c
+++ b/citadel/modules/imap/imap_list.c
@@ -97,7 +97,7 @@ void imap_list_floors(char *verb, int num_patterns, StrBuf **patterns)
 			}
 			if (match) {
 				IAPrintf("* %s (\\NoSelect \\HasChildren) \"/\" ", verb);
-				plain_imap_strout(fl->f_name);
+				IPutStr(fl->f_name, (fl->f_name)?strlen(fl->f_name):0);
 				IAPuts("\r\n");
 			}
 		}
@@ -168,7 +168,8 @@ void imap_listroom(struct ctdlroom *qrbuf, void *data)
 	}
 
 	if (yes_output_this_room) {
-		imap_mailboxname(MailboxName, sizeof MailboxName, qrbuf);
+		long len;
+		len = imap_mailboxname(MailboxName, sizeof MailboxName, qrbuf);
 		match = 0;
 		for (i=0; i<ImapFilter->num_patterns; ++i) {
 			if (imap_mailbox_matches_pattern(ChrPtr(ImapFilter->patterns[i]), MailboxName)) {
@@ -177,7 +178,7 @@ void imap_listroom(struct ctdlroom *qrbuf, void *data)
 		}
 		if (match) {
 			IAPrintf("* %s (%s) \"/\" ", ImapFilter->verb, return_options);
-			plain_imap_strout(MailboxName);
+			IPutStr(MailboxName, len);
 			IAPuts("\r\n");
 		}
 	}