diff --git a/global.org b/global.org
index d23cf1d..db07906 100644
--- a/global.org
+++ b/global.org
@@ -604,7 +604,9 @@
      (setq mu4e-maildir "~/.mail"
            mu4e-attachment-dir "~/attachments"
            mu4e-html2text-command "w3m -dump -T text/html -cols 72 -o display_link_number=true -o auto_image=false -o display_image=false -o ignore_null_img_alt=true"
-           mu4e-headers-show-threads nil)
+           mu4e-headers-show-threads nil
+           mu4e-view-use-gnus t
+           mm-text-html-renderer 'gnus-w3m)
 
      (setq mu4e-contexts
            `( ,(make-mu4e-context
@@ -635,11 +637,11 @@
 
      ;; start with the first (default) context;
      ;; default is to ask-if-none (ask when there's no context yet, and none match)
-     ;; (setq mu4e-context-policy 'pick-first)
+     (setq mu4e-context-policy 'pick-first)
 
      ;; compose with the current context is no context matches;
      ;; default is to ask
-     ;; (setq mu4e-compose-context-policy nil)
+     (setq mu4e-compose-context-policy 'pick-first)
 
         (add-hook 'mu4e-headers-mode-hook
                   #'(lambda () (setq-local show-trailing-whitespace nil)))
@@ -682,7 +684,7 @@
         (define-key org-src-mode-map (kbd "C-c C-`") 'org-edit-src-abort))
       (require 'org)
       (require 'org-pomodoro)
-      (add-to-list 'org-modules 'habit t)
+      (require 'org-habit)
     #+end_src
 *** Hooks
     Enable ~auto-fill-mode~ (see [[[https://www.gnu.org/software/emacs/manual/html_node/emacs/Auto-Fill.html][the manual]]]: honestly I do not see