diff --git a/secrets/thinkpad.yaml b/secrets/thinkpad.yaml
index 5e59cb8..5efa7af 100644
--- a/secrets/thinkpad.yaml
+++ b/secrets/thinkpad.yaml
@@ -1,4 +1,4 @@
-wireless-env: ENC[AES256_GCM,data:1WuWUmSe1kJykE9wtZ6UkLxYACUdvr9nTesfJQGM0fNgeRUDaUEAld5jaKb3GzKHx/0Q05xSNcWCCBYN68ZYP94BgGLy8bEHvTqTkp4Ub/HKPLcDSiqZtCRiQjV2eKDC8EsP5MMOuc2F7qxNjrMeEWdVF0HcdVYamhRPP/uDQK3m9iUqpqwwaXQ++V9LjjQ0v6M0f9dCo+7ngSgDWApMlZDeMLIOsUn9vnklVnLc8FyOxD+pNthrBhIOGBN1yTIYVUJaM5nr,iv:QsouKCwdBrVonPgKcnxPy/mZzWsWx8O4AOsAiFheDyI=,tag:R0ZinGNTX0G46ye/AAwJwg==,type:str]
+wireless-env: ENC[AES256_GCM,data:Ff4K563edWDrcnXmkF61W3dAdXiZHRTDxBAcy0W6EFxy76r7HTc7wXnqQyQiS9LCJd9nBTjHuWKi2xbeewWlnHbVz1OuAoV7FrWuNd27gf6I6e3n8lURIjaGMXX2ttzzVdvoviFmA12ZQzj8diS+MTNGzHrAHR/ZNEmNS3qFLIe8EHWCFAqcByuURB2lw6kIz8GBB//Cu5fAhncorppbMIQbhNj6LX0GRm6177EIeG9hOc/oc3mTMZ6HJEEIjJEQHK5z0UMj9Q==,iv:Rq+MrdCHaIXgUKqSUr/lmrcWPl2K2WRcotKSX5FkiFw=,tag:ijyM4lHrigvI41kyG/WjDw==,type:str]
 uni:
     zih: ENC[AES256_GCM,data:XwpN5u2X3YBZqxtb7COASMA=,iv:RmOYmjiNhXjs1iNq5WTZeVYmQArjqNpp6/a+9EkiIfw=,tag:Hcb0ECIM6HB4kM6/JudaMQ==,type:str]
 wireguard:
@@ -9,6 +9,7 @@ email:
     tu-dresden: ENC[AES256_GCM,data:13YAHNUqwmwj1yqOle+M1us=,iv:Ed960kTLUeq2lq0NogRmGXS69yKT2Mwst5XBrd110bY=,tag:6HNlFPTYXNzfsXTlwg1+uQ==,type:str]
     rfive: ENC[AES256_GCM,data:dyJEoaq8EKqMD0loWr0H5gXepwptZ8givA==,iv:WAT4LsBbIA/po2xd5R0K5HAsqbw+WigLJWo0T8ftPTE=,tag:Tjs9zETfxXZsS43hC6+13Q==,type:str]
     google: ENC[AES256_GCM,data:1BeiGEku2zE9uS8WR3yRgA==,iv:uRaDPblZpxdAH72EaV2Rjho/MZsiVjqFsVSJHzz3GrU=,tag:Vs9GWbwFrdg8vYnLROaOGA==,type:str]
+    ifsr: ENC[AES256_GCM,data:yeYK+dZwSaL3oKS0UE8Plmh6dVKWTA==,iv:xrBlx9C6uau6hVHVZDTcdMegI0475QQR4ZCjIwq7kP0=,tag:D4G15DIkswldCRa63P1IgQ==,type:str]
 sops:
     kms: []
     gcp_kms: []
@@ -24,8 +25,8 @@ sops:
             ZGFKS3ZXR216SXpBK1E2d3IyS2h3WjAK6xFl7yDaLald51Dts1lL+M4IF84bzsgy
             1RJiIAGi3/0R4f6GxH7oXaV14zXDk/6lw3VJbwIcgC9FSVcW1FJXIQ==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2023-01-28T13:13:40Z"
-    mac: ENC[AES256_GCM,data:DbgaU8iyEVBL8EQKHDXlu0DLoKjKKiHPtX3ugBzdTH3foW+ndQVwaLWa69rqJCaRSteq7GMsoGuodksR8MdOhP8qd9cFyNc34ap6D8EAYI/BlLUo71LryvMfAgBvQ2wuzrMFxWderPcg9tKIGMmbTeMcnK5gyDSBTrTm382Uj0Q=,iv:sMNqSQqlCV3YohSlPSa1f1kGDt3iN37o+7AdKMJdCw8=,tag:3DZ7iSbf7He8B6Xw+8np0A==,type:str]
+    lastmodified: "2023-01-31T14:10:56Z"
+    mac: ENC[AES256_GCM,data:bxqaG3QXd1W9rSlcTUYnv+RvScjt53lyteTniLUNbLMmDcYDonTK6E+pudhrq0OWoRGfsKQrfrTWmAQZg4jRWr+M6zLt2IFrLar5b/XYuGdMD9+nEGxnpRfvmOeHDGCFAmG98H1A35Y9YPGA4vEzuxCKRNG5Somk81sPt9x0C7Q=,iv:zNcxle9LiWKE6Zu2xpagR5VFLQsoabpGwswa7FFb3BI=,tag:o9vGc35oofTmCsu2sWHx6Q==,type:str]
     pgp:
         - created_at: "2023-01-28T13:13:40Z"
           enc: |-
diff --git a/users/rouven/fixes.nix b/users/rouven/fixes.nix
index 57c91c0..a8a3c92 100644
--- a/users/rouven/fixes.nix
+++ b/users/rouven/fixes.nix
@@ -4,6 +4,7 @@
   sops.secrets."email/tu-dresden".owner = "rouven";
   sops.secrets."email/rfive".owner = "rouven";
   sops.secrets."email/google".owner = "rouven";
+  sops.secrets."email/ifsr".owner = "rouven";
 
   # generate system completions
   programs.zsh.enable = true;
diff --git a/users/rouven/modules/accounts/default.nix b/users/rouven/modules/accounts/default.nix
index 15d96d5..1af4fff 100644
--- a/users/rouven/modules/accounts/default.nix
+++ b/users/rouven/modules/accounts/default.nix
@@ -106,7 +106,6 @@ in
         port = 587;
         tls.useStartTls = true;
       };
