diff --git a/homes/x86_64-linux/rafiq/default.nix b/homes/x86_64-linux/rafiq/default.nix
index 1547e1d..46e45aa 100644
--- a/homes/x86_64-linux/rafiq/default.nix
+++ b/homes/x86_64-linux/rafiq/default.nix
@@ -1,5 +1,48 @@
-{ pkgs, inputs, ... }:
 {
+  pkgs,
+  inputs,
+  osConfig,
+  ...
+}:
+{
+  accounts = {
+    email = {
+      maildirBasePath = "mail";
+      accounts = {
+        "rafiq@rrv.sh" = {
+          primary = true;
+          address = "rafiq@rrv.sh";
+          maildir.path = "rafiq@rrv.sh";
+          userName = "rafiq@rrv.sh";
+          realName = "Mohammad Rafiq";
+          passwordCommand = "sudo cat ${osConfig.sops.secrets."rafiq/personalEmailPassword".path}";
+          imap = {
+            host = "imap.forwardemail.net";
+            port = 993;
+          };
+          smtp = {
+            host = "smtp.forwardemail.net";
+            port = 465;
+          };
+        };
+        "mohammadrafiq@rrv.sh" = {
+          address = "mohammadrafiq@rrv.sh";
+          maildir.path = "mohammadrafiq@rrv.sh";
+          userName = "mohammadrafiq@rrv.sh";
+          realName = "Mohammad Rafiq";
+          passwordCommand = "sudo cat ${osConfig.sops.secrets."rafiq/workEmailPassword".path}";
+          imap = {
+            host = "imap.forwardemail.net";
+            port = 993;
+          };
+          smtp = {
+            host = "smtp.forwardemail.net";
+            port = 465;
+          };
+        };
+      };
+    };
+  };
   cli = {
     shell = "zsh";
     finder = "fzf";
diff --git a/modules/nixos/system/secrets.nix b/modules/nixos/system/secrets.nix
index 1ad952f..3bf53fc 100644
--- a/modules/nixos/system/secrets.nix
+++ b/modules/nixos/system/secrets.nix
@@ -11,6 +11,8 @@
       "keys/telegram_bot" = { };
       "misc/cvt-jira-link" = { };
       "rafiq/hashedPassword".neededForUsers = true;
+      "rafiq/personalEmailPassword" = { };
+      "rafiq/workEmailPassword" = { };
       "librechat/creds_key" = { };
       "librechat/creds_iv" = { };
       "librechat/jwt_secret" = { };
diff --git a/secrets/secrets.yaml b/secrets/secrets.yaml
index c1749e0..765c41c 100644
--- a/secrets/secrets.yaml
+++ b/secrets/secrets.yaml
@@ -1,5 +1,7 @@
 rafiq:
     hashedPassword: ENC[AES256_GCM,data:SzzSPg5Ze4H+fVl6ZvAULO9FDfRehusmP6uldT4Ok2/9ZeOp9r4LgjKajoiw2A1DWD1zQ1GQwMCHKpeZjCC4rBUNWW5DMcBUJA==,iv:KktKuqr0JNhjeJIlIgkoAv6mP2dQlfQrXiIOASLPkbw=,tag:g9LarkT6EjDrH+dXSjMwPg==,type:str]
+    personalEmailPassword: ENC[AES256_GCM,data:TGJtDO++QcWqU1AbLe4=,iv:RjLRmq7fdbVRbv0M8ZQHyCK5l95JW3TRjN5w9Ci92zs=,tag:JibrH863smajCXESwhAR4g==,type:str]
+    workEmailPassword: ENC[AES256_GCM,data:++Gm9dIhmqEQz3+Ej9c=,iv:dAvyyLZvsHcjudU4gdU0iyWYDjjhe49UC2swHh++ldc=,tag:6o1DyJk5WOFO/Hfr0uMKSw==,type:str]
 keys:
     tailscale: ENC[AES256_GCM,data:sW64TZY/GtWD+8KOQDHYvnwzWiqOlsJ5782utaxVwUaiWa18hU+Ppd3gp/8f0R3rK6gskaPC22iuCuzvuA==,iv:TN2zWKgU6eXH3uaL7Ci2JKmo8Ql4DUSWS3Lxfnag7j4=,tag:s5of4wLdCp6b5VMGWLLxvw==,type:str]
     gemini: ENC[AES256_GCM,data:t4XTzJLMbHBG7LNaWMwO0YyYHREYOp4Zn95Kwshunnpwq9ezVv+0,iv:ZHq1ytak7Qy5a/zHghwEIWRinDWAkk2Vxw4iu/Q/UPk=,tag:Wyk0FqLTOWelznWHg/anxg==,type:str]
@@ -25,7 +27,7 @@ sops:
             WXFKbjNMWDF0LzNyekJJMGFva2diemcKQTc8ODuK6IWqRhulHiCF92aU+3p23riY
             M94Nzh+VT6QTFOgb3J7bBJMLhRH/fkQb6L6ia2n9QrVXFyYYMJ0oBw==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2025-05-29T12:08:02Z"
-    mac: ENC[AES256_GCM,data:stUFIwqeYA3DV+41Su9xnvee5AzzwT7A2XEBeIEtp+E/LW5UdBd9ZIABglMswezqdT3i4zttBHgampymUQM/J9knUdAsJzEusappH+qnX/XD4LbNWNga+hK5yMWngf79hlI8EVt2IXYKIPmkL3LI6uDJf/+Wd0u/LX6MD3hOgM0=,iv:5JuzuUkoGgm1rBhOvDd4iOWb0X+aJwJwGHh8BQ63wnk=,tag:WNiLCzjOYy5h2Yss4OM5Tw==,type:str]
+    lastmodified: "2025-06-05T10:02:05Z"
+    mac: ENC[AES256_GCM,data:V0mLHIKpivYFCLwdaFE5+z2fq6EsvuYw6GAk4CWRDxfdLz+TBRdZTf3qCICK6ArxL0Cy6U/yspCEWyDObKdLQdZ3DUgcW/I3jZWvTeJwubQpQx+wP0GYRFjYHYH16gj3iCLUekYhjXZXQz1x3ANyZExtynP7zu+sWHoQpeQfNv8=,iv:Iid240sxUSRfzwUIQeZfnspN1GqI0e410wQnlCH5xkk=,tag:Fs2+fZUjvLDqjJ5xgPFRwQ==,type:str]
     unencrypted_suffix: _unencrypted
     version: 3.10.2