From: Michael Elkins <me@sigpipe.org>
Date: Sat, 1 Dec 2012 22:32:48 +0000 (-0800)
Subject: don't perform rfc3676 space stuffing when recalling a postponed message where it... 
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=04cb5bde;p=mutt

don't perform rfc3676 space stuffing when recalling a postponed message where it has already been done.

closes #3600
---

diff --git a/send.c b/send.c
index 9b2fb10c..6326610a 100644
--- a/send.c
+++ b/send.c
@@ -1408,8 +1408,17 @@ ci_send_message (int flags,		/* send mode */
 	  mutt_perror (msg->content->filename);
       }
       
-      if (option (OPTTEXTFLOWED))
-	rfc3676_space_stuff (msg);
+      /* If using format=flowed, perform space stuffing.  Avoid stuffing when
+       * recalling a postponed message where the stuffing was already
+       * performed.  If it has already been performed, the format=flowed
+       * parameter will be present.
+       */
+      if (option (OPTTEXTFLOWED) && msg->content->type == TYPETEXT && !ascii_strcasecmp("plain", msg->content->subtype))
+      {
+	char *p = mutt_get_parameter("format", msg->content->parameter);
+	if (ascii_strcasecmp("flowed", NONULL(p)))
+	  rfc3676_space_stuff (msg);
+      }
 
       mutt_message_hook (NULL, msg, M_SEND2HOOK);
     }