diff --git a/user/chat.nix b/user/chat.nix
index 8417484..b2487c5 100644
--- a/user/chat.nix
+++ b/user/chat.nix
@@ -1,5 +1,17 @@
 { config, pkgs, lib, inputs, ... }: {
   systemd.user.services = {
+    thunderbird = {
+      Unit = {
+        Description = "Thunderbird Email client";
+        PartOf = [ "graphical-session.target" ];
+        After = [ "graphical-session.target" ];
+      };
+      Service = {
+        ExecStart = "${pkgs.thunderbird}/bin/thunderbird";
+        Restart = "on-failure";
+      };
+      Install = { WantedBy = [ "sway-session.target" ]; };
+    };
     discord = {
       Unit = {
         Description = "Discord Internet voice chat";
@@ -26,5 +38,5 @@
     };
   };
 
-  home.packages = with pkgs; [ tdesktop webcord ];
+  home.packages = with pkgs; [ tdesktop webcord thunderbird ];
 }
diff --git a/user/sway.nix b/user/sway.nix
index fddfce9..199a475 100644
--- a/user/sway.nix
+++ b/user/sway.nix
@@ -104,6 +104,9 @@ in {
             { class = "Chromium"; }
             { app_id = "chromium"; }
           ];
+          "7" = [
+            { app_id = "thunderbird"; }
+          ];
           "9" = [
             { class = ".*[Ss]team.*"; }
             { app_id = ".*[Ss]team.*"; }