diff -Naur a/mail b/mail
--- a/mail	2013-02-07 14:18:51.237960677 +0100
+++ b/mail	2013-02-07 14:23:38.297960677 +0100
@@ -22,11 +22,14 @@
 MAILFILE="/var/spool/mail/$USER"
 
 __mail_detail() {
-	[ -s "$MAILFILE" ] && ls -alF "$MAILFILE" 2>&1
+	[ ! -d "$MAILFILE" -a -s "$MAILFILE" ] && ls -alF "$MAILFILE" 2>&1
+	[ -d "$MAILFILE/new" ] && ls -AlF "$MAILFILE/new" 2>&1
 }
 
 __mail() {
-	if [ -s "$MAILFILE" ]; then
+	if [ ! -d "$MAILFILE" -a -s "$MAILFILE" ]; then
+		 color b; printf "%s" "$ICON_MAIL"; color --
+	elif [ -d "$MAILFILE/new" -a "$(ls "$MAILFILE/new" 2>/dev/null)" ]; then
 		 color b; printf "%s" "$ICON_MAIL"; color --
 	else
 		rm -f "$BYOBU_RUN_DIR/status.$BYOBU_BACKEND/mail"*