diff --git a/secrets/thinkpad.yaml b/secrets/thinkpad.yaml
index 56258ef..84f19fc 100644
--- a/secrets/thinkpad.yaml
+++ b/secrets/thinkpad.yaml
@@ -5,6 +5,10 @@ wireguard:
     dorm:
         private: ENC[AES256_GCM,data:ISK2FjZsBx60Sgag8tJs+SyXSvdIQeIHeqB1V/m3g8RxkgIFBkCBnEjB8/g=,iv:CbDXnT3ERB+OYSa0+Xc4nN8joNj3dtSPTQa0SU5S5xg=,tag:Eap30fSv0MtBzaZvBLWAYA==,type:str]
         preshared: ENC[AES256_GCM,data:5Kc/CMoEVpqJO0vyDOKmw5A19P68jJe5N025+kIvdvoOoNs2Knl127EuSAA=,iv:5lX9Kj5hz1GNh3a6Ig701cocuZ1CYr4Ze++wJzu7AAU=,tag:1rVx8EA5N++SgXpv0aMGNg==,type:str]
+email:
+    tu-dresden: ENC[AES256_GCM,data:erIlghjlXWE2kUqMZLEN70c=,iv:hWTA68mBDe92qDPwemlSFR2vV2sL+/GI4WjHbwViVic=,tag:ZZ2/vTxBWiC6lbN33lNr5w==,type:str]
+    rfive: ENC[AES256_GCM,data:+lYvCL0OxM7o3nLN4fPeeVyMSKUL6O0uEg==,iv:I0KrK6GRkQWyDkp0GxXgHuCbDzDZ0u2gejNJCEzChxo=,tag:bBsG3n7nsb9T/NOCeptSgg==,type:str]
+    google: ENC[AES256_GCM,data:J97kR5rrJ7GpqIN1XAeVlg==,iv:r6qXU6pGEfeiajWyqq3cVatS2m6omlUcJD7bDTwHDQI=,tag:B/lTvdRVxKjyAsO7TSsXdA==,type:str]
 sops:
     kms: []
     gcp_kms: []
@@ -20,8 +24,8 @@ sops:
             S0NwYWFQcmFtTm5zTEZLVXRtMi91Zk0K3ylHH4OXduJlJxepPz9GxBzVmKGpv9LL
             ApkEQxfPL4Bxrb2XOFLOYqJGv2SwxBv1QNYT7eTXRLTEsIXUHR0MGA==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2023-01-14T10:27:33Z"
-    mac: ENC[AES256_GCM,data:rRIzDJCCmAY2f8Ufn0055hiPLpBbz9OWRYLzrI5byzTtXAeoXMwOM4oMJUFg3uIofgvOPbUB1OP/ZJNG3iYTkUy8sDuqzU1Oogp2ZIdwv7ke3lAVec+oT1WGMOOithoRtahs7aP3bggnboaov32YUwOH9JAerV1MkDA+OJNyTpA=,iv:+N8ylMN3tgtEmuN9jtXDTRKvM3JHZXJr3IaeXOERVHM=,tag:MGzcRwD6Ih9kqp4/65DGCw==,type:str]
+    lastmodified: "2023-01-27T10:55:24Z"
+    mac: ENC[AES256_GCM,data:gzQG0cc3x0MYqrafz7VYBC49hcYed9Bfvih1I6jsNvZ2olKLZaOnj4FKhgoDhmOqbbmjl5SCEaMDIgTkRxj5IZvkLlaJwquO8RFDHVZr2wgOzbbxPmo6NIJL7+kOJ2Qr17lr/L0JMD5kHA1srN0K5jNwSeOneHsloZtJsypd/cY=,iv:KOt/CM9+8mv7xVHGjUZMaaCTuU8oD7UVqnNmTA9utm8=,tag:gwTDa1p8O7sY/v6ON71wlw==,type:str]
     pgp:
         - created_at: "2022-12-27T16:39:15Z"
           enc: |-
