diff --git a/emacs/notmuch-lib.el b/emacs/notmuch-lib.el
index da48bb86..4496ecd2 100644
--- a/emacs/notmuch-lib.el
+++ b/emacs/notmuch-lib.el
@@ -611,7 +611,8 @@ the given type."
 				   ,@(and process-crypto '("--decrypt=true"))
 				   ,(notmuch-id-to-query (plist-get msg :id))))
 			   (coding-system-for-read
-			    (if binaryp 'no-conversion
+			    (if binaryp
+				'no-conversion
 			      (let ((coding-system
 				     (mm-charset-to-coding-system
 				      (plist-get part :content-charset))))
@@ -680,7 +681,8 @@ current buffer, if possible."
       ;; `gnus-decoded' charset.  Otherwise, we'll fetch the binary
       ;; part content and let mm-* decode it.
       (let* ((have-content (plist-member part :content))
-	     (charset (if have-content 'gnus-decoded
+	     (charset (if have-content
+			  'gnus-decoded
 			(plist-get part :content-charset)))
 	     (handle (mm-make-handle (current-buffer)
 				     `(,content-type (charset . ,charset)))))
diff --git a/emacs/notmuch-tag.el b/emacs/notmuch-tag.el
index 1067f185..e71de041 100644
--- a/emacs/notmuch-tag.el
+++ b/emacs/notmuch-tag.el
@@ -532,7 +532,8 @@ and vice versa."
 		       (and (symbolp name)
 			    (symbol-name name))))
 	     (name-string (if name
-			      (if reverse (concat "Reverse " name)
+			      (if reverse
+				  (concat "Reverse " name)
 				name)
 			    (mapconcat #'identity tag-change " "))))
 	(push (list key name-string
diff --git a/emacs/notmuch-tree.el b/emacs/notmuch-tree.el
index 6a619ec2..b498db07 100644
--- a/emacs/notmuch-tree.el
+++ b/emacs/notmuch-tree.el
@@ -1009,7 +1009,8 @@ the same as for the function notmuch-tree."
   (setq notmuch-tree-basic-query basic-query)
   (setq notmuch-tree-query-context (if (or (string= query-context "")
 					   (string= query-context "*"))
-				       nil query-context))
+				       nil
+				     query-context))
   (setq notmuch-tree-target-msg target)
   (setq notmuch-tree-open-target open-target)
   ;; Set the default value for `notmuch-show-process-crypto' in this