Merge in the mailcap patch from stable.

1 files changed, 0 insertions, 5 deletions

diff --git a/mx.c b/mx.c
index aed1be41..21428642 100644
--- a/mx.c
+++ b/mx.c
@@ -1306,13 +1306,8 @@ void mx_update_context (CONTEXT *ctx)
 #ifdef _PGPPATH
   /* NOTE: this _must_ be done before the check for mailcap! */
   h->pgp = pgp_query (h->content);
-  if (!h->pgp)
 #endif /* _PGPPATH */
 
-
-
-    if (mutt_needs_mailcap (h->content))
-      h->mailcap = 1;
   if (h->flagged)
     ctx->flagged++;
   if (h->deleted)