diff --git a/mutt/.mailcap b/mutt/.mailcap
new file mode 100644
index 0000000..a09ec71
--- /dev/null
+++ b/mutt/.mailcap
@@ -0,0 +1,6 @@
+application/octet-stream ; echo %s "can be anything..."                    ; copiousoutput
+text/html                ; /usr/bin/elinks -dump %s ; nametemplate=%s.html ; copiousoutput
+application/pdf          ; /usr/bin/zathura %s                             ; copiousoutput
+image/*                  ; /usr/bin/mirage %s                              ; copiousoutput
+audio/*                  ; /usr/bin/mplayer %s                             ; copiousoutput
+video/*                  ; /usr/bin/mplayer %s                             ; copiousoutput
diff --git a/mutt/.muttrc b/mutt/.muttrc
index b4bc45a..23a0b45 100644
--- a/mutt/.muttrc
+++ b/mutt/.muttrc
@@ -3,11 +3,17 @@
 # Change the following six lines to match your Gmail account details
 set imap_user = "%GMAIL_LOGIN%"
 set imap_pass = "%GMAIL_PASS%" # leave blank for prompt
-set smtp_url = "smtps://$imap_user@smtp.gmail.com:465/"
-set smtp_pass = "%GMAIL_PASS%" # will prompt if blank
+set smtp_url = "smtp://$imap_user@smtp.gmail.com:587"
+set smtp_pass = "$imap_pass"
 set from = "%GMAIL_FROM%"
 set realname = "%GMAIL_NAME%"
 
+# activate TLS if available on the server
+set ssl_starttls=yes
+
+# always use SSL when connecting to a server
+set ssl_force_tls=yes
+
 # Change the following line to a different editor you prefer (and update the Dockerfile accordingly, of course).
 set editor = "vim"
 
@@ -31,9 +37,9 @@ set folder = "imaps://imap.gmail.com:993"
 set spoolfile = "+INBOX"
 set imap_check_subscribed
 set hostname = gmail.com
-set mail_check = 120
 set timeout = 300
 set imap_keepalive = 300
+set mail_check = 60
 set postponed = "+[Gmail]/Drafts"
 set record = "" # gmail automatically handles saving sent emails
 
@@ -58,6 +64,8 @@ bind editor <Tab> complete-query
 bind editor ^T complete
 bind editor <space> noop
 
+set mailcap_path      = ~/.mailcap
+
 # Gmail-style keyboard shortcuts
 macro index,pager gi "<change-folder>=INBOX<enter>" "Go to Inbox"
 macro index,pager ga "<change-folder>=[Gmail]/All Mail<enter>" "Go to All Mail"
@@ -65,7 +73,7 @@ macro index,pager gs "<change-folder>=[Gmail]/Starred<enter>" "Go to Starred"
 macro index,pager gd "<change-folder>=[Gmail]/Drafts<enter>" "Go to Drafts"
 macro index,pager gt "<change-folder>=[Gmail]/Sent Mail<enter>" "Go to Sent Mail"
 
-macro index,pager y "<enter-command>unset trash\n <delete-message>" "Archive"
+macro index,pager y "<enter-command>unset resolve<enter><enter-command>unset trash<enter><clear-flag>N<enter-command>set resolve<enter><delete-message><enter>"
 macro index,pager d "<enter-command>set trash=\"imaps://imap.googlemail.com/[GMail]/Bin\"\n <delete-message>" "Trash"
 
 macro index,pager !  <save-message>=[Gmail]/Spam<enter><enter> "Report spam"
diff --git a/mutt/Dockerfile b/mutt/Dockerfile
index fd3df48..d2677a2 100644
--- a/mutt/Dockerfile
+++ b/mutt/Dockerfile
@@ -9,7 +9,8 @@ RUN apt-get update && apt-get install -y \
     lynx \
     mutt-patched \
     vim-nox \
-    --no-install-recommends
+    --no-install-recommends 
+
 ENV BROWSER lynx
 ENV TERM xterm-256color