diff --git a/mu4e/mu4e-actions.el b/mu4e/mu4e-actions.el
index 18a3e70a..c557d6b2 100644
--- a/mu4e/mu4e-actions.el
+++ b/mu4e/mu4e-actions.el
@@ -383,7 +383,7 @@ the message."
          nil nil nil
          msgid (and (eq major-mode 'mu4e-view-mode)
                     (not (eq mu4e-split-view 'single-window))))))))
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
+;;; _
 (provide 'mu4e-actions)
 ;;; mu4e-actions.el ends here
diff --git a/mu4e/mu4e-compose.el b/mu4e/mu4e-compose.el
index 4a7111fd..03256fa3 100644
--- a/mu4e/mu4e-compose.el
+++ b/mu4e/mu4e-compose.el
@@ -944,5 +944,6 @@ is supplied, or Transient Mark mode is enabled and the mark is active."
 (define-key mu4e-compose-mode-map
   (vector 'remap 'end-of-buffer) 'mu4e-compose-goto-bottom)
 
+;;; _
 (provide 'mu4e-compose)
 ;;; mu4e-compose.el ends here
diff --git a/mu4e/mu4e-context.el b/mu4e/mu4e-context.el
index ff4ae763..8eb1bb82 100644
--- a/mu4e/mu4e-context.el
+++ b/mu4e/mu4e-context.el
@@ -280,5 +280,6 @@ match, POLICY determines what to do:
                           (mu4e~context-ask-user "Select context: ")))
          (otherwise nil))))))
 
+;;; _
 (provide 'mu4e-context)
 ;;; mu4e-context.el ends here
diff --git a/mu4e/mu4e-contrib.el b/mu4e/mu4e-contrib.el
index 0b785ce0..3b2660c4 100644
--- a/mu4e/mu4e-contrib.el
+++ b/mu4e/mu4e-contrib.el
@@ -216,7 +216,7 @@ buffers found, compose a new message and then attach the file."
                    (setq files-to-attach (cdr files-to-attach)))
                  (message "Attached file(s) %s" files-str))
         (message "No buffer to attach file to.")))))
-;;; end of eshell functions
 
+;;; _
 (provide 'mu4e-contrib)
 ;;; mu4e-contrib.el ends here
diff --git a/mu4e/mu4e-draft.el b/mu4e/mu4e-draft.el
index 6636b618..6f37a31d 100644
--- a/mu4e/mu4e-draft.el
+++ b/mu4e/mu4e-draft.el
@@ -602,6 +602,6 @@ will be created from either `mu4e~draft-reply-construct', or
     (unless mu4e~draft-drafts-folder
       (mu4e-error "Failed to determine drafts folder"))))
 
-
+;;; _
 (provide 'mu4e-draft)
 ;;; mu4e-draft.el ends here
diff --git a/mu4e/mu4e-headers.el b/mu4e/mu4e-headers.el
index b381891f..e5a80138 100644
--- a/mu4e/mu4e-headers.el
+++ b/mu4e/mu4e-headers.el
@@ -1892,6 +1892,6 @@ other windows."
       (kill-buffer)
       (mu4e~main-view))))
 
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; _
 (provide 'mu4e-headers)
 ;;; mu4e-headers.el ends here
diff --git a/mu4e/mu4e-icalendar.el b/mu4e/mu4e-icalendar.el
index 7b60c80d..03fcb406 100644
--- a/mu4e/mu4e-icalendar.el
+++ b/mu4e/mu4e-icalendar.el
@@ -184,6 +184,6 @@ given in the doc of `gnus-icalendar-event-reply-from-buffer'."
         (insert beg-date " " end-time " End of: " txt "\n"))
       (write-region (point-min) (point-max) filename t))))
 
-
+;;; _
 (provide 'mu4e-icalendar)
 ;;; mu4e-icalendar.el ends here
diff --git a/mu4e/mu4e-lists.el b/mu4e/mu4e-lists.el
index d9fbd459..8355ff41 100644
--- a/mu4e/mu4e-lists.el
+++ b/mu4e/mu4e-lists.el
@@ -97,5 +97,6 @@ be used as the shortname."
   :group 'mu4e-headers
   :type '(repeat (regexp)))
 
+;;; _
 (provide 'mu4e-lists)
 ;;; mu4e-lists.el ends here
diff --git a/mu4e/mu4e-main.el b/mu4e/mu4e-main.el
index 1e4b2acb..e0419153 100644
--- a/mu4e/mu4e-main.el
+++ b/mu4e/mu4e-main.el
@@ -287,5 +287,6 @@ clicked."
           (sit-for 1)
           (mu4e~main-menu))))))
 
+;;; _
 (provide 'mu4e-main)
 ;;; mu4e-main.el ends here
diff --git a/mu4e/mu4e-mark.el b/mu4e/mu4e-mark.el
index be384110..fb42833b 100644
--- a/mu4e/mu4e-mark.el
+++ b/mu4e/mu4e-mark.el
@@ -459,5 +459,6 @@ action', return nil means 'don't do anything'."
        (when (eq what 'apply)
          (mu4e-mark-execute-all t))))))
 
