diff --git a/users/simon/modules/git.nix b/users/simon/modules/git.nix
index 9717d4f..52d1e20 100644
--- a/users/simon/modules/git.nix
+++ b/users/simon/modules/git.nix
@@ -75,7 +75,7 @@
       (condition: {
         inherit condition;
         contents = {
-          user.email = config.accounts.email.accounts.tu-dresden.address;
+          user.email = "simon.bruder@mailbox.tu-dresden.de";
         };
       })
       [
diff --git a/users/simon/modules/mail/default.nix b/users/simon/modules/mail/default.nix
index 4fbe889..86e2faf 100644
--- a/users/simon/modules/mail/default.nix
+++ b/users/simon/modules/mail/default.nix
@@ -1,7 +1,12 @@
+{ pkgs, ... }:
 {
   imports = [
-    ./accounts.nix
-    ./aerc
-    ./notmuch.nix
+    #./accounts.nix
+    #./aerc
+    #./notmuch.nix
+  ];
+
+  home.packages = with pkgs; [
+    thunderbird
   ];
 }