X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch.c;h=f47e4fcbb65d6ddf805ecbedb07c4fa61a097861;hp=66b615b2285605cd712852e3eb2060365028d43d;hb=90a0ef4ac4a023f11f82b037c635b4b22762b12f;hpb=bf78a89196b251c2465f6cefa8198f22c87ff23d

diff --git a/notmuch.c b/notmuch.c
index 66b615b2..f47e4fcb 100644
--- a/notmuch.c
+++ b/notmuch.c
@@ -806,7 +806,10 @@ show_command (unused (int argc), unused (char *argv[]))
     notmuch_query_t *query = NULL;
     notmuch_message_results_t *messages;
     notmuch_message_t *message;
+    const char *filename;
+    FILE *file;
     int ret = 0;
+    int c;
 
     if (argc != 1) {
 	fprintf (stderr, "Error: \"notmuch show\" requires exactly one thread-ID argument.\n");
@@ -847,6 +850,22 @@ show_command (unused (int argc), unused (char *argv[]))
 	printf ("%s", notmuch_message_get_all_headers (message));
 
 	printf ("%%header}\n");
+
+	filename = notmuch_message_get_filename (message);
+
+	file = fopen (filename, "r");
+	if (file) {
+	    size_t header_size = notmuch_message_get_header_size (message);
+	    fseek (file, header_size + 1, SEEK_SET);
+	    while (1) {
+		c = fgetc (file);
+		if (c == EOF)
+		    break;
+		putchar (c);
+	    }
+	}
+	fclose (file);
+
 	printf ("%%message}\n");
 
 	notmuch_message_destroy (message);
@@ -1206,7 +1225,6 @@ command_t commands[] = {
       "\t\tmarks around any parenthesized expression)." },
     { "show", show_command,
       "<thread-id>\n\n"
-      "\t\tNote: The \"notmuch show\" command is not implemented yet.\n\n"
       "\t\tShow the thread with the given thread ID (see 'search').",
       "\t\tThread ID values are given as the first column in the\n"
       "\t\toutput of the \"notmuch search\" command. These are the\n"