diff --git a/i3/.config/i3/config.desktop b/i3/.config/i3/config.desktop
index b9fb29b..21315cc 100644
--- a/i3/.config/i3/config.desktop
+++ b/i3/.config/i3/config.desktop
@@ -50,6 +50,7 @@ assign [class="ncmpcpp"] $workspace4
 assign [class="Slack"] $workspace7
 assign [class="weechat"] $workspace7
 assign [class="retroarch"] $workspace8
+assign [class="mutt"] $workspace6
 
 # arandr
 for_window [title="Screen Layout Editor"] floating enable
@@ -122,6 +123,7 @@ exec iceweasel
 exec slack
 exec i3-sensible-terminal --class=weechat -e weechat
 exec i3-sensible-terminal --class=ncmpcpp -e ncmpcpp
+exec i3-sensible-terminal --class=mutt -e neomutt
 exec gpodder
 
 # Start dropdown shell
diff --git a/i3/.config/i3/config.thinkpad b/i3/.config/i3/config.thinkpad
index 15352ed..84da9b7 100644
--- a/i3/.config/i3/config.thinkpad
+++ b/i3/.config/i3/config.thinkpad
@@ -133,7 +133,7 @@ exec firefox
 exec slack
 exec i3-sensible-terminal --class=weechat -e weechat
 exec i3-sensible-terminal --class=ncmpcpp -e ncmpcpp
-exec i3-sensible-terminal --class=mutt -e mutt
+exec i3-sensible-terminal --class=mutt -e neomutt
 exec gpodder
 
 # Start dropdown shell