diff --git a/mu4e/mu4e-vars.el b/mu4e/mu4e-vars.el
index 3f9ec7db..b200e26e 100644
--- a/mu4e/mu4e-vars.el
+++ b/mu4e/mu4e-vars.el
@@ -31,7 +31,7 @@
 
 (defgroup mu4e nil
   "mu4e - mu for emacs"
-  :group 'local)
+  :group 'mail)
 
 (defcustom mu4e-mu-home nil
   "Location of the mu homedir, or nil for the default."
@@ -145,7 +145,8 @@ Also see `mu4e-headers-visible-lines'
 and `mu4e-headers-visible-columns'."
   :type '(choice (const :tag "Split horizontally" horizontal)
                  (const :tag "Split vertically" vertical)
-                 (const :tag "Don't split" nil)))
+                 (const :tag "Don't split" nil))
+  :group 'mu4e-headers)
 
 (defcustom mu4e-show-images nil
   "Whether to automatically display attached images in the message
diff --git a/mu4e/org-mu4e.el b/mu4e/org-mu4e.el
index 7b4cb6ea..44d5ea14 100644
--- a/mu4e/org-mu4e.el
+++ b/mu4e/org-mu4e.el
@@ -37,7 +37,8 @@
 
 (defgroup org-mu4e nil
   "Settings for the org-mode related functionality in mu4e."
-  :group 'org-mu4e)
+  :group 'mu4e
+  :group 'org)
 
 (defcustom org-mu4e-link-desc-func
   (lambda (msg) (or (plist-get msg :subject) "No subject"))