X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=handler.c;h=030916db1be0e45845d856a48d3758489397e4bb;hp=5c05b0f1f54d15b64e77f031226bf9c3ae8abfa0;hb=31edbe030ac69952aa535730427246b5e9a1603c;hpb=c7ceecd31e97891dd5cf48536d4bddf2c1d7d9dd

diff --git a/handler.c b/handler.c
index 5c05b0f..030916d 100644
--- a/handler.c
+++ b/handler.c
@@ -1217,22 +1217,29 @@ static void print_flowed_line(char * line, STATE *s,int ql) {
       --width;
     if (width < 0)
       width = MaxLineLength;
-  } else {
-    width = COLS - SidebarWidth - WrapMargin - ql - 1;
+  } 
+  else {
+    if (option(OPTMBOXPANE))
+      width = COLS - SidebarWidth - WrapMargin - ql - 1;
+    else
+      width = COLS - WrapMargin - ql - 1;
+    
     if (option(OPTSTUFFQUOTED))
       --width;
     if (width < 0)
       width = COLS;
-  }
+  } 
 
   /* fprintf(stderr,"print_flowed_line will print `%s' with ql = %d\n",line,ql); */
 
   if (strlen(line)==0) {
-    if (s->prefix)
-      state_puts(s->prefix,s);
-    for (i=0;i<ql;++i) state_putc('>',s);
-    if (option(OPTSTUFFQUOTED))
-      state_putc(' ',s);
+    if (option (OPTQUOTEEMPTY)) {
+      if (s->prefix)
+        state_puts(s->prefix,s);
+      for (i=0;i<ql;++i) state_putc('>',s);
+      if (option(OPTSTUFFQUOTED))
+        state_putc(' ',s);
+    }
     state_putc('\n',s);
     return;
   }