diff --git a/users/rouven/modules/accounts/default.nix b/users/rouven/modules/accounts/default.nix
new file mode 100644
index 0000000..afefcee
--- /dev/null
+++ b/users/rouven/modules/accounts/default.nix
@@ -0,0 +1,62 @@
+{ config, ... }:
+let
+  gpg-default-key = "116987A8DD3F78FF8601BF4DB95E8FE6B11C4D09";
+in
+{
+  programs.thunderbird = {
+    enable = true;
+    profiles = {
+      default = {
+        withExternalGnupg = true;
+        isDefault = true;
+      };
+    };
+  };
+  accounts.email.accounts = {
+    "rouven@rfive.de" = rec {
+      primary = true;
+      address = "rouven@rfive.de";
+      gpg.key = gpg-default-key;
+      realName = "Rouven Seifert";
+      userName = address;
+      imap = {
+        host = "pro1.mail.ovh.net";
+        port = 993;
+      };
+      smtp = {
+        host = "pro1.mail.ovh.net";
+        port = 587;
+      };
+      thunderbird.enable = true;
+    };
+    "TU Dresden" = {
+      address = "rouven.seifert@mailbox.tu-dresden.de";
+      gpg.key = gpg-default-key;
+      realName = "Rouven Seifert";
+      userName = "user\\rose159e";
+      imap = {
+        host = "msx.tu-dresden.de";
+        port = 993;
+      };
+      smtp = {
+        host = "msx.tu-dresden.de";
+        port = 587;
+      };
+      thunderbird.enable = true;
+    };
+    GMail = rec {
+      address = "seifertrouven@gmail.com";
+      realName = "Rouven Seifert";
+      userName = address;
+      imap = {
+        host = "imap.gmail.com";
+        port = 993;
+      };
+      smtp = {
+        host = "smtp.gmail.com";
+        port = 587;
+      };
+      thunderbird.enable = true;
+    };
+  };
+}
diff --git a/users/rouven/modules/default.nix b/users/rouven/modules/default.nix
index cc070bf..3f422ae 100644
--- a/users/rouven/modules/default.nix
+++ b/users/rouven/modules/default.nix
@@ -2,9 +2,11 @@
 {
   imports =
     [
+      ./accounts
       ./alacritty
       ./awesome
       ./flameshot
+      ./fzf
       ./git
       ./kdeconnect
       ./neovim
diff --git a/users/rouven/modules/packages.nix b/users/rouven/modules/packages.nix
index 307990a..2b8203f 100644
--- a/users/rouven/modules/packages.nix
+++ b/users/rouven/modules/packages.nix
@@ -13,7 +13,6 @@
     okular
     gimp
 
-
     gh # github cli tool
 
     # sound
@@ -23,12 +22,11 @@
     blueman
 
     # internet
-    thunderbird # TODO configure
-    discord
     google-chrome
     nextcloud-client
 
     # messaging
+    discord
     tdesktop
     element-desktop
     whatsapp-for-linux