         (help-mode . emacs)
         (eshell-mode . emacs)
         (shell-mode . emacs)
-        (message-mode . emacs)
+        ;;(message-mode . emacs)
         (magit-log-edit-mode . emacs)
         (fundamental-mode . emacs)
         (gtags-select-mode . emacs)

    "gl" 'outline-next-visible-heading
    "H" 'org-beginning-of-line ; smarter behaviour on headlines etc.
    "L" 'org-end-of-line ; smarter behaviour on headlines etc.
    "t" 'org-todo ; mark a TODO item as DONE
    ",c" 'org-cycle
    ",e" 'org-export-dispatch
    ",n" 'outline-next-visible-heading


; @see https://github.com/timcharper/evil-surround
(global-surround-mode 1)

(defun toggle-org-or-message-mode ()
  (interactive)
  (if (eq major-mode 'message-mode)
    (org-mode)
    (if (eq major-mode 'org-mode) (message-mode))
    ))

;; (evil-set-initial-state 'org-mode 'emacs)
;; Remap org-mode meta keys for convenience
