diff --git a/configs/mail.nix b/configs/mail.nix
index 89f35d1..a72a0b7 100644
--- a/configs/mail.nix
+++ b/configs/mail.nix
@@ -6,13 +6,34 @@
     pkgs.msmtp
     pkgs.neomutt
   ];
-
   home-manager.users.me = {
+    programs.astroid = {
+      enable = true;
+      externalEditor = "urxvt -embed %3 -e nvim %1";
+      pollScript = "offlineimap";
+    };
+
     accounts.email.maildirBasePath = "${config.users.users.me.home}/mail";
+
+    accounts.email.accounts.amroplay = {
+      astroid.enable = true;
+      address = "amroplay@gmail.com";
+      userName = "amroplay";
+      flavor = "gmail.com";
+      realName = config.niveum.user.name;
+      msmtp.enable = true;
+      notmuch.enable = true;
+      offlineimap = {
+        enable = true;
+        postSyncHookCommand = "notmuch new";
+      };
+    };
+
     accounts.email.accounts.hu-berlin = {
+      astroid.enable = true;
       address = "meinhark@hu-berlin.de";
       userName = "meinhark";
-      realName = config.niveum.user.fullName;
+      realName = config.niveum.user.name;
       imap = {
         host = "mailbox.cms.hu-berlin.de";
         port = 993;
@@ -32,8 +53,6 @@
       primary = true;
     };
 
-    programs.offlineimap = {
-      enable = true;
-    };
+    programs.offlineimap.enable = true;
   };
 }