diff --git a/modules/default.nix b/modules/default.nix
index 3eae34e..38d81ed 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -13,6 +13,7 @@
     ./fsj.nix
     ./i18n.nix
     ./obsvcam.nix
+    ./gpg.nix
     ./self.nix
   ];
 }
diff --git a/modules/gpg.nix b/modules/gpg.nix
new file mode 100644
index 0000000..95d64c0
--- /dev/null
+++ b/modules/gpg.nix
@@ -0,0 +1,11 @@
+{ pkgs, ... }:
+
+{
+  services.pcscd.enable = true;
+  programs.gnupg.agent = {
+     enable = true;
+     pinentryPackage = pkgs.pinentry-gtk2;
+     enableSSHSupport = true;
+  };
+  services.dbus.packages = [ pkgs.gcr ];
+}
diff --git a/users/hashcube/email.nix b/users/hashcube/email.nix
index cd74320..0ace4a0 100644
--- a/users/hashcube/email.nix
+++ b/users/hashcube/email.nix
@@ -27,6 +27,12 @@
         enable = true;
       };
 
+      folders = let prefix = "INBOX."; in {
+        inbox = "INBOX";
+        sent  = "${prefix}Sent";
+        trash = "${prefix}Trash";
+      };
+
       smtp = {
         host = "smtp.porkbun.com";
         port = 465;
diff --git a/users/hashcube/programs/cli/gpg.nix b/users/hashcube/programs/cli/gpg.nix
index f4be895..3bb8c36 100644
--- a/users/hashcube/programs/cli/gpg.nix
+++ b/users/hashcube/programs/cli/gpg.nix
@@ -1,5 +1,6 @@
-{...}:
+{ pkgs, lib, ... }:
 
 {
   programs.gpg.enable = true;
+  services.gpg-agent.enable = true;
 }