diff --git a/autostart b/autostart
index 22712ab..f2b6f51 100755
--- a/autostart
+++ b/autostart
@@ -145,7 +145,7 @@ hc keybind $Mod-BackSpace spawn ${TERMINAL:-xterm} # use your $TERMINAL with xte
 hc keybind $Mod-dead_circumflex spawn ~/.dmenu
 hc keybind XF86HomePage spawn firefox
 hc keybind $Mod-q       spawn qutebrowser
-hc keybind XF86Mail spawn thunderbird
+hc keybind XF86Mail spawn icedove
 hc keybind XF86Calculator spawn gnome-calculator
 hc keybind Print spawn ~/bin/printscreen
 hc keybind $Mod-XF86AudioPlay spawn rhythmbox
@@ -225,11 +225,11 @@ hc load msg '
     (clients vertical:0)
     (clients vertical:0)))
 '
-hc rule class=Thunderbird tag=msg focus=on index=01
-hc rule class=Thunderbird windowrole=Msgcompose focus=on index=01
+hc rule class=Icedove tag=msg focus=on index=01
+hc rule class=Icedove windowrole=Msgcompose focus=on index=01
 # OpenPGP passphrase
 hc rule class=Gcr-prompter tag=msg focus=on index=10
-hc rule class=Thunderbird windowrole=AlarmWindow tag=msg focus=off index=10
+hc rule class=Icedove windowrole=AlarmWindow tag=msg focus=off index=10
 
 # oth
 hc load oth '