diff --git a/machines/polysaa/default.nix b/machines/polysaa/default.nix
index bd12eb3..51e6776 100644
--- a/machines/polysaa/default.nix
+++ b/machines/polysaa/default.nix
@@ -23,7 +23,7 @@
   ];
   boot.initrd.kernelModules = [ "dm-snapshot" "uas" "usbcore" "usb_storage" "ext4" "nls_cp437" "nls_iso8859_1"];
   boot.initrd.postDeviceCommands = pkgs.lib.mkBefore ''
-    mkdir -m 0755 -p /key/
+    mkdir -m 0755 -p /run/secrets/
     sleep 2
     mount -n -t ext4 -o ro `findfs UUID=545bfd15-0973-4395-9d05-6c4c78a9e45c` /run/secrets/
   '';
diff --git a/profiles/basic/default.nix b/profiles/basic/default.nix
index 8319baf..53b5b8d 100644
--- a/profiles/basic/default.nix
+++ b/profiles/basic/default.nix
@@ -12,6 +12,7 @@
     ./secrets.nix
     ./locale.nix
     ./ssh.nix
+    ./email.nix
   ];
 
   nix.settings.experimental-features = [
diff --git a/profiles/basic/email.nix b/profiles/basic/email.nix
new file mode 100644
index 0000000..b57da4f
--- /dev/null
+++ b/profiles/basic/email.nix
@@ -0,0 +1,54 @@
+{config, lib, pkgs, sops, ...}: {
+
+  home-manager.users.mysaa.accounts.email.accounts = {
+
+    hadoly = {
+      realName = "Mysaa Java";
+      address = "mysaa@hadoly.fr";
+      imap = {
+        host = "imap.hadoly.fr";
+        port = 993;
+        tls.enable = true;
+      };
+      smtp = {
+        host = "smtp.hadoly.fr";
+        port = 443;
+        tls.enable = true;
+      };
+      primary = true;
+      userName = "mysaa@hadoly.fr";
+      passwordCommand = ''cat /run/secrets/pass/hadoly_password'';
+    };
+
+    ens = {
+      address = "samy.avrillon@ens-lyon.fr";
+    };
+
+    personal = {
+      address = "samyavrillon@netcourrier.com";
+      realName = "Samy Avrillon";
+      imap = {
+        host = "mail.mailo.com";
+        port = 993;
+        tls.enable = true;
+      };
+      smtp = {
+        host = "mail.mailo.com";
+        port = 443;
+        tls.enable = true;
+      };
+      userName = "samyavrillon@netcourrier.com";
+      passwordCommand = ''cat /run/secrets/pass/netcourrier_password'';
+    };
+
+    junk = {
+      address = "qqnavrillon@netcourrier.com";
+    };
+
+    google = {
+      address = "samsouleavr@gmail.com";
+    };
+
+  };
+
+}
diff --git a/profiles/graphical/packages.nix b/profiles/graphical/packages.nix
index 70ccc37..35d4b7e 100644
--- a/profiles/graphical/packages.nix
+++ b/profiles/graphical/packages.nix
@@ -24,4 +24,13 @@
       ];
     })
   ];
+
+  home-manager.users.mysaa.accounts.email.accounts."hadoly".thunderbird.enable = true;
+  home-manager.users.mysaa.accounts.email.accounts."personal".thunderbird.enable = true;
+  home-manager.users.mysaa.programs.thunderbird = {
+    enable = true;
+    profiles.default = {
+      isDefault = true;
+    };
+  };
 }