diff --git a/test/emacs b/test/emacs
index f2e95980..fa3426ed 100755
--- a/test/emacs
+++ b/test/emacs
@@ -196,4 +196,20 @@ Thanks for the advice! I will be sure to put it to good use.
 [ 9-line hidden original message. Click/Enter to show. ]" > EXPECTED
 test_expect_equal_file OUTPUT EXPECTED
 
+test_begin_subtest "Hiding message in notmuch-show view"
+output=$(test_emacs '(notmuch-show "id:f35dbb950911171438k5df6eb56k77b6c0944e2e79ae@mail.gmail.com")
+		     (notmuch-show-toggle-message)
+		     (princ (visible-buffer-string))')
+expected=$(cat $EXPECTED/notmuch-show-thread-with-hidden-messages)
+test_expect_equal "$output" "$expected"
+
+test_begin_subtest "Hiding message with visible citation in notmuch-show view"
+output=$(test_emacs '(notmuch-show "id:f35dbb950911171438k5df6eb56k77b6c0944e2e79ae@mail.gmail.com")
+		     (search-forward "Click/Enter to show.")
+		     (button-activate (button-at (point)))
+		     (notmuch-show-toggle-message)
+		     (princ (visible-buffer-string))')
+expected=$(cat $EXPECTED/notmuch-show-thread-with-hidden-messages)
+test_expect_equal "$output" "$expected"
+
 test_done
diff --git a/test/emacs.expected-output/notmuch-show-thread-with-hidden-messages b/test/emacs.expected-output/notmuch-show-thread-with-hidden-messages
new file mode 100644
index 00000000..5df66063
--- /dev/null
+++ b/test/emacs.expected-output/notmuch-show-thread-with-hidden-messages
@@ -0,0 +1,3 @@
+Jan Janak <jan@ryngle.com> (2009-11-17) (inbox unread)
+ Jan Janak <jan@ryngle.com> (2009-11-17) (inbox)
+ Carl Worth <cworth@cworth.org> (2009-11-18) (inbox unread)