-      thunderbird.enable = true;
       mbsync = {
         enable = true;
         create = "maildir";
@@ -156,6 +155,67 @@ in
         extraMailboxes = [ "Opal" "Sent" "Trash" "Junk" "Drafts" ];
       };
     };
+    "iFSR" = {
+      address = "rouven.seifert@ifsr.de";
+      gpg.key = gpg-default-key;
+      realName = "Rouven Seifert";
+      userName = "rouven.seifert";
+      passwordCommand = "${pkgs.coreutils}/bin/cat /run/secrets/email/ifsr";
+      imap = {
+        host = "mail.ifsr.de";
+        port = 143;
+        tls.useStartTls = true;
+      };
+      smtp = {
+        host = "mail.ifsr.de";
+        port = 587;
+        tls.useStartTls = true;
+      };
+      mbsync = {
+        enable = true;
+        create = "maildir";
+        expunge = "both";
+        groups.ifsr = {
+          channels.inbox = {
+            nearPattern = "INBOX";
+            farPattern = "INBOX";
+            extraConfig.Create = "near";
+          };
+          channels.trash = {
+            nearPattern = "Trash";
+            farPattern = "Trash";
+            extraConfig.Create = "near";
+          };
+          channels.sent = {
+            nearPattern = "Sent";
+            farPattern = "Sent";
+            extraConfig.Create = "near";
+          };
+          # There is a lot of spam around, maybe we should not include that folder
+          #channels.junk = {
+          #nearPattern = "Junk";
+          #farPattern = "Public/Spam";
+          #extraConfig.Create = "near";
+          #};
+          channels.drafts = {
+            nearPattern = "Drafts";
+            farPattern = "Drafts";
+            extraConfig.Create = "near";
+          };
+        };
+        extraConfig = {
+          account = {
+            AuthMechs = "Login";
+          };
+        };
+      };
+      msmtp.enable = true;
+      neomutt = {
+        enable = true;
+        mailboxName = "--iFSR-------------";
+        extraMailboxes = [ "Sent" "Trash" "Drafts" ];
+      };
+    };
     "gmail" = rec {
       address = "seifertrouven@gmail.com";
       realName = "Rouven Seifert";