-diff -udprP mutt-1.5.9.orig/init.h mutt-1.5.9/init.h
---- mutt-1.5.9.orig/init.h 2005-03-01 17:56:02.000000000 +0200
-+++ mutt-1.5.9/init.h 2005-03-13 19:42:58.023680512 +0200
-@@ -2124,6 +2124,19 @@ struct option_t MuttVars[] = {
- ** have no effect, and if it is set to ask-yes or ask-no, you are
+@@ -1617,7 +1621,7 @@ int mutt_body_handler (BODY *b, STATE *s
+ */
+ if ((WithCrypto & APPLICATION_PGP) && mutt_is_application_pgp (b))
+ handler = crypt_pgp_application_pgp_handler;
+- else if (option(OPTREFLOWTEXT) && ascii_strcasecmp ("flowed", mutt_get_parameter ("format", b->parameter)) == 0)
++ else if (option(OPTREFLOWTEXT) && ascii_strcasecmp ("flowed", mutt_get_parameter ("format", b->parameter)) == 0 && !s->prefix)
+ handler = rfc3676_handler;
+ else
+ handler = text_plain_handler;
+diff -udprP mutt-1.5.19.orig/init.h mutt-1.5.19/init.h
+--- mutt-1.5.19.orig/init.h 2009-01-05 21:20:53.000000000 +0200
++++ mutt-1.5.19/init.h 2009-01-06 19:40:35.000000000 +0200
+@@ -2451,6 +2451,19 @@ struct option_t MuttVars[] = {
+ ** have no effect, and if it is set to \fIask-yes\fP or \fIask-no\fP, you are