diff --git a/users/rouven/fixes.nix b/users/rouven/fixes.nix
index aa5b56f..57c91c0 100644
--- a/users/rouven/fixes.nix
+++ b/users/rouven/fixes.nix
@@ -1,5 +1,10 @@
 { config, pkgs, ... }:
 {
+  # email passwords
+  sops.secrets."email/tu-dresden".owner = "rouven";
+  sops.secrets."email/rfive".owner = "rouven";
+  sops.secrets."email/google".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 d64e048..6dd1619 100644
--- a/users/rouven/modules/accounts/default.nix
+++ b/users/rouven/modules/accounts/default.nix
@@ -1,8 +1,13 @@
-{ config, ... }:
+{ config, pkgs, ... }:
 let
   gpg-default-key = "116987A8DD3F78FF8601BF4DB95E8FE6B11C4D09";
 in
 {
+  home.packages = with pkgs; [
+    imv
+    w3m
+  ];
+  services.mbsync.enable = true;
   programs = {
     neomutt = {
       enable = true;
@@ -15,6 +20,7 @@ in
         bind index,pager \Cn sidebar-next
         # Open the highlighted mailbox
         bind index,pager <space><return> sidebar-open
+        set mailcap_path = ${./mailcap}
         source ${./dracula.muttrc}
         source ${./powerline.neomuttrc}
       '';
@@ -29,9 +35,7 @@ in
       gpg.key = gpg-default-key;
       realName = "Rouven Seifert";
       userName = address;
-      # we use pass here since bitwarden's password input can't be reached frow within neomutt
-      # maybe we can replace this with sops as soon as the home manager module is merged
-      passwordCommand = "pass mail/rouven@rfive.de";
+      passwordCommand = "${pkgs.coreutils}/bin/cat /run/secrets/email/rfive";
       imap = {
         host = "pro1.mail.ovh.net";
         port = 993;
@@ -50,7 +54,6 @@ in
             AuthMechs = "Login";
           };
         };
-        subFolders = "Verbatim";
       };
       neomutt = {
         enable = true;
@@ -63,7 +66,7 @@ in
       gpg.key = gpg-default-key;
       realName = "Rouven Seifert";
       userName = "rose159e";
-      passwordCommand = "pass mail/tu-dresden";
+      passwordCommand = "${pkgs.coreutils}/bin/cat /run/secrets/email/tu-dresden";
       imap = {
         host = "msx.tu-dresden.de";
         port = 993;
@@ -82,13 +85,12 @@ in
             AuthMechs = "Login";
           };
         };
-        subFolders = "Verbatim";
       };
       msmtp.enable = true;
       neomutt = {
         enable = true;
         mailboxName = "--TU Dresden-------";
-        # mbsync can't handle umlauts, rap
+        # mbsync can't handle umlauts, crap
         extraMailboxes = [ "Gesendete Elemente" "Opal" "Gel&APY-schte Elemente" "Junk-E-Mail" "Entw&APw-rfe" ];
         extraConfig = ''
           unset postponed
@@ -104,7 +106,7 @@ in
       address = "seifertrouven@gmail.com";
       realName = "Rouven Seifert";
       userName = address;
-      passwordCommand = "pass mail/google";
+      passwordCommand = "${pkgs.coreutils}/bin/cat /run/secrets/email/google";
       imap = {
         host = "imap.gmail.com";
         port = 993;
@@ -121,7 +123,6 @@ in
             AuthMechs = "Login";
           };
         };
-        subFolders = "Verbatim";
       };
       msmtp.enable = true;
       neomutt = {
@@ -138,6 +139,7 @@ in
         '';
       };
     };
-
   };
+
+
 }
diff --git a/users/rouven/modules/accounts/mailcap b/users/rouven/modules/accounts/mailcap
new file mode 100644
index 0000000..f1659aa
--- /dev/null
+++ b/users/rouven/modules/accounts/mailcap
@@ -0,0 +1,6 @@
+text/plain; $EDITOR %s ;
+text/html; w3m -I %{charset} -T text/html; copiousoutput;
+image/*; setsid imv %s >/dev/null & ;
+video/*; setsid mpv --quiet %s >/dev/null &;
+audio/*; mpv %s ;
+application/pdf; setsid evince %s >/dev/null & ;
diff --git a/users/rouven/modules/packages.nix b/users/rouven/modules/packages.nix
index 736f0e8..0f71d89 100644
--- a/users/rouven/modules/packages.nix
+++ b/users/rouven/modules/packages.nix
@@ -37,7 +37,6 @@
     yubioath-flutter
     bitwarden
     bitwarden-cli
-    pass
 
     # misc
     neofetch