diff --git a/symlinks/config/mutt/accounts/accounttemplate b/symlinks/config/mutt/accounts/accounttemplate
index c18ae0d..c41ef2e 100644
--- a/symlinks/config/mutt/accounts/accounttemplate
+++ b/symlinks/config/mutt/accounts/accounttemplate
@@ -1,6 +1,24 @@
+# vim: filetype=muttrc
+unmailboxes *
+
+set realname = "Firstname Lastname"
 set imap_user = "username@mail.com"
 set imap_pass = "YOURAPPPASSWORD"
 set folder = "imapurl"
 set smtp_url = "smptul"
 set smtp_pass = "YOURAPPPASSWORD"
 set spoolfile = "+INBOX"
+
+set from = "username@mail.com"
+set envelope_from
+set use_from = "yes"
+set record = "+Sent"
+set trash = "+Trash"
+set postponed = "+Drafts"
+set mail_check = 6
+
+unset imap_passive
+
+set imap_keepalive = 300
+
+account-hook $folder "set imap_pass=YOURAPPPASSWORD"
diff --git a/symlinks/config/mutt/muttrc b/symlinks/config/mutt/muttrc
index d9c9de4..f72d7f0 100644
--- a/symlinks/config/mutt/muttrc
+++ b/symlinks/config/mutt/muttrc
@@ -25,7 +25,11 @@ auto_view text/html
 alternative_order text/plain text/enriched text/html
 set editor = "vim"
 
-source accounts/personal
+source accounts/gmail
+folder-hook $folder 'source ~/.config/mutt/accounts/gmail'
+
+source accounts/ensarsarajcic
+folder-hook $folder 'source ~/.config/mutt/accounts/ensarsarajcic'
 
 # Mailbox type
 set mbox_type = Maildir
@@ -35,7 +39,9 @@ mailboxes = +Inbox
 set imap_check_subscribed
 
 source /usr/share/doc/neomutt/vim-keys/vim-keys.rc
+source colors-gruvbox.muttrc
 
 macro index,pager A "<save-message>=Archive<enter>" "Archive Message"
 
-source colors-gruvbox.muttrc
+macro index,pager <f2> '<sync-mailbox><enter-command>source ~/.config/mutt/accounts/gmail<enter><change-folder>!<enter>'
+macro index,pager <f3> '<sync-mailbox><enter-command>source ~/.config/mutt/accounts/ensarsarajcic<enter><change-folder>!<enter>'