diff --git a/modules/emacs.nix b/modules/emacs.nix
index 6dd32e9..ca17359 100644
--- a/modules/emacs.nix
+++ b/modules/emacs.nix
@@ -4,7 +4,7 @@ with lib;
 {
   services.emacs = {
     enable = true;
-    package = with pkgs; ((emacsPackagesFor emacsGit).emacsWithPackages 
+    package = with pkgs; ((emacsPackagesFor emacsPgtk).emacsWithPackages 
       (epkgs: with epkgs; [
         vterm
         magit
diff --git a/user/home.nix b/user/home.nix
index 6fae7ee..f59db70 100644
--- a/user/home.nix
+++ b/user/home.nix
@@ -22,40 +22,42 @@
   # Let Home Manager install and manage itself.
   programs.home-manager.enable = true;
 
-  # accounts.email.accounts = {
-  #   personal = {
-  #     address = "chris@cochrun.xyz";
-  #     mbsync.enable = true;
-  #     create =  "maildir";
-  #     mu.enable = true;
-  #     imap = {
-  #       host = "mail.cochrun.xyz";
-  #       port = 993;
-  #       tls.enable = true;
-  #     };
-  #     smtp = {
-  #       host = "mail.cochrun.xyz";
-  #       port = 25;
-  #       tls.enable = true;
-  #     };
-  #   };
-  #   work = {
-  #     address = "chris@tfcconnection.org";
-  #     mbsync.enable = true;
-  #     create =  "maildir";
-  #     mu.enable = true;
-  #     imap = {
-  #       host = "outlook.office365.com";
-  #       port = 993;
-  #       tls.enable = true;
-  #     };
-  #     smtp = {
-  #       host = "mail.cochrun.xyz";
-  #       port = 25;
-  #       tls.enable = true;
-  #     };
-  #   };
-  # };
+  accounts.email.accounts = {
+    personal = {
+      address = "chris@cochrun.xyz";
+      mbsync.enable = true;
+      create =  "maildir";
+      mu.enable = true;
+      flavor = "plain";
+      imap = {
+        host = "mail.cochrun.xyz";
+        port = 993;
+        tls.enable = true;
+      };
+      smtp = {
+        host = "mail.cochrun.xyz";
+        port = 25;
+        tls.enable = true;
+      };
+    };
+    work = {
+      address = "chris@tfcconnection.org";
+      mbsync.enable = true;
+      create =  "maildir";
+      mu.enable = true;
+      flavor = "outlook.office365.com";
+      imap = {
+        host = "outlook.office365.com";
+        port = 993;
+        tls.enable = true;
+      };
+      smtp = {
+        host = "mail.cochrun.xyz";
+        port = 25;
+        tls.enable = true;
+      };
+    };
+  };
 
   programs.git = {
     enable = true;