no longer flatten mailboxes at all, fix #648

1 files changed, 1 insertions, 2 deletions

diff --git a/bin/mw b/bin/mw
index 03abc4d..e8d02f1 100755
--- a/bin/mw
+++ b/bin/mw
@@ -62,7 +62,6 @@ MaildirStore $fulladdr-local
 Subfolders Verbatim
 Path ${XDG_DATA_HOME:-$HOME/.local/share}/mail/$fulladdr/
 Inbox ${XDG_DATA_HOME:-$HOME/.local/share}/mail/$fulladdr/${inbox:-INBOX}
-Flatten _
 
 Channel $fulladdr
 Expunge Both
@@ -231,7 +230,7 @@ getboxes() { if [ -n "${force+x}" ]; then
 	else
 		info="$(curl --location-trusted -s -m 5 --user "$login:$(pass $fulladdr)" --url "${protocol:-imaps}://$imap:${iport:-993}")"
 		[ -z "$info" ] && echo "Log-on not successful." && return 1
-		mailboxes="$(echo "$info" | sed "s/.*\" //;s/\"//g" | tr -d '
')"
+		mailboxes="$(echo "$info" | grep -v HasChildren | sed "s/.*\" //;s/\"//g" | tr -d '
')"
 	fi
 	getaccounts; for x in $(seq 1 9); do echo "$accounts" | grep -q "^$x:" || { export idnum="$x"; break ;}; done
 	toappend="mailboxes $(echo "$mailboxes" | sed "s/^/\"=/;s/$/\"/" | paste -sd ' ' - )"