3 files changed, 13 insertions, 8 deletions

diff --git a/mutt/default b/mutt/default
index 8c8e5d6..a86baf0 100644
--- a/mutt/default
+++ b/mutt/default
@@ -1,7 +1,12 @@
+# Connection options
+set ssl_force_tls = yes
+unset ssl_starttls
+
 # Default settings
 set header_cache     = "~/.cache/mutt"
 set message_cachedir = "~/.cache/mutt"
 set edit_headers=yes
+macro index,pager <f2> '<sync-mailbox><enter-command>source ~/.config/mutt/muttrc.b97602041<enter><change-folder>!<enter>'
 
 # Interface
 set editor = "vim"
diff --git a/mutt/muttrc.b97602041 b/mutt/muttrc.b97602041
index 70c6583..fb2bd1f 100644
--- a/mutt/muttrc.b97602041
+++ b/mutt/muttrc.b97602041
@@ -1,11 +1,11 @@
-source ./default
+source ~/.config/mutt/default
 
 set pop_host = "pops://ms97.ntu.edu.tw"
-set pop_user = b97602041
-set pop_pass = `pass misc/ntu | head -1`
-#set smtp_url="smtp://localhost:25"
+set pop_user = `pass misc/ntu | sed -n 2p`
+set pop_pass = `pass misc/ntu | sed -n 1p`
 
-set ssl_starttls = yes 
-set ssl_force_tls = yes
+set pop_reconnect = yes
+set pop_checkinterval = 1
+set pop_delete = yes
 
-set folder = pops://b97602041:`pass misc/ntu | head -1`@ms97.ntu.edu.tw:995/
+set spoolfile = pops://ms97.ntu.edu.tw/
diff --git a/mutt/muttrc.gmail b/mutt/muttrc.gmail
index b4e56c3..fe54a33 100644
--- a/mutt/muttrc.gmail
+++ b/mutt/muttrc.gmail
@@ -1,4 +1,4 @@
-source ./default
+source ~/.config/mutt/default
 
 # IMAP/SMTP settings
 set imap_user = "typebrook"