diff --git a/.config/aerc/accounts.conf b/.config/aerc/accounts.conf
index 9709221d..bc0eb53f 100644
--- a/.config/aerc/accounts.conf
+++ b/.config/aerc/accounts.conf
@@ -13,7 +13,6 @@ source            = imaps+xoauth2://18daf3%40queensu.ca@outlook.office365.com
 source-cred-cmd = /home/fic/tools/mutt_oauth2.py /home/fic/tools/tokenfile-test
 outgoing          = smtp+xoauth2://18daf3%40queensu.ca@outlook.office365.com:587
 outgoing-cred-cmd = /home/fic/tools/mutt_oauth2.py /home/fic/tools/tokenfile-test
-# smtp-starttls = yes
 from = Daniel Fichtinger <fichtinger.d@queensu.ca>
 default = INBOX
 copy-to = Sent
diff --git a/.config/aerc/aerc.conf b/.config/aerc/aerc.conf
index 42099784..3438c8fe 100644
--- a/.config/aerc/aerc.conf
+++ b/.config/aerc/aerc.conf
@@ -129,7 +129,7 @@
 # See time.Time#Format at https://godoc.org/time#Time.Format
 #
 # Default: 2006 Jan 02
-#timestamp-format=2006 Jan 02
+timestamp-format=Jan 02 2006
 
 #
 # Index-only time format for messages that were received/sent today.
@@ -156,7 +156,7 @@
 # Overrides timestamp-format for the message view.
 #
 # Default: 2006 Jan 02, 15:04 GMT-0700
-#message-view-timestamp-format=2006 Jan 02, 15:04 GMT-0700
+message-view-timestamp-format=Jan 02 2006, 15:04 GMT-0700
 
 #
 # If set, overrides timestamp-format in the message view for messages
@@ -213,7 +213,7 @@
 # Enable mouse events in the ui, e.g. clicking and scrolling with the mousewheel
 #
 # Default: false
-#mouse-enabled=false
+mouse-enabled=false
 
 #
 # Ring the bell when new messages are received