diff --git a/mu4e/mu4e-actions.el b/mu4e/mu4e-actions.el
index 5b659aa3..08083816 100644
--- a/mu4e/mu4e-actions.el
+++ b/mu4e/mu4e-actions.el
@@ -1,4 +1,4 @@
-;;; mu4e-actions.el --- Actions for messages and attachments in mu4e -*- lexical-binding: t -*-
+;;; mu4e-actions.el --- Actions for messages/attachments -*- lexical-binding: t -*-
 
 ;; Copyright (C) 2011-2023 Dirk-Jan C. Binnema
 
diff --git a/mu4e/mu4e-bookmarks.el b/mu4e/mu4e-bookmarks.el
index 26497a8d..452169be 100644
--- a/mu4e/mu4e-bookmarks.el
+++ b/mu4e/mu4e-bookmarks.el
@@ -1,4 +1,4 @@
-;;; mu4e-bookmarks.el --- Bookmarks for mu4e -*- lexical-binding: t -*-
+;;; mu4e-bookmarks.el --- Bookmarks handling -*- lexical-binding: t -*-
 
 ;; Copyright (C) 2011-2023 Dirk-Jan C. Binnema
 
diff --git a/mu4e/mu4e-compose.el b/mu4e/mu4e-compose.el
index 01482059..958bca61 100644
--- a/mu4e/mu4e-compose.el
+++ b/mu4e/mu4e-compose.el
@@ -1,4 +1,4 @@
-;;; mu4e-compose.el --- Various functions to compose/send messages from mu4e -*- lexical-binding: t -*-
+;;; mu4e-compose.el --- Compose and send messages -*- lexical-binding: t -*-
 
 ;; Copyright (C) 2011-2022 Dirk-Jan C. Binnema
 
diff --git a/mu4e/mu4e-contacts.el b/mu4e/mu4e-contacts.el
index 07e5168f..e06817c7 100644
--- a/mu4e/mu4e-contacts.el
+++ b/mu4e/mu4e-contacts.el
@@ -1,6 +1,6 @@
-;;; mu4e-contacts.el -- part of mu4e -*- lexical-binding: t -*-
+;;; mu4e-contacts.el -- Dealing with contacts -*- lexical-binding: t -*-
 
-;; Copyright (C) 2022 Dirk-Jan C. Binnema
+;; Copyright (C) 2022-2023 Dirk-Jan C. Binnema
 
 ;; Author: Dirk-Jan C. Binnema <djcb@djcbsoftware.nl>
 ;; Maintainer: Dirk-Jan C. Binnema <djcb@djcbsoftware.nl>
@@ -81,10 +81,10 @@ their canonical counterpart; useful as an example."
 
 (make-obsolete-variable 'mu4e-contact-rewrite-function
                         "mu4e-contact-process-function (see docstring)"
-			"mu4e 1.3.2")
+                        "mu4e 1.3.2")
 (make-obsolete-variable 'mu4e-compose-complete-ignore-address-regexp
                         "mu4e-contact-process-function (see docstring)"
-			"mu4e 1.3.2")
+                        "mu4e 1.3.2")
 
 (defcustom mu4e-contact-process-function
   (lambda(addr)
@@ -165,7 +165,7 @@ with both the plain addresses and /regular expressions/."
                         'mu4e-user-mail-address-list "0.9.9.x")
 (make-obsolete-variable 'mu4e-user-mail-address-list
                         "determined by server; see `mu4e-personal-addresses'."
-			"1.3.8")
+                        "1.3.8")
 
 
 ;; Helpers
@@ -231,9 +231,9 @@ case a phrase contains a quote, it will be escaped."
 (defun mu4e-contact-full (contact)
   "Get the full combination of name and email address from CONTACT."
   (let* ((email (mu4e-contact-email contact))
-	 (name (mu4e-contact-name contact)))
+         (name (mu4e-contact-name contact)))
     (if (and name (> (length name) 0))
-	(format "%s <%s>" (mu4e--rfc822-quote-phrase name) email)
+        (format "%s <%s>" (mu4e--rfc822-quote-phrase name) email)
       email)))
 
 
