diff --git a/users/profiles/email/default.nix b/users/profiles/email/default.nix
index 45a8d01a..4ae24b65 100644
--- a/users/profiles/email/default.nix
+++ b/users/profiles/email/default.nix
@@ -50,10 +50,13 @@
       alternative_order text/plain text/enriched text/html text/*
 
       # main options
-      set envelope_from
+      set use_from
+      set from="anish@lakhwara.com"
+      set sendmail="msmtpq"      # send from default account using msmtp
+      set sendmail_wait=-1
       set edit_headers                     # show headers when composing
       set fast_reply                       # skip to compose when replying
-      set askcc                            # ask for CC:
+      #set askcc                            # ask for CC:
       set fcc_attach                       # save attachments with the body
       set forward_format = "Fwd: %s"       # format of subject when forwarding
       set forward_decode                   # decode when forwarding
@@ -63,6 +66,8 @@
       set include                          # include message in replies
       set forward_quote                    # include message in forwards
       set text_flowed
+      set ssl_force_tls
+      set fast_reply
       #unset sig_dashes                     # no dashes before sig
       #unset mime_forward                   # forward attachments as part of body
       #unset help                           # No help bar at the top of index
@@ -92,7 +97,7 @@
       # Makes notmuch return threads rather than messages
       set nm_query_type = "threads"
       # Binding for notmuch search
-      bind index \\ vfolder-from-query
+      macro index,pager S "<vfolder-from-query>" "Search mailbox"
 
       # Pager View Options
       set pager_index_lines = 10  # Shows 10 lines of index when pager is active
@@ -142,6 +147,8 @@
 
 
       # sidebar mappings
+      set sidebar_short_path=yes
+      set sidebar_delim_chars='/'
       bind index,pager \Ck sidebar-prev
       bind index,pager \Cj sidebar-next
       bind index,pager \Co sidebar-open
@@ -160,7 +167,7 @@
       bind editor ^T complete
 
       # Press A to archive
-      macro index,pager A  "<clear-flag>N<save-message>=/Archive<enter>"  "mark message as Archived"
+      macro index,pager A  "<clear-flag>N<save-message>=/Archive"  "mark message as Archived"
       # Press C to add contact to Khard address book
       macro index,pager C \
       "<pipe-message>khard add-email<return>" \
@@ -268,6 +275,9 @@
         };
       };
       msmtp.enable = true;
+      msmtp.extraConfig = {
+        "port" = "465";
+      };
       notmuch.enable = true;
       realName = "Anish Lakhwara";
       signature = {