X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=emacs%2Fnotmuch-show.el;h=4b1baf38dd2a5bcc3fc64145fb15407943be7bd1;hb=6039864ed5019d2ea367d4deceb0a10f664ba29d;hp=f5de8ae91a79fdf8679b2b6b13e2776ad208a6a8;hpb=01ec4d3bcb660e0b26f66db02c25b3dfaec5e1fe;p=notmuch

diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el
index f5de8ae9..4b1baf38 100644
--- a/emacs/notmuch-show.el
+++ b/emacs/notmuch-show.el
@@ -71,7 +71,8 @@ any given message."
   "Functions used to improve the display of text/plain parts."
   :group 'notmuch
   :type 'hook
-  :options '(notmuch-wash-wrap-long-lines
+  :options '(notmuch-wash-convert-inline-patch-to-part
+	     notmuch-wash-wrap-long-lines
 	     notmuch-wash-tidy-citations
 	     notmuch-wash-elide-blank-lines
 	     notmuch-wash-excerpt-citations))
@@ -833,8 +834,8 @@ any effects from previous calls to
       ;; If a small number of lines from the previous message are
       ;; visible, realign so that the top of the current message is at
       ;; the top of the screen.
-      (if (< (count-lines (window-start) (notmuch-show-message-top))
-	     next-screen-context-lines)
+      (if (<= (count-screen-lines (window-start) start-of-message)
+	      next-screen-context-lines)
 	  (progn
 	    (goto-char (notmuch-show-message-top))
 	    (notmuch-show-message-adjust)))