X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=rfc3676.c;h=b76108daaffac4cfe365289b1f63fb4e6a334cce;hp=7ca872639c1d0724aadc017de2b35b76571eae39;hb=c228dbc78fa40b09da8bcf5c1650d6006c389ce4;hpb=28b09c881c2b1175298a3b94e09106f77a94eb88

diff --git a/rfc3676.c b/rfc3676.c
index 7ca8726..b76108d 100644
--- a/rfc3676.c
+++ b/rfc3676.c
@@ -52,7 +52,7 @@ static void print_flowed_line (char *line, STATE * s,
 
   if (MaxLineLength > 0) {
     width = MaxLineLength - WrapMargin - ql - 1;
-    if (option (OPTSTUFFQUOTED))
+    if (!(s->flags & M_REPLYING) && option (OPTSTUFFQUOTED))
       --width;
     if (width < 0)
       width = MaxLineLength;
@@ -63,7 +63,7 @@ static void print_flowed_line (char *line, STATE * s,
     else
       width = COLS - WrapMargin - ql - 1;
 
-    if (option (OPTSTUFFQUOTED))
+    if (!(s->flags & M_REPLYING) && option (OPTSTUFFQUOTED))
       --width;
     if (width < 0)
       width = COLS;
@@ -74,7 +74,7 @@ static void print_flowed_line (char *line, STATE * s,
       if (s->prefix)
         state_puts(s->prefix,s);
       for (i=0;i<ql;++i) state_putc('>',s);
-      if (option(OPTSTUFFQUOTED))
+      if (!(s->flags & M_REPLYING) && option(OPTSTUFFQUOTED))
         state_putc(' ',s);
     }
     state_putc('\n',s);
@@ -123,7 +123,8 @@ static void print_flowed_line (char *line, STATE * s,
 
     for (i = 0; i < ql; ++i)
       state_putc ('>', s);
-    if (option (OPTSTUFFQUOTED) && (ql > 0 || s->prefix))
+    if (!(s->flags & M_REPLYING) && option (OPTSTUFFQUOTED) &&
+        (ql > 0 || s->prefix))
       state_putc (' ', s);
 
     if (delsp && spaces && space_len > 0) {
@@ -270,9 +271,7 @@ void rfc3676_quote_line (STATE* s, char* dst, size_t dstlen,
   }
   debug_print (4, ("f=f: quotelevel = %d, new prefix = '%s'\n",
                    i, NONULL (quote)));
-  /* if we changed prefix, make sure we respect $stuff_quoted */
-  snprintf (dst, dstlen, "%s%s%s%s", NONULL (s->prefix), NONULL (quote),
-            option (OPTSTUFFQUOTED) && line[offset] != ' ' ? " " : "",
+  snprintf (dst, dstlen, "%s%s%s", NONULL (s->prefix), NONULL (quote),
             &line[offset]);
 }