diff --git a/imap.go b/imap.go
index ca35005..748d5cb 100644
--- a/imap.go
+++ b/imap.go
@@ -216,7 +216,9 @@ func listMessages(conn *imapclient.Client, mboxName string) ([]imapMessage, erro
 	mbox := conn.Mailbox()
 	from := uint32(1)
 	to := mbox.Messages
-	if mbox.Messages > n {
+	if mbox.Messages == 0 {
+		return nil, nil
+	} else if mbox.Messages > n {
 		from = mbox.Messages - n
 	}
 	seqSet := new(imap.SeqSet)
diff --git a/public/mailbox.html b/public/mailbox.html
index d8c7209..e56efcb 100644
--- a/public/mailbox.html
+++ b/public/mailbox.html
@@ -15,13 +15,17 @@
 	{{end}}
 </ul>
 
-<p>Messages:</p>
-<ul>
-	{{range .Messages}}
-		<li><a href="/message/{{$.Mailbox.Name | pathescape}}/{{.Uid}}?part={{.TextPartName}}">
-			{{.Envelope.Subject}}
-		</a></li>
-	{{end}}
-</ul>
+{{if .Messages}}
+	<p>Messages:</p>
+	<ul>
+		{{range .Messages}}
+			<li><a href="/message/{{$.Mailbox.Name | pathescape}}/{{.Uid}}?part={{.TextPartName}}">
+				{{.Envelope.Subject}}
+			</a></li>
+		{{end}}
+	</ul>
+{{else}}
+	<p>Mailbox is empty.</p>
+{{end}}
 
 {{template "foot"}}