diff --git a/mu4e/mu4e-vars.el b/mu4e/mu4e-vars.el
index a3bac4bd..a319c38a 100644
--- a/mu4e/mu4e-vars.el
+++ b/mu4e/mu4e-vars.el
@@ -901,6 +901,9 @@ argument, and returns a string. See the default value of
 (defconst mu4e~headers-buffer-name "*mu4e-headers*"
   "Name of the buffer for message headers.")
 
+(defvar mu4e~headers-last-query nil
+  "The present (most recent) query.")
+
 ;;;; View
 
 (defconst mu4e~view-buffer-name "*mu4e-view*"
@@ -917,9 +920,6 @@ We need to keep this information around to quickly re-sort
 subsets of the contacts in the completions function in
 mu4e-compose.")
 
-(defvar mu4e~headers-last-query nil
-  "The present (most recent) query.")
-
 (defvar mu4e~server-props nil
   "Information  we receive from the mu4e server process \(in the 'pong-handler').")
 
diff --git a/mu4e/mu4e-view.el b/mu4e/mu4e-view.el
index 3e15f6d4..6a29bc98 100644
--- a/mu4e/mu4e-view.el
+++ b/mu4e/mu4e-view.el
@@ -105,6 +105,13 @@ the end of a message. Otherwise, don't move to the next message."
   :type 'boolean
   :group 'mu4e-view)
 
+(defcustom mu4e-view-auto-mark-as-read t
+  "Automatically mark messages are 'read' when you read
+them. This is typically the expected behavior, but can be turned
+off, for example when using a read-only file-system."
+  :type 'boolean
+  :group 'mu4e-view)
+
 (defcustom mu4e-save-multiple-attachments-without-asking nil
   "If non-nil, saving multiple attachments asks once for a
 directory and saves all attachments in the chosen directory."
@@ -151,14 +158,6 @@ The first letter of NAME is used as a shortcut character."
   :group 'mu4e-view
   :type '(alist :key-type string :value-type function))
 
-;;; Variables
-
-(defvar-local mu4e~view-message nil
-  "The message being viewed in view mode.")
-
-(defvar mu4e-view-fill-headers t
-  "If non-nil, automatically fill the headers when viewing them.")
-
 ;;; Keymaps
 
 (defvar mu4e-view-header-field-keymap
@@ -192,15 +191,14 @@ The first letter of NAME is used as a shortcut character."
     map)
   "Keymap used in the \"Attachements\" header field.")
 
-(defcustom mu4e-view-auto-mark-as-read t
-  "Automatically mark messages are 'read' when you read
-them. This is typically the expected behavior, but can be turned
-off, for example when using a read-only file-system."
-  :type 'boolean
-  :group 'mu4e-view)
-
 ;;; Variables
 
+(defvar-local mu4e~view-message nil
+  "The message being viewed in view mode.")
+
+(defvar mu4e-view-fill-headers t
+  "If non-nil, automatically fill the headers when viewing them.")
+
 (defvar mu4e~view-cited-hidden nil "Whether cited lines are hidden.")
 (put 'mu4e~view-cited-hidden 'permanent-local t)