lib/PublicInbox/IMAP.pm  | 8 ++++----
 lib/PublicInbox/IMAPD.pm | 4 +++-
 t/imapd.t                | 4 ++--

diff --git a/lib/PublicInbox/IMAP.pm b/lib/PublicInbox/IMAP.pm
index d3f4874e496a99cd20721a7446aca997b8a1d399..b3c449b0712778b571ab2cbbb0d5e24b72e53c65 100644
--- a/lib/PublicInbox/IMAP.pm
+++ b/lib/PublicInbox/IMAP.pm
@@ -254,13 +254,14 @@ }
 
 sub ensure_ranges_exist ($$$) {
 	my ($imapd, $ibx, $max) = @_;
+	defined(my $mb_top = $ibx->{newsgroup}) or return;
 	my $mailboxes = $imapd->{mailboxes};
-	my $mb_top = $ibx->{newsgroup};
 	my @created;
 	for (my $i = int($max/UID_BLOCK); $i >= 0; --$i) {
 		my $sub_mailbox = "$mb_top.$i";
 		last if exists $mailboxes->{$sub_mailbox};
 		$mailboxes->{$sub_mailbox} = $ibx;
+		$sub_mailbox =~ s/\Ainbox\./INBOX./i; # more familiar to users
 		push @created, $sub_mailbox;
 	}
 	return unless @created;
@@ -693,9 +694,8 @@ 	if ($refname eq '' && $wildcard eq '') {
 		# request for hierarchy delimiter
 		$l = [ qq[* LIST (\\Noselect) "." ""\r\n] ];
 	} elsif ($refname ne '' || $wildcard ne '*') {
-		$wildcard = lc $wildcard;
-		$wildcard =~ s!([^a-z0-9_])!$patmap{$1} // "\Q$1"!eg;
-		$l = [ grep(/ \Q$refname\E$wildcard\r\n\z/s, @$l) ];
+		$wildcard =~ s!([^a-z0-9_])!$patmap{$1} // "\Q$1"!egi;
+		$l = [ grep(/ \Q$refname\E$wildcard\r\n\z/is, @$l) ];
 	}
 	\(join('', @$l, "$tag OK List done\r\n"));
 }
diff --git a/lib/PublicInbox/IMAPD.pm b/lib/PublicInbox/IMAPD.pm
index 261d756042fbf7ee2856e486d11e28c46b3202e4..186ec7b0062976523bb420eeec3eb768d5ca65aa 100644
--- a/lib/PublicInbox/IMAPD.pm
+++ b/lib/PublicInbox/IMAPD.pm
@@ -71,7 +71,9 @@ 	$imapd->{mailboxes} = $mailboxes;
 	$imapd->{inboxlist} = [
 		map {
 			my $no = $mailboxes->{$_} == $dummy ? '' : 'No';
-			qq[* LIST (\\Has${no}Children) "." $_\r\n]
+			my $u = $_; # capitalize "INBOX" for user-familiarity
+			$u =~ s/\Ainbox(\.|\z)/INBOX$1/i;
+			qq[* LIST (\\Has${no}Children) "." $u\r\n]
 		} sort {
 			# shortest names first, alphabetically if lengths match
 			length($a) == length($b) ?
diff --git a/t/imapd.t b/t/imapd.t
index 233be9f2c0a796b469d99dcd2ddfbe94deb12692..c691e1a96a7026b3228cdcaaa2f1ebd466b22eb7 100644
--- a/t/imapd.t
+++ b/t/imapd.t
@@ -101,13 +101,13 @@ 	\(MESSAGES\x20\d+\x20UIDNEXT\x20\d+\x20UIDVALIDITY\x20\d+\)\r\n/sx);
 like($raw[1], qr/\A\S+ OK /, 'finished status response');
 
 my @orig_list = @raw = $mic->list;
-like($raw[0], qr/^\* LIST \(.*?\) "\." inbox/,
+like($raw[0], qr/^\* LIST \(.*?\) "\." INBOX/,
 	'got an inbox');
 like($raw[-1], qr/^\S+ OK /, 'response ended with OK');
 is(scalar(@raw), scalar(@V) + 4, 'default LIST response');
 @raw = $mic->list('', 'inbox.i1');
 is(scalar(@raw), 2, 'limited LIST response');
-like($raw[0], qr/^\* LIST \(.*?\) "\." inbox/,
+like($raw[0], qr/^\* LIST \(.*?\) "\." INBOX/,
 		'got an inbox.i1');
 like($raw[-1], qr/^\S+ OK /, 'response ended with OK');