diff --git a/config/aerospace/aerospace.toml b/config/aerospace/aerospace.toml
index 31c911b..b0797a0 100644
--- a/config/aerospace/aerospace.toml
+++ b/config/aerospace/aerospace.toml
@@ -10,13 +10,13 @@ persistent-workspaces = ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10']
 enable-normalization-flatten-containers = false
 enable-normalization-opposite-orientation-for-nested-containers = false
 on-focused-monitor-changed = ['move-mouse monitor-lazy-center']
-exec-on-workspace-change = ['/Users/rayandrew/dotfiles/bin/path-shim',
+exec-on-workspace-change = ['~/dotfiles/bin/path-shim',
     'sketchybar --trigger aerospace_workspace_changed FOCUSED_WORKSPACE=$AEROSPACE_FOCUSED_WORKSPACE PREV_WORKSPACE=$AEROSPACE_PREV_WORKSPACE && aerospace-scratchpad hook pull-window $AEROSPACE_PREV_WORKSPACE $AEROSPACE_FOCUSED_WORKSPACE'
 ]
 on-focus-changed = [
   # 'move-mouse window-lazy-center',
-  'exec-and-forget /Users/rayandrew/dotfiles/bin/path-shim sketchybar --trigger front_app_switched',
-  'exec-and-forget /Users/rayandrew/dotfiles/bin/path-shim sketchybar --trigger update_windows'
+  'exec-and-forget ~/dotfiles/bin/path-shim sketchybar --trigger front_app_switched',
+  'exec-and-forget ~/dotfiles/bin/path-shim sketchybar --trigger update_windows'
 ]
 
 [gaps]
@@ -77,14 +77,14 @@ on-focus-changed = [
 
     alt-shift-semicolon = [
         'mode service',
-        'exec-and-forget /Users/rayandrew/dotfiles/bin/path-shim sketchybar --trigger send_message MESSAGE=SERVICE_MODE HOLD=true'
+        'exec-and-forget ~/dotfiles/bin/path-shim sketchybar --trigger send_message MESSAGE=SERVICE_MODE HOLD=true'
     ]
     alt-r = [
         'mode resize',
-        'exec-and-forget /Users/rayandrew/dotfiles/bin/path-shim sketchybar --trigger send_message MESSAGE=RESIZE_MODE HOLD=true'
+        'exec-and-forget ~/dotfiles/bin/path-shim sketchybar --trigger send_message MESSAGE=RESIZE_MODE HOLD=true'
     ]
 
-    cmd-ctrl-1 = "exec-and-forget /Users/rayandrew/dotfiles/bin/path-shim aerospace-scratchpad show Finder"
+    cmd-ctrl-1 = "exec-and-forget ~/dotfiles/bin/path-shim aerospace-scratchpad show Finder"
 
 [mode.resize.binding]
     h = 'resize width -50'
@@ -93,18 +93,18 @@ on-focus-changed = [
     l = 'resize width +50'
     esc = [
       'mode main',
-      'exec-and-forget /Users/rayandrew/dotfiles/bin/path-shim sketchybar --trigger hide_message'
+      'exec-and-forget ~/dotfiles/bin/path-shim sketchybar --trigger hide_message'
     ]
     enter = [
       'mode main',
-      'exec-and-forget /Users/rayandrew/dotfiles/bin/path-shim sketchybar --trigger hide_message'
+      'exec-and-forget ~/dotfiles/bin/path-shim sketchybar --trigger hide_message'
     ]
 
 [mode.service.binding]
     esc = [
         'reload-config',
-        'exec-and-forget /Users/rayandrew/dotfiles/bin/path-shim sketchybar --trigger hide_message',
-        'exec-and-forget /Users/rayandrew/dotfiles/bin/path-shim sketchybar --reload',
+        'exec-and-forget ~/dotfiles/bin/path-shim sketchybar --trigger hide_message',
+        'exec-and-forget ~/dotfiles/bin/path-shim sketchybar --reload',
         'mode main',
     ]
     r = ['flatten-workspace-tree', 'mode main']
@@ -119,14 +119,14 @@ on-focus-changed = [
 
     p = [
        'exec-and-forget ~/dotfiles/bin/presentation-mode on',
-       'exec-and-forget /Users/rayandrew/dotfiles/bin/path-shim sketchybar --bar height=0',
-       'exec-and-forget /Users/rayandrew/dotfiles/bin/path-shim sketchybar --trigger hide_message',
+       'exec-and-forget ~/dotfiles/bin/path-shim sketchybar --bar height=0',
+       'exec-and-forget ~/dotfiles/bin/path-shim sketchybar --trigger hide_message',
        'mode main'
     ]
     shift-p = [
        'exec-and-forget ~/dotfiles/bin/presentation-mode off',
-       'exec-and-forget /Users/rayandrew/dotfiles/bin/path-shim sketchybar --bar height=30',
-       'exec-and-forget /Users/rayandrew/dotfiles/bin/path-shim sketchybar --trigger hide_message',
+       'exec-and-forget ~/dotfiles/bin/path-shim sketchybar --bar height=30',
+       'exec-and-forget ~/dotfiles/bin/path-shim sketchybar --trigger hide_message',
        'mode main'
     ]
 
@@ -140,11 +140,11 @@ on-focus-changed = [
 
 [[on-window-detected]]
     if.app-id = 'com.openai.chat'
-    run = ['move-node-to-workspace 3']
+    run = ['move-node-to-workspace 3', 'layout h_accordion']
 
 [[on-window-detected]]
     if.app-id = 'com.anthropic.claudefordesktop'
-    run = ['move-node-to-workspace 3']
+    run = ['move-node-to-workspace 3', 'layout h_accordion']
 
 [[on-window-detected]]
     if.app-id = 'com.1password.1password'
@@ -178,11 +178,11 @@ on-focus-changed = [
 
 [[on-window-detected]]
     if.app-id = 'org.mozilla.firefox'
-    run = ['move-node-to-workspace 10']
+    run = ['move-node-to-workspace 10', 'layout h_accordion']
 
 [[on-window-detected]]
     if.app-id = 'com.apple.Safari'
-    run = ['move-node-to-workspace 10']
+    run = ['move-node-to-workspace 10', 'layout h_accordion']
 
 [[on-window-detected]]
     if.app-id = 'org.zotero.zotero'
diff --git a/config/neomutt/accounts/personal b/config/neomutt/accounts/personal
index 3064e97..9185c19 100644
--- a/config/neomutt/accounts/personal
+++ b/config/neomutt/accounts/personal
@@ -35,8 +35,9 @@ named-mailboxes "p/trash"     =Trash
 named-mailboxes "p/archive"   =Archive
 
 # Virtual mailboxes (notmuch)
-virtual-mailboxes "All Mail" "notmuch://?query=folder:personal/** AND date:30d.."
-virtual-mailboxes "Unread" "notmuch://?query=folder:personal/** AND tag:unread"
+virtual-mailboxes "Last 30d" "notmuch://?query=path:personal/** AND date:30d.."
+virtual-mailboxes "All Mail" "notmuch://?query=path:personal/**"
+virtual-mailboxes "Unread" "notmuch://?query=path:personal/** AND tag:unread"
 
 # Signature
 set signature = "~/.config/neomutt/signatures/personal"
diff --git a/config/neomutt/accounts/uchicago b/config/neomutt/accounts/uchicago
index acb16cb..6ea7462 100644
--- a/config/neomutt/accounts/uchicago
+++ b/config/neomutt/accounts/uchicago
@@ -36,8 +36,9 @@ named-mailboxes "u/archive"   =Archive
 named-mailboxes "u/teaching"  =Teaching
 
 # Virtual mailboxes (notmuch)
-virtual-mailboxes "All Mail" "notmuch://?query=folder:uchicago/** AND date:30d.."
-virtual-mailboxes "Unread" "notmuch://?query=folder:uchicago/** AND tag:unread"
+virtual-mailboxes "Last 30d" "notmuch://?query=path:uchicago/** AND date:30d.."
+virtual-mailboxes "All Mail" "notmuch://?query=path:uchicago/**"
+virtual-mailboxes "Unread" "notmuch://?query=path:uchicago/** AND tag:unread"
 
 # Signature
 set signature = "~/.config/neomutt/signatures/uchicago"
diff --git a/config/neomutt/neomuttrc b/config/neomutt/neomuttrc
index d353b6d..4004a46 100644
--- a/config/neomutt/neomuttrc
+++ b/config/neomutt/neomuttrc
@@ -30,10 +30,15 @@ set mail_check_stats
 set status_chars = " *%A"
 set status_format = "[ Folder: %D ] [%r%m messages%?n? (%n new)?%?d? (%d to delete)?%?t? (%t tagged)? ]%>─%?p?( %p postponed )?"
 set date_format = "%d.%m.%Y %H:%M"
-set sort = date
-set sort_aux = date
+
+# set sort = date
+# set sort_aux = date
+set use_threads = reverse
+set sort = last-date-received
+set sort_browser = reverse-date
 set uncollapse_jump
 set sort_re
+
 set index_format = "%4C %Z %{%b %d} %-15.15L %?E?(%E)&? %s"
 set reply_regexp = "^(([Rr][Ee]?(\[[0-9]+\])?: *)?(\[[^]]+\] *)?)*"
 set quote_regexp = "^( {0,4}[>|:#%]| {0,4}[a-z0-9]+[>|]+)+"
@@ -80,5 +85,8 @@ set nm_default_url = `echo "notmuch://$HOME/mail"`
 set nm_query_type = messages
 set nm_record_tags = "-inbox,sent"
 
-# Source primary account (personal)
-source ~/.config/neomutt/accounts/personal
+# Source primary account (uchicago)
+source ~/.config/neomutt/accounts/uchicago
+
+# # Source primary account (personal)
+# source ~/.config/neomutt/accounts/personal
diff --git a/config/nvim/init.lua b/config/nvim/init.lua
index 0c74f57..226515e 100644
--- a/config/nvim/init.lua
+++ b/config/nvim/init.lua
@@ -61,8 +61,41 @@ add 'wakatime/vim-wakatime'
 add 'EdenEast/nightfox.nvim'
 
 now(function()
+  require('mail-count').setup {
+    accounts = {
+      { name = 'U', query = 'tag:unread AND path:uchicago/**' },
+      { name = 'P', query = 'tag:unread AND path:personal/**' },
+    },
+    interval = 60000, -- 60 seconds
+  }
+
   require('mini.statusline').setup {
     use_icons = true,
+    content = {
+      active = function()
+        local mode, mode_hl = MiniStatusline.section_mode { trunc_width = 120 }
+        local git = MiniStatusline.section_git { trunc_width = 40 }
+        local diff = MiniStatusline.section_diff { trunc_width = 75 }
+        local diagnostics = MiniStatusline.section_diagnostics { trunc_width = 75 }
+        local lsp = MiniStatusline.section_lsp { trunc_width = 75 }
+        local filename = MiniStatusline.section_filename { trunc_width = 140 }
+        local fileinfo = MiniStatusline.section_fileinfo { trunc_width = 120 }
+        local location = MiniStatusline.section_location { trunc_width = 75 }
+        local search = MiniStatusline.section_searchcount { trunc_width = 75 }
+        local mail = require('mail-count').get()
+
+        return MiniStatusline.combine_groups {
+          { hl = mode_hl, strings = { mode } },
+          { hl = 'MiniStatuslineDevinfo', strings = { git, diff, diagnostics, lsp } },
+          '%<',
+          { hl = 'MiniStatuslineFilename', strings = { filename } },
+          '%=',
+          { hl = 'MiniStatuslineMail', strings = { mail } },
+          { hl = 'MiniStatuslineFileinfo', strings = { fileinfo } },
+          { hl = mode_hl, strings = { search, location } },
+        }
+      end,
+    },
   }
 
   require('mini.icons').setup {
diff --git a/config/nvim/lua/mail-count.lua b/config/nvim/lua/mail-count.lua
new file mode 100644
index 0000000..d07f664
--- /dev/null
+++ b/config/nvim/lua/mail-count.lua
@@ -0,0 +1,84 @@
+-- mail-count.lua - Async mail count for statusline
+local M = {}
+
+---@class MailCountAccount
+---@field name string Display name (e.g., "U" for uchicago)
+---@field query string Notmuch query for this account
+
+---@class MailCountConfig
+---@field accounts MailCountAccount[] List of accounts to check
+---@field interval? number Check interval in milliseconds (default: 60000)
+---@field icon? string Icon to display (default: "󰇮")
+---@field hide_zero? boolean Hide when all counts are zero (default: false)
+
+---@type MailCountConfig
+local config = {
+  accounts = {},
+  interval = 60000,
+  icon = '󰇮',
+  hide_zero = false,
+}
+
+local counts = {}
+local last_check = 0
+local timer = nil
+
+local function update_count(account)
+  vim.fn.jobstart({ 'notmuch', 'count', account.query }, {
+    stdout_buffered = true,
+    on_stdout = function(_, data)
+      if data and data[1] then counts[account.name] = tonumber(data[1]) or 0 end
+    end,
+  })
+end
+
+function M.refresh()
+  for _, account in ipairs(config.accounts) do
+    update_count(account)
+  end
+  last_check = vim.uv.now()
+end
+
+function M.get()
+  if #config.accounts == 0 then return '' end
+
+  local now = vim.uv.now()
+  if now - last_check > config.interval then M.refresh() end
+
+  local total = 0
+  local parts = {}
+  for _, account in ipairs(config.accounts) do
+    local count = counts[account.name] or 0
+    total = total + count
+    table.insert(parts, string.format('%s:%d', account.name, count))
+  end
+
+  if config.hide_zero and total == 0 then return '' end
+
+  return string.format('%s %s', config.icon, table.concat(parts, ' | '))
+end
+
+---@param opts? MailCountConfig
+function M.setup(opts)
+  config = vim.tbl_deep_extend('force', config, opts or {})
+
+  -- Initialize counts
+  for _, account in ipairs(config.accounts) do
+    counts[account.name] = 0
+  end
+
+  -- Initial fetch on load
+  vim.schedule(function() M.refresh() end)
+
+  -- Stop existing timer if any
+  if timer then
+    timer:stop()
+    timer:close()
+  end
+
+  -- Refresh on timer
+  timer = vim.uv.new_timer()
+  timer:start(config.interval, config.interval, vim.schedule_wrap(function() M.refresh() end))
+end
+
+return M
diff --git a/config/nvim/lua/raytheme.lua b/config/nvim/lua/raytheme.lua
index 28f9e57..7bda1b9 100644
--- a/config/nvim/lua/raytheme.lua
+++ b/config/nvim/lua/raytheme.lua
@@ -349,6 +349,7 @@ local function apply_highlights(c, opts)
   hi('MiniStatuslineFilename', { fg = c.fg, bg = c.bg_float })
   hi('MiniStatuslineFileinfo', { fg = c.fg, bg = c.bg_highlight })
   hi('MiniStatuslineInactive', { fg = c.fg_dark, bg = c.bg_float })
+  hi('MiniStatuslineMail', { fg = c.bg, bg = c.info, bold = true })
 
   -- Mini.icons
   hi('MiniIconsAzure', { fg = c.info })
diff --git a/flake.lock b/flake.lock
index a522a29..1235314 100644
--- a/flake.lock
+++ b/flake.lock
@@ -6,11 +6,11 @@
         "utils": "utils"
       },
       "locked": {
-        "lastModified": 1764407814,
-        "narHash": "sha256-IiOWUqodFqzy4PhU6LcziwoJbbFR0AfaOBJDO83/mHM=",
+        "lastModified": 1764744276,
+        "narHash": "sha256-4Qrmb5+LLu2XWjW6XEbRHlRRCoKdUW4eWJ8N8pketn8=",
         "owner": "cristianoliveira",
         "repo": "aerospace-scratchpad",
-        "rev": "d039cd49e2a15144c9a766509abe1b7f59eb6b04",
+        "rev": "643bf206319f6f56437aff72b13a43bc06adc9ed",
         "type": "github"
       },
       "original": {
diff --git a/home/email/default.nix b/home/email/default.nix
index 7f09c08..6351046 100644
--- a/home/email/default.nix
+++ b/home/email/default.nix
@@ -28,7 +28,7 @@
     services.mbsync = {
       enable = config.custom.email.mbsync;
       configFile = "${dots}/config/mbsync/mbsyncrc";
-      frequency = "*:0/1";
+      frequency = "*:0/5";
       extraPackages = with pkgs; [ sops ] ++ lib.optionals config.custom.email.notmuch [ notmuch ];
       postExec = lib.mkIf config.custom.email.notmuch "${pkgs.notmuch}/bin/notmuch new";
       environment = {