+;;; _
 (provide 'mu4e-mark)
 ;;; mu4e-mark.el ends here
diff --git a/mu4e/mu4e-message.el b/mu4e/mu4e-message.el
index 56c61279..b67a5ebe 100644
--- a/mu4e/mu4e-message.el
+++ b/mu4e/mu4e-message.el
@@ -344,5 +344,6 @@ Emacs. Based on code by Titus von der Malsburg."
        (call-process-shell-command mu4e-html2text-command tmp-file t t)
        (delete-file tmp-file))) msg))
 
+;;; _
 (provide 'mu4e-message)
 ;;; mu4e-message.el ends here
diff --git a/mu4e/mu4e-org.el b/mu4e/mu4e-org.el
index 97602143..b2a38d04 100644
--- a/mu4e/mu4e-org.el
+++ b/mu4e/mu4e-org.el
@@ -151,6 +151,7 @@ it with org)."
   (org-capture))
 
 (make-obsolete 'org-mu4e-store-and-capture 'org-mu4e-store-and-capture "1.3.6")
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+;;; _
 (provide 'mu4e-org)
 ;;; mu4e-org.el ends here
diff --git a/mu4e/mu4e-proc.el b/mu4e/mu4e-proc.el
index f890c55a..636bdfc0 100644
--- a/mu4e/mu4e-proc.el
+++ b/mu4e/mu4e-proc.el
@@ -488,5 +488,6 @@ result will be delivered to the function registered as
                   :extract-images ,images
                   :extract-encrypted ,decrypt)))
 
+;;; _
 (provide 'mu4e-proc)
 ;;; mu4e-proc.el ends here
diff --git a/mu4e/mu4e-speedbar.el b/mu4e/mu4e-speedbar.el
index 41686963..8ef6d5e5 100644
--- a/mu4e/mu4e-speedbar.el
+++ b/mu4e/mu4e-speedbar.el
@@ -129,5 +129,6 @@
 (defun mu4e-headers-speedbar-buttons (buffer) (mu4e-speedbar-buttons buffer))
 (defun mu4e-view-speedbar-buttons (buffer) (mu4e-speedbar-buttons buffer))
 
+;;; _
 (provide 'mu4e-speedbar)
 ;;; mu4e-speedbar.el ends here
diff --git a/mu4e/mu4e-utils.el b/mu4e/mu4e-utils.el
index ee6ec2af..a0ae6bd8 100644
--- a/mu4e/mu4e-utils.el
+++ b/mu4e/mu4e-utils.el
@@ -1249,5 +1249,6 @@ string will be shortened to fit if its length exceeds
           (push (buffer-name buffer) buffers))))
     (nreverse buffers)))
 
+;;; _
 (provide 'mu4e-utils)
 ;;; mu4e-utils.el ends here
diff --git a/mu4e/mu4e-vars.el b/mu4e/mu4e-vars.el
index c852026a..a819452c 100644
--- a/mu4e/mu4e-vars.el
+++ b/mu4e/mu4e-vars.el
@@ -1021,8 +1021,7 @@ sexp received from the server process.")
 
 (defvar mu4e-temp-func 'mu4e~view-temp-handler
   "A function called for each (:temp <file> <cookie>) sexp.")
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; _
 (provide 'mu4e-vars)
 ;;; mu4e-vars.el ends here
diff --git a/mu4e/mu4e-view.el b/mu4e/mu4e-view.el
index b8961945..6d64b4de 100644
--- a/mu4e/mu4e-view.el
+++ b/mu4e/mu4e-view.el
@@ -1704,5 +1704,6 @@ other windows."
           (when (buffer-live-p (mu4e-get-headers-buffer))
             (switch-to-buffer (mu4e-get-headers-buffer))))))))
 
+;;; _
 (provide 'mu4e-view)
 ;;; mu4e-view.el ends here
diff --git a/mu4e/mu4e.el b/mu4e/mu4e.el
index 1c84fae3..2f6d2a10 100644
--- a/mu4e/mu4e.el
+++ b/mu4e/mu4e.el
@@ -63,7 +63,7 @@ window, unless BACKGROUND (prefix-argument) is non-nil."
       (when (y-or-n-p (mu4e-format "Are you sure you want to quit?"))
         (mu4e~stop))
     (mu4e~stop)))
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
+;;; _
 (provide 'mu4e)
 ;;; mu4e.el ends here
diff --git a/mu4e/org-mu4e.el b/mu4e/org-mu4e.el
index b073544c..194267f9 100644
--- a/mu4e/org-mu4e.el
+++ b/mu4e/org-mu4e.el
@@ -225,6 +225,6 @@ Edit the message body using org mode. DEPRECATED."
       (mu4e-compose-mode)
       (message "org-mu4e-compose-org-mode disabled"))))
 
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; _
 (provide 'org-mu4e)
 ;;; org-mu4e.el ends here