diff --git a/config.org b/config.org
index b36744d..81e886d 100644
--- a/config.org
+++ b/config.org
@@ -2559,30 +2559,14 @@ and configure it
 #+end_src
 
 ** E-Mail
-*** mu Installation
-#+begin_src config :tangle pkg-list.txt
-mu
-#+end_src
-*** isync Installation
+*** isync
+**** Installation
+isync git is needed to deal with a [[https://bugzilla.redhat.com/show_bug.cgi?id=2314719][current bug]]
 #+begin_src config :tangle pkg-list.txt
 isync-git
 #+end_src
-*** msmtp Installation
-#+begin_src config :tangle pkg-list.txt
-msmtp
-#+end_src
-**** recommended config
-#+begin_src emacs-lisp :tangle ~/.config/doom/config.el
-(after! mu4e
-  (setq sendmail-program (executable-find "msmtp")
-	send-mail-function #'smtpmail-send-it
-	message-sendmail-f-is-evil t
-	message-sendmail-extra-arguments '("--read-envelope-from")
-	message-send-mail-function #'message-send-mail-with-sendmail))
-#+end_src
-
-*** mbsync Configuration
-**** paul@ploedige.com
+**** mbsync Configuration
+***** paul@ploedige.com
 #+begin_src config :tangle ~/.mbsyncrc
 # Account Information
 IMAPAccount ploedige
@@ -2611,13 +2595,52 @@ Create Both
 Expunge Both
 SyncState *
 #+end_src
-***** create mail directory if not yet exists
+****** create mail directory if not yet exists
 #+begin_src shell :tangle update.sh
 MAILDIR_PATH="$HOME/mail/ploedige"
 if [ ! -d "$MAILDIR_PATH" ]; then
     mkdir -p "$MAILDIR_PATH"
 fi
 #+end_src
+*** mu
+**** Installation
+#+begin_src config :tangle pkg-list.txt
+mu
+#+end_src
+***** Initialize if needed
+#+begin_src shell :tangle update.sh
+MAILDIR_PATH="$HOME/mail/ploedige"
+if [ ! -d "$HOME/.cache/mu" ]; then
+    echo "Initializing mu!"
+    mu init --maildir="$MAILDIR_PATH" --my-address paul@ploedige.com --my-address ploedige@yahoo.com
+    mu index
+fi
+#+end_src
+*** Setup Emacs
+#+begin_src emacs-lisp :tangle ~/.config/doom/config.el
+(after! mu4e
+  (set-email-account! "ploedige.com"
+        '((mu4e-sent-folder     . "/Sent")
+          (mu4e-drafts-folder   . "/Draft")
+          (mu4e-trash-folder    . "/Trash")
+          (mu4e-refile-folder   . "/Bulk")
+          (smtpmail-smtp-user   . "ploedige@yahoo.com"))
+        t))
+#+end_src
+*** msmtp Installation
+#+begin_src config :tangle pkg-list.txt
+msmtp
+#+end_src
+**** recommended config
+#+begin_src emacs-lisp :tangle ~/.config/doom/config.el
+(after! mu4e
+  (setq sendmail-program (executable-find "msmtp")
+	send-mail-function #'smtpmail-send-it
+	message-sendmail-f-is-evil t
+	message-sendmail-extra-arguments '("--read-envelope-from")
+	message-send-mail-function #'message-send-mail-with-sendmail))
+#+end_src
+
 ** Org Mode
 *** Dependencies
 #+begin_src conf :tangle pkg-list.txt