@@ -249,9 +249,9 @@ This is used by the completion function in mu4e-compose."
     (dolist (contact contacts)
       (cl-incf n)
       (when (functionp mu4e-contact-process-function)
-	(setq contact (funcall mu4e-contact-process-function contact)))
+        (setq contact (funcall mu4e-contact-process-function contact)))
       (when contact ;; note the explicit deccode; the strings we get are
-		      ;; utf-8, but emacs doesn't know yet.
+                      ;; utf-8, but emacs doesn't know yet.
         (puthash (decode-coding-string contact 'utf-8) t mu4e--contacts-set)))
     (setq mu4e--contacts-tstamp (or tstamp "0"))
     (unless (zerop n)
@@ -265,7 +265,7 @@ For testing/debugging."
   (with-current-buffer (get-buffer-create "*mu4e-contacts-info*")
     (erase-buffer)
     (insert (format "complete addresses:        %s\n"
-		    (if mu4e-compose-complete-addresses "yes" "no")))
+                    (if mu4e-compose-complete-addresses "yes" "no")))
     (insert (format "only personal addresses:   %s\n"
                     (if mu4e-compose-complete-only-personal "yes" "no")))
     (insert (format "only addresses seen after: %s\n"
@@ -275,7 +275,7 @@ For testing/debugging."
       (insert (format "number of contacts cached: %d\n\n"
                       (hash-table-count mu4e--contacts-set)))
       (maphash (lambda (contact _)
-		 (insert (format "%s\n" contact))) mu4e--contacts-set))
+                 (insert (format "%s\n" contact))) mu4e--contacts-set))
     (pop-to-buffer "*mu4e-contacts-info*")))
 
 (declare-function mu4e--server-contacts  "mu4e-server")
diff --git a/mu4e/mu4e-context.el b/mu4e/mu4e-context.el
index e481e6e7..98cfedc4 100644
--- a/mu4e/mu4e-context.el
+++ b/mu4e/mu4e-context.el
@@ -1,4 +1,4 @@
-;;; mu4e-context.el --- Contexts to switch between accounts in mu4e -*- lexical-binding: t -*-
+;;; mu4e-context.el --- Switching between settings -*- lexical-binding: t -*-
 
 ;; Copyright (C) 2015-2023 Dirk-Jan C. Binnema
 
diff --git a/mu4e/mu4e-contrib.el b/mu4e/mu4e-contrib.el
index afb90853..79b30e93 100644
--- a/mu4e/mu4e-contrib.el
+++ b/mu4e/mu4e-contrib.el
@@ -1,6 +1,6 @@
-;;; mu4e-contrib.el --- Some user-contributed functions for mu4e -*- lexical-binding: t -*-
+;;; mu4e-contrib.el --- User-contributed functions -*- lexical-binding: t -*-
 
-;; Copyright (C) 2013-2022 Dirk-Jan C. Binnema
+;; Copyright (C) 2013-2023 Dirk-Jan C. Binnema
 
 ;; This file is not part of GNU Emacs.
 
diff --git a/mu4e/mu4e-draft.el b/mu4e/mu4e-draft.el
index 01a07ba1..8ce8498c 100644
--- a/mu4e/mu4e-draft.el
+++ b/mu4e/mu4e-draft.el
@@ -1,6 +1,6 @@
-;;; mu4e-draft.el --- various functions to create draft messages in mu4e -*- lexical-binding: t -*-
+;;; mu4e-draft.el --- Creating draft messages -*- lexical-binding: t -*-
 ;;
-;; Copyright (C) 2011-2022 Dirk-Jan C. Binnema
+;; Copyright (C) 2011-2023 Dirk-Jan C. Binnema
 
 ;; Author: Dirk-Jan C. Binnema <djcb@djcbsoftware.nl>
 ;; Maintainer: Dirk-Jan C. Binnema <djcb@djcbsoftware.nl>
diff --git a/mu4e/mu4e-folders.el b/mu4e/mu4e-folders.el
index f41cfbad..330264ae 100644
--- a/mu4e/mu4e-folders.el
+++ b/mu4e/mu4e-folders.el
@@ -1,4 +1,4 @@
-;;; mu4e-folders.el --- Dealing with maildirs & folders in mu4e -*- lexical-binding: t -*-
+;;; mu4e-folders.el --- Dealing with maildirs & folders -*- lexical-binding: t -*-
 
 ;; Copyright (C) 2021-2023 Dirk-Jan C. Binnema
 
