3 files changed, 15 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index d6a6e58..daf9916 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@ bookmarks
 /ac-comphist.dat
 /.cask
 /.custom.el
+/server
diff --git a/init.el b/init.el
index 428608b..3add1e2 100644
--- a/init.el
+++ b/init.el
@@ -50,11 +50,13 @@
 
 (require 'init-yas)
 
-(require 'init-gnus)
-
 (when (file-exists-p (expand-file-name "init-untracked.el" km/init-lisp-dir))
   (require 'init-untracked))
 
+(setq server-use-tcp t)
 (require 'server)
 (unless (server-running-p)
   (server-start))
+
+(require 'init-mail)
+
diff --git a/lisp/init-mail.el b/lisp/init-mail.el
new file mode 100644
index 0000000..0163420
--- /dev/null
+++ b/lisp/init-mail.el
@@ -0,0 +1,10 @@
+
+(require 'init-gnus)
+
+(if (equal (daemonp) "mail")
+    (progn
+      (setq mode-line-misc-info (cons " [Mail] " mode-line-misc-info))
+      (key-chord-define-global "jg" 'km/mail-map))
+  (global-set-key (kbd "C-x m") nil))
+
+(provide 'init-mail)