X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=muttlib.c;h=2e34fadc7fdfc0a8eed9b476788731932d82e55c;hp=22d4c76a89b661917ab94277be811b223533efaf;hb=b661011c5210796beaf103676c0d24b87f1a2787;hpb=16ff93bd19515d67ea15468b4adb35395970a559

diff --git a/muttlib.c b/muttlib.c
index 22d4c76..2e34fad 100644
--- a/muttlib.c
+++ b/muttlib.c
@@ -1029,7 +1029,7 @@ void mutt_FormatString (char *dest,		/* output buffer */
 	if ( DrawFullLine )
 	  count = (COLS < destlen ? COLS : destlen);
 	else
-	  count = ((COLS-SidebarWidth) < destlen ? COLS - SidebarWidth : destlen);
+	  count = ((COLS) < destlen ? (COLS) : destlen);
 	if (count > col)
 	{
 	  count -= col; /* how many columns left on this line */
@@ -1042,8 +1042,10 @@ void mutt_FormatString (char *dest,		/* output buffer */
 	    wptr += count;
 	    col += count;
 	  }
-	  if (len + wlen > destlen)
+	  if (wid + wlen > destlen)
 	    len = destlen - wlen;
+    else
+      len = wid;
 	  memcpy (wptr, buf, len);
 	  wptr += len;
 	  wlen += len;
@@ -1327,7 +1329,8 @@ int state_printf (STATE *s, const char *fmt, ...)
 void state_mark_attach (STATE *s)
 {
   if ((s->flags & M_DISPLAY) && !mutt_strcmp (Pager, "builtin"))
-    state_puts (AttachmentMarker, s);
+    //state_puts (AttachmentMarker, s);
+    ;
 }
 
 void state_attach_puts (const char *t, STATE *s)