diff --git a/mu4e/mu4e-headers.el b/mu4e/mu4e-headers.el
index 80ea06ff..a7769ad6 100644
--- a/mu4e/mu4e-headers.el
+++ b/mu4e/mu4e-headers.el
@@ -1,4 +1,4 @@
-;;; mu4e-headers.el --- Functions related to mu4e-headers-mode -*- lexical-binding: t; coding:utf-8 -*-
+;;; mu4e-headers.el --- Message headers -*- lexical-binding: t; coding:utf-8 -*-
 
 ;; Copyright (C) 2011-2023 Dirk-Jan C. Binnema
 
diff --git a/mu4e/mu4e-helpers.el b/mu4e/mu4e-helpers.el
index 0c7e5f12..af08ae4c 100644
--- a/mu4e/mu4e-helpers.el
+++ b/mu4e/mu4e-helpers.el
@@ -1,4 +1,4 @@
-;;; mu4e-helpers.el --- Helper functions used in mu4e -*- lexical-binding: t -*-
+;;; mu4e-helpers.el --- Helper functions -*- lexical-binding: t -*-
 
 ;; Copyright (C) 2022-2023  Dirk-Jan C. Binnema
 
diff --git a/mu4e/mu4e-icalendar.el b/mu4e/mu4e-icalendar.el
index f82704f1..8b4aa757 100644
--- a/mu4e/mu4e-icalendar.el
+++ b/mu4e/mu4e-icalendar.el
@@ -1,4 +1,4 @@
-;;; mu4e-icalendar.el --- Icalendar and diary integration in mu4e -*- lexical-binding: t; -*-
+;;; mu4e-icalendar.el --- iCcalendar & diary integration -*- lexical-binding: t; -*-
 
 ;; Copyright (C) 2019-2023 Christophe Troestler
 
diff --git a/mu4e/mu4e-lists.el b/mu4e/mu4e-lists.el
index 9771ae5b..f19239fe 100644
--- a/mu4e/mu4e-lists.el
+++ b/mu4e/mu4e-lists.el
@@ -1,4 +1,4 @@
-;;; mu4e-lists.el --- Create tables of list-id -> shortname for mailing lists in mu4e -*- lexical-binding: t -*-
+;;; mu4e-lists.el --- Get names for mailing lists -*- lexical-binding: t -*-
 
 ;; Copyright (C) 2011-2023 Dirk-Jan C. Binnema
 
diff --git a/mu4e/mu4e-mark.el b/mu4e/mu4e-mark.el
index 8280287e..a0a14567 100644
--- a/mu4e/mu4e-mark.el
+++ b/mu4e/mu4e-mark.el
@@ -1,4 +1,4 @@
-;;; mu4e-mark.el --- functions related to marking messages in mu4e -*- lexical-binding: t -*-
+;;; mu4e-mark.el --- Marking messages -*- lexical-binding: t -*-
 
 ;; Copyright (C) 2011-2022 Dirk-Jan C. Binnema
 
diff --git a/mu4e/mu4e-message.el b/mu4e/mu4e-message.el
index acf3251a..5e278e09 100644
--- a/mu4e/mu4e-message.el
+++ b/mu4e/mu4e-message.el
@@ -1,4 +1,4 @@
-;;; mu4e-message.el --- Functions to get data from mu4e-message plist structure -*- lexical-binding: t -*-
+;;; mu4e-message.el --- Working with mu4e-message plists -*- lexical-binding: t -*-
 
 ;; Copyright (C) 2012-2022 Dirk-Jan C. Binnema
 
diff --git a/mu4e/mu4e-mime-parts.el b/mu4e/mu4e-mime-parts.el
index 132acc26..b0d269f4 100644
--- a/mu4e/mu4e-mime-parts.el
+++ b/mu4e/mu4e-mime-parts.el
@@ -1,4 +1,4 @@
-;;; mu4e-mime-parts.el --- Implements functions and variables for dealing with MIME-parts and URLs -*- lexical-binding: t -*-
+;;; mu4e-mime-parts.el --- Dealing with MIME-parts & URLs -*- lexical-binding: t -*-
 
 ;; Copyright (C) 2023 Dirk-Jan C. Binnema
 
