2 files changed, 9 insertions, 9 deletions

diff --git a/alias b/alias
index b787532..81b88ab 100644
--- a/alias
+++ b/alias
@@ -73,12 +73,12 @@ ssh.down() {
 }
 
 # imap
-curl.mail.save() {
+imap.save() {
   curl "imaps://mail.topo.tw/$1" \
       --user pham:`pass mail/pham@mail.topo.tw` \
       -T $2
 }
-curl.mail.save_attachment() {
+imap.save_attachment() {
 #TEMPFILE=$(mktemp)
   trap 'rm $TEMPFILE' EXIT
   mail -a $1 -Sexpandaddr /dev/stdout | \
@@ -86,12 +86,12 @@ curl.mail.save_attachment() {
       --user pham:`pass mail/pham@mail.topo.tw` \
       -T /dev/stdin
 }
-curl.mail.search.subject() {
+imap.search.subject() {
   curl "imaps://mail.topo.tw/$1" \
     --user pham:`pass mail/pham@mail.topo.tw` \
     --request "SEARCH SUBJECT $2"
 }
-curl.mail.fetch() {
+imap.fetch() {
   curl "imaps://mail.topo.tw/$1;MAILINDEX=$2" \
     --user pham:`pass mail/pham@mail.topo.tw` | \
     dos2unix | \
diff --git a/mutt/muttrc.topo b/mutt/muttrc.topo
index f841f78..65e7956 100644
--- a/mutt/muttrc.topo
+++ b/mutt/muttrc.topo
@@ -29,7 +29,7 @@ set move = yes
 set record = "+INBOX"
 set trash = "+Trash"
 set postponed = "+Drafts"
-set mask="!(INBOX|mbox|dev|Sent|Trash|Drafts|DeltaChat|civildef|hometeach|osm|arch-general|mutt-users|bash|STOCK|pay|keep|login|update|test|spam)" 
+set mask="!(INBOX|mbox|dev|Sent|Trash|Drafts|DeltaChat|civildef|hometeach|osm|STOCK|pay|keep|login|update|test|spam)" 
 
 # Sidebar
 mailboxes  -label '📭 [i]' +INBOX \
@@ -41,10 +41,10 @@ mailboxes  -label '📭 [i]' +INBOX \
            -label CivilDEF +civildef \
            +hometeach \
            -label OSM +osm \
-           -label Arch +arch-general \
-           -label Mutt +mutt-users \
-           -label Bash +bash \
-           -label Aerc +aerc \
+           -label Arch +mailing_list.arch-general \
+           -label Mutt +mailing_list.mutt-users \
+           -label Bash +mailing_list.bash \
+           -label Aerc +mailing_list.aerc \
            +STOCK \
            -label '📢 [f]' +feedback \
            "+-- Permanent ---" \