diff --git a/flake.lock b/flake.lock
index 15b8d5b..690f7ba 100644
--- a/flake.lock
+++ b/flake.lock
@@ -47,11 +47,11 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1674661101,
-        "narHash": "sha256-iFFUngau5KHjsKScLhovpb7kCMjJvw/mXXOj6I62sVM=",
+        "lastModified": 1674729546,
+        "narHash": "sha256-15ukCRGhgDd7T60QBbc3PEeMpOkNVgwduT+u93zmyZM=",
         "owner": "hyprwm",
         "repo": "Hyprland",
-        "rev": "fc89e70a1fb74429ad0f772d399325f69e65b357",
+        "rev": "06b17db22776e613a714e7e936618c16c3f47eaa",
         "type": "github"
       },
       "original": {
diff --git a/hosts/thinkpad/default.nix b/hosts/thinkpad/default.nix
index ccd992a..60fdc74 100755
--- a/hosts/thinkpad/default.nix
+++ b/hosts/thinkpad/default.nix
@@ -82,6 +82,8 @@
     traceroute
     killall
     python3
+    zip
+    unzip
   ];
 
   system.stateVersion = "22.11";
diff --git a/users/rouven/modules/accounts/default.nix b/users/rouven/modules/accounts/default.nix
index 7e68f32..7144d9a 100644
--- a/users/rouven/modules/accounts/default.nix
+++ b/users/rouven/modules/accounts/default.nix
@@ -12,6 +12,17 @@ in
       };
     };
   };
+  programs = {
+    neomutt = {
+      enable = true;
+      sidebar.enable = true;
+      extraConfig = ''
+        source ${./dracula.muttrc}
+      '';
+    };
+    mbsync.enable = true;
+    msmtp.enable = true;
+  };
   accounts.email.accounts = {
     "rouven@rfive.de" = rec {
       primary = true;
@@ -19,6 +30,9 @@ 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";
       imap = {
         host = "pro1.mail.ovh.net";
         port = 993;
@@ -29,12 +43,28 @@ in
         tls.useStartTls = true;
       };
       thunderbird.enable = true;
+      mbsync = {
+        enable = true;
+        create = "maildir";
+        extraConfig = {
+          account = {
+            AuthMechs = "Login";
+          };
+        };
+        subFolders = "Verbatim";
+      };
+      neomutt = {
+        enable = true;
+        mailboxName = "--rouven@rfive.de--";
+        extraMailboxes = [ "Sent" "Trash" "Junk-E-Mail" "Drafts" ];
+      };
     };
-    "TU Dresden" = {
+    "TU-Dresden" = {
       address = "rouven.seifert@mailbox.tu-dresden.de";
       gpg.key = gpg-default-key;
       realName = "Rouven Seifert";
-      userName = "user\\rose159e";
+      userName = "rose159e";
+      passwordCommand = "pass mail/tu-dresden";
       imap = {
         host = "msx.tu-dresden.de";
         port = 993;
@@ -45,20 +75,22 @@ in
         tls.useStartTls = true;
       };
       thunderbird.enable = true;
-    };
-    "Gmail" = rec {
-      address = "seifertrouven@gmail.com";
-      realName = "Rouven Seifert";
-      userName = address;
-      imap = {
-        host = "imap.gmail.com";
-        port = 993;
+      mbsync = {
+        enable = true;
+        create = "maildir";
+        extraConfig = {
+          account = {
+            AuthMechs = "Login";
+          };
+        };
+        subFolders = "Verbatim";
       };
-      smtp = {
-        host = "smtp.gmail.com";
-        port = 465;
+      msmtp.enable = true;
+      neomutt = {
+        enable = true;
+        mailboxName = "--TU Dresden-------";
+        extraMailboxes = [ "Sent" "Opal" "Trash" "Junk-E-Mail" "Drafts" ];
       };
-      thunderbird.enable = true;
     };
   };
 }
diff --git a/users/rouven/modules/accounts/dracula.muttrc b/users/rouven/modules/accounts/dracula.muttrc
new file mode 100644
index 0000000..aa77d0f
--- /dev/null
+++ b/users/rouven/modules/accounts/dracula.muttrc
@@ -0,0 +1,42 @@
+###############################################################################
+# Dracula Theme for Mutt: https://draculatheme.com/
+#
+# @author Paul Townsend <paul@caprica.org>
+
+# general ------------ foreground ---- background -----------------------------
+color error		color231	color212
+color indicator		color231	color241
+color markers		color210	default
+color message		default		default
+color normal		default		default
+color prompt		default	        default
+color search		color84		default
+color status 		color141	color236
+color tilde		color231	default
+color tree		color141	default
+
+# message index ------ foreground ---- background -----------------------------
+color index		color210	default 	~D # deleted messages
+color index		color84		default 	~F # flagged messages
+color index		color117	default 	~N # new messages
+color index		color212	default 	~Q # messages which have been replied to
+color index		color215	default 	~T # tagged messages
+color index		color141	default		~v # messages part of a collapsed thread
+
+# message headers ---- foreground ---- background -----------------------------
+color hdrdefault	color117	default
+color header		color231	default		^Subject:.*
+
+# message body ------- foreground ---- background -----------------------------
+color attachment	color228	default
+color body		color231	default		[\-\.+_a-zA-Z0-9]+@[\-\.a-zA-Z0-9]+               # email addresses
+color body		color228	default		(https?|ftp)://[\-\.,/%~_:?&=\#a-zA-Z0-9]+        # URLs
+color body		color231	default		(^|[[:space:]])\\*[^[:space:]]+\\*([[:space:]]|$) # *bold* text
+color body		color231	default		(^|[[:space:]])_[^[:space:]]+_([[:space:]]|$)     # _underlined_ text
+color body		color231	default		(^|[[:space:]])/[^[:space:]]+/([[:space:]]|$)     # /italic/ text
+color quoted		color61		default
+color quoted1		color117	default
+color quoted2		color84		default
+color quoted3		color215	default
+color quoted4		color212	default
+color signature		color212	default
diff --git a/users/rouven/modules/packages.nix b/users/rouven/modules/packages.nix
index 0f71d89..736f0e8 100644
--- a/users/rouven/modules/packages.nix
+++ b/users/rouven/modules/packages.nix
@@ -37,6 +37,7 @@
     yubioath-flutter
     bitwarden
     bitwarden-cli
+    pass
 
     # misc
     neofetch