diff --git a/mu4e/mu4e-notification.el b/mu4e/mu4e-notification.el
index 94526e96..f4a172ab 100644
--- a/mu4e/mu4e-notification.el
+++ b/mu4e/mu4e-notification.el
@@ -1,4 +1,4 @@
-;;; mu4e-notification.el --- Generic support for showing new-mail notifications from mu4e -*- coding: utf-8; lexical-binding: t -*-
+;;; mu4e-notification.el --- Showing mail notifications -*- lexical-binding: t-*-
 ;;
 ;; Copyright (C) 1996-2023 Dirk-Jan C. Binnema <djcb@djcbsoftware.nl>
 
diff --git a/mu4e/mu4e-obsolete.el b/mu4e/mu4e-obsolete.el
index 91f7ad4c..3bf2a808 100644
--- a/mu4e/mu4e-obsolete.el
+++ b/mu4e/mu4e-obsolete.el
@@ -1,4 +1,4 @@
-;;; mu4e-obsolete-vars.el --- Obsolete variables and functions aliases for mu4e -*- lexical-binding: t -*-
+;;; mu4e-obsolete-vars.el --- Obsolete things -*- lexical-binding: t -*-
 
 ;; Copyright (C) 2022 Dirk-Jan C. Binnema
 
diff --git a/mu4e/mu4e-query-items.el b/mu4e/mu4e-query-items.el
index 17f0141e..b2523e79 100644
--- a/mu4e/mu4e-query-items.el
+++ b/mu4e/mu4e-query-items.el
@@ -1,4 +1,4 @@
-;;; mu4e-query-items.el --- Queries for bookmarks and items for mu4e -*- lexical-binding: t -*-
+;;; mu4e-query-items.el --- Manage query results -*- lexical-binding: t -*-
 
 ;; Copyright (C) 2023 Dirk-Jan C. Binnema
 
diff --git a/mu4e/mu4e-search.el b/mu4e/mu4e-search.el
index 544b075d..1f96ea77 100644
--- a/mu4e/mu4e-search.el
+++ b/mu4e/mu4e-search.el
@@ -1,4 +1,4 @@
-;;; mu4e-search.el --- Search-related functions for mu4e -*- lexical-binding: t -*-
+;;; mu4e-search.el --- Search-related functions -*- lexical-binding: t -*-
 
 ;; Copyright (C) 2021,2022 Dirk-Jan C. Binnema
 
diff --git a/mu4e/mu4e-thread.el b/mu4e/mu4e-thread.el
index 03fcb62f..c9737456 100644
--- a/mu4e/mu4e-thread.el
+++ b/mu4e/mu4e-thread.el
@@ -1,4 +1,4 @@
-;;; mu4e-thread.el --- Thread folding support for mu4e -*- lexical-binding: t -*-
+;;; mu4e-thread.el --- Thread folding support -*- lexical-binding: t -*-
 
 ;; Copyright (C) 2023 Nicolas P. Rougier
 
diff --git a/mu4e/mu4e-view.el b/mu4e/mu4e-view.el
index 6b56803c..003be73a 100644
--- a/mu4e/mu4e-view.el
+++ b/mu4e/mu4e-view.el
@@ -1,4 +1,4 @@
-;;; mu4e-view.el --- Define mu4e-view-mode for viewing e-mail messages in mu4e -*- lexical-binding: t -*-
+;;; mu4e-view.el --- Mode for viewing e-mail messages -*- lexical-binding: t -*-
 
 ;; Copyright (C) 2021-2023 Dirk-Jan C. Binnema
 
diff --git a/mu4e/mu4e-window.el b/mu4e/mu4e-window.el
index 2c3d43cb..3d0b0d52 100644
--- a/mu4e/mu4e-window.el
+++ b/mu4e/mu4e-window.el
@@ -1,4 +1,4 @@
-;;; mu4e-window.el --- window management for mu4e    -*- lexical-binding: t; -*-
+;;; mu4e-window.el --- Window management -*- lexical-binding: t; -*-
 
 ;; Copyright (C) 2022  Mickey Petersen
 
diff --git a/mu4e/mu4e.el b/mu4e/mu4e.el
index 57a85b30..a772147d 100644
--- a/mu4e/mu4e.el
+++ b/mu4e/mu4e.el
@@ -1,4 +1,4 @@
-;;; mu4e.el --- part of mu4e, the mu mail user agent -*- lexical-binding: t -*-
+;;; mu4e.el --- Mu4e, the mu mail user agent -*- lexical-binding: t -*-
 
 ;; Copyright (C) 2011-2023 Dirk-Jan C. Binnema